From 93fa6f8636a2cb80e707ce7e5461e6e723d5813d Mon Sep 17 00:00:00 2001 From: Joey Payne Date: Fri, 16 Jan 2015 11:36:58 +1300 Subject: [PATCH] Fixed downloads not downloading when all are selected. --- command_line.py | 5 +++-- files/images/icon.png | Bin 0 -> 36956 bytes main.py | 12 +++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 files/images/icon.png diff --git a/command_line.py b/command_line.py index bb284d9..5db6d73 100644 --- a/command_line.py +++ b/command_line.py @@ -513,7 +513,8 @@ class CommandBase(object): # shutil will make the directory for us shutil.copytree(os.path.join('files', ex_setting.name), - export_dest) + export_dest, + ignore=shutil.ignore_patterns('place_holder.txt')) self.progress_text += '.' if 'mac' in ex_setting.name: @@ -545,7 +546,7 @@ class CommandBase(object): nw_path = os.path.join(export_dest, ex_setting.dest_files[0]) - if windows and 'x32' in ex_setting.name: + if windows: self.replace_icon_in_exe(nw_path) #self.compress_nw(nw_path) diff --git a/files/images/icon.png b/files/images/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..89139a97c0f851647dabc4b488fa0e17d9947fa9 GIT binary patch literal 36956 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 FV1jdP6&C;i literal 0 HcmV?d00001 diff --git a/main.py b/main.py index 59d8528..e493671 100644 --- a/main.py +++ b/main.py @@ -36,7 +36,8 @@ class MainWindow(QtGui.QWidget, CommandBase): super(MainWindow, self).__init__(parent) CommandBase.__init__(self) self.output_package_json = True - self.setWindowIcon(QtGui.QIcon('icon.png')) + self.setWindowIcon(QtGui.QIcon(os.path.join(CWD, 'files', + 'images', 'icon.png'))) self.update_json = False self.setup_nw_versions() @@ -262,6 +263,7 @@ class MainWindow(QtGui.QWidget, CommandBase): return self.out_file.close() + self.http.abort() if error: self.out_file.remove() @@ -349,9 +351,13 @@ class MainWindow(QtGui.QWidget, CommandBase): self.http_request_aborted = True self.http.abort() self.enable_ui() + self.progress_bar.setValue(0) + self.progress_bar.setVisible(False) def update_progress_bar(self, bytes_read, total_bytes): if self.http_request_aborted: + self.progress_bar.setValue(0) + self.progress_bar.setVisible(False) return self.progress_bar.setMaximum(total_bytes) self.progress_bar.setValue(bytes_read) @@ -367,7 +373,7 @@ class MainWindow(QtGui.QWidget, CommandBase): archive_exists = QFile.exists(file_name) - dest_files_exist = False + #dest_files_exist = False # for dest_file in setting.dest_files: # dest_file_path = os.path.join('files', setting.name, dest_file) @@ -375,7 +381,7 @@ class MainWindow(QtGui.QWidget, CommandBase): forced = self.get_setting('force_download').value - if (archive_exists or dest_files_exist) and not forced: + if archive_exists and not forced: self.continue_downloading_or_extract() return