public/kcc
1
0
Fork 0
mirror of https://github.com/ciromattia/kcc synced 2025-12-19 04:31:50 +00:00
Code Issues Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Paweł Jastrzębski
2015-09-02 17:47:36 +02:00
parent a7440e06a9
commit 57e9637c81
8 changed files with 68 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kcc/KCC_gui.py
View File

@@ -66,7 +66,6 @@ class QApplicationMessaging(QtWidgets.QApplication):
socket.connectToServer(self._key, QtCore.QIODevice.WriteOnly) socket.connectToServer(self._key, QtCore.QIODevice.WriteOnly)
if not socket.waitForConnected(self._timeout): if not socket.waitForConnected(self._timeout):
self._server = QtNetwork.QLocalServer(self) self._server = QtNetwork.QLocalServer(self)
# noinspection PyUnresolvedReferences
self._server.newConnection.connect(self.handleMessage) self._server.newConnection.connect(self.handleMessage)
self._server.listen(self._key) self._server.listen(self._key)
else: else:
@@ -139,7 +138,7 @@ class Icons:
class WebServerHandler(BaseHTTPRequestHandler): class WebServerHandler(BaseHTTPRequestHandler):
# noinspection PyAttributeOutsideInit, PyArgumentList # noinspection PyAttributeOutsideInit
def do_GET(self): def do_GET(self):
if self.path == '/': if self.path == '/':
self.path = '/index.html' self.path = '/index.html'
@@ -276,8 +275,8 @@ class VersionThread(QtCore.QThread):
try: try:
MW.modeConvert.emit(-1) MW.modeConvert.emit(-1)
MW.progressBarTick.emit('Downloading update') MW.progressBarTick.emit('Downloading update')
path = urlretrieve('https://kcc.iosphe.re/Windows/KindleComicConverter_win_' path = urlretrieve('https://kcc.iosphe.re/Windows/KindleComicConverter_win_' +
+ self.newVersion + '.exe', reporthook=self.getNewVersionTick) self.newVersion + '.exe', reporthook=self.getNewVersionTick)
if self.md5 != md5Checksum(path[0]): if self.md5 != md5Checksum(path[0]):
raise Exception raise Exception
move(path[0], path[0] + '.exe') move(path[0], path[0] + '.exe')
@@ -324,7 +323,6 @@ class ProgressThread(QtCore.QThread):
class WorkerThread(QtCore.QThread): class WorkerThread(QtCore.QThread):
# noinspection PyArgumentList
def __init__(self): def __init__(self):
QtCore.QThread.__init__(self) QtCore.QThread.__init__(self)
self.conversionAlive = False self.conversionAlive = False
@@ -552,7 +550,6 @@ class SystemTrayIcon(QtWidgets.QSystemTrayIcon):
super().__init__() super().__init__()
if self.isSystemTrayAvailable(): if self.isSystemTrayAvailable():
QtWidgets.QSystemTrayIcon.__init__(self, GUI.icons.programIcon, MW) QtWidgets.QSystemTrayIcon.__init__(self, GUI.icons.programIcon, MW)
# noinspection PyUnresolvedReferences
self.activated.connect(self.catchClicks) self.activated.connect(self.catchClicks)
def catchClicks(self): def catchClicks(self):

4
kcc/cbxarchive.py
View File

@@ -70,8 +70,8 @@ class CBxArchive:
if sys.platform.startswith('darwin'): if sys.platform.startswith('darwin'):
copy(self.origFileName, os.path.join(os.path.dirname(self.origFileName), 'TMP_KCC_TMP')) 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') 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 -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) targetdir + '"', stdout=PIPE, stderr=STDOUT, shell=True)
extracted = False extracted = False
for line in output.stdout: for line in output.stdout:
if b"Everything is Ok" in line: if b"Everything is Ok" in line:

16
kcc/comic2ebook.py
View File

@@ -242,9 +242,9 @@ def buildNCX(dstdir, title, chapters, chapterNames):
navID = filename[0].replace('/', '_').replace('\\', '_') navID = filename[0].replace('/', '_').replace('\\', '_')
elif os.path.basename(folder) != "Text": elif os.path.basename(folder) != "Text":
title = chapterNames[os.path.basename(folder)] title = chapterNames[os.path.basename(folder)]
f.write("<navPoint id=\"" + navID + "\"><navLabel><text>" f.write("<navPoint id=\"" + navID + "\"><navLabel><text>" +
+ title + "</text></navLabel><content src=\"" + filename[0].replace("\\", "/") title + "</text></navLabel><content src=\"" + filename[0].replace("\\", "/") +
+ ".html\"/></navPoint>\n") ".html\"/></navPoint>\n")
f.write("</navMap>\n</ncx>") f.write("</navMap>\n</ncx>")
f.close() f.close()
@@ -341,15 +341,15 @@ def buildOPF(dstdir, title, filelist, cover=None):
filename = getImageFileName(path[1]) filename = getImageFileName(path[1])
uniqueid = os.path.join(folder, filename[0]).replace('/', '_').replace('\\', '_') uniqueid = os.path.join(folder, filename[0]).replace('/', '_').replace('\\', '_')
reflist.append(uniqueid) reflist.append(uniqueid)
f.write("<item id=\"page_" + str(uniqueid) + "\" href=\"" f.write("<item id=\"page_" + str(uniqueid) + "\" href=\"" +
+ folder.replace('Images', 'Text') + "/" + filename[0] folder.replace('Images', 'Text') + "/" + filename[0] +
+ ".html\" media-type=\"application/xhtml+xml\"/>\n") ".html\" media-type=\"application/xhtml+xml\"/>\n")
if '.png' == filename[1]: if '.png' == filename[1]:
mt = 'image/png' mt = 'image/png'
else: else:
mt = 'image/jpeg' mt = 'image/jpeg'
f.write("<item id=\"img_" + str(uniqueid) + "\" href=\"" + folder + "/" + path[1] + "\" media-type=\"" f.write("<item id=\"img_" + str(uniqueid) + "\" href=\"" + folder + "/" + path[1] + "\" media-type=\"" +
+ mt + "\"/>\n") mt + "\"/>\n")
f.write("<item id=\"css\" href=\"Text/style.css\" media-type=\"text/css\"/>\n") f.write("<item id=\"css\" href=\"Text/style.css\" media-type=\"text/css\"/>\n")
if options.righttoleft: if options.righttoleft:
f.write("</manifest>\n<spine page-progression-direction=\"rtl\" toc=\"ncx\">\n") f.write("</manifest>\n<spine page-progression-direction=\"rtl\" toc=\"ncx\">\n")

7
kcc/dualmetafix.py
View File

@@ -87,8 +87,8 @@ def get_exth_params(rec0):
def add_exth(rec0, exth_num, exth_bytes): def add_exth(rec0, exth_num, exth_bytes):
ebase, elen, enum, rlen = get_exth_params(rec0) ebase, elen, enum, rlen = get_exth_params(rec0)
newrecsize = 8 + len(exth_bytes) newrecsize = 8 + len(exth_bytes)
newrec0 = rec0[0:ebase+4]+struct.pack('>L', elen+newrecsize)+struct.pack('>L', enum+1)+struct.pack('>L', exth_num)\ newrec0 = rec0[0:ebase + 4] + struct.pack('>L', elen + newrecsize) + struct.pack('>L', enum + 1) + \
+ struct.pack('>L', newrecsize)+exth_bytes+rec0[ebase+12:] struct.pack('>L', exth_num) + struct.pack('>L', newrecsize) + exth_bytes + rec0[ebase + 12:]
newrec0 = writeint(newrec0, title_offset, getint(newrec0, title_offset) + newrecsize) newrec0 = writeint(newrec0, title_offset, getint(newrec0, title_offset) + newrecsize)
# keep constant record length by removing newrecsize null bytes from end # keep constant record length by removing newrecsize null bytes from end
sectail = newrec0[-newrecsize:] sectail = newrec0[-newrecsize:]
@@ -123,7 +123,8 @@ def del_exth(rec0, exth_num):
newrec0 = rec0 newrec0 = rec0
newrec0 = writeint(newrec0, title_offset, getint(newrec0, title_offset) - exth_size) newrec0 = writeint(newrec0, title_offset, getint(newrec0, title_offset) - exth_size)
newrec0 = newrec0[:ebase_idx] + newrec0[ebase_idx + exth_size:] newrec0 = newrec0[:ebase_idx] + newrec0[ebase_idx + exth_size:]
newrec0 = newrec0[0:ebase+4]+struct.pack('>L', elen-exth_size)+struct.pack('>L', enum-1)+newrec0[ebase+12:] newrec0 = newrec0[0:ebase + 4] + struct.pack('>L', elen - exth_size) + \
struct.pack('>L', enum - 1) + newrec0[ebase + 12:]
newrec0 += b'\0' * exth_size newrec0 += b'\0' * exth_size
if rlen != len(newrec0): if rlen != len(newrec0):
raise DualMetaFixException('del_exth: incorrect section size change') raise DualMetaFixException('del_exth: incorrect section size change')

4
kcc/image.py
View File

@@ -148,8 +148,8 @@ class ComicPage:
if self.noVPV: if self.noVPV:
flags.append('NoVerticalPanelView') flags.append('NoVerticalPanelView')
if self.border: if self.border:
flags.append('Margins-' + str(self.border[0]) + '-' + str(self.border[1]) + '-' flags.append('Margins-' + str(self.border[0]) + '-' + str(self.border[1]) + '-' +
+ str(self.border[2]) + '-' + str(self.border[3])) str(self.border[2]) + '-' + str(self.border[3]))
if self.fill != 'white': if self.fill != 'white':
flags.append('BlackFill') flags.append('BlackFill')
if self.opt.quality == 2: if self.opt.quality == 2:

4
kcc/shared.py
View File

@@ -46,6 +46,9 @@ class HTMLStripper(HTMLParser):
def get_data(self): def get_data(self):
return ''.join(self.fed) return ''.join(self.fed)
def error(self, message):
pass
def getImageFileName(imgfile): def getImageFileName(imgfile):
name, ext = os.path.splitext(imgfile) name, ext = os.path.splitext(imgfile)
@@ -125,7 +128,6 @@ def sanitizeTrace(traceback):
.replace('C:\\Python34_64\\', '') .replace('C:\\Python34_64\\', '')
# noinspection PyUnresolvedReferences
def dependencyCheck(level): def dependencyCheck(level):
missing = [] missing = []
if level > 2: if level > 2:

2
setup.py
View File

@@ -22,7 +22,6 @@ VERSION = __version__
MAIN = 'kcc.py' MAIN = 'kcc.py'
extra_options = {} extra_options = {}
# noinspection PyUnresolvedReferences
if platform == 'darwin': if platform == 'darwin':
from setuptools import setup from setuptools import setup
from os import chmod, makedirs from os import chmod, makedirs
@@ -60,7 +59,6 @@ if platform == 'darwin':
) )
) )
elif platform == 'win32': elif platform == 'win32':
# noinspection PyUnresolvedReferences
import py2exe import py2exe
from platform import architecture from platform import architecture
from distutils.core import setup from distutils.core import setup