From 80e3d0eab49ed0a53d495394cc3e32bfc5ac0aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Jastrz=C4=99bski?= Date: Mon, 24 Jun 2013 11:40:09 +0200 Subject: [PATCH] Refactored KindleGen version check --- kcc/KCC_gui.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/kcc/KCC_gui.py b/kcc/KCC_gui.py index 9a94db4..6d6d4ca 100644 --- a/kcc/KCC_gui.py +++ b/kcc/KCC_gui.py @@ -415,22 +415,15 @@ class Ui_KCC(object): self.addMessage('Welcome!', 'info') self.addMessage('Remember: All options have additional informations in tooltips.', 'info') if call('kindlegen', stdout=PIPE, stderr=STDOUT, shell=True) == 0: + self.KindleGen = True + formats = ['MOBI', 'EPUB', 'CBZ'] versionCheck = Popen('kindlegen', stdout=PIPE, stderr=STDOUT, shell=True) for line in versionCheck.stdout: if "Amazon kindlegen" in line: versionCheck = line.split('V')[1].split(' ')[0] - if tuple(map(int, (versionCheck.split(".")))) >= tuple(map(int, ('2.9'.split(".")))): - versionCheck = True - else: - versionCheck = False + if tuple(map(int, (versionCheck.split(".")))) < tuple(map(int, ('2.9'.split(".")))): + self.addMessage('KindleGen is outdated! Creating MOBI might fail.', 'warning') break - if versionCheck: - self.KindleGen = True - formats = ['MOBI', 'EPUB', 'CBZ'] - else: - self.KindleGen = False - formats = ['EPUB', 'CBZ'] - self.addMessage('KindleGen is outdated! Creating MOBI files is disabled.', 'warning') else: self.KindleGen = False formats = ['EPUB', 'CBZ']