Merge pull request #241 from ciromattia/dev

5.4.1 preparation
ciromattia · Aug 19, 2017 · 0b4503a · 0b4503a
2 parents c3e950f + 437ffb9
commit 0b4503a
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,24 @@
+language: generic
+os: osx
+osx_image: xcode6.4
+before_install:
+- brew update
+- brew install python3
+- brew upgrade node
+- pip3 install --upgrade pip setuptools wheel
+- openssl aes-256-cbc -K $encrypted_ed1022070d5f_key -iv $encrypted_ed1022070d5f_iv -in other/osx/sentry.py.enc -out kindlecomicconverter/sentry.py -d
+install:
+- pip3 install -r requirements.txt
+- pip3 install pyinstaller certifi
+- npm install appdmg
+script: python3 setup.py build_binary
+deploy:
+  provider: releases
+  api_key:
+    secure: hLjRHmcFILPvKtn0PzWrt/8ImFKGmSKzdIOj6VNANwFDPl+2tIl3pVl7MlRq6KBYU8RiV+cUDVvxG7T59WY4Dd74FSvECKjaNdSo2+00oiuovr0PHznvzH+/gDY2GOrgZihOILILgx0HYRqLQls+h5vlPPQwW6XShvaFfGT20837+ycT6EQ77mZAfXpm7agUe8tjdxV/qqrnFnHasymZiqkqd3+uZa07QfZHh1piwdNR/fAKwJXufcFcntOSs/lyTlFMIuwdtAv2mixqm3ePTrMYEX3hqv6b+dy7Usc3d88M9NKBemggQdHSWbM+xedtSEM/h2MQS/VLXsmTsXx2MgAs8r1uTf2/uecbpeOZMcFgiOx1q/nqbUnEjGPhyeaA3VNMGaXrKmiXXIe2ZHmFALTHfXoMfznJTJa53JJ7yWAmMtryt7WRNGv3TvdLkK6Jn+GY6jtvGpOWPDTGUM6afoRUyeyAb5owZGBcSCTNv+ZJFpiJPOBRg80hX3iiCtWT3q4AC6OqNko20j/yesFPTh1z+dSTGnu9TUFF5b8FcVzUSkd+y153IxVsuveq7U18uczDX+GtP/2HlMHBwwxqC/cgBibxLLsQYK7MK9esocxT4X/otsNLKgvCPhFSZ19YpHSzYSvyOtziE49n63bqbagRxK+sR5UYz8MoQeCkn24=
+  file_glob: true
+  file: dist/KindleComicConverter_osx_*
+  skip_cleanup: true
+  on:
+    repo: AcidWeb/kcc
+    tags: true
diff --git a/docker/Build b/docker/Build
@@ -2,7 +2,7 @@
 set -e
 
 pip3 install --upgrade pip setuptools wheel
-pip3 install pillow python-slugify psutil pyinstaller raven pyqt5 certifi
+pip3 install pillow python-slugify psutil raven pyqt5 certifi https://github.com/pyinstaller/pyinstaller/archive/develop.zip
 gem install fpm
 
 cd /app

diff --git a/kindlecomicconverter/KCC_gui.py b/kindlecomicconverter/KCC_gui.py
@@ -927,7 +927,7 @@ def __init__(self, KCCAplication, KCCWindow):
             "Kindle PW 1/2": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0,
                               'DefaultUpscale': False, 'Label': 'KPW'},
             "Kindle": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0,
-                       'DefaultUpscale': False, 'Label': 'K45'},
+                       'DefaultUpscale': False, 'Label': 'K578'},
             "Kindle DX/DXG": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 2,
                               'DefaultUpscale': False, 'Label': 'KDX'},
             "Kobo Mini/Touch": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 1,
@@ -950,8 +950,10 @@ def __init__(self, KCCAplication, KCCWindow):
                          'DefaultUpscale': False, 'Label': 'K1'},
             "Kindle 2": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0,
                          'DefaultUpscale': False, 'Label': 'K2'},
-            "Kindle 3": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0,
-                         'DefaultUpscale': False, 'Label': 'K3'},
+            "Kindle Keyboard": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0,
+                                'DefaultUpscale': False, 'Label': 'K34'},
+            "Kindle Touch": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0,
+                             'DefaultUpscale': False, 'Label': 'K34'},
         }
         profilesGUI = [
             "Kindle Oasis",
@@ -964,16 +966,18 @@ def __init__(self, KCCAplication, KCCWindow):
             "Kobo Aura H2O",
             "Kobo Aura HD",
             "Kobo Aura",
-            "Kobo Glo HD",
-            "Kobo Glo",
-            "Kobo Mini/Touch",
             "Separator",
             "Other",
             "Separator",
+            "Kindle Touch",
+            "Kindle Keyboard",
             "Kindle DX/DXG",
-            "Kindle 3",
             "Kindle 2",
             "Kindle 1",
+            "Separator",
+            "Kobo Glo HD",
+            "Kobo Glo",
+            "Kobo Mini/Touch",
         ]
 
         statusBarLabel = QtWidgets.QLabel('<b><a href="https://kcc.iosphe.re/">HOMEPAGE</a> - <a href="https://github.'

diff --git a/kindlecomicconverter/comic2ebook.py b/kindlecomicconverter/comic2ebook.py
@@ -887,7 +887,7 @@ def makeParser():
     otherOptions = OptionGroup(psr, "OTHER")
 
     mainOptions.add_option("-p", "--profile", action="store", dest="profile", default="KV",
-                           help="Device profile (Available options: K1, K2, K3, K45, KDX, KPW, KV, KoMT, KoG, KoGHD,"
+                           help="Device profile (Available options: K1, K2, K34, K578, KDX, KPW, KV, KoMT, KoG, KoGHD,"
                                 " KoA, KoAHD, KoAH2O, KoAO) [Default=KV]")
     mainOptions.add_option("-m", "--manga-style", action="store_true", dest="righttoleft", default=False,
                            help="Manga style (right-to-left reading and splitting)")
@@ -951,13 +951,13 @@ def checkOptions():
     options.iskindle = False
     options.bordersColor = None
     if options.format == 'Auto':
-        if options.profile in ['K1', 'K2', 'K3', 'K45', 'KPW', 'KV']:
+        if options.profile in ['K1', 'K2', 'K34', 'K578', 'KPW', 'KV']:
             options.format = 'MOBI'
         elif options.profile in ['OTHER', 'KoMT', 'KoG', 'KoGHD', 'KoA', 'KoAHD', 'KoAH2O', 'KoAO']:
             options.format = 'EPUB'
         elif options.profile in ['KDX']:
             options.format = 'CBZ'
-    if options.profile in ['K1', 'K2', 'K3', 'K45', 'KPW', 'KV']:
+    if options.profile in ['K1', 'K2', 'K34', 'K578', 'KPW', 'KV']:
         options.iskindle = True
     if options.white_borders:
         options.bordersColor = 'white'
@@ -967,7 +967,7 @@ def checkOptions():
     if options.format == 'MOBI' and options.batchsplit != 2:
         options.batchsplit = 1
     # Older Kindle models don't support Panel View.
-    if options.profile == 'K1' or options.profile == 'K2' or options.profile == 'KDX':
+    if options.profile == 'K1' or options.profile == 'K2' or options.profile == 'K34' or options.profile == 'KDX':
         options.panelview = False
         options.hq = False
     # Webtoon mode mandatory options

diff --git a/kindlecomicconverter/image.py b/kindlecomicconverter/image.py
@@ -80,8 +80,8 @@ def __init__(self):
     Profiles = {
         'K1': ("Kindle 1", (600, 670), Palette4, 1.8),
         'K2': ("Kindle 2", (600, 670), Palette15, 1.8),
-        'K3': ("Kindle", (600, 800), Palette16, 1.8),
-        'K45': ("Kindle", (600, 800), Palette16, 1.8),
+        'K34': ("Kindle Keyboard/Touch", (600, 800), Palette16, 1.8),
+        'K578': ("Kindle", (600, 800), Palette16, 1.8),
         'KDX': ("Kindle DX/DXG", (824, 1000), Palette16, 1.8),
         'KPW': ("Kindle Paperwhite 1/2", (758, 1024), Palette16, 1.8),
         'KV': ("Kindle Paperwhite 3/Voyage/Oasis", (1072, 1448), Palette16, 1.8),

diff --git a/other/osx/sentry.py.enc b/other/osx/sentry.py.enc