1
0
mirror of https://github.com/ciromattia/kcc synced 2025-12-13 01:36:27 +00:00

Moved dependiences check out of module

This commit is contained in:
Paweł Jastrzębski
2014-01-15 14:58:45 +01:00
parent 87009f27a6
commit cf3df581e1
9 changed files with 87 additions and 109 deletions

View File

@@ -23,6 +23,34 @@ __license__ = 'ISC'
__copyright__ = '2012-2013, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
__docformat__ = 'restructuredtext en'
# Dependiences check
missing = []
try:
# noinspection PyUnresolvedReferences
from psutil import TOTAL_PHYMEM, Popen
except ImportError:
missing.append('psutil')
try:
# noinspection PyUnresolvedReferences
from slugify import slugify
except ImportError:
missing.append('python-slugify')
try:
# noinspection PyUnresolvedReferences
from PIL import Image, ImageOps, ImageStat, ImageChops
if tuple(map(int, ('2.3.0'.split(".")))) > tuple(map(int, (Image.PILLOW_VERSION.split(".")))):
missing.append('Pillow 2.3.0+')
except ImportError:
missing.append('Pillow 2.3.0+')
if len(missing) > 0:
print('ERROR: ' + ', '.join(missing) + ' is not installed!')
import tkinter
import tkinter.messagebox
importRoot = tkinter.Tk()
importRoot.withdraw()
tkinter.messagebox.showerror('KCC - Error', 'ERROR: ' + ', '.join(missing) + ' is not installed!')
exit(1)
import sys
from multiprocessing import freeze_support
from kcc.comic2ebook import main, Copyright

View File

@@ -23,6 +23,24 @@ __license__ = 'ISC'
__copyright__ = '2012-2013, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
__docformat__ = 'restructuredtext en'
# Dependiences check
missing = []
try:
# noinspection PyUnresolvedReferences
from PIL import Image, ImageOps, ImageStat, ImageChops
if tuple(map(int, ('2.3.0'.split(".")))) > tuple(map(int, (Image.PILLOW_VERSION.split(".")))):
missing.append('Pillow 2.3.0+')
except ImportError:
missing.append('Pillow 2.3.0+')
if len(missing) > 0:
print('ERROR: ' + ', '.join(missing) + ' is not installed!')
import tkinter
import tkinter.messagebox
importRoot = tkinter.Tk()
importRoot.withdraw()
tkinter.messagebox.showerror('KCC - Error', 'ERROR: ' + ', '.join(missing) + ' is not installed!')
exit(1)
import sys
from multiprocessing import freeze_support
from kcc.comic2panel import main, Copyright

41
kcc.py
View File

@@ -23,22 +23,43 @@ __license__ = 'ISC'
__copyright__ = '2012-2013, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
__docformat__ = 'restructuredtext en'
import sys
import os
# Dependiences check
missing = []
try:
# noinspection PyUnresolvedReferences
from PyQt5 import QtCore, QtGui, QtNetwork, QtWidgets
except ImportError:
print("ERROR: PyQT5 is not installed!")
if sys.platform.startswith('linux'):
import tkinter
import tkinter.messagebox
importRoot = tkinter.Tk()
importRoot.withdraw()
tkinter.messagebox.showerror("KCC - Error", "PyQT5 is not installed!")
missing.append('PyQt5')
try:
# noinspection PyUnresolvedReferences
from psutil import TOTAL_PHYMEM, Popen
except ImportError:
missing.append('psutil')
try:
# noinspection PyUnresolvedReferences
from slugify import slugify
except ImportError:
missing.append('python-slugify')
try:
# noinspection PyUnresolvedReferences
from PIL import Image, ImageOps, ImageStat, ImageChops
if tuple(map(int, ('2.3.0'.split(".")))) > tuple(map(int, (Image.PILLOW_VERSION.split(".")))):
missing.append('Pillow 2.3.0+')
except ImportError:
missing.append('Pillow 2.3.0+')
if len(missing) > 0:
print('ERROR: ' + ', '.join(missing) + ' is not installed!')
import tkinter
import tkinter.messagebox
importRoot = tkinter.Tk()
importRoot.withdraw()
tkinter.messagebox.showerror('KCC - Error', 'ERROR: ' + ', '.join(missing) + ' is not installed!')
exit(1)
from kcc import KCC_gui
import sys
import os
from multiprocessing import freeze_support
from kcc import KCC_gui
# OS specific PATH variable workarounds
if sys.platform.startswith('darwin'):

View File

@@ -26,11 +26,8 @@ import os
import sys
import traceback
import urllib.request
import urllib.error
import urllib.parse
import socket
from . import comic2ebook
from . import kindlesplit
from time import sleep
from shutil import move
from http.server import BaseHTTPRequestHandler, HTTPServer
@@ -39,19 +36,10 @@ from subprocess import STDOUT, PIPE
from PyQt5 import QtGui, QtCore, QtWidgets
from xml.dom.minidom import parse
from html.parser import HTMLParser
from .KCC_rc_web import WebContent
try:
# noinspection PyUnresolvedReferences
from psutil import TOTAL_PHYMEM, Popen
except ImportError:
print("ERROR: Psutil is not installed!")
if sys.platform.startswith('linux'):
import tkinter
import tkinter.messagebox
importRoot = tkinter.Tk()
importRoot.withdraw()
tkinter.messagebox.showerror("KCC - Error", "Psutil is not installed!")
exit(1)
from psutil import TOTAL_PHYMEM, Popen
from . import comic2ebook
from . import kindlesplit
from . import KCC_rc_web
if sys.platform.startswith('darwin'):
from . import KCC_ui_osx as KCC_ui
elif sys.platform.startswith('linux'):
@@ -993,7 +981,7 @@ class KCCGUI(KCC_ui.Ui_KCC):
# Empty string cover all versions before this system was implemented
purgeSettingsVersions = ['']
self.icons = Icons()
self.webContent = WebContent()
self.webContent = KCC_rc_web.WebContent()
self.tray = SystemTrayIcon()
self.settings = QtCore.QSettings('KindleComicConverter', 'KindleComicConverter')
self.settingsVersion = self.settings.value('settingsVersion', '', type=str)

View File

@@ -21,23 +21,11 @@ __docformat__ = 'restructuredtext en'
import os
import zipfile
from . import rarfile
import locale
from sys import platform
from subprocess import STDOUT, PIPE
try:
# noinspection PyUnresolvedReferences
from psutil import Popen
except ImportError:
print("ERROR: Psutil is not installed!")
if platform.startswith('linux'):
import tkinter
import tkinter.messagebox
importRoot = tkinter.Tk()
importRoot.withdraw()
tkinter.messagebox.showerror("KCC - Error", "Psutil is not installed!")
exit(1)
from psutil import Popen
from shutil import move
from . import rarfile
class CBxArchive:

View File

@@ -34,27 +34,7 @@ from multiprocessing import Pool
from xml.dom.minidom import parse
from uuid import uuid4
from slugify import slugify
try:
# noinspection PyUnresolvedReferences
from PIL import Image
if tuple(map(int, ('2.3.0'.split(".")))) > tuple(map(int, (Image.PILLOW_VERSION.split(".")))):
print("ERROR: Pillow 2.3.0 or newer is required!")
if sys.platform.startswith('linux'):
import tkinter
import tkinter.messagebox
importRoot = tkinter.Tk()
importRoot.withdraw()
tkinter.messagebox.showerror("KCC - Error", "Pillow 2.3.0 or newer is required!")
exit(1)
except ImportError:
print("ERROR: Pillow is not installed!")
if sys.platform.startswith('linux'):
import tkinter
import tkinter.messagebox
importRoot = tkinter.Tk()
importRoot.withdraw()
tkinter.messagebox.showerror("KCC - Error", "Pillow 2.3.0 or newer is required!")
exit(1)
from PIL import Image
try:
from PyQt5 import QtCore
except ImportError:

View File

@@ -27,27 +27,7 @@ import sys
from shutil import rmtree, copytree, move
from optparse import OptionParser, OptionGroup
from multiprocessing import Pool
try:
# noinspection PyUnresolvedReferences
from PIL import Image, ImageStat
if tuple(map(int, ('2.3.0'.split(".")))) > tuple(map(int, (Image.PILLOW_VERSION.split(".")))):
print("ERROR: Pillow 2.3.0 or newer is required!")
if sys.platform.startswith('linux'):
import tkinter
import tkinter.messagebox
importRoot = tkinter.Tk()
importRoot.withdraw()
tkinter.messagebox.showerror("KCC - Error", "Pillow 2.3.0 or newer is required!")
exit(1)
except ImportError:
print("ERROR: Pillow is not installed!")
if sys.platform.startswith('linux'):
import tkinter
import tkinter.messagebox
importRoot = tkinter.Tk()
importRoot.withdraw()
tkinter.messagebox.showerror("KCC - Error", "Pillow 2.3.0 or newer is required!")
exit(1)
from PIL import Image, ImageStat
try:
from PyQt5 import QtCore
except ImportError:

View File

@@ -21,29 +21,8 @@ __copyright__ = '2012-2013, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jas
__docformat__ = 'restructuredtext en'
import os
from sys import platform
from functools import reduce
try:
# noinspection PyUnresolvedReferences
from PIL import Image, ImageOps, ImageStat, ImageChops
if tuple(map(int, ('2.3.0'.split(".")))) > tuple(map(int, (Image.PILLOW_VERSION.split(".")))):
print("ERROR: Pillow 2.3.0 or newer is required!")
if platform.startswith('linux'):
import tkinter
import tkinter.messagebox
importRoot = tkinter.Tk()
importRoot.withdraw()
tkinter.messagebox.showerror("KCC - Error", "Pillow 2.3.0 or newer is required!")
exit(1)
except ImportError:
print("ERROR: Pillow is not installed!")
if platform.startswith('linux'):
import tkinter
import tkinter.messagebox
importRoot = tkinter.Tk()
importRoot.withdraw()
tkinter.messagebox.showerror("KCC - Error", "Pillow 2.3.0 or newer is required!")
exit(1)
from PIL import Image, ImageOps, ImageStat, ImageChops
class ProfileData:

View File

@@ -1,4 +0,0 @@
Pillow==2.2.1
Unidecode==0.04.14
psutil==1.1.3
python-slugify==0.0.6