Skip to content

Commit

Permalink
3.1.1 Update
Browse files Browse the repository at this point in the history
  • Loading branch information
devhotteok committed Aug 27, 2023
1 parent 9c54f94 commit 0031e1a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
5 changes: 3 additions & 2 deletions AppData/Updater.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def Update_3_1_0(data: dict) -> dict:
"preferredQualityIndex": preset["preferredQualityIndex"],
"preferredFrameRateIndex": preset["preferredFrameRateIndex"],
"fileFormat": preset["fileFormat"],
"skipAds": False,
"skipAds": True,
"remux": preset["remux"],
"preferredResolutionOnly": preset["preferredResolutionOnly"],
"enabled": preset["enabled"],
Expand All @@ -148,7 +148,8 @@ def getUpdaters(cls, versionFrom: str) -> list[typing.Callable[[dict], dict]] |
"3.0.2": None,
"3.0.3": None,
"3.0.4": None,
"3.1.0": cls.Update_3_1_0
"3.1.0": cls.Update_3_1_0,
"3.1.1": None
}
updaters = []
versionFound = False
Expand Down
2 changes: 1 addition & 1 deletion Core/Meta.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
class Meta:
APP_NAME = "TwitchLink"

APP_VERSION = "3.1.0"
APP_VERSION = "3.1.1"

AUTHOR = "DevHotteok"

Expand Down
2 changes: 2 additions & 0 deletions Download/Downloader/Core/Engine/BaseEngine.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ def abort(self, exception: Exception) -> None:
self._raiseException(exception)

def _raiseException(self, exception: Exception) -> None:
self.logger.warning("The following exception occurred.")
self.logger.warning(exception)
self.status.raiseError(exception)
self._syncStatus()

Expand Down
6 changes: 4 additions & 2 deletions Download/Downloader/Core/Engine/Playlist/PlaylistEngine.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from Services.Utils.Utils import Utils
from Services.Logging.Logger import Logger
from Services.Temp.TempManager import SafeTempDirectory
from Services.Twitch.Playback import TwitchPlaybackModels
from Services.Playlist import Playlist
from Services.Playlist.Segment import Segment
from Services.Playlist.PlaylistManager import PlaylistManager
Expand Down Expand Up @@ -144,7 +143,10 @@ def _mergeSegment(self, segmentDownloader: SegmentDownloader) -> None:
if segmentDownloader.file.open(QtCore.QIODevice.OpenModeFlag.ReadOnly):
while not segmentDownloader.file.atEnd():
if self.downloadInfo.isRemuxEnabled():
if self._FFmpeg.write(segmentDownloader.file.read(Config.FILE_CHUNK_SIZE)) == -1 or not self._FFmpeg.waitForBytesWritten(Config.PIPE_TIMEOUT):
if self._FFmpeg == None:
self.logger.warning("Unable to find pipe target.")
self._raiseException(Exceptions.UnexpectedError())
elif self._FFmpeg.write(segmentDownloader.file.read(Config.FILE_CHUNK_SIZE)) == -1 or not self._FFmpeg.waitForBytesWritten(Config.PIPE_TIMEOUT):
self.logger.warning("Unable to write data to pipe.")
self._raiseException(Exceptions.UnexpectedError())
else:
Expand Down

0 comments on commit 0031e1a

Please sign in to comment.