refactor display when kindlegen is missing (#555)

display_kindlegen_missing
ciromattia · Jul 25, 2023 · 217f571 · 217f571
1 parent 531cea8
commit 217f571
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -67,9 +67,11 @@ $ sudo apt-get install -y python3 python3-dev libpng-dev libjpeg-dev p7zip-full
 $ sudo apt-get install qt5dxcb-plugin
 ```
 
-- KindleGen ~~[deprecated link](http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1000765211)~~ v2.9+ in a directory reachable by your _PATH_ or in _KCC_ directory *(For MOBI generation) 
- - It can be found in [Kindle Previewer](https://www.amazon.com/Kindle-Previewer/b?ie=UTF8&node=21381691011)
- `Amazon Kindle Previewer 3 Folder\lib\fc\bin`, the usual location in windows is in windows is `C:\Users\user\AppData\Local\Amazon\Kindle Previewer 3\lib\fc\bin\`
+- KindleGen ~~[(deprecated link)](http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1000765211)~~ v2.9+ (For MOBI generation) 
+ - should be placed in a directory reachable by your _PATH_ or in _KCC_ directory
+ - `KindleGen` can be found in [Kindle Previewer](https://www.amazon.com/Kindle-Previewer/b?ie=UTF8&node=21381691011)
+ `Amazon Kindle Previewer 3 Folder\lib\fc\bin`, the usual location in windows is in windows is `C:\Users\user\AppData\Local\Amazon\Kindle Previewer 3\lib\fc\bin\`
+ - `KindleGen` can be also be found in [Kindle Comic Creator](https://www.amazon.com/b?node=23496309011)
 - [7z](http://www.7-zip.org/download.html) *(For CBZ/ZIP, CBR/RAR, 7z/CB7 support)*
 - Unrar (no rar in 7z on Fedora)
 

diff --git a/kindlecomicconverter/KCC_gui.py b/kindlecomicconverter/KCC_gui.py
@@ -743,18 +743,25 @@ def convertStart(self):
  self.detectKindleGen()
  if not self.kindleGen:
  GUI.jobList.clear()
- self.addMessage('Cannot find <a href="http://www.amazon.com/gp/feature.html?ie=UTF8&docId='
- '1000765211"><b>KindleGen</b></a>! MOBI conversion is unavailable!', 'error')
- if sys.platform.startswith('win'):
- self.addMessage('Download it and place EXE in KCC directory.', 'error')
- elif sys.platform.startswith('darwin'):
- self.addMessage('Install it using <a href="http://brew.sh/">Homebrew</a>.', 'error')
- else:
- self.addMessage('Download it and place executable in /usr/local/bin directory.', 'error')
+ self.display_kindlegen_missing()
  self.needClean = True
  return
  self.worker.start()
 
+ def display_kindlegen_missing(self):
+ self.addMessage('Cannot find <b>KindleGen</b> from '
+ '<a href="https://www.amazon.com/b?node=23496309011"><b>Kindle Comic Creator</b></a> or '
+ '<a href="https://www.amazon.com/Kindle-Previewer/b?ie=UTF8&node=21381691011">'
+ '<b>Kindle Previewer</b></a>! MOBI conversion is unavailable!', 'error')
+ if sys.platform.startswith('win'):
+ self.addMessage('Download it and place EXE in KCC directory.', 'error')
+ elif sys.platform.startswith('darwin'):
+ self.addMessage('<a href="https://github.com/ciromattia/kcc/wiki/Installation/_edit#kindlegen">'
+ 'Install the kindle-comic-creator cask using Homebrew</a> to enable MOBI conversion',
+ 'error')
+ else:
+ self.addMessage('Download it and place executable in /usr/local/bin directory.', 'error')
+
  def saveSettings(self, event):
  if self.conversionAlive:
  GUI.convertButton.setEnabled(False)
@@ -848,22 +855,15 @@ def detectKindleGen(self, startup=False):
  if 'Amazon kindlegen' in line:
  versionCheck = line.split('V')[1].split(' ')[0]
  if StrictVersion(versionCheck) < StrictVersion('2.9'):
- self.addMessage('Your <a href="http://www.amazon.com/gp/feature.html?ie=UTF8&docId='
- '1000765211">KindleGen</a> is outdated! MOBI conversion might fail.', 'warning')
+ self.addMessage('Your <a href="https://www.amazon.com/b?node=23496309011">KindleGen</a>'
+ ' is outdated! MOBI conversion might fail.', 'warning')
  break
  else:
  self.kindleGen = False
  if startup:
- self.addMessage('Cannot find <a href="http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1000765211">'
- '<b>KindleGen</b></a>! MOBI conversion will be unavailable!', 'error')
- if sys.platform.startswith('win'):
- self.addMessage('Download it and place EXE in KCC directory.', 'error')
- elif sys.platform.startswith('darwin'):
- self.addMessage('Install it using <a href="http://brew.sh/">Homebrew</a>: '
- '<i>brew install --cask kindle-comic-creator</i> or '
- '<i>brew install --cask kindle-previewer</i>', 'error')
- else:
- self.addMessage('Download it and place executable in /usr/local/bin directory.', 'error')
+ self.display_kindlegen_missing()
+
+
 
  def __init__(self, kccapp, kccwindow):
  global APP, MW, GUI