sync

tool/core/cmd/get_file.py

@@ -2,6 +2,7 @@
 import struct
 import zlib
 from pathlib import Path
+from rich.progress import Progress, SpinnerColumn, TextColumn, BarColumn, DownloadColumn, TransferSpeedColumn, TimeRemainingColumn
 from core.utils import console, console_err
 from core.protocol import COMMANDS
 
@@ -21,24 +22,34 @@ class get_file:
 
         source_path_bytes = source_path.encode('utf-8')
         payload = struct.pack('B', len(source_path_bytes)) + source_path_bytes
-        device_file_crc = None
-        try:
-            self.bus.send_request(COMMANDS['crc_32'], payload)
-            crc_resp = self.bus.receive_response(length=4)
-            if crc_resp and crc_resp.get('type') == 'response':
-                device_file_crc = struct.unpack('<I', crc_resp['data'])[0]
-        except Exception:
-            device_file_crc = None
-
         self.bus.send_request(COMMANDS['get_file'], payload)
-        
-        stream_res = self.bus.receive_stream()  
+
+        # Fortschrittsbalken Setup
+        with Progress(
+            SpinnerColumn(),
+            TextColumn("[progress.description]{task.description}"),
+            BarColumn(),
+            DownloadColumn(),
+            TransferSpeedColumn(),
+            "•",
+            TimeRemainingColumn(),
+            console=console,
+            transient=False
+        ) as progress:
+            
+            task = progress.add_task(f"Lade {source_path}...", total=None)
+
+            def update_bar(received, total):
+                progress.update(task, total=total, completed=received)
+
+            stream_res = self.bus.receive_stream(progress_callback=update_bar)  
         
         if not stream_res or stream_res.get('type') == 'error':
             return None
-
         file_data = stream_res['data']
-        remote_crc = stream_res['crc32']
+        remote_crc = stream_res.get('crc32')
+        local_crc = zlib.crc32(file_data) & 0xFFFFFFFF
+        duratuion = stream_res.get('duration')
 
         if local_crc == remote_crc:
             with open(p, 'wb') as f:
@@ -55,8 +66,8 @@ class get_file:
             'dest_path': dest_path,
             'crc32_remote': remote_crc,
             'crc32_local': local_crc,
-            'crc32_device_file': device_file_crc,
-            'size': len(file_data)
+            'size': len(file_data),
+            'duration': duratuion
         }
 
     def print(self, result):
@@ -73,4 +84,6 @@ class get_file:
         console.print(f"  • Local CRC:  [info]{result['crc32_local']:08X}[/info]")
         if result.get('crc32_device_file') is not None:
             console.print(f"  • Device CRC: [info]{result['crc32_device_file']:08X}[/info]")
-        console.print(f"  • Zielpfad:   [info]{result['dest_path']}[/info]")
+        console.print(f"  • Zielpfad:   [info]{result['dest_path']}[/info]")
+        if result.get('duration') is not None and result.get('duration') > 0:
+            console.print(f"  • Dauer:      [info]{result['duration']:.2f} s[/info]")