Fix threading. Yeah. I've *fixed* threading.

parsers/cbz.py

@@ -3,16 +3,17 @@
 import os
 import time
 import zipfile
-import tempfile
 import collections
 
 
 class ParseCBZ:
-    def __init__(self, filename):
+    def __init__(self, filename, temp_dir, file_md5):
         # TODO
         # Maybe also include book description
         self.filename = filename
         self.book = None
+        self.temp_dir = temp_dir
+        self.file_md5 = file_md5
 
     def read_book(self):
         try:
@@ -43,17 +44,17 @@ class ParseCBZ:
         return None
 
     def get_contents(self):
+        extract_path = os.path.join(self.temp_dir, self.file_md5)
         contents = collections.OrderedDict()
         # This is a brute force approach
         # Maybe try reading from the file as everything
         # matures a little bit more
-        temp_dir = tempfile.mkdtemp()
 
         contents = collections.OrderedDict()
         for count, i in enumerate(self.book.infolist()):
-            self.book.extract(i, path=temp_dir)
+            self.book.extract(i, path=extract_path)
             page_name = 'Page ' + str(count + 1)
-            image_path = os.path.join(temp_dir, i.filename)
+            image_path = os.path.join(extract_path, i.filename)
             # This does image returns.
 
             # TODO
@@ -64,7 +65,7 @@ class ParseCBZ:
             contents[page_name] = "<img src='%s' align='middle'/>" % image_path
 
         file_settings = {
-            'temp_dir': temp_dir,
+            'temp_dir': self.temp_dir,
             'images_only': True}
 
         return contents, file_settings

parsers/epub.py

@@ -10,17 +10,20 @@
 
 import os
 import re
+import zipfile
 import collections
 
 import ebooklib.epub
 
 
 class ParseEPUB:
-    def __init__(self, filename):
+    def __init__(self, filename, temp_dir, file_md5):
         # TODO
         # Maybe also include book description
         self.filename = filename
         self.book = None
+        self.temp_dir = temp_dir
+        self.file_md5 = file_md5
 
     def read_book(self):
         try:
@@ -103,6 +106,11 @@ class ParseEPUB:
             return None
 
     def get_contents(self):
+        # Extract all contents to a temporary directory
+        # for relative path lookup voodoo
+        extract_path = os.path.join(self.temp_dir, self.file_md5)
+        zipfile.ZipFile(self.filename).extractall(extract_path)
+
         contents = collections.OrderedDict()
 
         def flatten_chapter(toc_element):
@@ -141,7 +149,7 @@ class ParseEPUB:
         # Special settings that have to be returned with the file
         # Referenced in sorter.py
         file_settings = {
-            'temp_dir': None,
+            'temp_dir': extract_path,
             'images_only': False}
 
         return contents, file_settings