From 6eb05b3a8fb9ca98a642cfadbb77c6bb1aa11848 Mon Sep 17 00:00:00 2001 From: Carlos Rosa Date: Wed, 4 Apr 2018 10:12:30 -0300 Subject: Allow for multiple file arguments on startup --- kindlecomicconverter/startup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kindlecomicconverter/startup.py b/kindlecomicconverter/startup.py index deb6313..158f520 100644 --- a/kindlecomicconverter/startup.py +++ b/kindlecomicconverter/startup.py @@ -30,15 +30,15 @@ def start(): os.environ['QT_AUTO_SCREEN_SCALE_FACTOR'] = "1" KCCAplication = KCC_gui.QApplicationMessaging(sys.argv) if KCCAplication.isRunning(): - if len(sys.argv) > 1: - KCCAplication.sendMessage(sys.argv[1]) + for i in range (1, len(sys.argv)): + KCCAplication.sendMessage(sys.argv[i]) else: KCCAplication.sendMessage('ARISE') else: KCCWindow = KCC_gui.QMainWindowKCC() KCCUI = KCC_gui.KCCGUI(KCCAplication, KCCWindow) - if len(sys.argv) > 1: - KCCUI.handleMessage(sys.argv[1]) + for i in range (1, len(sys.argv)): + KCCUI.handleMessage(sys.argv[i]) sys.exit(KCCAplication.exec_()) -- cgit 1.4.1 From 1c615ffc20dcf9d30aba76b7a28374bc3ee85ac2 Mon Sep 17 00:00:00 2001 From: Carlos Rosa Date: Wed, 4 Apr 2018 11:04:31 -0300 Subject: Make format checking more straightforward --- kindlecomicconverter/KCC_gui.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/kindlecomicconverter/KCC_gui.py b/kindlecomicconverter/KCC_gui.py index 7959b40..48b3dd5 100644 --- a/kindlecomicconverter/KCC_gui.py +++ b/kindlecomicconverter/KCC_gui.py @@ -812,16 +812,11 @@ class KCCGUI(KCC_ui.Ui_mainWindow): if self.needClean: self.needClean = False GUI.jobList.clear() + formats = ['.cbz', '.zip', '.pdf'] if self.UnRAR: + formats.extend(['.cbr', '.rar']) if self.sevenza: - formats = ['.cbz', '.cbr', '.cb7', '.zip', '.rar', '.7z', '.pdf'] - else: - formats = ['.cbz', '.cbr', '.zip', '.rar', '.pdf'] - else: - if self.sevenza: - formats = ['.cbz', '.cb7', '.zip', '.7z', '.pdf'] - else: - formats = ['.cbz', '.zip', '.pdf'] + formats.extend(['.cb7', '.7z']) if os.path.isdir(message): GUI.jobList.addItem(message) GUI.jobList.scrollToBottom() -- cgit 1.4.1 From 2591b53a0905944263c39a22a0816024b2370c68 Mon Sep 17 00:00:00 2001 From: Carlos Rosa Date: Wed, 4 Apr 2018 11:05:13 -0300 Subject: Make file type error more informative (display file name) --- kindlecomicconverter/KCC_gui.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kindlecomicconverter/KCC_gui.py b/kindlecomicconverter/KCC_gui.py index 48b3dd5..d3e6f10 100644 --- a/kindlecomicconverter/KCC_gui.py +++ b/kindlecomicconverter/KCC_gui.py @@ -815,7 +815,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): formats = ['.cbz', '.zip', '.pdf'] if self.UnRAR: formats.extend(['.cbr', '.rar']) - if self.sevenza: + if self.sevenza: formats.extend(['.cb7', '.7z']) if os.path.isdir(message): GUI.jobList.addItem(message) @@ -826,7 +826,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): GUI.jobList.addItem(message) GUI.jobList.scrollToBottom() else: - self.addMessage('This file type is unsupported!', 'error') + self.addMessage('Unsupported file type for ' + message, 'error') def dragAndDrop(self, e): e.accept() -- cgit 1.4.1