DRMTalks
/
devine
mirror of https://github.com/devine-dl/devine.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

fix(dl): Log output from mkvmerge on failure

This commit is contained in:
rlaphoenix 2024-05-15 14:00:38 +01:00
parent f08402d795
commit 2e697d93fc
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devine/commands/dl.py
View File

@ -701,15 +701,17 @@ class dl:
): ):
for task_id, task_tracks in multiplex_tasks: for task_id, task_tracks in multiplex_tasks:
progress.start_task(task_id) # TODO: Needed? progress.start_task(task_id) # TODO: Needed?
muxed_path, return_code = task_tracks.mux( muxed_path, return_code, output = task_tracks.mux(
str(title), str(title),
progress=partial(progress.update, task_id=task_id), progress=partial(progress.update, task_id=task_id),
delete=False delete=False
) )
muxed_paths.append(muxed_path) muxed_paths.append(muxed_path)
if return_code == 1: if return_code == 1:
self.log.warning(output)
self.log.warning("mkvmerge had at least one warning, will continue anyway...") self.log.warning("mkvmerge had at least one warning, will continue anyway...")
elif return_code >= 2: elif return_code >= 2:
self.log.warning(output)
self.log.error(f"Failed to Mux video to Matroska file ({return_code})") self.log.error(f"Failed to Mux video to Matroska file ({return_code})")
sys.exit(1) sys.exit(1)
for video_track in task_tracks.videos: for video_track in task_tracks.videos:

6
devine/core/tracks/tracks.py
View File

@ -316,7 +316,7 @@ class Tracks:
][:per_language or None]) ][:per_language or None])
return selected return selected
def mux(self, title: str, delete: bool = True, progress: Optional[partial] = None) -> tuple[Path, int]: def mux(self, title: str, delete: bool = True, progress: Optional[partial] = None) -> tuple[Path, int, str]:
""" """
Multiplex all the Tracks into a Matroska Container file. Multiplex all the Tracks into a Matroska Container file.
@ -410,15 +410,17 @@ class Tracks:
# let potential failures go to caller, caller should handle # let potential failures go to caller, caller should handle
try: try:
output = ""
p = subprocess.Popen([ p = subprocess.Popen([
*cl, *cl,
"--output", str(output_path), "--output", str(output_path),
"--gui-mode" "--gui-mode"
], text=True, stdout=subprocess.PIPE) ], text=True, stdout=subprocess.PIPE)
for line in iter(p.stdout.readline, ""): for line in iter(p.stdout.readline, ""):
output += line
if "progress" in line: if "progress" in line:
progress(total=100, completed=int(line.strip()[14:-1])) progress(total=100, completed=int(line.strip()[14:-1]))
return output_path, p.wait() return output_path, p.wait(), output
finally: finally:
if chapters_path: if chapters_path:
# regardless of delete param, we delete as it's a file we made during muxing # regardless of delete param, we delete as it's a file we made during muxing