mirror of
				https://github.com/devine-dl/devine.git
				synced 2025-11-04 03:44:49 +00:00 
			
		
		
		
	Move the Downloaded msg after Decrypt mgs in DASH/URL downloads
This commit is contained in:
		
							parent
							
								
									6cdde3efb0
								
							
						
					
					
						commit
						03c012f88e
					
				@ -915,8 +915,6 @@ class dl:
 | 
			
		||||
 | 
			
		||||
                        track.path = save_path
 | 
			
		||||
 | 
			
		||||
                        progress(downloaded="Downloaded")
 | 
			
		||||
 | 
			
		||||
                        if drm:
 | 
			
		||||
                            progress(downloaded="Decrypting", completed=0, total=100)
 | 
			
		||||
                            drm.decrypt(save_path)
 | 
			
		||||
@ -924,6 +922,8 @@ class dl:
 | 
			
		||||
                            if callable(track.OnDecrypted):
 | 
			
		||||
                                track.OnDecrypted(track)
 | 
			
		||||
                            progress(downloaded="Decrypted", completed=100)
 | 
			
		||||
 | 
			
		||||
                        progress(downloaded="Downloaded")
 | 
			
		||||
                except KeyboardInterrupt:
 | 
			
		||||
                    self.DL_POOL_STOP.set()
 | 
			
		||||
                    progress(downloaded="[yellow]STOPPED")
 | 
			
		||||
 | 
			
		||||
@ -514,10 +514,7 @@ class DASH:
 | 
			
		||||
                    f.write(segment_file.read_bytes())
 | 
			
		||||
                    segment_file.unlink()
 | 
			
		||||
 | 
			
		||||
            progress(downloaded="Downloaded")
 | 
			
		||||
 | 
			
		||||
            if drm:
 | 
			
		||||
                # TODO: What if the manifest does not mention DRM, but has DRM
 | 
			
		||||
                progress(downloaded="Decrypting", completed=0, total=100)
 | 
			
		||||
                drm.decrypt(save_path)
 | 
			
		||||
                track.drm = None
 | 
			
		||||
@ -528,6 +525,8 @@ class DASH:
 | 
			
		||||
            track.path = save_path
 | 
			
		||||
            save_dir.rmdir()
 | 
			
		||||
 | 
			
		||||
            progress(downloaded="Downloaded")
 | 
			
		||||
 | 
			
		||||
    @staticmethod
 | 
			
		||||
    def _get(
 | 
			
		||||
        item: str,
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user