Saverr/svtplay-dl
1
0
Fork 0
mirror of https://github.com/spaam/svtplay-dl.git synced 2024-11-27 21:54:17 +01:00
Code Issues Projects Releases Wiki Activity

Fixed issue with --force-subtitle.

Browse Source 
--force-subtitle and -S did not respect each other but now it is
working as it should. If --force-subtitle is used with -S it downloads
only the subtitles, and if --force-subtitle is used alone it overwrites
the existing subtitles and continues with the audio/video stream.
This commit is contained in:
iwconfig 2016-06-20 18:22:11 +00:00
parent 4e63c15ef9
commit 3c1d45a37c
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/svtplay_dl/__init__.py
View File

@ -206,6 +206,7 @@ def get_one_media(stream, options):
videos = []
subs = []
subfixes = []
error = []
streams = stream.get()
try:
@ -245,8 +246,7 @@ def get_one_media(stream, options):
if options.force_subtitle:
return
subfixes = []
if options.subtitle and options.output != "-" and not options.get_url:
def options_subs_dl(subfixes):
if subs:
if options.get_all_subtitles:
for sub in subs:
@ -255,23 +255,16 @@ def get_one_media(stream, options):
subfixes += [sub.subfix]
else:
subs[0].download()
elif options.merge_subtitle:
options.merge_subtitle = False
if options.force_subtitle:
return
if options.subtitle and options.output != "-" and not options.get_url:
options_subs_dl(subfixes)
if options.force_subtitle:
return
if options.merge_subtitle and not options.subtitle:
if subs:
if options.get_all_subtitles:
for sub in subs:
sub.download()
subfixes += [sub.subfix]
else:
subs[0].download()
else:
options.merge_subtitle = False
options_subs_dl(subfixes)
if len(videos) == 0:
@ -283,11 +276,11 @@ def get_one_media(stream, options):
return
try:
stream = select_quality(options, videos)
log.info("Selected to download %s, bitrate: %s",
stream.name(), stream.bitrate)
if options.get_url:
print(stream.url)
return
log.info("Selected to download %s, bitrate: %s",
stream.name(), stream.bitrate)
stream.download()
except UIException as e:
if options.verbose:
@ -410,8 +403,6 @@ def main():
parser.error("Incorrect number of arguments")
if options.exclude:
options.exclude = options.exclude.split(",")
if options.force_subtitle:
options.subtitle = True
if options.require_subtitle:
if options.merge_subtitle:
options.merge_subtitle = True

3
lib/svtplay_dl/postprocess/__init__.py
View File

@ -21,9 +21,6 @@ class postprocess(object):
for i in ["ffmpeg", "avconv"]:
self.detect = which(i)
if self.detect:
if self.merge_subtitle and not 'ffmpeg' in self.detect:
log.error("error no ffmpeg")
import sys; sys.exit(2)
break
def sublanguage(self):