diff options
| author | Micah Lee <micah@micahflee.com> | 2020-07-05 11:48:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-05 11:48:48 -0700 |
| commit | 4a4811afb59a1e212dd9330e76af81e0e8c6b888 (patch) | |
| tree | 2f957584cd0dfe78e1263eb8d66499f45aa263fb /onionshare_gui | |
| parent | 45c8e33791ad9239f915343ef0bcc1c029db8718 (diff) | |
| parent | de81447b8f084037ba0dc2bff69982a9aef64000 (diff) | |
| download | onionshare-4a4811afb59a1e212dd9330e76af81e0e8c6b888.tar.gz onionshare-4a4811afb59a1e212dd9330e76af81e0e8c6b888.zip | |
Merge pull request #1122 from mig5/fix_progress_bar_2GB_file_and_receive_mode_eta_progress
#1095 Fix crash for shares larger than 2GB. #1089 add ETA/bytes uploaded in progress bar of ReceiveMode items
Diffstat (limited to 'onionshare_gui')
| -rw-r--r-- | onionshare_gui/tab/mode/history.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/onionshare_gui/tab/mode/history.py b/onionshare_gui/tab/mode/history.py index 0797320e..f445efa6 100644 --- a/onionshare_gui/tab/mode/history.py +++ b/onionshare_gui/tab/mode/history.py @@ -119,7 +119,7 @@ class ShareHistoryItem(HistoryItem): self.progress_bar.setAttribute(QtCore.Qt.WA_DeleteOnClose) self.progress_bar.setAlignment(QtCore.Qt.AlignHCenter) self.progress_bar.setMinimum(0) - self.progress_bar.setMaximum(total_bytes) + self.progress_bar.setMaximum(total_bytes / 1024) self.progress_bar.setValue(0) self.progress_bar.setStyleSheet( self.common.gui.css["downloads_uploads_progress_bar"] @@ -138,8 +138,8 @@ class ShareHistoryItem(HistoryItem): def update(self, downloaded_bytes): self.downloaded_bytes = downloaded_bytes - self.progress_bar.setValue(downloaded_bytes) - if downloaded_bytes == self.progress_bar.total_bytes: + self.progress_bar.setValue(downloaded_bytes / 1024) + if (downloaded_bytes / 1024) == (self.progress_bar.total_bytes / 1024): pb_fmt = strings._("gui_all_modes_progress_complete").format( self.common.format_seconds(time.time() - self.started) ) @@ -322,8 +322,8 @@ class ReceiveHistoryItem(HistoryItem): total_uploaded_bytes += data["progress"][filename]["uploaded_bytes"] # Update the progress bar - self.progress_bar.setMaximum(self.content_length) - self.progress_bar.setValue(total_uploaded_bytes) + self.progress_bar.setMaximum(self.content_length / 1024) + self.progress_bar.setValue(total_uploaded_bytes / 1024) elapsed = datetime.now() - self.started if elapsed.seconds < 10: @@ -339,6 +339,8 @@ class ReceiveHistoryItem(HistoryItem): estimated_time_remaining, ) + self.progress_bar.setFormat(pb_fmt) + # Using list(progress) to avoid "RuntimeError: dictionary changed size during iteration" for filename in list(data["progress"]): # Add a new file if needed @@ -451,7 +453,7 @@ class IndividualFileHistoryItem(HistoryItem): else: self.total_bytes = data["filesize"] self.progress_bar.setMinimum(0) - self.progress_bar.setMaximum(data["filesize"]) + self.progress_bar.setMaximum(data["filesize"] / 1024) self.progress_bar.total_bytes = data["filesize"] # Start at 0 @@ -460,8 +462,8 @@ class IndividualFileHistoryItem(HistoryItem): def update(self, downloaded_bytes): self.downloaded_bytes = downloaded_bytes - self.progress_bar.setValue(downloaded_bytes) - if downloaded_bytes == self.progress_bar.total_bytes: + self.progress_bar.setValue(downloaded_bytes / 1024) + if (downloaded_bytes / 1024 ) == (self.progress_bar.total_bytes / 1024): self.status_code_label.setText("200") self.status_code_label.setStyleSheet( self.common.gui.css["history_individual_file_status_code_label_2xx"] |