diff --git a/kcc.py b/kcc.py index ba23c4d..f53ab11 100644 --- a/kcc.py +++ b/kcc.py @@ -120,8 +120,8 @@ class QApplicationMessaging(QtWidgets.QApplication): # Adding signals to QMainWindow class QMainWindowKCC(QtWidgets.QMainWindow): - progressBarTick = QtCore.pyqtSignal(str, str) - modeConvert = QtCore.pyqtSignal(str) + progressBarTick = QtCore.pyqtSignal(str) + modeConvert = QtCore.pyqtSignal(bool) addMessage = QtCore.pyqtSignal(str, str, bool) addTrayMessage = QtCore.pyqtSignal(str, str) showDialog = QtCore.pyqtSignal(str) diff --git a/kcc/KCC_gui.py b/kcc/KCC_gui.py index 905c41f..da5d036 100644 --- a/kcc/KCC_gui.py +++ b/kcc/KCC_gui.py @@ -89,7 +89,7 @@ class HTMLStripper(HTMLParser): class WebServerHandler(BaseHTTPRequestHandler): - #noinspection PyAttributeOutsideInit + # noinspection PyAttributeOutsideInit, PyArgumentList def do_GET(self): if self.path == '/': self.path = '/index.html' @@ -109,7 +109,7 @@ class WebServerHandler(BaseHTTPRequestHandler): self.send_response(200) self.send_header('Content-type', 'text/html') self.end_headers() - self.wfile.write('\n' + self.wfile.write(bytes('\n' '\n' '\n' '\n' @@ -118,16 +118,16 @@ class WebServerHandler(BaseHTTPRequestHandler): '\n' '
\n' '

- -

\n') + 'alt="KCC Logo" src="' + GUI.webContent.logo + '" /> -

\n', 'UTF-8')) if len(GUI.completedWork) > 0 and not GUI.conversionAlive: for key in sorted(GUI.completedWork.keys()): - self.wfile.write('

' + key.split('.')[0] + '

\n') + self.wfile.write(bytes('

' + key.split('.')[0] + '

\n', 'UTF-8')) else: - self.wfile.write('

No downloads are available.
' - 'Convert some files and refresh this page.

\n') - self.wfile.write('
\n' + self.wfile.write(bytes('

No downloads are available.
' + 'Convert some files and refresh this page.

\n', 'UTF-8')) + self.wfile.write(bytes('\n' '\n' - '\n') + '\n', 'UTF-8')) elif sendReply: outputFile = GUI.completedWork[urllib.parse.unquote(self.path[1:])].decode('utf-8') fp = open(outputFile, 'rb') @@ -314,6 +314,8 @@ class WorkerThread(QtCore.QThread): # Let's make sure that we don't use too many threads if self.threadNumber > QtCore.QThread.idealThreadCount(): self.threadNumber = QtCore.QThread.idealThreadCount() + self.progressBarTick = MW.progressBarTick + self.addMessage = MW.addMessage def __del__(self): self.wait() @@ -331,7 +333,7 @@ class WorkerThread(QtCore.QThread): MW.modeConvert.emit(True) def addResult(self, output): - MW.progressBarTick.emit(False, False) + MW.progressBarTick.emit('tick') self.workerOutput.append(output) def run(self): @@ -433,9 +435,9 @@ class WorkerThread(QtCore.QThread): else: MW.addMessage.emit('Creating EPUB files... Done!', 'info', True) if str(GUI.FormatBox.currentText()) == 'MOBI': - MW.progressBarTick.emit('status', 'Creating MOBI files') - MW.progressBarTick.emit(len(outputPath)*2+1, False) - MW.progressBarTick.emit(False, False) + MW.progressBarTick.emit('Creating MOBI files') + MW.progressBarTick.emit(str(len(outputPath)*2+1)) + MW.progressBarTick.emit('tick') MW.addMessage.emit('Creating MOBI files', 'info', False) GUI.progress.content = 'Creating MOBI files' self.workerOutput = [] @@ -463,8 +465,6 @@ class WorkerThread(QtCore.QThread): if self.kindlegenErrorCode[0] == 0: GUI.progress.content = '' MW.addMessage.emit('Creating MOBI files... Done!', 'info', True) - MW.addMessage.emit('Cleaning MOBI files is currently disabled in this branch', 'info', False) - GUI.progress.content = 'Cleaning MOBI files is currently disabled in this branch' MW.addMessage.emit('Cleaning MOBI files', 'info', False) GUI.progress.content = 'Cleaning MOBI files' self.workerOutput = [] @@ -528,7 +528,7 @@ class WorkerThread(QtCore.QThread): class SystemTrayIcon(QtWidgets.QSystemTrayIcon): def __init__(self): - if not sys.platform.startswith('darwin') and self.isSystemTrayAvailable(): + if self.isSystemTrayAvailable(): QtWidgets.QSystemTrayIcon.__init__(self, GUI.icons.programIcon, MW) self.activated.connect(self.catchClicks) @@ -538,23 +538,22 @@ class SystemTrayIcon(QtWidgets.QSystemTrayIcon): MW.activateWindow() def addTrayMessage(self, message, icon): - if not sys.platform.startswith('darwin'): - icon = eval('QtGui.QSystemTrayIcon.' + icon) - if self.supportsMessages() and not MW.isActiveWindow(): - self.showMessage('Kindle Comic Converter', message, icon) + icon = eval('QtWidgets.QSystemTrayIcon.' + icon) + if self.supportsMessages() and not MW.isActiveWindow(): + self.showMessage('Kindle Comic Converter', message, icon) class KCCGUI(KCC_ui.Ui_KCC): - # TODO: Check dialog def selectDir(self): if self.needClean: self.needClean = False GUI.JobList.clear() # Dirty, dirty way but OS native QFileDialogs don't support directory multiselect - dirDialog = QtWidgets.QFileDialog(MW, 'Select directory', self.lastPath) + dirDialog = QtWidgets.QFileDialog(MW, 'Select directory', self.lastPath, 'Directory (*.abcdefg)') dirDialog.setFileMode(dirDialog.Directory) dirDialog.setOption(dirDialog.ShowDirsOnly, True) dirDialog.setOption(dirDialog.DontUseNativeDialog, True) + dirDialog.setOption(dirDialog.HideNameFilterDetails, True) l = dirDialog.findChild(QtWidgets.QListView, "listView") t = dirDialog.findChild(QtWidgets.QTreeView) if l: @@ -573,7 +572,6 @@ class KCCGUI(KCC_ui.Ui_KCC): GUI.JobList.addItem(dname) MW.setFocus() - # TODO: Check dialog def selectFile(self): if self.needClean: self.needClean = False @@ -581,20 +579,22 @@ class KCCGUI(KCC_ui.Ui_KCC): if self.UnRAR: if self.sevenza: fnames = QtWidgets.QFileDialog.getOpenFileNames(MW, 'Select file', self.lastPath, - '*.cbz *.cbr *.cb7 *.zip *.rar *.7z *.pdf') + 'Comic (*.cbz *.cbr *.cb7 *.zip *.rar *.7z *.pdf)') else: fnames = QtWidgets.QFileDialog.getOpenFileNames(MW, 'Select file', self.lastPath, - '*.cbz *.cbr *.zip *.rar *.pdf') + 'Comic (*.cbz *.cbr *.zip *.rar *.pdf)') else: if self.sevenza: fnames = QtWidgets.QFileDialog.getOpenFileNames(MW, 'Select file', self.lastPath, - '*.cbz *.cb7 *.zip *.7z *.pdf') + 'Comic (*.cbz *.cb7 *.zip *.7z *.pdf)') else: fnames = QtWidgets.QFileDialog.getOpenFileNames(MW, 'Select file', self.lastPath, - '*.cbz *.zip *.pdf') - for fname in fnames: - if str(fname) != "": - self.lastPath = os.path.abspath(os.path.join(str(fname), os.pardir)) + 'Comic (*.cbz *.zip *.pdf)') + for fname in fnames[0]: + if fname != '': + if sys.platform.startswith('win'): + fname = fname.replace('/', '\\') + self.lastPath = os.path.abspath(os.path.join(fname, os.pardir)) GUI.JobList.addItem(fname) def clearJobs(self): @@ -849,8 +849,8 @@ class KCCGUI(KCC_ui.Ui_KCC): s.feed(html) return s.get_data() - def addMessage(self, message, icon=None, replace=False): - if icon: + def addMessage(self, message, icon, replace=False): + if icon != '': icon = eval('self.icons.' + icon) item = QtWidgets.QListWidgetItem(icon, ' ' + self.stripTags(message)) else: @@ -873,15 +873,15 @@ class KCCGUI(KCC_ui.Ui_KCC): def showDialog(self, message): QtWidgets.QMessageBox.critical(MW, 'KCC - Error', message, QtWidgets.QMessageBox.Ok) - def updateProgressbar(self, new=False, status=False): - if new == "status": - GUI.ProgressBar.setFormat(status) - elif new: - GUI.ProgressBar.setMaximum(new - 1) + def updateProgressbar(self, command): + if command == 'tick': + GUI.ProgressBar.setValue(GUI.ProgressBar.value() + 1) + elif command.isdigit(): + GUI.ProgressBar.setMaximum(int(command) - 1) GUI.ProgressBar.reset() GUI.ProgressBar.show() else: - GUI.ProgressBar.setValue(GUI.ProgressBar.value() + 1) + GUI.ProgressBar.setFormat(command) def convertStart(self): if self.conversionAlive: @@ -923,6 +923,7 @@ class KCCGUI(KCC_ui.Ui_KCC): if not GUI.ConvertButton.isEnabled(): event.ignore() self.contentServer.stop() + self.tray.hide() self.settings.setValue('settingsVersion', __version__) self.settings.setValue('lastPath', self.lastPath) self.settings.setValue('lastDevice', GUI.DeviceBox.currentIndex()) diff --git a/kcc/KCC_ui_linux.py b/kcc/KCC_ui_linux.py index 983c077..233ef5e 100644 --- a/kcc/KCC_ui_linux.py +++ b/kcc/KCC_ui_linux.py @@ -375,4 +375,4 @@ class Ui_KCC(object): self.ActionBasic.setText(_translate("KCC", "Basic")) self.ActionAdvanced.setText(_translate("KCC", "Advanced")) -import KCC_rc +from . import KCC_rc diff --git a/kcc/KCC_ui_osx.py b/kcc/KCC_ui_osx.py index d6b49a8..d4793ba 100644 --- a/kcc/KCC_ui_osx.py +++ b/kcc/KCC_ui_osx.py @@ -393,4 +393,4 @@ class Ui_KCC(object): self.ActionBasic.setText(_translate("KCC", "Basic")) self.ActionAdvanced.setText(_translate("KCC", "Advanced")) -import KCC_rc +from . import KCC_rc diff --git a/kcc/comic2ebook.py b/kcc/comic2ebook.py index 1c88ed1..4cc0573 100755 --- a/kcc/comic2ebook.py +++ b/kcc/comic2ebook.py @@ -343,7 +343,7 @@ def dirImgProcess(path): pagenumber += 1 work.append([afile, dirpath, options]) if GUI: - GUI.progressBarTick.emit(pagenumber, False) + GUI.progressBarTick.emit(str(pagenumber)) if len(work) > 0: for i in work: workerPool.apply_async(func=fileImgProcess, args=(i, ), callback=fileImgProcess_tick) @@ -365,7 +365,7 @@ def fileImgProcess_tick(output): workerOutput.append(output) workerPool.terminate() if GUI: - GUI.progressBarTick.emit(False, False) + GUI.progressBarTick.emit('tick') if not GUI.conversionAlive: workerPool.terminate() @@ -793,11 +793,11 @@ def preSplitDirectory(path): if filesNumber > 0: print('\nWARNING: Automatic output splitting failed.') if GUI: - GUI.progressBarTick.emit('Automatic output splitting failed. ' - 'More details.', 'warning', False) - GUI.progressBarTick.emit('', False, False) + GUI.addMessage.emit('Automatic output splitting failed. ' + 'More details.', 'warning', False) + GUI.addMessage.emit('', '', False) return [path] detectedSubSubdirectories = False detectedFilesInSubdirectories = False @@ -808,11 +808,11 @@ def preSplitDirectory(path): elif len(dirs) == 0 and detectedSubSubdirectories: print('\nWARNING: Automatic output splitting failed.') if GUI: - GUI.progressBarTick.emit('Automatic output splitting failed. ' - 'More details.', 'warning', False) - GUI.progressBarTick.emit('', False, False) + GUI.addMessage.emit('Automatic output splitting failed. ' + 'More details.', 'warning', False) + GUI.addMessage.emit('', '', False) return [path] if len(files) != 0: detectedFilesInSubdirectories = True @@ -825,11 +825,11 @@ def preSplitDirectory(path): if detectedFilesInSubdirectories and detectedSubSubdirectories: print('\nWARNING: Automatic output splitting failed.') if GUI: - GUI.progressBarTick.emit('Automatic output splitting failed. ' - 'More details.', 'warning', False) - GUI.progressBarTick.emit('', False, False) + GUI.addMessage.emit('Automatic output splitting failed. ' + 'More details.', 'warning', False) + GUI.addMessage.emit('', '', False) return [path] # Split directories split = splitDirectory(os.path.join(path, 'OEBPS', 'Images'), mode) @@ -949,7 +949,7 @@ def main(argv=None, qtGUI=None): checkOptions() if qtGUI: GUI = qtGUI - GUI.progressBarTick.emit(1, False) + GUI.progressBarTick.emit('1') else: GUI = None if len(args) != 1: @@ -966,10 +966,10 @@ def main(argv=None, qtGUI=None): if options.imgproc: print("\nProcessing images...") if GUI: - GUI.progressBarTick.emit('status', 'Processing images') + GUI.progressBarTick.emit('Processing images') dirImgProcess(path + "/OEBPS/Images/") if GUI: - GUI.progressBarTick.emit(1, False) + GUI.progressBarTick.emit('1') sanitizeTree(os.path.join(path, 'OEBPS', 'Images')) if options.batchsplit: tomes = preSplitDirectory(path) @@ -979,11 +979,11 @@ def main(argv=None, qtGUI=None): tomeNumber = 0 if GUI: if options.cbzoutput: - GUI.progressBarTick.emit('status', 'Compressing CBZ files') + GUI.progressBarTick.emit('Compressing CBZ files') else: - GUI.progressBarTick.emit('status', 'Compressing EPUB files') - GUI.progressBarTick.emit(len(tomes) + 1, False) - GUI.progressBarTick.emit(False, False) + GUI.progressBarTick.emit('Compressing EPUB files') + GUI.progressBarTick.emit(str(len(tomes) + 1)) + GUI.progressBarTick.emit('tick') options.baseTitle = options.title for tome in tomes: if len(tomes) > 1: @@ -1009,7 +1009,7 @@ def main(argv=None, qtGUI=None): move(tome + '_comic.zip', filepath[-1]) rmtree(tome, True) if GUI: - GUI.progressBarTick.emit(False, False) + GUI.progressBarTick.emit('tick') return filepath diff --git a/kcc/comic2panel.py b/kcc/comic2panel.py index 34c405f..9e92d78 100644 --- a/kcc/comic2panel.py +++ b/kcc/comic2panel.py @@ -64,7 +64,7 @@ def mergeDirectory_tick(output): mergeWorkerOutput.append(output) mergeWorkerPool.terminate() if GUI: - GUI.progressBarTick.emit(False, False) + GUI.progressBarTick.emit('tick') if not GUI.conversionAlive: mergeWorkerPool.terminate() @@ -132,7 +132,7 @@ def splitImage_tick(output): splitWorkerOutput.append(output) splitWorkerPool.terminate() if GUI: - GUI.progressBarTick.emit(False, False) + GUI.progressBarTick.emit('tick') if not GUI.conversionAlive: splitWorkerPool.terminate() @@ -278,8 +278,8 @@ def main(argv=None, qtGUI=None): directoryNumer += 1 mergeWork.append([os.path.join(root, directory)]) if GUI: - GUI.progressBarTick.emit('status', 'Combining images') - GUI.progressBarTick.emit(directoryNumer, False) + GUI.progressBarTick.emit('Combining images') + GUI.progressBarTick.emit(str(directoryNumer)) for i in mergeWork: mergeWorkerPool.apply_async(func=mergeDirectory, args=(i, ), callback=mergeDirectory_tick) mergeWorkerPool.close() @@ -298,9 +298,9 @@ def main(argv=None, qtGUI=None): else: os.remove(os.path.join(root, name)) if GUI: - GUI.progressBarTick.emit('status', 'Splitting images') - GUI.progressBarTick.emit(pagenumber, False) - GUI.progressBarTick.emit(False, False) + GUI.progressBarTick.emit('Splitting images') + GUI.progressBarTick.emit(str(pagenumber)) + GUI.progressBarTick.emit('tick') if len(work) > 0: for i in work: splitWorkerPool.apply_async(func=splitImage, args=(i, ), callback=splitImage_tick) diff --git a/kcc/pdfjpgextract.py b/kcc/pdfjpgextract.py index cb3f084..e322bdf 100644 --- a/kcc/pdfjpgextract.py +++ b/kcc/pdfjpgextract.py @@ -40,7 +40,7 @@ class PdfJpgExtract: return self.path def extract(self): - pdf = open(self.origFileName, "rb").read() + pdf = open(self.origFileName, "r").read() startmark = "\xff\xd8" startfix = 0 @@ -69,7 +69,7 @@ class PdfJpgExtract: iend += endfix jpg = pdf[istart:iend] jpgfile = open(self.path + "/jpg%d.jpg" % njpg, "wb") - jpgfile.write(jpg) + jpgfile.write(bytearray(jpg, 'utf-8')) jpgfile.close() njpg += 1