kenzuya/unshackle
1
0
Fork 1
mirror of https://github.com/unshackle-dl/unshackle.git synced 2026-03-10 08:29:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(dl): overwrite existing files on re-download and use atomic replace

Browse Source 
The collision-avoidance logic was preventing overwrites of files from previous runs.

Also switch subtitles with OnSegmentFilter from n_m3u8dl_re to the requests downloader so segment filtering works at download time.
This commit is contained in:
Andy
2026-02-21 15:33:07 -07:00
parent ff093a7896
commit 4814ba9144
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
unshackle/commands/dl.py
View File

@@ -3,6 +3,7 @@ from __future__ import annotations
import html import html
import logging import logging
import math import math
import os
import random import random
import re import re
import shutil import shutil
@@ -1771,6 +1772,11 @@ class dl:
) )
self.cdm = quality_based_cdm self.cdm = quality_based_cdm
for track in title.tracks.subtitles:
if callable(track.OnSegmentFilter) and track.downloader.__name__ == "n_m3u8dl_re":
from unshackle.core.downloaders import requests as requests_downloader
track.downloader = requests_downloader
dl_start_time = time.time() dl_start_time = time.time()
try: try:
@@ -2266,6 +2272,7 @@ class dl:
self.log.debug(f"Saved: {final_path.name}") self.log.debug(f"Saved: {final_path.name}")
else: else:
# Handle muxed files # Handle muxed files
used_final_paths: set[Path] = set()
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
@@ -2282,14 +2289,15 @@ class dl:
final_filename = f"{final_filename.rstrip()}{sep}{audio_codec_suffix.name}" final_filename = f"{final_filename.rstrip()}{sep}{audio_codec_suffix.name}"
final_path = final_dir / f"{final_filename}{muxed_path.suffix}" final_path = final_dir / f"{final_filename}{muxed_path.suffix}"
if final_path.exists(): if final_path in used_final_paths:
sep = "." if config.scene_naming else " " sep = "." if config.scene_naming else " "
i = 2 i = 2
while final_path.exists(): while final_path in used_final_paths:
final_path = final_dir / f"{final_filename.rstrip()}{sep}{i}{muxed_path.suffix}" final_path = final_dir / f"{final_filename.rstrip()}{sep}{i}{muxed_path.suffix}"
i += 1 i += 1
shutil.move(muxed_path, final_path) os.replace(muxed_path, final_path)
used_final_paths.add(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)