Skip to content

Commit

Permalink
Merge pull request #94 from blackjack4494/conv_subs_when_skipped
Browse files Browse the repository at this point in the history
[youtube] Convert subs when download is skipped
  • Loading branch information
blackjack4494 authored Sep 13, 2020
2 parents 84da5d8 + f791b41 commit ef0389f
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 0 deletions.
24 changes: 24 additions & 0 deletions youtube_dlc/YoutubeDL.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
FFmpegFixupStretchedPP,
FFmpegMergerPP,
FFmpegPostProcessor,
FFmpegSubtitlesConvertorPP,
get_postprocessor,
)
from .version import __version__
Expand Down Expand Up @@ -1846,6 +1847,29 @@ def dl(name, info):
(sub_lang, error_to_compat_str(err)))
continue

if self.params.get('skip_download', False):
if self.params.get('convertsubtitles', False):
subconv = FFmpegSubtitlesConvertorPP(self, format=self.params.get('convertsubtitles'))
filename_real_ext = os.path.splitext(filename)[1][1:]
filename_wo_ext = (
os.path.splitext(filename)[0]
if filename_real_ext == info_dict['ext']
else filename)
afilename = '%s.%s' % (filename_wo_ext, self.params.get('convertsubtitles'))
if subconv.available:
info_dict.setdefault('__postprocessors', [])
# info_dict['__postprocessors'].append(subconv)
if os.path.exists(encodeFilename(afilename)):
self.to_screen(
'[download] %s has already been downloaded and '
'converted' % afilename)
else:
try:
self.post_process(filename, info_dict)
except (PostProcessingError) as err:
self.report_error('postprocessing: %s' % str(err))
return

if self.params.get('writeinfojson', False):
infofn = replace_extension(filename, 'info.json', info_dict.get('ext'))
if self.params.get('nooverwrites', False) and os.path.exists(encodeFilename(infofn)):
Expand Down
1 change: 1 addition & 0 deletions youtube_dlc/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,7 @@ def parse_retries(retries):
else match_filter_func(opts.match_filter))

ydl_opts = {
'convertsubtitles': opts.convertsubtitles,
'usenetrc': opts.usenetrc,
'username': opts.username,
'password': opts.password,
Expand Down

0 comments on commit ef0389f

Please sign in to comment.