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

Move the Downloaded msg after Decrypt mgs in DASH/URL downloads

This commit is contained in:
rlaphoenix 2023-05-17 02:07:38 +01:00
parent 6cdde3efb0
commit 03c012f88e
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devine/commands/dl.py
View File

@ -915,8 +915,6 @@ class dl:
track.path = save_path track.path = save_path
progress(downloaded="Downloaded")
if drm: if drm:
progress(downloaded="Decrypting", completed=0, total=100) progress(downloaded="Decrypting", completed=0, total=100)
drm.decrypt(save_path) drm.decrypt(save_path)
@ -924,6 +922,8 @@ class dl:
if callable(track.OnDecrypted): if callable(track.OnDecrypted):
track.OnDecrypted(track) track.OnDecrypted(track)
progress(downloaded="Decrypted", completed=100) progress(downloaded="Decrypted", completed=100)
progress(downloaded="Downloaded")
except KeyboardInterrupt: except KeyboardInterrupt:
self.DL_POOL_STOP.set() self.DL_POOL_STOP.set()
progress(downloaded="[yellow]STOPPED") progress(downloaded="[yellow]STOPPED")

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

@ -514,10 +514,7 @@ class DASH:
f.write(segment_file.read_bytes()) f.write(segment_file.read_bytes())
segment_file.unlink() segment_file.unlink()
progress(downloaded="Downloaded")
if drm: if drm:
# TODO: What if the manifest does not mention DRM, but has DRM
progress(downloaded="Decrypting", completed=0, total=100) progress(downloaded="Decrypting", completed=0, total=100)
drm.decrypt(save_path) drm.decrypt(save_path)
track.drm = None track.drm = None
@ -528,6 +525,8 @@ class DASH:
track.path = save_path track.path = save_path
save_dir.rmdir() save_dir.rmdir()
progress(downloaded="Downloaded")
@staticmethod @staticmethod
def _get( def _get(
item: str, item: str,