Merge pull request #207 from ciromattia/dev

5.1.3

.gitignore

@@ -4,7 +4,6 @@
 .idea
 .DS_Store
 Thumbs.db
-build
 dist
 Output
 test
@@ -14,3 +13,4 @@ kindlegen*
 setup.bat
 setup.sh
 kcc/sentry.py
+build/

README.md

@@ -6,7 +6,7 @@ actually a comic/manga to EPUB converter that every e-reader owner can happily u
 It can also optionally optimize images by applying a number of transformations.
 
 ### A word of warning
-**KCC** _is not_ [Amazon's Kindle Comic Creator](http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1001103761) nor is in any way endorsed by Amazon.  
+**KCC** _is not_ [Amazon's Kindle Comic Creator](http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1001103761) nor is in any way endorsed by Amazon.
 Amazon's tool is for comic publishers and involves a lot of manual effort, while **KCC** is for comic/manga readers.
 _KC2_ in no way is a replacement for **KCC** so you can be quite confident we'll going to carry on developing our little monster ;-)
 
@@ -76,7 +76,7 @@ Options:
   MAIN:
     -p PROFILE, --profile=PROFILE
                         Device profile (Available options: K1, K2, K3, K45, KDX,
-                        KPW, KV, KoMT, KoG, KoGHD, KoA, KoAHD, KoAH2O) [Default=KV]
+                        KPW, KV, KoMT, KoG, KoGHD, KoA, KoAHD, KoAH2O, KoAO) [Default=KV]
     -m, --manga-style   Manga style (right-to-left reading and splitting)
     -w, --webtoon       Webtoon processing mode
 
@@ -153,16 +153,19 @@ The app relies and includes the following scripts:
 * [Kindle Paperwhite 3 / Voyage / Oasis](http://kcc.iosphe.re/Samples/Ubunchu!-KV.mobi)
 * [Kindle Paperwhite 1 / 2](http://kcc.iosphe.re/Samples/Ubunchu!-KPW.mobi)
 * [Kindle](http://kcc.iosphe.re/Samples/Ubunchu!-K45.mobi)
-* [Kindle Keyboard](http://kcc.iosphe.re/Samples/Ubunchu!-K3.mobi)
-* [Kindle DX/DXG](http://kcc.iosphe.re/Samples/Ubunchu!-KDX.cbz)
-* [Kobo Mini/Touch](http://kcc.iosphe.re/Samples/Ubunchu-KoMT.kepub.epub)
-* [Kobo Glo](http://kcc.iosphe.re/Samples/Ubunchu-KoG.kepub.epub)
-* [Kobo Glo HD](http://kcc.iosphe.re/Samples/Ubunchu-KoGHD.kepub.epub)
 * [Kobo Aura](http://kcc.iosphe.re/Samples/Ubunchu-KoA.kepub.epub)
 * [Kobo Aura HD](http://kcc.iosphe.re/Samples/Ubunchu-KoAHD.kepub.epub)
 * [Kobo Aura H2O](http://kcc.iosphe.re/Samples/Ubunchu-KoAH2O.kepub.epub)
+* [Kobo Aura ONE](http://kcc.iosphe.re/Samples/Ubunchu-KoAO.kepub.epub)
 
 ## CHANGELOG
+####5.1.3:
+* Added Kobo Aura ONE profile
+* Fixed few small bugs
+
+####5.1.2:
+* Fixed error reporting
+
 ####5.1.1:
 * Fixed multiple GUI bugs
 

docker/Build

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+
+pip3 install --upgrade pip setuptools wheel
+pip3 install pillow python-slugify psutil pyinstaller==3.1.1 raven pyqt5 certifi
+gem install fpm
+
+cd /app
+pyinstaller -F -s kcc.py
+mkdir -p dist/usr/bin dist/usr/share/applications dist/usr/share/doc/kindlecomicconverter dist/usr/share/kindlecomicconverter dist/usr/share/lintian/overrides
+mv dist/kcc dist/usr/bin
+cp icons/comic2ebook.png dist/usr/share/kindlecomicconverter
+cp LICENSE.txt dist/usr/share/doc/kindlecomicconverter/copyright
+cp other/linux/kindlecomicconverter.desktop dist/usr/share/applications
+cp other/linux/kindlecomicconverter dist/usr/share/lintian/overrides
+
+cd /app/dist
+fpm -f -s dir -t deb -n kindlecomicconverter -v $KCCVER -m "Paweł Jastrzębski <pawelj@iosphe.re>" --license "ISC" --description "$(printf "Comic and Manga converter for e-book readers.\nThis app allows you to transform your PNG, JPG, GIF, CBZ, CBR and CB7 files\ninto EPUB or MOBI format e-books.")" --url "https://kcc.iosphe.re/" --deb-priority "optional" --vendor "" --category "graphics" -d "unrar | unrar-free" -d "p7zip-full" -d "libc6" usr

docker/Dockerfile

@@ -0,0 +1,18 @@
+# acidweb/kcc
+FROM debian:jessie
+MAINTAINER Paweł Jastrzębski <pawelj@iosphe.re>
+
+ADD ./Build /Build
+
+RUN printf "deb http://httpredir.debian.org/debian stretch main" > /etc/apt/sources.list.d/stretch.list
+RUN printf "Package: *\nPin: release a=testing\nPin-Priority: 400\n" > /etc/apt/preferences.d/stretch.pref
+RUN printf "deb http://httpredir.debian.org/debian sid main" > /etc/apt/sources.list.d/sid.list
+RUN printf "Package: *\nPin: release a=testing\nPin-Priority: 300\n" > /etc/apt/preferences.d/sid.pref
+RUN apt-get update && apt-get -y dist-upgrade
+RUN apt-get -y install build-essential curl ruby ruby-dev libpng-dev libjpeg-dev
+RUN apt-get -y -t testing install python3 python3-dev
+RUN apt-get -y -t unstable install python3-pyqt5
+RUN curl https://bootstrap.pypa.io/get-pip.py | python3
+RUN apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+CMD /Build

kcc.iss

@@ -1,5 +1,5 @@
 #define MyAppName "Kindle Comic Converter"
-#define MyAppVersion "5.1.1"
+#define MyAppVersion "5.1.3"
 #define MyAppPublisher "Ciro Mattia Gonano, Paweł Jastrzębski"
 #define MyAppURL "http://kcc.iosphe.re/"
 #define MyAppExeName "KCC.exe"

kcc/KCC_gui.py

@@ -328,9 +328,10 @@ class WorkerThread(QtCore.QThread):
                                    'for more details.', 'error', False)
                 MW.addTrayMessage.emit('Error during conversion!', 'Critical')
             if not self.conversionAlive:
-                for item in outputPath:
-                    if os.path.exists(item):
-                        os.remove(item)
+                if 'outputPath' in locals():
+                    for item in outputPath:
+                        if os.path.exists(item):
+                            os.remove(item)
                 self.clean()
                 return
             if not self.errors:
@@ -917,6 +918,8 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                              'DefaultUpscale': True, 'Label': 'KoAHD'},
             "Kobo Aura H2O": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 1,
                               'DefaultUpscale': True, 'Label': 'KoAH2O'},
+            "Kobo Aura ONE": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 1,
+                              'DefaultUpscale': True, 'Label': 'KoAO'},
             "Other": {'Quality': False, 'ForceExpert': True, 'DefaultFormat': 1,
                       'DefaultUpscale': False, 'Label': 'OTHER'},
             "Kindle 1": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 0,
@@ -933,6 +936,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
             "Kindle PW 1/2",
             "Kindle",
             "Separator",
+            "Kobo Aura ONE",
             "Kobo Aura H2O",
             "Kobo Aura HD",
             "Kobo Aura",

kcc/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '5.1.1'
+__version__ = '5.1.3'
 __license__ = 'ISC'
 __copyright__ = '2012-2016, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
 __docformat__ = 'restructuredtext en'

kcc/comic2ebook.py

@@ -64,7 +64,10 @@ def main(argv=None):
     if len(args) == 0:
         parser.print_help()
         return 0
-    sources = set([source for arg in args for source in glob(arg)])
+    if sys.platform.startswith('win'):
+        sources = set([source for arg in args for source in glob(arg)])
+    else:
+        sources = set(args)
     if len(sources) == 0:
         print('No matching files found.')
         return 1
@@ -957,7 +960,7 @@ def makeParser():
 
     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,"
-                                " KoA, KoAHD, KoAH2O) [Default=KV]")
+                                " 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)")
     mainOptions.add_option("-w", "--webtoon", action="store_true", dest="webtoon", default=False,
@@ -1021,7 +1024,7 @@ def checkOptions():
     if options.format == 'Auto':
         if options.profile in ['K1', 'K2', 'K3', 'K45', 'KPW', 'KV']:
             options.format = 'MOBI'
-        elif options.profile in ['OTHER', 'KoMT', 'KoG', 'KoGHD', 'KoA', 'KoAHD', 'KoAH2O']:
+        elif options.profile in ['OTHER', 'KoMT', 'KoG', 'KoGHD', 'KoA', 'KoAHD', 'KoAH2O', 'KoAO']:
             options.format = 'EPUB'
         elif options.profile in ['KDX']:
             options.format = 'CBZ'

kcc/image.py

@@ -90,6 +90,7 @@ class ProfileData:
         'KoA': ("Kobo Aura", (758, 1024), Palette16, 1.8, (1137, 1536)),
         'KoAHD': ("Kobo Aura HD", (1080, 1440), Palette16, 1.8, (1620, 2160)),
         'KoAH2O': ("Kobo Aura H2O", (1080, 1430), Palette16, 1.8, (1620, 2145)),
+        'KoAO': ("Kobo Aura ONE", (1404, 1872), Palette16, 1.8, (2106, 2808)),
         'OTHER': ("Other", (0, 0), Palette16, 1.8, (0, 0)),
     }
 

other/linux/kindlecomicconverter.desktop

@@ -5,7 +5,7 @@ Name=Kindle Comic Converter
 GenericName=Kindle Comic Converter
 Comment=Comic and Manga converter for e-book readers
 Icon=/usr/share/kindlecomicconverter/comic2ebook.png
-Exec=/usr/bin/kcc
+Exec=/usr/bin/kcc %f
 Terminal=false
 Categories=Graphics;
 MimeType=application/zip;application/x-rar;application/x-7z-compressed;

other/osx/Info.plist

@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>MacOS/Kindle Comic Converter</string>
 	<key>CFBundleGetInfoString</key>
-	<string>KindleComicConverter 5.1.1, written 2012-2016 by Ciro Mattia Gonano and Pawel Jastrzebski</string>
+	<string>KindleComicConverter 5.1.3, written 2012-2016 by Ciro Mattia Gonano and Pawel Jastrzebski</string>
 	<key>CFBundleIconFile</key>
 	<string>comic2ebook.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -21,11 +21,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.1.1</string>
+	<string>5.1.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.1.1</string>
+	<string>5.1.3</string>
 	<key>LSEnvironment</key>
 	<dict>
 		<key>PATH</key>