ninjajiraiya
/
devine
forked from DRMTalks/devine
1
0
Fork 0
Code Pull Requests Activity

DASH: Update progress bar when merging segments

This commit is contained in:
rlaphoenix 2024-02-15 20:06:19 +00:00
parent 4e12b867f1
commit 1f11ed258b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devine/core/manifests/dash.py
View File

@ -461,10 +461,13 @@ class DASH:
status_update["downloaded"] = f"DASH {downloaded}" status_update["downloaded"] = f"DASH {downloaded}"
progress(**status_update) progress(**status_update)
segments_to_merge = sorted(save_dir.iterdir())
progress(downloaded="Merging", completed=0, total=len(segments_to_merge))
with open(save_path, "wb") as f: with open(save_path, "wb") as f:
if init_data: if init_data:
f.write(init_data) f.write(init_data)
for segment_file in sorted(save_dir.iterdir()): for segment_file in segments_to_merge:
segment_data = segment_file.read_bytes() segment_data = segment_file.read_bytes()
# TODO: fix encoding after decryption? # TODO: fix encoding after decryption?
if ( if (
@ -475,6 +478,7 @@ class DASH:
segment_data = html.unescape(segment_data.decode("utf8")).encode("utf8") segment_data = html.unescape(segment_data.decode("utf8")).encode("utf8")
f.write(segment_data) f.write(segment_data)
segment_file.unlink() segment_file.unlink()
progress(advance=1)
track.path = save_path track.path = save_path
if callable(track.OnDownloaded): if callable(track.OnDownloaded):
@ -486,7 +490,7 @@ class DASH:
track.drm = None track.drm = None
if callable(track.OnDecrypted): if callable(track.OnDecrypted):
track.OnDecrypted(drm) track.OnDecrypted(drm)
progress(downloaded="Decrypted", completed=100) progress(downloaded="Decrypting", advance=100)
save_dir.rmdir() save_dir.rmdir()