thegame_1980/TwinVine
1
0
Fork 0
mirror of https://github.com/vinefeeder/TwinVine.git synced 2026-07-15 18:10:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

no-mux option upstream

Browse Source
This commit is contained in:
VineFeeder
2025-10-02 10:07:56 +01:00
parent 3e7b267a2f
commit 261ee38ecb
1 changed files with 59 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/envied/src/envied/commands/dl.py
+51 -7
View File
@@ -240,6 +240,7 @@ class dl:
@click.option( @click.option(
"--no-source", is_flag=True, default=False, help="Disable the source tag from the output file name and path." "--no-source", is_flag=True, default=False, help="Disable the source tag from the output file name and path."
) )
@click.option("--no-mux", is_flag=True, default=False, help="Do not mux tracks into a container file.")
@click.option( @click.option(
"--workers", "--workers",
type=int, type=int,
@@ -454,6 +455,7 @@ class dl:
no_proxy: bool, no_proxy: bool,
no_folder: bool, no_folder: bool,
no_source: bool, no_source: bool,
no_mux: bool,
workers: Optional[int], workers: Optional[int],
downloads: int, downloads: int,
select_titles: bool, select_titles: bool,
@@ -466,7 +468,7 @@ class dl:
# Check if dovi_tool is available when hybrid mode is requested # Check if dovi_tool is available when hybrid mode is requested
if any(r == Video.Range.HYBRID for r in range_): if any(r == Video.Range.HYBRID for r in range_):
from envied.core.binaries import DoviTool from unshackle.core.binaries import DoviTool
if not DoviTool: if not DoviTool:
self.log.error("Unable to run hybrid mode: dovi_tool not detected") self.log.error("Unable to run hybrid mode: dovi_tool not detected")
@@ -1086,7 +1088,13 @@ class dl:
muxed_paths = [] muxed_paths = []
if isinstance(title, (Movie, Episode)): if no_mux:
# Skip muxing, handle individual track files
for track in title.tracks:
if track.path and track.path.exists():
muxed_paths.append(track.path)
elif isinstance(title, (Movie, Episode)):
progress = Progress( progress = Progress(
TextColumn("[progress.description]{task.description}"), TextColumn("[progress.description]{task.description}"),
SpinnerColumn(finished_text=""), SpinnerColumn(finished_text=""),
@@ -1200,20 +1208,57 @@ class dl:
# dont mux # dont mux
muxed_paths.append(title.tracks.audio[0].path) muxed_paths.append(title.tracks.audio[0].path)
if no_mux:
# Handle individual track files without muxing
final_dir = config.directories.downloads
if not no_folder and isinstance(title, (Episode, Song)):
# Create folder based on title
# Use first available track for filename generation
sample_track = title.tracks.videos[0] if title.tracks.videos else (
title.tracks.audio[0] if title.tracks.audio else (
title.tracks.subtitles[0] if title.tracks.subtitles else None
)
)
if sample_track and sample_track.path:
media_info = MediaInfo.parse(sample_track.path)
final_dir /= title.get_filename(media_info, show_service=not no_source, folder=True)
final_dir.mkdir(parents=True, exist_ok=True)
for track_path in muxed_paths:
# Generate appropriate filename for each track
media_info = MediaInfo.parse(track_path)
base_filename = title.get_filename(media_info, show_service=not no_source)
# Add track type suffix to filename
track = next((t for t in title.tracks if t.path == track_path), None)
if track:
if isinstance(track, Video):
track_suffix = f".{track.codec.name if hasattr(track.codec, 'name') else 'video'}"
elif isinstance(track, Audio):
lang_suffix = f".{track.language}" if track.language else ""
track_suffix = f"{lang_suffix}.{track.codec.name if hasattr(track.codec, 'name') else 'audio'}"
elif isinstance(track, Subtitle):
lang_suffix = f".{track.language}" if track.language else ""
forced_suffix = ".forced" if track.forced else ""
sdh_suffix = ".sdh" if track.sdh else ""
track_suffix = f"{lang_suffix}{forced_suffix}{sdh_suffix}"
else:
track_suffix = ""
final_path = final_dir / f"{base_filename}{track_suffix}{track_path.suffix}"
else:
final_path = final_dir / f"{base_filename}{track_path.suffix}"
shutil.move(track_path, final_path)
self.log.debug(f"Saved: {final_path.name}")
else:
# Handle muxed files
for muxed_path in muxed_paths: for muxed_path in muxed_paths:
media_info = MediaInfo.parse(muxed_path) media_info = MediaInfo.parse(muxed_path)
final_dir = config.directories.downloads final_dir = config.directories.downloads
final_filename = title.get_filename(media_info, show_service=not no_source) 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)
tags.tag_file(final_path, title, self.tmdb_id) tags.tag_file(final_path, title, self.tmdb_id)
title_dl_time = time_elapsed_since(dl_start_time) title_dl_time = time_elapsed_since(dl_start_time)
console.print( console.print(
Padding(f":tada: Title downloaded in [progress.elapsed]{title_dl_time}[/]!", (0, 5, 1, 5)) Padding(f":tada: Title downloaded in [progress.elapsed]{title_dl_time}[/]!", (0, 5, 1, 5))
@@ -1550,7 +1595,6 @@ class dl:
secret=cdm_api['Secret'], secret=cdm_api['Secret'],
device_name=cdm_api['Device Name'], device_name=cdm_api['Device Name'],
) )
prd_path = config.directories.prds / f"{cdm_name}.prd" prd_path = config.directories.prds / f"{cdm_name}.prd"
if not prd_path.is_file(): if not prd_path.is_file():
prd_path = config.directories.wvds / f"{cdm_name}.prd" prd_path = config.directories.wvds / f"{cdm_name}.prd"