Updated OSX libs

This should eliminate last problems with file locks on Windows

README.md

@@ -43,7 +43,7 @@ You can find the latest released binary at the following links:
 - Python 3.3
 - [PyQt5](http://www.riverbankcomputing.co.uk/software/pyqt/download5)
 - [Pillow](http://pypi.python.org/pypi/Pillow/) 2.3.0+
-- [psutil](https://pypi.python.org/pypi/psutil)
+- [psutil](https://pypi.python.org/pypi/psutil) 2.0+
 - [python-slugify](http://pypi.python.org/pypi/python-slugify)
 
 On Debian based distributions these two commands should install all dependencies:
@@ -53,8 +53,8 @@ sudo pip3 install pillow python-slugify psutil
 ```
 
 ### For freezing code:
-- Windows - [cx_Freeze](https://bitbucket.org/anthony_tuininga/cx_freeze) version 4.3.2 with [this](https://bitbucket.org/anthony_tuininga/cx_freeze/pull-request/29/conversions-to-support-untranslated-wide) patchset.
+- Windows - [cx_Freeze](https://bitbucket.org/anthony_tuininga/cx_freeze) HEAD version with [this](https://bitbucket.org/anthony_tuininga/cx_freeze/pull-request/29/conversions-to-support-untranslated-wide) patchset.
-- OS X - [py2app](https://bitbucket.org/ronaldoussoren/py2app) HEAD version.
+- OS X - [py2app](https://bitbucket.org/ronaldoussoren/py2app) 0.8+
 
 ## USAGE
 
@@ -63,10 +63,10 @@ After completed conversion you should find ready file alongside the original inp
 
 Please check [our wiki](https://github.com/ciromattia/kcc/wiki/) for more details.
 
-### Standalone `comic2ebook.py` usage:
+### Standalone `kcc-c2e.py` usage:
 
 ```
-Usage: comic2ebook.py [options] comic_file|comic_folder
+Usage: kcc-c2e [options] comic_file|comic_folder
 
 Options:
   MAIN:
@@ -108,10 +108,10 @@ Options:
     -h, --help          Show this help message and exit
 ```
 
-### Standalone `comic2panel.py` usage:
+### Standalone `kcc-c2p.py` usage:
 
 ```
-Usage: comic2panel.py [options] comic_folder
+Usage: kcc-c2p [options] comic_folder
 
 Options:
   MANDATORY:
@@ -339,6 +339,10 @@ The app relies and includes the following scripts/binaries:
 * Improved performance of WebToon splitter
 * Tweaked margin color detection
 
+####4.0.2:
+* Fixed some Windows and OSX specific bugs
+* Fixed problem with marigns when using HQ mode
+
 ## KNOWN ISSUES
 Please check [wiki page](https://github.com/ciromattia/kcc/wiki/Known-issues).
 

kcc-c2e.py

@@ -18,7 +18,7 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-__version__ = '4.0.1'
+__version__ = '4.0.2'
 __license__ = 'ISC'
 __copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
 __docformat__ = 'restructuredtext en'
@@ -32,7 +32,7 @@ if sys.version_info[0] != 3:
 missing = []
 try:
     # noinspection PyUnresolvedReferences
-    from psutil import TOTAL_PHYMEM, Popen
+    from psutil import virtual_memory, Popen
 except ImportError:
     missing.append('psutil')
 try:

kcc-c2p.py

@@ -23,7 +23,7 @@ if sys.version_info[0] != 3:
     print('ERROR: This is Python 3 script!')
     exit(1)
 
-__version__ = '4.0.1'
+__version__ = '4.0.2'
 __license__ = 'ISC'
 __copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
 __docformat__ = 'restructuredtext en'

kcc.iss

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

kcc.py

@@ -18,7 +18,7 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-__version__ = '4.0.1'
+__version__ = '4.0.2'
 __license__ = 'ISC'
 __copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
 __docformat__ = 'restructuredtext en'
@@ -37,7 +37,7 @@ except ImportError:
     missing.append('PyQt5')
 try:
     # noinspection PyUnresolvedReferences
-    from psutil import TOTAL_PHYMEM, Popen
+    from psutil import virtual_memory, Popen
 except ImportError:
     missing.append('psutil')
 try:
@@ -78,6 +78,16 @@ if sys.platform.startswith('darwin'):
 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/;' + os.environ['PATH']
         os.chdir(os.path.dirname(os.path.abspath(__file__)))

kcc/KCC_gui.py

@@ -17,7 +17,7 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-__version__ = '4.0.1'
+__version__ = '4.0.2'
 __license__ = 'ISC'
 __copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
 __docformat__ = 'restructuredtext en'
@@ -36,7 +36,7 @@ from subprocess import STDOUT, PIPE
 from PyQt5 import QtGui, QtCore, QtWidgets
 from xml.dom.minidom import parse
 from html.parser import HTMLParser
-from psutil import TOTAL_PHYMEM, Popen
+from psutil import virtual_memory, Popen
 from .shared import md5Checksum
 from . import comic2ebook
 from . import kindlesplit
@@ -195,6 +195,7 @@ class VersionThread(QtCore.QThread):
 
     def run(self):
         try:
+            sleep(1)
             XML = urlopen('http://kcc.vulturis.eu/Version.php')
             XML = parse(XML)
         except Exception:
@@ -337,7 +338,7 @@ class WorkerThread(QtCore.QThread):
         self.kindlegenErrorCode = [0]
         self.workerOutput = []
         # Let's make sure that we don't fill the memory
-        availableMemory = TOTAL_PHYMEM/1000000000
+        availableMemory = virtual_memory().total/1000000000
         if availableMemory <= 2:
             self.threadNumber = 1
         elif 2 < availableMemory <= 4:

kcc/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '4.0.1'
+__version__ = '4.0.2'
 __license__ = 'ISC'
 __copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
 __docformat__ = 'restructuredtext en'

kcc/cbxarchive.py

@@ -104,7 +104,7 @@ class CBxArchive:
             for f in os.listdir(os.path.join(targetdir, adir[0])):
                 # If directory names contain UTF-8 chars shutil.move can't clean up the mess alone
                 if os.path.isdir(os.path.join(targetdir, f)):
-                    os.rename(os.path.join(targetdir, adir[0], f), os.path.join(targetdir, adir[0], f + '-A'))
+                    os.replace(os.path.join(targetdir, adir[0], f), os.path.join(targetdir, adir[0], f + '-A'))
                     f += '-A'
                 move(os.path.join(targetdir, adir[0], f), targetdir)
             os.rmdir(os.path.join(targetdir, adir[0]))

kcc/comic2ebook.py

@@ -18,7 +18,7 @@
 # PERFORMANCE OF THIS SOFTWARE.
 #
 
-__version__ = '4.0.1'
+__version__ = '4.0.2'
 __license__ = 'ISC'
 __copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
 __docformat__ = 'restructuredtext en'
@@ -673,7 +673,7 @@ def sanitizeTree(filetree):
                 newKey = os.path.join(root, slugified + splitname[1])
                 key = os.path.join(root, name)
                 if key != newKey:
-                    os.rename(key, newKey)
+                    os.replace(key, newKey)
         for name in dirs:
             if name.startswith('.'):
                 os.remove(os.path.join(root, name))
@@ -686,7 +686,7 @@ def sanitizeTree(filetree):
                 newKey = os.path.join(root, slugified)
                 key = os.path.join(root, name)
                 if key != newKey:
-                    os.rename(key, newKey)
+                    os.replace(key, newKey)
     return chapterNames
 
 
@@ -883,7 +883,7 @@ def Usage():
 
 def main(argv=None, qtGUI=None):
     global parser, options, GUI
-    parser = OptionParser(usage="Usage: %prog [options] comic_file|comic_folder", add_help_option=False)
+    parser = OptionParser(usage="Usage: kcc-c2e [options] comic_file|comic_folder", add_help_option=False)
     mainOptions = OptionGroup(parser, "MAIN")
     processingOptions = OptionGroup(parser, "PROCESSING")
     outputOptions = OptionGroup(parser, "OUTPUT SETTINGS")

kcc/comic2panel.py

@@ -18,7 +18,7 @@
 # PERFORMANCE OF THIS SOFTWARE.
 #
 
-__version__ = '4.0.1'
+__version__ = '4.0.2'
 __license__ = 'ISC'
 __copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
 __docformat__ = 'restructuredtext en'
@@ -213,7 +213,7 @@ def Copyright():
 
 def main(argv=None, qtGUI=None):
     global options, GUI, splitWorkerPool, splitWorkerOutput, mergeWorkerPool, mergeWorkerOutput
-    parser = OptionParser(usage="Usage: %prog [options] comic_folder", add_help_option=False)
+    parser = OptionParser(usage="Usage: kcc-c2p [options] comic_folder", add_help_option=False)
     mainOptions = OptionGroup(parser, "MANDATORY")
     otherOptions = OptionGroup(parser, "OTHER")
     mainOptions.add_option("-y", "--height", type="int", dest="height", default=0,

kcc/image.py

@@ -223,6 +223,9 @@ class ComicPage:
                 self.size[0] and self.image.size[1] <= self.size[1]:
             size = (self.size[0], self.size[1])
         elif qualityMode == 1:
+            # Forcing upscale to make sure that margins will be not too big
+            if not stretch:
+                upscale = True
             size = (self.panelviewsize[0], self.panelviewsize[1])
         elif qualityMode == 2 and not stretch and not upscale and self.image.size[0] <=\
                 self.size[0] and self.image.size[1] <= self.size[1]:

setup.py

@@ -14,7 +14,7 @@ if version_info[0] != 3:
     exit(1)
 
 NAME = "KindleComicConverter"
-VERSION = "4.0.1"
+VERSION = "4.0.2"
 MAIN = "kcc.py"
 
 if platform == "darwin":

setup.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Linux Python package build script
 
-VERSION="4.0.1"
+VERSION="4.0.2"
 
 cp kcc.py __main__.py
 zip kcc.zip __main__.py kcc/*.py