Fix another UTF-8 filename encoding bug. Add error output to the slice log so we see exceptions.
parent
7eedb7eb99
commit
57b585b851
|
@ -266,7 +266,7 @@ def writeOutput(fileName, shouldAnalyze=True):
|
||||||
repository = ExportRepository()
|
repository = ExportRepository()
|
||||||
settings.getReadRepository(repository)
|
settings.getReadRepository(repository)
|
||||||
startTime = time.time()
|
startTime = time.time()
|
||||||
print('File ' + archive.getSummarizedFileName(fileName) + ' is being chain exported.')
|
print('File ' + archive.getSummarizedFileName(fileName.encode('ascii', 'replace')) + ' is being chain exported.')
|
||||||
fileNameSuffix = fileName[: fileName.rfind('.')]
|
fileNameSuffix = fileName[: fileName.rfind('.')]
|
||||||
if repository.addExportSuffix.value:
|
if repository.addExportSuffix.value:
|
||||||
fileNameSuffix += '_export'
|
fileNameSuffix += '_export'
|
||||||
|
|
|
@ -183,6 +183,11 @@ class WorkerThread(threading.Thread):
|
||||||
wx.CallAfter(self.notifyWindow.statusText.SetLabel, "Aborted by user.")
|
wx.CallAfter(self.notifyWindow.statusText.SetLabel, "Aborted by user.")
|
||||||
return
|
return
|
||||||
line = p.stdout.readline()
|
line = p.stdout.readline()
|
||||||
|
line = p.stderr.readline()
|
||||||
|
while(len(line) > 0):
|
||||||
|
line = line.rstrip()
|
||||||
|
self.progressLog.append(line)
|
||||||
|
line = p.stderr.readline()
|
||||||
self.returnCode = p.wait()
|
self.returnCode = p.wait()
|
||||||
self.fileIdx += 1
|
self.fileIdx += 1
|
||||||
if self.fileIdx == len(self.cmdList):
|
if self.fileIdx == len(self.cmdList):
|
||||||
|
|
Loading…
Reference in New Issue