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

postprocess: remux and merge is more or less the same.

Browse Source 
they do the same. better to have one function to do it.
This commit is contained in:
Johan Andersson 2021-06-13 01:22:16 +02:00
parent 82151fd1ed
commit 00e5c84196
2 changed files with 13 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,95 +12,20 @@ from requests import post
from requests import Timeout from requests import Timeout
from svtplay_dl.utils.output import formatname from svtplay_dl.utils.output import formatname
from svtplay_dl.utils.proc import run_program from svtplay_dl.utils.proc import run_program
from svtplay_dl.utils.stream import subtitle_filter
class postprocess: class postprocess:
def __init__(self, stream, config, subfixes=None): def __init__(self, stream, config, subfixes=None):
self.stream = stream self.stream = stream
self.config = config self.config = config
self.subfixes = subfixes self.subfixes = [x.subfix for x in subtitle_filter(subfixes)]
self.detect = None self.detect = None
for i in ["ffmpeg", "avconv"]: for i in ["ffmpeg", "avconv"]:
self.detect = which(i) self.detect = which(i)
if self.detect: if self.detect:
break break
def remux(self):
if self.detect is None:
logging.error("Cant detect ffmpeg or avconv. Cant mux files without it.")
return
if self.stream.finished is False:
return
if formatname(self.stream.output, self.config).suffix != ".mp4":
orig_filename = formatname(self.stream.output, self.config)
new_name = orig_filename.with_suffix(".mp4")
cmd = [self.detect, "-i", str(orig_filename)]
_, stdout, stderr = run_program(cmd, False) # return 1 is good here.
streams = _streams(stderr)
videotrack, audiotrack = _checktracks(streams)
if self.config.get("merge_subtitle"):
logging.info(f"Muxing {orig_filename.name} and merging its subtitle into {new_name.name}")
else:
logging.info(f"Muxing {orig_filename.name} into {new_name.name}")
tempfile = orig_filename.with_suffix(".temp")
arguments = []
if videotrack:
arguments += ["-map", f"{videotrack}"]
if audiotrack:
arguments += ["-map", f"{audiotrack}"]
arguments += ["-c", "copy", "-f", "mp4"]
if orig_filename.suffix == ".ts" and streams and "aac" in _getcodec(streams, audiotrack):
arguments += ["-bsf:a", "aac_adtstoasc"]
if self.config.get("merge_subtitle"):
langs = _sublanguage(self.stream, self.config, self.subfixes)
for stream_num, language in enumerate(langs):
arguments += [
"-map",
str(stream_num + 1),
"-c:s:" + str(stream_num),
"mov_text",
"-metadata:s:s:" + str(stream_num),
"language=" + language,
]
if self.subfixes and len(self.subfixes) >= 2:
for subfix in self.subfixes:
# subfile = f"{name + subfix}.srt"
subfile = orig_filename.parent / (orig_filename.stem + "." + subfix + ".srt")
cmd += ["-i", str(subfile)]
else:
subfile = orig_filename.with_suffix(".srt")
cmd += ["-i", str(subfile)]
arguments += ["-y", str(tempfile)]
cmd += arguments
returncode, stdout, stderr = run_program(cmd)
if returncode != 0:
return
if self.config.get("keep_original") is True:
logging.info("Muxing done, keeping original file(s).")
os.rename(tempfile, new_name)
return
if self.config.get("merge_subtitle") and not self.config.get("subtitle"):
logging.info("Muxing done, removing the old files.")
if self.subfixes and len(self.subfixes) >= 2:
for subfix in self.subfixes:
subfile = orig_filename.parent / (orig_filename.stem + "." + subfix + ".srt")
os.remove(subfile)
else:
os.remove(subfile)
else:
logging.info("Muxing done, removing the old file.")
os.remove(orig_filename)
os.rename(tempfile, new_name)
def merge(self): def merge(self):
if self.detect is None: if self.detect is None:
logging.error("Cant detect ffmpeg or avconv. Cant mux files without it.") logging.error("Cant detect ffmpeg or avconv. Cant mux files without it.")
@ -120,26 +45,27 @@ class postprocess:
cmd = [self.detect] cmd = [self.detect]
if self.config.get("only_video") or not self.config.get("only_audio"): if self.config.get("only_video") or not self.config.get("only_audio"):
cmd += ["-i", str(orig_filename)] cmd += ["-i", str(orig_filename)]
if self.config.get("only_audio") or not self.config.get("only_video"): if self.stream.audio and self.config.get("only_audio") or not self.config.get("only_video"):
cmd += ["-i", str(audio_filename)] cmd += ["-i", str(audio_filename)]
_, stdout, stderr = run_program(cmd, False) # return 1 is good here. _, stdout, stderr = run_program(cmd, False) # return 1 is good here.
streams = _streams(stderr) streams = _streams(stderr)
videotrack, audiotrack = _checktracks(streams) videotrack, audiotrack = _checktracks(streams)
if self.config.get("merge_subtitle"): if self.config.get("merge_subtitle"):
logging.info(f"Merge audio, video and subtitle into {orig_filename.name}") logging.info(f"Merge audio, video and subtitle into {new_name.name}")
else: else:
logging.info(f"Merge audio and video into {orig_filename.name}") logging.info(f"Merge audio and video into {new_name.name}")
tempfile = orig_filename.with_suffix(".temp") tempfile = orig_filename.with_suffix(".temp")
arguments = ["-c:v", "copy", "-c:a", "copy", "-f", "mp4"] arguments = ["-c:v", "copy", "-c:a", "copy", "-f", "mp4"]
if ext == ".ts": if ext == ".ts":
if audiotrack and "aac" in _getcodec(streams, audiotrack): if audiotrack and "aac" in _getcodec(streams, audiotrack):
arguments += ["-bsf:a", "aac_adtstoasc"] arguments += ["-bsf:a", "aac_adtstoasc"]
cmd = [self.detect] cmd = [self.detect]
if self.config.get("only_video") or not self.config.get("only_audio"): if self.config.get("only_video") or not self.config.get("only_audio"):
cmd += ["-i", str(orig_filename)] cmd += ["-i", str(orig_filename)]
if self.config.get("only_audio") or not self.config.get("only_video"): if (self.stream.audio and self.config.get("only_audio")) or (self.stream.audio and not self.config.get("only_video")):
cmd += ["-i", str(audio_filename)] cmd += ["-i", str(audio_filename)]
if videotrack: if videotrack:
arguments += ["-map", f"{videotrack}"] arguments += ["-map", f"{videotrack}"]
@ -151,13 +77,13 @@ class postprocess:
for stream_num, language in enumerate(langs, start=len(tracks)): for stream_num, language in enumerate(langs, start=len(tracks)):
arguments += [ arguments += [
"-map", "-map",
str(stream_num), f"{str(stream_num - 1)}:0",
"-c:s:" + str(stream_num - 2), "-c:s:" + str(stream_num - 2),
"mov_text", "mov_text",
"-metadata:s:s:" + str(stream_num - 2), "-metadata:s:s:" + str(stream_num - 2),
"language=" + language, "language=" + language,
] ]
if self.subfixes: if self.subfixes and self.config.get("get_all_subtitles"):
for subfix in self.subfixes: for subfix in self.subfixes:
subfile = orig_filename.parent / (orig_filename.stem + "." + subfix + ".srt") subfile = orig_filename.parent / (orig_filename.stem + "." + subfix + ".srt")
cmd += ["-i", str(subfile)] cmd += ["-i", str(subfile)]
@ -179,7 +105,7 @@ class postprocess:
logging.info("Merging done, removing old files.") logging.info("Merging done, removing old files.")
if self.config.get("only_video") or not self.config.get("only_audio"): if self.config.get("only_video") or not self.config.get("only_audio"):
os.remove(orig_filename) os.remove(orig_filename)
if self.config.get("only_audio") or not self.config.get("only_video"): if (self.stream.audio and self.config.get("only_audio")) or (self.stream.audio and not self.config.get("only_video")):
os.remove(audio_filename) os.remove(audio_filename)
if self.config.get("merge_subtitle") and not self.config.get("subtitle"): if self.config.get("merge_subtitle") and not self.config.get("subtitle"):
@ -258,10 +184,7 @@ def _sublanguage(stream, config, subfixes):
langs = [] langs = []
exceptions = {"lulesamiska": "smj", "meankieli": "fit", "jiddisch": "yid"} exceptions = {"lulesamiska": "smj", "meankieli": "fit", "jiddisch": "yid"}
if subfixes and len(subfixes) >= 2: logging.info("Determining the language of the subtitle(s).")
logging.info("Determining the languages of the subtitles.")
else:
logging.info("Determining the language of the subtitle.")
if config.get("get_all_subtitles"): if config.get("get_all_subtitles"):
for subfix in subfixes: for subfix in subfixes:
if [exceptions[key] for key in exceptions.keys() if match(key, subfix.strip("-"))]: if [exceptions[key] for key in exceptions.keys() if match(key, subfix.strip("-"))]:

11
lib/svtplay_dl/utils/getmedia.py
View File

@ -106,7 +106,6 @@ def get_one_media(stream):
videos = [] videos = []
subtitles = [] subtitles = []
subfixes = []
error = [] error = []
streams = stream.get() streams = stream.get()
try: try:
@ -215,16 +214,10 @@ def get_one_media(stream):
logging.info("All done. Not postprocessing files, leaving them completely untouched.") logging.info("All done. Not postprocessing files, leaving them completely untouched.")
return return
post = postprocess(fstream, fstream.config, subfixes) post = postprocess(fstream, fstream.config, subtitles)
if fstream.audio and not post.detect and fstream.finished: if fstream.audio and not post.detect and fstream.finished:
logging.warning("Can't find ffmpeg/avconv. audio and video is in seperate files. if you dont want this use -P hls or hds") logging.warning("Can't find ffmpeg/avconv. audio and video is in seperate files. if you dont want this use -P hls or hds")
if post.detect and fstream.config.get("no_merge") is False:
if fstream.audio and post.detect and fstream.config.get("no_merge") is False:
post.merge() post.merge()
elif fstream.name == "hls" and post.detect and fstream.config.get("no_remux") is False:
if fstream.config.get("no_merge") is True:
logging.warning("Can't remux HLS streams without merging. Use --no-postprocess to leave content completely untouched.")
post.merge()
post.remux()
else: else:
logging.info("All done. Not postprocessing files, leaving them completely untouched.") logging.info("All done. Not postprocessing files, leaving them completely untouched.")