diff options
| -rw-r--r-- | .gitignore | 15 | ||||
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | kcc.iss | 2 | ||||
| -rwxr-xr-x | kcc.py | 10 | ||||
| -rw-r--r-- | kindlecomicconverter/KCC_gui.py | 2 | ||||
| -rw-r--r-- | kindlecomicconverter/__init__.py | 2 | ||||
| -rwxr-xr-x | kindlecomicconverter/image.py | 2 | ||||
| -rw-r--r-- | other/osx/Info.plist | 8 | ||||
| -rwxr-xr-x | setup.py | 1 |
10 files changed, 27 insertions, 27 deletions
diff --git a/.gitignore b/.gitignore index 6877d7a..3e74b4d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,10 @@ *.pyc -*.cbz -*.cbr -*.spec -.idea -.DS_Store -.python-version -Thumbs.db -dist -Output -kindlegen* +Pipfile +Pipfile.lock setup.bat kindlecomicconverter/sentry.py +other/windows/kindlegen.exe +dist/ build/ KindleComicConverter.egg-info/ +.idea/ \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 37a65b7..de4f5b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ # CHANGELOG +#### 5.5.2: +* Fixed KindleGen detection on macOS 10.15 +* Fixed multiple smaller issues + #### 5.5.1: * Fixes some stability issues diff --git a/README.md b/README.md index 32836a4..7e39ea5 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ If you find **KCC** valuable you can consider donating to the authors: ## BINARY RELEASES You can find the latest released binary at the following links: - **[Windows](http://kcc.iosphe.re/Windows/) (64-bit only)** -- **[macOS](http://kcc.iosphe.re/OSX/) (10.12+)** +- **[macOS](http://kcc.iosphe.re/OSX/) (10.13+)** - **Linux:** Currently unavailable. ## PYPI @@ -43,7 +43,7 @@ Following software is required to run Linux version of **KCC** and/or bare sourc - [PyQt5](https://pypi.python.org/pypi/PyQt5) 5.6.0+ - [Pillow](https://pypi.python.org/pypi/Pillow/) 4.0.0+ - [psutil](https://pypi.python.org/pypi/psutil) 5.0.0+ -- [python-slugify](https://pypi.python.org/pypi/python-slugify) 1.2.1+ +- [python-slugify](https://pypi.python.org/pypi/python-slugify) 1.2.1+, <3.0.0 - [raven](https://pypi.python.org/pypi/raven) 6.0.0+ On Debian based distributions these two commands should install all needed dependencies: @@ -160,7 +160,7 @@ The app relies and includes the following scripts: - Icon is by **Nikolay Verin** ([http://ncrow.deviantart.com/](http://ncrow.deviantart.com/)) and released under [CC BY-NC-SA 3.0](http://creativecommons.org/licenses/by-nc-sa/3.0/) License. ## SAMPLE FILES CREATED BY KCC -* [Kindle Oasis 2](http://kcc.iosphe.re/Samples/Ubunchu!-KO.mobi) +* [Kindle Oasis 2 / 3](http://kcc.iosphe.re/Samples/Ubunchu!-KO.mobi) * [Kindle Paperwhite 3 / 4 / 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!-K578.mobi) @@ -173,7 +173,7 @@ The app relies and includes the following scripts: ## PRIVACY **KCC** is initiating internet connections in two cases: * During startup - Version check. -* When error occurs - Automatic reporting on Windows and MacOS. +* When error occurs - Automatic reporting on Windows and macOS. ## KNOWN ISSUES Please check [wiki page](https://github.com/ciromattia/kcc/wiki/Known-issues). diff --git a/kcc.iss b/kcc.iss index 699b17a..caae98d 100644 --- a/kcc.iss +++ b/kcc.iss @@ -1,5 +1,5 @@ #define MyAppName "Kindle Comic Converter" -#define MyAppVersion "5.5.1" +#define MyAppVersion "5.5.2" #define MyAppPublisher "Ciro Mattia Gonano, Paweł Jastrzębski" #define MyAppURL "http://kcc.iosphe.re/" #define MyAppExeName "KCC.exe" diff --git a/kcc.py b/kcc.py index 9c4d983..27284ce 100755 --- a/kcc.py +++ b/kcc.py @@ -42,11 +42,11 @@ elif sys.platform.startswith('win'): os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/windows/;' + os.environ['PATH'] os.chdir(os.path.dirname(os.path.abspath(__file__))) # Load additional Sentry configuration -if getattr(sys, 'frozen', False): - try: - import kindlecomicconverter.sentry - except ImportError: - pass +# if getattr(sys, 'frozen', False): +# try: +# import kindlecomicconverter.sentry +# except ImportError: +# pass from multiprocessing import freeze_support, set_start_method from kindlecomicconverter.startup import start diff --git a/kindlecomicconverter/KCC_gui.py b/kindlecomicconverter/KCC_gui.py index 6020c7d..ea36e1e 100644 --- a/kindlecomicconverter/KCC_gui.py +++ b/kindlecomicconverter/KCC_gui.py @@ -953,7 +953,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): 'DefaultUpscale': False, 'Label': 'K34'}, } profilesGUI = [ - "Kindle Oasis 2", + "Kindle Oasis 2/3", "Kindle Oasis", "Kindle Voyage", "Kindle PW 3/4", diff --git a/kindlecomicconverter/__init__.py b/kindlecomicconverter/__init__.py index c0f1b84..6ad0c10 100644 --- a/kindlecomicconverter/__init__.py +++ b/kindlecomicconverter/__init__.py @@ -1,4 +1,4 @@ -__version__ = '5.5.1' +__version__ = '5.5.2' __license__ = 'ISC' __copyright__ = '2012-2019, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>' __docformat__ = 'restructuredtext en' diff --git a/kindlecomicconverter/image.py b/kindlecomicconverter/image.py index bc96e0c..35fcfc8 100755 --- a/kindlecomicconverter/image.py +++ b/kindlecomicconverter/image.py @@ -358,7 +358,7 @@ class Cover: try: self.image.save(self.target, "JPEG", optimize=1, quality=85) except IOError: - raise RuntimeError('Failed to process downloaded cover.') + raise RuntimeError('Failed to save cover.') def saveToKindle(self, kindle, asin): self.image = self.image.resize((300, 470), Image.ANTIALIAS) diff --git a/other/osx/Info.plist b/other/osx/Info.plist index 54a4f19..daed678 100644 --- a/other/osx/Info.plist +++ b/other/osx/Info.plist @@ -30,7 +30,7 @@ <key>CFBundleExecutable</key> <string>MacOS/Kindle Comic Converter</string> <key>CFBundleGetInfoString</key> - <string>KindleComicConverter 5.5.1, written 2012-2019 by Ciro Mattia Gonano and Pawel Jastrzebski</string> + <string>KindleComicConverter 5.5.2, written 2012-2019 by Ciro Mattia Gonano and Pawel Jastrzebski</string> <key>CFBundleIconFile</key> <string>comic2ebook.icns</string> <key>CFBundleIdentifier</key> @@ -42,11 +42,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>5.5.1</string> + <string>5.5.2</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>5.5.1</string> + <string>5.5.2</string> <key>LSEnvironment</key> <dict> <key>PATH</key> @@ -55,7 +55,7 @@ <key>LSHasLocalizedDisplayName</key> <false/> <key>LSMinimumSystemVersion</key> - <string>10.12.0</string> + <string>10.13.0</string> <key>NSAppleScriptEnabled</key> <false/> <key>NSHumanReadableCopyright</key> diff --git a/setup.py b/setup.py index 0868767..b21925d 100755 --- a/setup.py +++ b/setup.py @@ -22,6 +22,7 @@ MAIN = 'kcc.py' VERSION = __version__ +# noinspection PyUnresolvedReferences class BuildBinaryCommand(distutils.cmd.Command): description = 'build binary release' user_options = [] |