mirrors/yt-dlp-deezer
1
0
Fork 0
mirror of https://github.com/LucBerge/yt-dlp.git synced 2025-03-17 19:57:52 +03:00
Code Issues Projects Releases Packages Wiki Activity

[cleanup] Minor fixes

Browse source 
Closes #2334
This commit is contained in:
pukkandan 2022-01-20 04:27:36 +05:30
parent fc5fa964c7
commit 6970b6005e
No known key found for this signature in database
GPG key ID: 0F00D95A001F4698
12 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

19
yt_dlp/postprocessor/ffmpeg.py
View file

@ -568,7 +568,7 @@ class FFmpegVideoConvertorPP(FFmpegPostProcessor):
else f'already is in target format {source_ext}' if source_ext == target_ext
else None)
if _skip_msg:
self.to_screen(f'Not {self._ACTION} media file {filename!r}; {_skip_msg}')
self.to_screen(f'Not {self._ACTION} media file "{filename}"; {_skip_msg}')
return [], info
outpath = replace_extension(filename, target_ext, source_ext)
@ -917,7 +917,7 @@ class FFmpegFixupTimestampPP(FFmpegFixupPostProcessor):
return [], info
class FFmpegCopyStreamPostProcessor(FFmpegFixupPostProcessor):
class FFmpegCopyStreamPP(FFmpegFixupPostProcessor):
MESSAGE = 'Copying stream'
@PostProcessor._restrict_to(images=False)
@ -926,11 +926,11 @@ class FFmpegCopyStreamPostProcessor(FFmpegFixupPostProcessor):
return [], info
class FFmpegFixupDurationPP(FFmpegCopyStreamPostProcessor):
class FFmpegFixupDurationPP(FFmpegCopyStreamPP):
MESSAGE = 'Fixing video duration'
class FFmpegFixupDuplicateMoovPP(FFmpegCopyStreamPostProcessor):
class FFmpegFixupDuplicateMoovPP(FFmpegCopyStreamPP):
MESSAGE = 'Fixing duplicate MOOV atoms'
@ -1132,15 +1132,20 @@ class FFmpegConcatPP(FFmpegPostProcessor):
def concat_files(self, in_files, out_file):
if len(in_files) == 1:
if os.path.realpath(in_files[0]) != os.path.realpath(out_file):
self.to_screen(f'Moving "{in_files[0]}" to "{out_file}"')
os.replace(in_files[0], out_file)
return
return []
codecs = [traverse_obj(self.get_metadata_object(file), ('streams', ..., 'codec_name')) for file in in_files]
if len(set(map(tuple, codecs))) > 1:
raise PostProcessingError(
'The files have different streams/codecs and cannot be concatenated. '
'Either select different formats or --recode-video them to a common format')
self.to_screen(f'Concatenating {len(in_files)} files; Destination: {out_file}')
super().concat_files(in_files, out_file)
return in_files
@PostProcessor._restrict_to(images=False)
def run(self, info):
@ -1161,10 +1166,10 @@ class FFmpegConcatPP(FFmpegPostProcessor):
ie_copy['ext'] = exts[0] if len(set(exts)) == 1 else 'mkv'
out_file = self._downloader.prepare_filename(ie_copy, 'pl_video')
self.concat_files(in_files, out_file)
files_to_delete = self.concat_files(in_files, out_file)
info['requested_downloads'] = [{
'filepath': out_file,
'ext': ie_copy['ext'],
}]
return in_files, info
return files_to_delete, info