CDRM-Team/devine
1
0
Fork 0
mirror of https://github.com/devine-dl/devine.git synced 2025-04-29 17:49:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression where only last mux would be moved to dl folder

Browse Source
This commit is contained in:
rlaphoenix 2023-03-27 18:51:32 +01:00
parent 8c14b73bc1
commit 527cd4cca1
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
devine/commands/dl.py
View File

@ -598,6 +598,8 @@ class dl:
# we don't want to fill up the log with "Repacked x track" # we don't want to fill up the log with "Repacked x track"
self.log.info("Repacked one or more tracks with FFMPEG") self.log.info("Repacked one or more tracks with FFMPEG")
muxed_paths = []
if isinstance(title, (Movie, Episode)): if isinstance(title, (Movie, Episode)):
progress = Progress( progress = Progress(
TextColumn("[progress.description]{task.description}"), TextColumn("[progress.description]{task.description}"),
@ -628,6 +630,7 @@ class dl:
progress=partial(progress.update, task_id=task), progress=partial(progress.update, task_id=task),
delete=False delete=False
) )
muxed_paths.append(muxed_path)
if return_code == 1: if return_code == 1:
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:
@ -638,19 +641,20 @@ class dl:
track.delete() track.delete()
else: else:
# dont mux # dont mux
muxed_path = title.tracks.audio[0].path muxed_paths.append(title.tracks.audio[0].path)
media_info = MediaInfo.parse(muxed_path) for muxed_path in muxed_paths:
final_dir = config.directories.downloads media_info = MediaInfo.parse(muxed_path)
final_filename = title.get_filename(media_info, show_service=not no_source) final_dir = config.directories.downloads
final_filename = title.get_filename(media_info, show_service=not no_source)
if not no_folder and isinstance(title, (Episode, Song)): if not no_folder and isinstance(title, (Episode, Song)):
final_dir /= title.get_filename(media_info, show_service=not no_source, folder=True) final_dir /= title.get_filename(media_info, show_service=not no_source, folder=True)
final_dir.mkdir(parents=True, exist_ok=True) final_dir.mkdir(parents=True, exist_ok=True)
final_path = final_dir / f"{final_filename}{muxed_path.suffix}" final_path = final_dir / f"{final_filename}{muxed_path.suffix}"
shutil.move(muxed_path, final_path) shutil.move(muxed_path, final_path)
title_dl_time = time_elapsed_since(dl_start_time) title_dl_time = time_elapsed_since(dl_start_time)
console.print(Padding( console.print(Padding(