mirror of
https://github.com/unshackle-dl/unshackle.git
synced 2026-11-16 22:15:07 +00:00
fix(manifests): clean stale .!dev resume markers before merge
HLS/DASH/ISM iterdir included leftover .!dev control files from aborted runs, crashing HLS merge_discontinuity and silently corrupting DASH/ISM merged output.
This commit is contained in:
@@ -489,6 +489,9 @@ class DASH:
|
|||||||
)
|
)
|
||||||
raise FileNotFoundError(error_msg)
|
raise FileNotFoundError(error_msg)
|
||||||
|
|
||||||
|
for control_file in save_dir.glob("*.!dev"):
|
||||||
|
control_file.unlink(missing_ok=True)
|
||||||
|
|
||||||
segments_to_merge = [x for x in sorted(save_dir.iterdir()) if x.is_file()]
|
segments_to_merge = [x for x in sorted(save_dir.iterdir()) if x.is_file()]
|
||||||
|
|
||||||
if debug_logger:
|
if debug_logger:
|
||||||
|
|||||||
@@ -655,9 +655,8 @@ class HLS:
|
|||||||
status_update["downloaded"] = f"HLS {downloaded}"
|
status_update["downloaded"] = f"HLS {downloaded}"
|
||||||
progress(**status_update)
|
progress(**status_update)
|
||||||
|
|
||||||
# see https://github.com/devine-dl/devine/issues/71
|
for control_file in segment_save_dir.glob("*.!dev"):
|
||||||
for control_file in segment_save_dir.glob("*.aria2__temp"):
|
control_file.unlink(missing_ok=True)
|
||||||
control_file.unlink()
|
|
||||||
|
|
||||||
progress(total=total_segments, completed=0, downloaded="Merging")
|
progress(total=total_segments, completed=0, downloaded="Merging")
|
||||||
|
|
||||||
|
|||||||
@@ -325,6 +325,9 @@ class ISM:
|
|||||||
)
|
)
|
||||||
raise FileNotFoundError(error_msg)
|
raise FileNotFoundError(error_msg)
|
||||||
|
|
||||||
|
for control_file in save_dir.glob("*.!dev"):
|
||||||
|
control_file.unlink(missing_ok=True)
|
||||||
|
|
||||||
segments_to_merge = [x for x in sorted(save_dir.iterdir()) if x.is_file()]
|
segments_to_merge = [x for x in sorted(save_dir.iterdir()) if x.is_file()]
|
||||||
|
|
||||||
if debug_logger:
|
if debug_logger:
|
||||||
|
|||||||
@@ -358,9 +358,6 @@ class Track:
|
|||||||
status_update["downloaded"] = f"URL {downloaded}"
|
status_update["downloaded"] = f"URL {downloaded}"
|
||||||
progress(**status_update)
|
progress(**status_update)
|
||||||
|
|
||||||
# see https://github.com/devine-dl/devine/issues/71
|
|
||||||
save_path.with_suffix(f"{save_path.suffix}.aria2__temp").unlink(missing_ok=True)
|
|
||||||
|
|
||||||
self.path = save_path
|
self.path = save_path
|
||||||
events.emit(events.Types.TRACK_DOWNLOADED, track=self)
|
events.emit(events.Types.TRACK_DOWNLOADED, track=self)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user