Merge pull request #137 from ciromattia/dev

4.5.1

README.md

@@ -1,7 +1,7 @@
 # KCC
 
 **Kindle Comic Converter** is a Python app to convert comic/manga files or folders to EPUB, Panel View MOBI or E-Ink optimized CBZ.
-It was initially developed for Kindle but since version 2.2 it outputs valid EPUB 2.0 so _**despite its name, KCC is
+It was initially developed for Kindle but since version 4.0 it outputs valid EPUB 3.0 so _**despite its name, KCC is
 actually a comic/manga to EPUB converter that every e-reader owner can happily use**_.
 It can also optionally optimize images by applying a number of transformations.
 
@@ -29,20 +29,8 @@ You can find the latest released binary at the following links:
 - **Linux:** [http://kcc.iosphe.re/Linux/](http://kcc.iosphe.re/Linux/)
 - **OS X (10.8+):** [http://kcc.iosphe.re/OSX/](http://kcc.iosphe.re/OSX/)
 
-## INPUT FORMATS
-**KCC** can understand and convert, at the moment, the following input types:
-- Folders containing: PNG, JPG or GIF files
-- CBZ, ZIP
-- CBR, RAR *(With `unrar` executable)*
-- CB7, 7Z *(With `7za` executable)*
-- PDF *(Only extracting JPG images)*
-
-## OPTIONAL REQUIREMENTS
-- [KindleGen](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)*
-- [UnRAR](http://www.rarlab.com/download.htm) *(For CBR/RAR support)*
-- [7za](http://www.7-zip.org/download.html) *(For 7z/CB7 support)*
-
-### For running from source:
+## 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.0+
 - [Pillow](http://pypi.python.org/pypi/Pillow/) 2.7.0+
@@ -50,15 +38,24 @@ You can find the latest released binary at the following links:
 - [python-slugify](http://pypi.python.org/pypi/python-slugify) 0.1.0+
 - [scandir](https://pypi.python.org/pypi/scandir) 0.9+
 
-On Debian based distributions these two commands should install all dependencies:
+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
 ```
 
-### For freezing code:
-- Windows - [py2exe](https://pypi.python.org/pypi/py2exe) 0.9.2.2+
-- OS X - [py2app](https://bitbucket.org/ronaldoussoren/py2app) 0.9.0+
+### Optional dependencies
+- [KindleGen](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)*
+- [UnRAR](http://www.rarlab.com/download.htm) *(For CBR/RAR support)*
+- [7za](http://www.7-zip.org/download.html) *(For 7z/CB7 support)*
+
+## INPUT FORMATS
+**KCC** can understand and convert, at the moment, the following input types:
+- Folders containing: PNG, JPG or GIF files
+- CBZ, ZIP
+- CBR, RAR *(With `unrar` executable)*
+- CB7, 7Z *(With `7za` executable)*
+- PDF *(Only extracting JPG images)*
 
 ## USAGE
 
@@ -78,7 +75,7 @@ Options:
   MAIN:
     -p PROFILE, --profile=PROFILE
                         Device profile (Available options: K1, K2, K345, KDX,
-                        KPW, KV, KFHD, KFHDX, KFHDX8, KFA, KoMT, KoG, KoA,
+                        KPW, KV, KFHD, KFHDX, KFHDX8, KFA, KoMT, KoG, KoGHD, KoA,
                         KoAHD, KoAH2O) [Default=KV]
     -q QUALITY, --quality=QUALITY
                         Quality of Panel View. 0 - Normal 1 - High 2 - Ultra [Default=0]
@@ -153,14 +150,20 @@ The app relies and includes the following scripts:
 * [Kindle](http://kcc.iosphe.re/Samples/Ubunchu!-K345.mobi)
 * [Kindle DX/DXG](http://kcc.iosphe.re/Samples/Ubunchu!-KDX.cbz)
 * [Kobo Mini/Touch](http://kcc.iosphe.re/Samples/Ubunchu!-KoMT.cbz)
-* [Kobo Glow](http://kcc.iosphe.re/Samples/Ubunchu!-KoG.cbz)
+* [Kobo Glo](http://kcc.iosphe.re/Samples/Ubunchu!-KoG.cbz)
+* [Kobo Glo HD](http://kcc.iosphe.re/Samples/Ubunchu!-KoGHD.cbz)
 * [Kobo Aura](http://kcc.iosphe.re/Samples/Ubunchu!-KoA.cbz)
 * [Kobo Aura HD](http://kcc.iosphe.re/Samples/Ubunchu!-KoAHD.cbz)
 * [Kobo Aura H2O](http://kcc.iosphe.re/Samples/Ubunchu!-KoAH2O.cbz)
 
 ## CHANGELOG
+####4.5.1:
+* Added Kobo Glo HD profile
+* Fixed RAR/CBR parsing anomalies
+* Minor bug fixes and tweaks
+
 ####4.5:
-* Added simple ComicRack medadata editor
+* Added simple ComicRack metadata editor
 * Re-enabled Manga Cover Database support
 * ComicRack bookmarks are now parsed
 * Fixed glitches in Kindle Voyage profile

kcc.iss

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

kcc/KCC_gui.py

@@ -1177,8 +1177,10 @@ class KCCGUI(KCC_ui.Ui_KCC):
                                 'DefaultUpscale': True, 'Label': 'KFHDX8'},
             "Kobo Mini/Touch": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 2,
                                 'DefaultUpscale': False, 'Label': 'KoMT'},
-            "Kobo Glow": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 2,
-                          'DefaultUpscale': False, 'Label': 'KoG'},
+            "Kobo Glo": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 2,
+                         'DefaultUpscale': False, 'Label': 'KoG'},
+            "Kobo Glo HD": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 2,
+                            'DefaultUpscale': False, 'Label': 'KoGHD'},
             "Kobo Aura": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 2,
                           'DefaultUpscale': False, 'Label': 'KoA'},
             "Kobo Aura HD": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 2,
@@ -1204,7 +1206,8 @@ class KCCGUI(KCC_ui.Ui_KCC):
             "K. Fire HDX 8.9",
             "Separator",
             "Kobo Mini/Touch",
-            "Kobo Glow",
+            "Kobo Glo",
+            "Kobo Glo HD",
             "Kobo Aura",
             "Kobo Aura HD",
             "Kobo Aura H2O",
@@ -1339,6 +1342,8 @@ class KCCGUI_MetaEditor(KCC_MetaEditor_ui.Ui_MetaEditorDialog):
             field.setText(self.parser.data[field.objectName()[:-4]])
         for field in (self.WriterLine, self.PencillerLine, self.InkerLine, self.ColoristLine):
             field.setText(', '.join(self.parser.data[field.objectName()[:-4] + 's']))
+        if self.SeriesLine.text() == '':
+            self.SeriesLine.setText(file.split('\\')[-1].split('.')[0])
 
     def saveData(self):
         for field in (self.VolumeLine, self.NumberLine, self.MUidLine):

kcc/__init__.py

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

kcc/cbxarchive.py

@@ -22,6 +22,7 @@ from zipfile import is_zipfile, ZipFile
 from subprocess import STDOUT, PIPE
 from psutil import Popen
 from shutil import move, copy
+from scandir import walk
 from . import rarfile
 from .shared import check7ZFile as is_7zfile, saferReplace
 
@@ -45,7 +46,7 @@ class CBxArchive:
         cbzFile = ZipFile(self.origFileName)
         filelist = []
         for f in cbzFile.namelist():
-            if f.startswith('__MACOSX') or f.endswith('.DS_Store') or f.endswith('thumbs.db'):
+            if f.startswith('__MACOSX') or f.endswith('.DS_Store') or f.endswith('humbs.db'):
                 pass    # skip MacOS special files
             elif f.endswith('/'):
                 try:
@@ -58,25 +59,18 @@ class CBxArchive:
 
     def extractCBR(self, targetdir):
         cbrFile = rarfile.RarFile(self.origFileName)
-        filelist = []
-        for f in cbrFile.namelist():
-            if f.startswith('__MACOSX') or f.endswith('.DS_Store') or f.endswith('thumbs.db'):
-                pass  # skip MacOS special files
-            elif f.endswith('/'):
-                try:
-                    os.makedirs(os.path.join(targetdir, f))
-                except Exception:
-                    pass  # the dir exists so we are going to extract the images only.
-            else:
-                filelist.append(f)
-        cbrFile.extractall(targetdir, filelist)
+        cbrFile.extractall(targetdir)
+        for root, dirnames, filenames in walk(targetdir):
+            for filename in filenames:
+                if filename.startswith('__MACOSX') or filename.endswith('.DS_Store') or filename.endswith('humbs.db'):
+                    os.remove(os.path.join(root, filename))
 
     def extractCB7(self, targetdir):
         # Workaround for some wide UTF-8 + Popen abnormalities
         if sys.platform.startswith('darwin'):
             copy(self.origFileName, os.path.join(os.path.dirname(self.origFileName), 'TMP_KCC_TMP'))
             self.origFileName = os.path.join(os.path.dirname(self.origFileName), 'TMP_KCC_TMP')
-        output = Popen('7za x "' + self.origFileName + '" -xr!__MACOSX -xr!.DS_Store -xr!thumbs.db -o"'
+        output = Popen('7za x "' + self.origFileName + '" -xr!__MACOSX -xr!.DS_Store -xr!thumbs.db -xr!Thumbs.db -o"'
                        + targetdir + '"', stdout=PIPE, stderr=STDOUT, shell=True)
         extracted = False
         for line in output.stdout:

kcc/comic2ebook.py

@@ -293,7 +293,10 @@ def buildOPF(dstdir, title, filelist, cover=None):
         f.write("<item id=\"img_" + str(uniqueid) + "\" href=\"" + folder + "/" + path[1] + "\" media-type=\""
                 + mt + "\"/>\n")
     f.write("<item id=\"css\" href=\"Text/style.css\" media-type=\"text/css\"/>\n")
-    f.write("</manifest>\n<spine toc=\"ncx\">\n")
+    if options.righttoleft:
+        f.write("</manifest>\n<spine page-progression-direction=\"rtl\" toc=\"ncx\">\n")
+    else:
+        f.write("</manifest>\n<spine page-progression-direction=\"ltr\" toc=\"ncx\">\n")
     for entry in reflist:
         f.write("<itemref idref=\"page_" + entry + "\"/>\n")
     f.write("</spine>\n<guide>\n</guide>\n</package>\n")
@@ -576,7 +579,7 @@ def getWorkFolder(afile):
     if len(afile) > 240:
         raise UserWarning("Path is too long.")
     if os.path.isdir(afile):
-        workdir = mkdtemp('', 'KCC-TMP-')
+        workdir = mkdtemp('', 'KCC-')
         try:
             os.rmdir(workdir)
             fullPath = os.path.join(workdir, 'OEBPS', 'Images')
@@ -595,7 +598,7 @@ def getWorkFolder(afile):
             rmtree(path, True)
             raise UserWarning("Failed to extract images.")
     else:
-        workdir = mkdtemp('', 'KCC-TMP-')
+        workdir = mkdtemp('', 'KCC-')
         cbx = cbxarchive.CBxArchive(afile)
         if cbx.isCbxFile():
             try:
@@ -895,9 +898,12 @@ def detectCorruption(tmpPath, orgPath):
                     img.verify()
                     img = Image.open(path)
                     img.load()
-                except Exception:
+                except Exception as err:
                     rmtree(os.path.join(tmpPath, '..', '..'), True)
-                    raise RuntimeError('Image file %s is corrupted.' % pathOrg)
+                    if 'decoder' in err and 'not available' in err:
+                        raise RuntimeError('Pillow was compiled without JPG and/or PNG decoder.')
+                    else:
+                        raise RuntimeError('Image file %s is corrupted.' % pathOrg)
             else:
                 os.remove(os.path.join(root, name))
 
@@ -932,7 +938,7 @@ def detectMargins(path):
 
 
 def createNewTome():
-    tomePathRoot = mkdtemp('', 'KCC-TMP-')
+    tomePathRoot = mkdtemp('', 'KCC-')
     tomePath = os.path.join(tomePathRoot, 'OEBPS', 'Images')
     os.makedirs(tomePath)
     return tomePath, tomePathRoot
@@ -971,7 +977,7 @@ def makeParser():
 
     mainOptions.add_option("-p", "--profile", action="store", dest="profile", default="KV",
                            help="Device profile (Available options: K1, K2, K345, KDX, KPW, KV, KFHD, KFHDX, KFHDX8,"
-                                " KFA, KoMT, KoG, KoA, KoAHD, KoAH2O) [Default=KV]")
+                                " KFA, KoMT, KoG, KoGHD, KoA, KoAHD, KoAH2O) [Default=KV]")
     mainOptions.add_option("-q", "--quality", type="int", dest="quality", default="0",
                            help="Quality of Panel View. 0 - Normal 1 - High 2 - Ultra [Default=0]")
     mainOptions.add_option("-m", "--manga-style", action="store_true", dest="righttoleft", default=False,
@@ -1037,7 +1043,7 @@ def checkOptions():
             options.format = 'MOBI'
         elif options.profile in ['Other']:
             options.format = 'EPUB'
-        elif options.profile in ['KDX', 'KoMT', 'KoG', 'KoA', 'KoAHD', 'KoAH2O']:
+        elif options.profile in ['KDX', 'KoMT', 'KoG', 'KoGHD', 'KoA', 'KoAHD', 'KoAH2O']:
             options.format = 'CBZ'
     if options.white_borders:
         options.bordersColor = 'white'

kcc/image.py

@@ -89,7 +89,8 @@ class ProfileData:
         'KFHDX8': ("K. Fire HDX 8.9", (1600, 2560), PalleteNull, 1.0, (2400, 3840)),
         'KFA': ("Kindle for Android", (0, 0), PalleteNull, 1.0, (0, 0)),
         'KoMT': ("Kobo Mini/Touch", (600, 800), Palette16, 1.8, (900, 1200)),
-        'KoG': ("Kobo Glow", (768, 1024), Palette16, 1.8, (1152, 1536)),
+        'KoG': ("Kobo Glo", (768, 1024), Palette16, 1.8, (1152, 1536)),
+        'KoGHD': ("Kobo Glo HD", (1072, 1448), Palette16, 1.8, (1608, 2172)),
         '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)),

kcc/metadata.py

@@ -64,7 +64,7 @@ class MetadataParser:
                             self.rawdata = parse(xml_file)
             elif is_7zfile(self.source):
                 self.compressor = '7z'
-                workdir = mkdtemp('', 'KCC-TMP-')
+                workdir = mkdtemp('', 'KCC-')
                 tmpXML = os.path.join(workdir, 'ComicInfo.xml')
                 output = Popen('7za e "' + self.source + '" ComicInfo.xml -o"' + workdir + '"',
                                stdout=PIPE, stderr=STDOUT, shell=True)
@@ -147,7 +147,7 @@ class MetadataParser:
             with open(self.source, 'w', encoding='utf-8') as f:
                 self.rawdata.writexml(f, encoding='utf-8')
         else:
-            workdir = mkdtemp('', 'KCC-TMP-')
+            workdir = mkdtemp('', 'KCC-')
             tmpXML = os.path.join(workdir, 'ComicInfo.xml')
             with open(tmpXML, 'w', encoding='utf-8') as f:
                 self.rawdata.writexml(f, encoding='utf-8')

kcc/pdfjpgextract.py

@@ -29,7 +29,7 @@ class PdfJpgExtract:
         self.origFileName = origFileName
         self.filename = os.path.splitext(origFileName)
         # noinspection PyUnusedLocal
-        self.path = self.filename[0] + "-KCC-TMP-" + ''.join(choice(ascii_uppercase + digits) for x in range(3))
+        self.path = self.filename[0] + "-KCC-" + ''.join(choice(ascii_uppercase + digits) for x in range(3))
 
     def getPath(self):
         return self.path

kcc/shared.py

@@ -104,9 +104,9 @@ def saferReplace(old, new):
 
 
 def removeFromZIP(zipfname, *filenames):
-    tempdir = mkdtemp('', 'KCC-TMP-')
+    tempdir = mkdtemp('', 'KCC-')
     try:
-        tempname = os.path.join(tempdir, 'KCC-TMP.zip')
+        tempname = os.path.join(tempdir, 'KCC.zip')
         with ZipFile(zipfname, 'r') as zipread:
             with ZipFile(tempname, 'w', compression=ZIP_DEFLATED) as zipwrite:
                 for item in zipread.infolist():

setup.py

@@ -1,25 +1,32 @@
 #!/usr/bin/env python3
 """
-py2exe/py2app build script for KCC.
+pip/py2exe/py2app build script for KCC.
 
 Usage (Windows):
-    python setup.py py2exe
+    py -3.4 setup.py py2exe
+
+Usage (Linux):
+    python3 setup.py make_pyz or python3 setup.py install
 
 Usage (Mac OS X):
-    python setup.py py2app
+    python3 setup.py py2app
 """
-from sys import platform, version_info
+from sys import platform, version_info, argv
 from kcc import __version__
 if version_info[0] != 3:
     print('ERROR: This is Python 3 script!')
     exit(1)
 
-NAME = "KindleComicConverter"
+NAME = 'KindleComicConverter'
 VERSION = __version__
-MAIN = "kcc.py"
+MAIN = 'kcc.py'
+extra_options = {}
 
-if platform == "darwin":
+# noinspection PyUnresolvedReferences
+if platform == 'darwin':
     from setuptools import setup
+    from os import chmod, makedirs
+    from shutil import copyfile
     extra_options = dict(
         setup_requires=['py2app'],
         app=[MAIN],
@@ -32,8 +39,8 @@ if platform == "darwin":
                 plist=dict(
                     CFBundleName=NAME,
                     CFBundleShortVersionString=VERSION,
-                    CFBundleGetInfoString=NAME + " " + VERSION +
-                    ", written 2012-2015 by Ciro Mattia Gonano and Pawel Jastrzebski",
+                    CFBundleGetInfoString=NAME + ' ' + VERSION +
+                    ', written 2012-2015 by Ciro Mattia Gonano and Pawel Jastrzebski',
                     CFBundleExecutable=NAME,
                     CFBundleDocumentTypes=[
                         dict(
@@ -52,12 +59,12 @@ if platform == "darwin":
             )
         )
     )
-elif platform == "win32":
+elif platform == 'win32':
     # noinspection PyUnresolvedReferences
     import py2exe
-    import platform
+    from platform import architecture
     from distutils.core import setup
-    if platform.architecture()[0] == '64bit':
+    if architecture()[0] == '64bit':
         suffix = '_64'
     else:
         suffix = ''
@@ -70,44 +77,86 @@ elif platform == "win32":
                               'C:\Python34' + suffix + '\Lib\site-packages\PyQt5\libGLESv2.dll',
                               'C:\Python34' + suffix + '\Lib\site-packages\PyQt5\libEGL.dll'])]
     extra_options = dict(
-        options={'py2exe': {"bundle_files": 1,
-                            "dist_dir": "dist" + suffix,
-                            "compressed": True,
-                            "includes": ["sip"],
-                            "excludes": ["tkinter"],
-                            "optimize": 2}},
-        windows=[{"script": MAIN,
-                  "dest_base": "KCC",
-                  "version": VERSION,
-                  "copyright": "Ciro Mattia Gonano, Pawel Jastrzebski © 2012-2015",
-                  "legal_copyright": "ISC License (ISCL)",
-                  "product_version": VERSION,
-                  "product_name": "Kindle Comic Converter",
-                  "file_description": "Kindle Comic Converter",
-                  "icon_resources": [(1, "icons\comic2ebook.ico")]}],
+        options={'py2exe': {'bundle_files': 1,
+                            'dist_dir': 'dist' + suffix,
+                            'compressed': True,
+                            'includes': ['sip'],
+                            'excludes': ['tkinter'],
+                            'optimize': 2}},
+        windows=[{'script': MAIN,
+                  'dest_base': 'KCC',
+                  'version': VERSION,
+                  'copyright': 'Ciro Mattia Gonano, Pawel Jastrzebski © 2012-2015',
+                  'legal_copyright': 'ISC License (ISCL)',
+                  'product_version': VERSION,
+                  'product_name': 'Kindle Comic Converter',
+                  'file_description': 'Kindle Comic Converter',
+                  'icon_resources': [(1, 'icons\comic2ebook.ico')]}],
         zipfile=None,
         data_files=additional_files)
 else:
-    print('Please use setup.sh to build Linux package.')
-    exit()
+    if argv[1] == 'make_pyz':
+        from os import system
+        script = '''
+        cp kcc.py __main__.py
+        zip kcc.zip __main__.py kcc/*.py
+        echo "#!/usr/bin/env python3" > kcc-bin
+        cat kcc.zip >> kcc-bin
+        chmod +x kcc-bin
+
+        cp kcc-c2e.py __main__.py
+        zip kcc-c2e.zip __main__.py kcc/*.py
+        echo "#!/usr/bin/env python3" > kcc-c2e-bin
+        cat kcc-c2e.zip >> kcc-c2e-bin
+        chmod +x kcc-c2e-bin
+
+        cp kcc-c2p.py __main__.py
+        zip kcc-c2p.zip __main__.py kcc/*.py
+        echo "#!/usr/bin/env python3" > kcc-c2p-bin
+        cat kcc-c2p.zip >> kcc-c2p-bin
+        chmod +x kcc-c2p-bin
+
+        tar --xform s:^.*/:: --xform s/LICENSE.txt/LICENSE/ --xform s/kcc-bin/kcc/ --xform s/kcc-c2p-bin/kcc-c2p/ \
+        --xform s/kcc-c2e-bin/kcc-c2e/ --xform s/comic2ebook/kcc/ -czf KindleComicConverter_linux_'''\
+        + VERSION + '''.tar.gz kcc-bin kcc-c2e-bin kcc-c2p-bin LICENSE.txt README.md icons/comic2ebook.png
+        rm __main__.py kcc.zip kcc-c2e.zip kcc-c2p.zip kcc-bin kcc-c2e-bin kcc-c2p-bin
+        '''
+        system("bash -c '%s'" % script)
+        exit(0)
+    else:
+        from setuptools import setup
+        from os import makedirs
+        from shutil import copyfile
+        makedirs('build/_scripts/', exist_ok=True)
+        copyfile('kcc.py', 'build/_scripts/kcc')
+        copyfile('kcc-c2e.py', 'build/_scripts/kcc-c2e')
+        copyfile('kcc-c2p.py', 'build/_scripts/kcc-c2p')
+        extra_options = dict(
+            scripts=['build/_scripts/kcc', 'build/_scripts/kcc-c2e', 'build/_scripts/kcc-c2p'],
+            packages=['kcc'],
+            install_requires=[
+                'Pillow>=2.7.0',
+                'psutil>=2.0',
+                'python-slugify>=0.1.0',
+                'scandir>=0.9',
+            ],
+            zip_safe=False,
+        )
 
-# noinspection PyUnboundLocalVariable
 setup(
     name=NAME,
     version=VERSION,
-    author="Ciro Mattia Gonano, Pawel Jastrzebski",
-    author_email="ciromattia@gmail.com, pawelj@iosphe.re",
-    description="Kindle Comic Converter",
-    license="ISC License (ISCL)",
-    keywords="kindle comic mobipocket mobi cbz cbr manga",
-    url="http://github.com/ciromattia/kcc",
+    author='Ciro Mattia Gonano, Pawel Jastrzebski',
+    author_email='ciromattia@gmail.com, pawelj@iosphe.re',
+    description='Comic and manga converter for E-Book readers.',
+    license='ISC License (ISCL)',
+    keywords='kindle comic mobipocket mobi cbz cbr manga',
+    url='http://github.com/ciromattia/kcc',
     **extra_options
 )
 
-if platform == "darwin":
-    from os import chmod, makedirs
-    from shutil import copyfile
-    makedirs('dist/' + NAME + '.app/Contents/PlugIns/platforms')
+if platform == 'darwin':
+    makedirs('dist/' + NAME + '.app/Contents/PlugIns/platforms', exist_ok=True)
     copyfile('other/libqcocoa.dylib', 'dist/' + NAME + '.app/Contents/PlugIns/platforms/libqcocoa.dylib')
     chmod('dist/' + NAME + '.app/Contents/Resources/unrar', 0o777)
     chmod('dist/' + NAME + '.app/Contents/Resources/7za', 0o777)

setup.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-# Linux Python package build script
-
-VERSION="4.5"
-
-cp kcc.py __main__.py
-zip kcc.zip __main__.py kcc/*.py
-echo "#!/usr/bin/env python3" > kcc-bin
-cat kcc.zip >> kcc-bin
-chmod +x kcc-bin
-
-cp kcc-c2e.py __main__.py
-zip kcc-c2e.zip __main__.py kcc/*.py
-echo "#!/usr/bin/env python3" > kcc-c2e-bin
-cat kcc-c2e.zip >> kcc-c2e-bin
-chmod +x kcc-c2e-bin
-
-cp kcc-c2p.py __main__.py
-zip kcc-c2p.zip __main__.py kcc/*.py
-echo "#!/usr/bin/env python3" > kcc-c2p-bin
-cat kcc-c2p.zip >> kcc-c2p-bin
-chmod +x kcc-c2p-bin
-
-tar --xform s:^.*/:: --xform s/kcc-bin/kcc/ --xform s/kcc-c2p-bin/kcc-c2p/ --xform s/kcc-c2e-bin/kcc-c2e/ --xform s/comic2ebook/kcc/ -czf KindleComicConverter_linux_${VERSION}.tar.gz kcc-bin kcc-c2e-bin kcc-c2p-bin LICENSE.txt icons/comic2ebook.png
-rm __main__.py kcc.zip kcc-c2e.zip kcc-c2p.zip kcc-bin kcc-c2e-bin kcc-c2p-bin