From 3d2554c5578df6359b254cc146d0efe9feb7db50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Jastrz=C4=99bski?= Date: Mon, 12 Aug 2013 16:32:40 +0200 Subject: [PATCH] Fixed tmp directories --- kcc/comic2ebook.py | 9 ++++++--- kcc/pdfjpgextract.py | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/kcc/comic2ebook.py b/kcc/comic2ebook.py index 54f13bc..9ec1fa9 100755 --- a/kcc/comic2ebook.py +++ b/kcc/comic2ebook.py @@ -597,8 +597,8 @@ def genEpubStruct(path): def getWorkFolder(afile): + workdir = tempfile.mkdtemp('', 'KCC-TMP-', os.path.join(os.path.splitext(afile)[0], '..')) if os.path.isdir(afile): - workdir = tempfile.mkdtemp('', 'KCC-TMP-', os.path.join(os.path.splitext(afile)[0], '..')) try: os.rmdir(workdir) # needed for copytree() fails if dst already exists fullPath = os.path.join(workdir, 'OEBPS', 'Images') @@ -610,9 +610,12 @@ def getWorkFolder(afile): raise elif afile.lower().endswith('.pdf'): pdf = pdfjpgextract.PdfJpgExtract(afile) - path = pdf.extract() + path, njpg = pdf.extract() + if njpg == 0: + rmtree(workdir) + rmtree(path) + raise UserWarning("Failed to extract images.") else: - workdir = tempfile.mkdtemp('', 'KCC-TMP-', os.path.splitext(afile)[0]) cbx = cbxarchive.CBxArchive(afile) if cbx.isCbxFile(): try: diff --git a/kcc/pdfjpgextract.py b/kcc/pdfjpgextract.py index da7fa56..dd5f067 100644 --- a/kcc/pdfjpgextract.py +++ b/kcc/pdfjpgextract.py @@ -70,4 +70,4 @@ class PdfJpgExtract: njpg += 1 i = iend - return self.path + return self.path, njpg