diff options
author | Micah Lee <micah@micahflee.com> | 2019-10-13 14:35:40 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-13 14:35:40 -0400 |
commit | 896659c6963c14c4e047cff7f3d421977060ed23 (patch) | |
tree | 660468dd7478fb001ced211a4a33ae28a1b5f9a4 /onionshare_gui/mode/share_mode/threads.py | |
parent | bbf6c02da645fcd4fc50db18dd341178ad4fa2e6 (diff) | |
parent | 7d24bf9ffcd1e21e087431c21bfc658803a61ab6 (diff) | |
download | onionshare-2.2.tar.gz onionshare-2.2.zip |
Merge pull request #1048 from micahflee/developv2.2
Version 2.2
Diffstat (limited to 'onionshare_gui/mode/share_mode/threads.py')
-rw-r--r-- | onionshare_gui/mode/share_mode/threads.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/onionshare_gui/mode/share_mode/threads.py b/onionshare_gui/mode/share_mode/threads.py index 24e2c242..414c7be1 100644 --- a/onionshare_gui/mode/share_mode/threads.py +++ b/onionshare_gui/mode/share_mode/threads.py @@ -24,13 +24,14 @@ class CompressThread(QtCore.QThread): """ Compresses files to be shared """ + success = QtCore.pyqtSignal() error = QtCore.pyqtSignal(str) def __init__(self, mode): super(CompressThread, self).__init__() self.mode = mode - self.mode.common.log('CompressThread', '__init__') + self.mode.common.log("CompressThread", "__init__") # prepare files to share def set_processed_size(self, x): @@ -38,21 +39,21 @@ class CompressThread(QtCore.QThread): self.mode._zip_progress_bar.update_processed_size_signal.emit(x) def run(self): - self.mode.common.log('CompressThread', 'run') + self.mode.common.log("CompressThread", "run") try: - if self.mode.web.share_mode.set_file_info(self.mode.filenames, processed_size_callback=self.set_processed_size): - self.success.emit() - else: - # Cancelled - pass - - self.mode.app.cleanup_filenames += self.mode.web.share_mode.cleanup_filenames + self.mode.web.share_mode.set_file_info( + self.mode.filenames, processed_size_callback=self.set_processed_size + ) + self.success.emit() + self.mode.app.cleanup_filenames += ( + self.mode.web.share_mode.cleanup_filenames + ) except OSError as e: self.error.emit(e.strerror) def cancel(self): - self.mode.common.log('CompressThread', 'cancel') + self.mode.common.log("CompressThread", "cancel") # Let the Web and ZipWriter objects know that we're canceling compression early self.mode.web.cancel_compression = True |