Merge pull request #566 from axu2/mac

Fix Mac CBZ, CBR, damaged, cover upload

kcc.py

@@ -34,13 +34,13 @@
  if getattr(sys, 'frozen', False):
  os.environ['PATH'] += os.pathsep + os.pathsep.join(mac_paths +
  [
- os.path.dirname(os.path.abspath(sys.executable)) + '/../Resources',
+ '/opt/homebrew/bin',
  '/usr/local/bin',
  '/usr/bin',
  '/bin',
  ]
  )
- os.chdir(os.path.dirname(os.path.abspath(sys.executable)) + '/../Resources')
+ os.chdir(os.path.dirname(os.path.abspath(sys.executable)))
  else:
  os.environ['PATH'] += os.pathsep + os.pathsep.join(mac_paths)
  os.chdir(os.path.dirname(os.path.abspath(__file__)))

kindlecomicconverter/KCC_gui.py

@@ -757,7 +757,7 @@ def display_kindlegen_missing(self):
  if sys.platform.startswith('win'):
  self.addMessage('Download it and place EXE in KCC directory.', 'error')
  elif sys.platform.startswith('darwin'):
- self.addMessage('<a href="https://github.com/ciromattia/kcc/wiki/Installation/_edit#kindlegen">'
+ self.addMessage('<a href="https://github.com/ciromattia/kcc/wiki/Installation#kindlegen">'
  'Install the kindle-comic-creator cask using Homebrew</a> to enable MOBI conversion',
  'error')
  else:
@@ -1046,7 +1046,7 @@ def __init__(self, kccapp, kccwindow):
  self.sevenzip = True
  else:
  self.sevenzip = False
- self.addMessage('<a href="https://github.com/ciromattia/kcc/wiki/Installation#7-zip">Install 7z and add to PATH!</a>!'
+ self.addMessage('<a href="https://github.com/ciromattia/kcc/wiki/Installation#7-zip">Cannot find 7z</a>!'
  ' CBZ/CBR/ZIP/etc processing disabled.', 'warning')
  self.detectKindleGen(True)
 

kindlecomicconverter/__init__.py

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

kindlecomicconverter/comicarchive.py

@@ -19,6 +19,8 @@
 #
 
 import os
+import platform
+import subprocess
 import distro
 from psutil import Popen
 from shutil import move
@@ -65,6 +67,11 @@ def extract(self, targetdir):
  process.communicate()
  if process.returncode != 0:
  raise OSError('Failed to extract archive.')
+ elif process.returncode != 0 and platform.system() == 'Darwin':
+ process = subprocess.run(f"unar '{self.filepath}' -f -o '{targetdir}'", 
+ stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True)
+ if process.returncode != 0:
+ raise Exception(process.stdout.decode("utf-8"))
  elif process.returncode != 0:
  raise OSError('Failed to extract archive. Check if p7zip-rar is installed.')
  tdir = os.listdir(targetdir)

setup.py

@@ -17,8 +17,6 @@
 import distutils.cmd
 from kindlecomicconverter import __version__
 
-OSX_INFO_PLIST = "other/osx/Info.plist"
-
 NAME = 'KindleComicConverter'
 MAIN = 'kcc.py'
 VERSION = __version__
@@ -40,18 +38,11 @@ def run(self):
  VERSION = __version__
  if sys.platform == 'darwin':
 
- with open(OSX_INFO_PLIST, 'r') as file:
- filedata = file.read()
- filedata = filedata.replace('5.5.2', VERSION)
- with open(OSX_INFO_PLIST, 'w') as file:
- file.write(filedata)
-
  os.system('pyinstaller -y -F -i icons/comic2ebook.icns -n "Kindle Comic Converter" -w -s kcc.py')
  os.makedirs('dist/Kindle Comic Converter.app/Contents/Resources/Codecs')
  shutil.copy('other/osx/7z', 'dist/Kindle Comic Converter.app/Contents/Resources')
  shutil.copy('other/osx/7z.so', 'dist/Kindle Comic Converter.app/Contents/Resources')
  shutil.copy('other/osx/Rar.so', 'dist/Kindle Comic Converter.app/Contents/Resources/Codecs')
- shutil.copy('other/osx/Info.plist', 'dist/Kindle Comic Converter.app/Contents')
  shutil.copy('LICENSE.txt', 'dist/Kindle Comic Converter.app/Contents/Resources')
  shutil.copy('other/windows/Additional-LICENSE.txt', 'dist/Kindle Comic Converter.app/Contents/Resources')
  os.chmod('dist/Kindle Comic Converter.app/Contents/Resources/7z', 0o777)