mirror/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-03-09 12:50:23 -05:00
Code Activity

Fix ruff format errors

Browse source
This commit is contained in:
Kenshin 2024-10-07 08:57:01 +02:00
parent de9b89b71f
commit 07d3a44dae
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
yt_dlp/postprocessor/common.py
View file

@ -204,7 +204,7 @@ def _prepare_multiline_status(self, lines=1):
self._multiline = MultilineLogger(self._downloader.params['logger'], lines) self._multiline = MultilineLogger(self._downloader.params['logger'], lines)
elif self._downloader.params.get('progress_with_newline'): elif self._downloader.params.get('progress_with_newline'):
self._multiline = BreaklineStatusPrinter(self._downloader._out_files.out, lines) self._multiline = BreaklineStatusPrinter(self._downloader._out_files.out, lines)
elif hasattr(self._downloader, "_out_files"): elif hasattr(self._downloader, '_out_files'):
self._multiline = MultilinePrinter(self._downloader._out_files.out, lines, not self._downloader.params.get('quiet')) self._multiline = MultilinePrinter(self._downloader._out_files.out, lines, not self._downloader.params.get('quiet'))
else: else:
self._multiline = MultilinePrinter(sys.stdout, lines, not self._downloader.params.get('quiet')) self._multiline = MultilinePrinter(sys.stdout, lines, not self._downloader.params.get('quiet'))

17
yt_dlp/postprocessor/ffmpeg.py
View file

@ -1254,11 +1254,11 @@ def _track_ffmpeg_progress(self):
self._duration_to_track, self._total_duration = self._compute_duration_to_track() self._duration_to_track, self._total_duration = self._compute_duration_to_track()
self._total_filesize = self._compute_total_filesize(self._duration_to_track, self._total_duration) self._total_filesize = self._compute_total_filesize(self._duration_to_track, self._total_duration)
self._status = { self._status = {
'filename': self._ffmpeg_args[-3].split(":")[-1], 'filename': self._ffmpeg_args[-3].split(':')[-1],
'status': 'ffmpeg_running', 'status': 'ffmpeg_running',
'total_bytes': self._total_filesize, 'total_bytes': self._total_filesize,
'elapsed': 0, 'elapsed': 0,
'outputted': 0 'outputted': 0,
} }
out_listener = Thread( out_listener = Thread(
@ -1278,7 +1278,7 @@ def _track_ffmpeg_progress(self):
self._status.update({ self._status.update({
'status': 'finished', 'status': 'finished',
'outputted': self._total_filesize 'outputted': self._total_filesize,
}) })
time.sleep(.5) # Needed if ffmpeg didn't release the file in time for yt-dlp to change its name time.sleep(.5) # Needed if ffmpeg didn't release the file in time for yt-dlp to change its name
return self._streams[0], self._streams[1], retcode return self._streams[0], self._streams[1], retcode
@ -1315,7 +1315,7 @@ def _wait_for_ffmpeg(self):
time.sleep(.01) time.sleep(.01)
self._handle_lines() self._handle_lines()
self._status.update({ self._status.update({
'elapsed': time.time() - self._start_time 'elapsed': time.time() - self._start_time,
}) })
self._hook_progress(self._status, self._info_dict) self._hook_progress(self._status, self._info_dict)
retcode = self.ffmpeg_proc.poll() retcode = self.ffmpeg_proc.poll()
@ -1351,8 +1351,7 @@ def _compute_total_filesize(self, duration_to_track, total_duration):
filesize = self._info_dict.get('filesize') filesize = self._info_dict.get('filesize')
if not filesize: if not filesize:
filesize = self._info_dict.get('filesize_approx', 0) filesize = self._info_dict.get('filesize_approx', 0)
total_filesize = filesize * duration_to_track // total_duration return filesize * duration_to_track // total_duration
return total_filesize
def _compute_duration_to_track(self): def _compute_duration_to_track(self):
duration = self._info_dict.get('duration') duration = self._info_dict.get('duration')
@ -1394,8 +1393,8 @@ def _compute_eta(ffmpeg_prog_infos, duration_to_track):
@staticmethod @staticmethod
def ffmpeg_time_string_to_seconds(time_string): def ffmpeg_time_string_to_seconds(time_string):
ffmpeg_time_seconds = 0 ffmpeg_time_seconds = 0
hms_parsed = re.match(r"((?P<Hour>\d+):)?((?P<Minute>\d+):)?(?P<Second>\d+)(\.(?P<float>\d+))?", time_string) hms_parsed = re.match(r'((?P<Hour>\d+):)?((?P<Minute>\d+):)?(?P<Second>\d+)(\.(?P<float>\d+))?', time_string)
smu_parse = re.match(r"(?P<Time>\d+)(?P<Unit>[mu]?s)", time_string) smu_parse = re.match(r'(?P<Time>\d+)(?P<Unit>[mu]?s)', time_string)
if hms_parsed: if hms_parsed:
if hms_parsed.group('Hour'): if hms_parsed.group('Hour'):
ffmpeg_time_seconds += 3600 * int_or_none(hms_parsed.group('Hour')) ffmpeg_time_seconds += 3600 * int_or_none(hms_parsed.group('Hour'))
@ -1416,7 +1415,7 @@ def ffmpeg_time_string_to_seconds(time_string):
@staticmethod @staticmethod
def _compute_bitrate(bitrate): def _compute_bitrate(bitrate):
bitrate_str = re.match(r"(?P<Integer>\d+)(\.(?P<float>\d+))?(?P<Prefix>[gmk])?bits/s", bitrate) bitrate_str = re.match(r'(?P<Integer>\d+)(\.(?P<float>\d+))?(?P<Prefix>[gmk])?bits/s', bitrate)
try: try:
no_prefix_bitrate = int_or_none(bitrate_str.group('Integer')) no_prefix_bitrate = int_or_none(bitrate_str.group('Integer'))
if bitrate_str.group('float'): if bitrate_str.group('float'):