Merge pull request #80 from DazedNConfused-/develop

Author: DazedNConfused-

README.md

@@ -8,8 +8,8 @@ SPDX-License-Identifier: MIT
 
 A [Cataclysm: Dark Days Ahead](https://cataclysmdda.org/) launcher with additional features.
 
-![GitHub Workflow Status (master)](https://img.shields.io/github/workflow/status/DazedNConfused-/CDDA-Game-Launcher/build/master?label=master)
-![GitHub Workflow Status (develop)](https://img.shields.io/github/workflow/status/DazedNConfused-/CDDA-Game-Launcher/build/develop?label=develop)
+![GitHub Workflow Status (master)](https://img.shields.io/github/actions/workflow/status/DazedNConfused-/CDDA-Game-Launcher/build.yml?branch=master)
+![GitHub Workflow Status (develop)](https://img.shields.io/github/actions/workflow/status/DazedNConfused-/CDDA-Game-Launcher/build.yml?branch=develop)
 
 ![GitHub release (latest by date)](https://img.shields.io/github/v/release/DazedNConfused-/CDDA-Game-Launcher)
 ![GitHub all releases](https://img.shields.io/github/downloads/DazedNConfused-/CDDA-Game-Launcher/total)

cddagl/VERSION

@@ -1 +1 @@
-1.6.8
+1.6.9

cddagl/ui/views/backups.py

@@ -46,6 +46,8 @@ def __init__(self):
         self.backup_compressing = False
 
         self.compressing_timer = None
+        self.scale_factor = 0 # Number of bits to shift file size right so we don't overflow the QProgressBar
+        self.filestep = 0 # File counter so we don't update the progress bar every single file
 
         current_backups_gb = QGroupBox()
         self.current_backups_gb = current_backups_gb
@@ -526,7 +528,9 @@ def restore_backup(self):
             extracting_size_label)
 
         progress_bar = QProgressBar()
-        progress_bar.setRange(0, self.total_extract_size)
+        self.filestep = 0
+        self.scale_factor = max(0,int(self.total_extract_size.bit_length()) - 31) 
+        progress_bar.setRange(0, self.total_extract_size >> self.scale_factor) 
         progress_bar.setValue(0)
         status_bar.addWidget(progress_bar)
         self.extracting_progress_bar = progress_bar
@@ -594,22 +598,26 @@ def extract_next_file():
 
         def completed_extract():
             self.extract_size += self.next_extract_file.file_size
-            self.extracting_progress_bar.setValue(self.extract_size)
-
-            self.extracting_size_label.setText(
-                '{bytes_read}/{total_bytes}'
-                .format(bytes_read=sizeof_fmt(self.extract_size),
-                        total_bytes=sizeof_fmt(self.total_extract_size))
-            )
-
-            delta_bytes = self.extract_size - self.last_extract_bytes
-            delta_time = datetime.utcnow() - self.last_extract
-            if delta_time.total_seconds() == 0:
-                delta_time = timedelta.resolution
-
-            bytes_secs = delta_bytes / delta_time.total_seconds()
-            self.extracting_speed_label.setText(_('{bytes_sec}/s'
-                ).format(bytes_sec=sizeof_fmt(bytes_secs)))
+            
+            self.filestep += 1
+            if self.filestep == 100:
+                self.filestep = 0
+                self.extracting_progress_bar.setValue(self.extract_size >> self.scale_factor) 
+
+                self.extracting_size_label.setText(
+                    '{bytes_read}/{total_bytes}'
+                    .format(bytes_read=sizeof_fmt(self.extract_size),
+                            total_bytes=sizeof_fmt(self.total_extract_size))
+                )
+
+                delta_bytes = self.extract_size - self.last_extract_bytes
+                delta_time = datetime.utcnow() - self.last_extract
+                if delta_time.total_seconds() == 0:
+                    delta_time = timedelta.resolution
+
+                bytes_secs = delta_bytes / delta_time.total_seconds()
+                self.extracting_speed_label.setText(_('{bytes_sec}/s'
+                    ).format(bytes_sec=sizeof_fmt(bytes_secs)))
 
             self.last_extract_bytes = self.extract_size
             self.last_extract = datetime.utcnow()
@@ -907,6 +915,7 @@ def backup_saves(self, name, single=False):
 
         self.total_backup_size = 0
         self.total_files = 0
+        self.filestep = 0
 
         self.disable_tab()
         self.get_main_tab().disable_tab()
@@ -929,10 +938,13 @@ def timeout():
                     entry = next(self.backup_scan)
 
                     if entry.is_file():
-                        self.compressing_label.setText(
-                            _('Found {filename} in {path}').format(
-                                filename=entry.name,
-                                path=os.path.dirname(entry.path)))
+                        self.filestep += 1
+                        if self.filestep == 100:
+                            self.filestep = 0
+                            self.compressing_label.setText(
+                                _('Found {filename} in {path}').format(
+                                    filename=entry.name,
+                                    path=os.path.dirname(entry.path)))
                         self.backup_files.append(entry.path)
                         self.total_backup_size += entry.stat().st_size
                         self.backup_file_sizes[entry.path
@@ -969,7 +981,9 @@ def timeout():
                             compressing_size_label)
 
                         progress_bar = QProgressBar()
-                        progress_bar.setRange(0, self.total_backup_size)
+                        self.filestep = 0
+                        self.scale_factor = max(0,int(self.total_backup_size.bit_length()) - 31) 
+                        progress_bar.setRange(0, self.total_backup_size >> self.scale_factor) 
                         progress_bar.setValue(0)
                         status_bar.addWidget(progress_bar)
                         self.compressing_progress_bar = progress_bar
@@ -1044,25 +1058,29 @@ def backup_next_file():
 
         def completed_compress():
             self.comp_size += self.backup_file_sizes[self.next_backup_file]
-            self.compressing_progress_bar.setValue(self.comp_size)
+            self.filestep += 1
+            if self.filestep == 100:
+                self.filestep = 0
+
+                self.compressing_progress_bar.setValue(self.comp_size >> self.scale_factor) 
 
-            self.compressing_size_label.setText(
-                '{bytes_read}/{total_bytes}'
-                .format(bytes_read=sizeof_fmt(self.comp_size),
-                        total_bytes=sizeof_fmt(self.total_backup_size))
-            )
+                self.compressing_size_label.setText(
+                    '{bytes_read}/{total_bytes}'
+                    .format(bytes_read=sizeof_fmt(self.comp_size),
+                            total_bytes=sizeof_fmt(self.total_backup_size))
+                )
 
-            delta_bytes = self.comp_size - self.last_comp_bytes
-            delta_time = datetime.utcnow() - self.last_comp
-            if delta_time.total_seconds() == 0:
-                delta_time = timedelta.resolution
+                delta_bytes = self.comp_size - self.last_comp_bytes
+                delta_time = datetime.utcnow() - self.last_comp
+                if delta_time.total_seconds() == 0:
+                    delta_time = timedelta.resolution
 
-            bytes_secs = delta_bytes / delta_time.total_seconds()
-            self.compressing_speed_label.setText(_('{bytes_sec}/s'
-                ).format(bytes_sec=sizeof_fmt(bytes_secs)))
+                bytes_secs = delta_bytes / delta_time.total_seconds()
+                self.compressing_speed_label.setText(_('{bytes_sec}/s'
+                    ).format(bytes_sec=sizeof_fmt(bytes_secs)))
 
-            self.last_comp_bytes = self.comp_size
-            self.last_comp = datetime.utcnow()
+                self.last_comp_bytes = self.comp_size
+                self.last_comp = datetime.utcnow()
 
             backup_next_file()
 

cddagl/ui/views/main.py

@@ -3660,6 +3660,7 @@ def __init__(self, src, dst, skips, status_bar, name):
         self.analysing = False
         self.copying = False
         self.copy_completed = False
+        self.scale_factor = 0 # Number of bits to shift file size right so we don't overflow the QProgressBar
 
     def step(self):
         if self.analysing:
@@ -3713,7 +3714,8 @@ def step(self):
                             self.copying_size_label = copying_size_label
 
                             progress_bar = QProgressBar()
-                            progress_bar.setRange(0, self.total_copy_size)
+                            self.scale_factor = max(0,int(self.total_copy_size.bit_length()) - 31) 
+                            progress_bar.setRange(0, self.total_copy_size >> self.scale_factor) 
                             progress_bar.setValue(0)
                             self.status_bar.addWidget(progress_bar)
                             self.progress_bar = progress_bar
@@ -3769,7 +3771,7 @@ def step(self):
                     self.destination_file.write(buf)
 
                     self.copied_size += buf_len
-                    self.progress_bar.setValue(self.copied_size)
+                    self.progress_bar.setValue(self.copied_size >> self.scale_factor) 
 
                     self.copy_speed_count += 1