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

Paths should support UTF-8 now

Browse Source
This commit is contained in:
Paweł Jastrzębski
2013-10-08 12:14:27 +02:00
parent 3022635a71
commit da4788a6c6
2 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
kcc/KCC_gui.py
View File

@@ -159,7 +159,7 @@ class WorkerThread(QtCore.QThread):
argv.append("--forcecolor") argv.append("--forcecolor")
for i in range(GUI.JobList.count()): for i in range(GUI.JobList.count()):
if GUI.JobList.item(i).icon().isNull(): if GUI.JobList.item(i).icon().isNull():
currentJobs.append(str(GUI.JobList.item(i).text())) currentJobs.append(unicode(GUI.JobList.item(i).text()))
GUI.JobList.clear() GUI.JobList.clear()
for job in currentJobs: for job in currentJobs:
time.sleep(0.5) time.sleep(0.5)
@@ -215,8 +215,8 @@ class WorkerThread(QtCore.QThread):
try: try:
self.kindlegenErrorCode = 0 self.kindlegenErrorCode = 0
if os.path.getsize(item) < 367001600: if os.path.getsize(item) < 367001600:
output = Popen('kindlegen -locale en "' + item + '"', stdout=PIPE, stderr=STDOUT, output = Popen('kindlegen -locale en "' + item.encode(sys.getfilesystemencoding()) +
shell=True) '"', stdout=PIPE, stderr=STDOUT, shell=True)
for line in output.stdout: for line in output.stdout:
# ERROR: Generic error # ERROR: Generic error
if "Error(" in line: if "Error(" in line:
@@ -312,18 +312,11 @@ class Ui_KCC(object):
dnames = dirDialog.selectedFiles() dnames = dirDialog.selectedFiles()
else: else:
dnames = "" dnames = ""
# Lame UTF-8 security measure
for dname in dnames: for dname in dnames:
try: if unicode(dname) != "":
str(dname)
except Exception:
QtGui.QMessageBox.critical(MainWindow, 'KCC - Error', 'Path cannot contain non-ASCII characters.',
QtGui.QMessageBox.Ok)
return
if str(dname) != "":
if sys.platform == 'win32': if sys.platform == 'win32':
dname = dname.replace('/', '\\') dname = dname.replace('/', '\\')
self.lastPath = os.path.abspath(os.path.join(str(dname), os.pardir)) self.lastPath = os.path.abspath(os.path.join(unicode(dname), os.pardir))
GUI.JobList.addItem(dname) GUI.JobList.addItem(dname)
def selectFile(self): def selectFile(self):
@@ -344,16 +337,9 @@ class Ui_KCC(object):
else: else:
fnames = QtGui.QFileDialog.getOpenFileNames(MainWindow, 'Select file', self.lastPath, fnames = QtGui.QFileDialog.getOpenFileNames(MainWindow, 'Select file', self.lastPath,
'*.cbz *.zip *.pdf') '*.cbz *.zip *.pdf')
# Lame UTF-8 security measure
for fname in fnames: for fname in fnames:
try: if unicode(fname) != "":
str(fname) self.lastPath = os.path.abspath(os.path.join(unicode(fname), os.pardir))
except Exception:
QtGui.QMessageBox.critical(MainWindow, 'KCC - Error', 'Path cannot contain non-ASCII characters.',
QtGui.QMessageBox.Ok)
return
if str(fname) != "":
self.lastPath = os.path.abspath(os.path.join(str(fname), os.pardir))
GUI.JobList.addItem(fname) GUI.JobList.addItem(fname)
def clearJobs(self): def clearJobs(self):

9
kcc/comic2ebook.py
View File

@@ -184,7 +184,7 @@ def buildNCX(dstdir, title, chapters):
"<meta name=\"dtb:maxPageNumber\" content=\"0\"/>\n", "<meta name=\"dtb:maxPageNumber\" content=\"0\"/>\n",
"<meta name=\"generated\" content=\"true\"/>\n", "<meta name=\"generated\" content=\"true\"/>\n",
"</head>\n", "</head>\n",
"<docTitle><text>", title, "</text></docTitle>\n", "<docTitle><text>", title.encode('utf-8'), "</text></docTitle>\n",
"<navMap>" "<navMap>"
]) ])
for chapter in chapters: for chapter in chapters:
@@ -192,8 +192,9 @@ def buildNCX(dstdir, title, chapters):
if os.path.basename(folder) != "Text": if os.path.basename(folder) != "Text":
title = os.path.basename(folder) title = os.path.basename(folder)
filename = getImageFileName(os.path.join(folder, chapter[1])) filename = getImageFileName(os.path.join(folder, chapter[1]))
f.write("<navPoint id=\"" + folder.replace('/', '_').replace('\\', '_') + "\"><navLabel><text>" + title f.write("<navPoint id=\"" + folder.replace('/', '_').replace('\\', '_') + "\"><navLabel><text>"
+ "</text></navLabel><content src=\"" + filename[0].replace("\\", "/") + ".html\"/></navPoint>\n") + title.encode('utf-8') + "</text></navLabel><content src=\"" + filename[0].replace("\\", "/")
+ ".html\"/></navPoint>\n")
f.write("</navMap>\n</ncx>") f.write("</navMap>\n</ncx>")
f.close() f.close()
return return
@@ -213,7 +214,7 @@ def buildOPF(dstdir, title, filelist, cover=None):
"xmlns=\"http://www.idpf.org/2007/opf\">\n", "xmlns=\"http://www.idpf.org/2007/opf\">\n",
"<metadata xmlns:opf=\"http://www.idpf.org/2007/opf\" ", "<metadata xmlns:opf=\"http://www.idpf.org/2007/opf\" ",
"xmlns:dc=\"http://purl.org/dc/elements/1.1/\">\n", "xmlns:dc=\"http://purl.org/dc/elements/1.1/\">\n",
"<dc:title>", title, "</dc:title>\n", "<dc:title>", title.encode('utf-8'), "</dc:title>\n",
"<dc:language>en-US</dc:language>\n", "<dc:language>en-US</dc:language>\n",
"<dc:identifier id=\"BookID\" opf:scheme=\"UUID\">", options.uuid, "</dc:identifier>\n", "<dc:identifier id=\"BookID\" opf:scheme=\"UUID\">", options.uuid, "</dc:identifier>\n",
"<dc:Creator>KCC</dc:Creator>\n", "<dc:Creator>KCC</dc:Creator>\n",