Yet another Windows file lock fixes

2 files changed, 5 insertions, 4 deletions

diff --git a/kcc/comic2ebook.py b/kcc/comic2ebook.py
index 0fc3db7..200c634 100755
--- a/kcc/comic2ebook.py
+++ b/kcc/comic2ebook.py
@@ -678,7 +678,8 @@ def getWorkFolder(afile):
             rmtree(workdir, True)
             raise UserWarning("Failed to detect archive format.")
     newpath = mkdtemp('', 'KCC-')
-    move(path, os.path.join(newpath, 'OEBPS', 'Images'))
+    copytree(path, os.path.join(newpath, 'OEBPS', 'Images'))
+    rmtree(src, True)
     return newpath
 
 
diff --git a/kcc/metadata.py b/kcc/metadata.py
index 1977099..da57e12 100644
--- a/kcc/metadata.py
+++ b/kcc/metadata.py
@@ -75,12 +75,12 @@ class MetadataParser:
                         extracted = True
                 if not extracted:
                     rmtree(workdir)
-                    raise OSError
+                    raise OSError('Failed to extract 7ZIP file.')
                 if os.path.isfile(tmpXML):
                     self.rawdata = parse(tmpXML)
                 rmtree(workdir)
             else:
-                raise OSError
+                raise OSError('Failed to detect archive format.')
             if self.rawdata:
                 self.parseXML()
 
@@ -168,5 +168,5 @@ class MetadataParser:
                         extracted = True
                 if not extracted:
                     rmtree(workdir)
-                    raise OSError
+                    raise OSError('Failed to modify 7ZIP file.')
             rmtree(workdir)