Migrated to PyInstaller

.gitignore

@@ -10,3 +10,6 @@ Output
 test
 solaio
 kindlegen*
+*.spec
+setup.bat
+setup.sh

Dockerfile

@@ -0,0 +1,26 @@
+# Recipe used to build DEB package
+
+FROM acidweb/kcc-base
+MAINTAINER Paweł Jastrzębski <[email protected]>
+
+ENV KCCVER 4.6.5
+ADD . /app
+
+RUN pip3 install pillow python-slugify psutil scandir https://github.com/pyinstaller/pyinstaller/archive/develop.zip
+RUN gem install fpm
+RUN useradd -ms /bin/bash kcc && chown -R kcc:kcc /app
+
+USER kcc
+WORKDIR /app
+RUN pyinstaller -F -s kcc.py
+RUN mkdir -p dist/usr/bin dist/usr/share/applications dist/usr/share/doc/kindlecomicconverter dist/usr/share/kindlecomicconverter dist/usr/share/lintian/overrides
+RUN mv dist/kcc dist/usr/bin
+RUN cp icons/comic2ebook.png dist/usr/share/kindlecomicconverter
+RUN cp LICENSE.txt dist/usr/share/doc/kindlecomicconverter/copyright
+RUN cp other/kindlecomicconverter.desktop dist/usr/share/applications
+RUN cp other/kindlecomicconverter dist/usr/share/lintian/overrides
+
+WORKDIR /app/dist
+RUN fpm -f -s dir -t deb -n kindlecomicconverter -v $KCCVER -m "Paweł Jastrzębski <[email protected]>" --license "ISC" --description "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" usr
+
+CMD mkdir -p /out/dist && cp kindlecomicconverter_${KCCVER}_amd64.deb /out/dist

README.md

@@ -32,16 +32,16 @@ You can find the latest released binary at the following links:
 ## DEPENDENCIES
 Following software is required to run Linux version of **KCC** and/or bare sources:
 - Python 3.3+
-- [PyQt](http://www.riverbankcomputing.co.uk/software/pyqt/download5) 5.2.1+
-- [Pillow](http://pypi.python.org/pypi/Pillow/) 2.8.2+
-- [psutil](https://pypi.python.org/pypi/psutil) 3.0.0+
-- [python-slugify](http://pypi.python.org/pypi/python-slugify) 1.1.3+
-- [scandir](https://pypi.python.org/pypi/scandir) 1.1.0+
+- [PyQt](http://www.riverbankcomputing.co.uk/software/pyqt/download5) 5.2.1+ _(5.5+ is recommended)_
+- [Pillow](http://pypi.python.org/pypi/Pillow/) 3.0.0+
+- [psutil](https://pypi.python.org/pypi/psutil) 3.2.1+
+- [python-slugify](http://pypi.python.org/pypi/python-slugify) 1.1.4+
+- [scandir](https://pypi.python.org/pypi/scandir) 1.1.0+ _(needed only when using Python 3.3 or 3.4)_
 
 On Debian based distributions these two commands should install all needed dependencies:
 ```
 sudo apt-get install python3 python3-dev python3-pip python3-pyqt5 libpng-dev libjpeg-dev p7zip-full unrar
-sudo pip3 install pillow python-slugify psutil scandir
+sudo pip3 install --upgrade pillow python-slugify psutil scandir
 ```
 
 ### Optional dependencies

kcc.iss

@@ -13,14 +13,14 @@ AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
 AppCopyright=Copyright (C) 2012-2015 Ciro Mattia Gonano and Paweł Jastrzębski
+ArchitecturesAllowed=x64 
 DefaultDirName={pf}\{#MyAppName}
 DefaultGroupName={#MyAppName}
 AllowNoIcons=yes
 LicenseFile=LICENSE.txt
 OutputBaseFilename=KindleComicConverter_win_{#MyAppVersion}
 SetupIconFile=icons\comic2ebook.ico
 SolidCompression=yes
-ArchitecturesInstallIn64BitMode=x64
 ShowLanguageDialog=no
 LanguageDetectionMethod=none
 WizardImageFile=icons\Wizard.bmp
@@ -31,6 +31,7 @@ ChangesAssociations=True
 InfoAfterFile=other\windows\InstallWarning.rtf
 SignTool=SignTool /d $q{#MyAppName}$q /du $q{#MyAppURL}$q $f
 MinVersion=0,6.0
+OutputDir=dist
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -42,31 +43,21 @@ Name: "CBRassociation"; Description: "CBR"; GroupDescription: "File associations
 Name: "CB7association"; Description: "CB7"; GroupDescription: "File associations:"
 
 [Files]
-; x64 files
-Source: "dist_64\platforms\*"; DestDir: "{app}\platforms\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "dist_64\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "dist_64\*.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "other\windows\vcredist_x64.exe"; DestDir: "{tmp}"; Flags: ignoreversion deleteafterinstall; Check: Is64BitInstallMode
-; x86 files
-Source: "dist\platforms\*"; DestDir: "{app}\platforms\"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "dist\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "dist\*.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "other\windows\vcredist_x86.exe"; DestDir: "{tmp}"; Flags: ignoreversion deleteafterinstall; Check: not Is64BitInstallMode
-; Common files
+Source: "dist\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
 Source: "LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion solidbreak
 Source: "other\windows\Additional-LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "other\windows\UnRAR.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "other\windows\7za.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "other\windows\vc_redist.x64.exe"; DestDir: "{tmp}"; Flags: ignoreversion deleteafterinstall
 
 [Icons]
 Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
 Name: "{group}\Readme"; Filename: "https://github.com/ciromattia/kcc#kcc"
 Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
 
 [Run]
+Filename: "{tmp}\vc_redist.x64.exe"; Parameters: "/quiet"; StatusMsg: "Installing Microsoft Visual C++ 2015 Redistributable Package..."
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall
-Filename: "{tmp}\vcredist_x64.exe"; Parameters: "/passive /Q:a /c:""msiexec /qb /i vcredist.msi"" "; StatusMsg: "Installing Microsoft Visual C++ 2010 Redistributable Package..."; Check: Is64BitInstallMode
-Filename: "{tmp}\vcredist_x86.exe"; Parameters: "/passive /Q:a /c:""msiexec /qb /i vcredist.msi"" "; StatusMsg: "Installing Microsoft Visual C++ 2010 Redistributable Package..."; Check: not Is64BitInstallMode
 
 [Messages]
 WelcomeLabel1=Welcome to the KCC Setup Wizard

kcc.py

@@ -26,24 +26,16 @@
 # OS specific PATH variable workarounds
 import os
 if sys.platform.startswith('darwin'):
-    if 'RESOURCEPATH' not in os.environ:
-        os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/osx/:' + os.environ['PATH']
-    else:
-        os.environ['PATH'] = './../Resources:/usr/local/bin:/usr/bin:/bin'
+    if getattr(sys, 'frozen', False):
+        os.environ['PATH'] = os.path.dirname(os.path.abspath(sys.executable)) + \
+            '/../Resources:/usr/local/bin:/usr/bin:/bin'
         os.system('defaults write com.kindlecomicconverter.KindleComicConverter ApplePersistenceIgnoreState YES')
+        os.system('defaults write com.kindlecomicconverter.KindleComicConverter NSInitialToolTipDelay -int 1000')
+    else:
+        os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/osx/:' + os.environ['PATH']
 elif sys.platform.startswith('win'):
     if getattr(sys, 'frozen', False):
         os.chdir(os.path.dirname(os.path.abspath(sys.executable)))
-
-        # Implementing dummy stdout and stderr for frozen Windows release
-        class FakeSTD(object):
-            def write(self, string):
-                pass
-
-            def flush(self):
-                pass
-        sys.stdout = FakeSTD()
-        sys.stderr = FakeSTD()
     else:
         os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/windows/;' + os.environ['PATH']
         os.chdir(os.path.dirname(os.path.abspath(__file__)))

kcc/shared.py

@@ -153,22 +153,22 @@ def dependencyCheck(level):
     if level > 1:
         try:
             from psutil import __version__ as psutilVersion
-            if StrictVersion('3.0.0') > StrictVersion(psutilVersion):
-                missing.append('psutil 3.0.0+')
+            if StrictVersion('3.2.1') > StrictVersion(psutilVersion):
+                missing.append('psutil 3.2.1+')
         except ImportError:
-            missing.append('psutil 3.0.0+')
+            missing.append('psutil 3.2.1+')
         try:
             from slugify import __version__ as slugifyVersion
-            if StrictVersion('1.1.3') > StrictVersion(slugifyVersion):
-                missing.append('python-slugify 1.1.3+')
+            if StrictVersion('1.1.4') > StrictVersion(slugifyVersion):
+                missing.append('python-slugify 1.1.4+')
         except ImportError:
-            missing.append('python-slugify 1.1.3+')
+            missing.append('python-slugify 1.1.4+')
     try:
         from PIL import PILLOW_VERSION as pillowVersion
-        if StrictVersion('2.8.2') > StrictVersion(pillowVersion):
-            missing.append('Pillow 2.8.2+')
+        if StrictVersion('3.0.0') > StrictVersion(pillowVersion):
+            missing.append('Pillow 3.0.0+')
     except ImportError:
-        missing.append('Pillow 2.8.2+')
+        missing.append('Pillow 3.0.0+')
     if version_info[1] < 5:
         try:
             from scandir import __version__ as scandirVersion

other/linux/kindlecomicconverter

@@ -0,0 +1,4 @@
+kindlecomicconverter: statically-linked-binary usr/bin/kcc
+kindlecomicconverter: binary-without-manpage usr/bin/kcc
+kindlecomicconverter: wrong-name-for-changelog-of-native-package usr/share/doc/kindlecomicconverter/changelog.Debian.gz
+kindlecomicconverter: file-missing-in-md5sums usr/share/doc/kindlecomicconverter/changelog.Debian.gz

other/linux/kindlecomicconverter.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+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
+Terminal=false
+Categories=Graphics;
+MimeType=application/zip;application/x-rar;application/x-7z-compressed;

other/osx/Info.plist

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>Kindle Comic Converter</string>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>cbz</string>
+				<string>cbr</string>
+				<string>cb7</string>
+				<string>zip</string>
+				<string>rar</string>
+				<string>7z</string>
+				<string>pdf</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>comic2ebook.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Comics</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+		</dict>
+	</array>
+	<key>CFBundleExecutable</key>
+	<string>MacOS/Kindle Comic Converter</string>
+	<key>CFBundleGetInfoString</key>
+	<string>KindleComicConverter 4.6.5, written 2012-2015 by Ciro Mattia Gonano and Pawel Jastrzebski</string>
+	<key>CFBundleIconFile</key>
+	<string>comic2ebook.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.kindlecomicconverter.KindleComicConverter</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Kindle Comic Converter</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>4.6.5</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>4.6.5</string>
+	<key>LSEnvironment</key>
+	<dict>
+		<key>PATH</key>
+		<string>./../Resources:/usr/local/bin:/usr/bin:/bin</string>
+	</dict>
+	<key>LSHasLocalizedDisplayName</key>
+	<false/>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.8.0</string>
+	<key>NSAppleScriptEnabled</key>
+	<false/>
+	<key>NSHumanReadableCopyright</key>
+	<string>ISC License (ISCL)</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>