Staging for transfer

lib/library.py

@@ -6,7 +6,7 @@ import zipfile
 from PIL import Image
 from bs4 import BeautifulSoup
 from config import Config
-from api_hooks import DuckDuckGo
+from lib.api_hooks import DuckDuckGo
 
 config = Config()
 
@@ -19,14 +19,6 @@ class Catalogue:
         self.opf_regx = re.compile(r'\.opf')
         self.cover_regx = re.compile(r'\.jpg|\.jpeg|\.png|\.bmp|\.gif')
         self.html_regx = re.compile(r'\.html')
-        """
-        with open(config.book_shelf, 'r') as f:
-            try:
-                self.catalogue = json.load(f)
-                self.current_files = self.scan_folder()
-            except Exception:
-                self.filter_books()
-        """
 
     def scan_folder(self, folder=config.book_path):
         for f in os.listdir(folder):
@@ -44,7 +36,7 @@ class Catalogue:
             try: _epub_open.open('content.opf'); return True
             except Exception as e: print(e); return False
 
-    def filter_books(self):
+    def filter_books(self, ret=0):
         """
         Scan book folder recursively for epub files
         filter_books(0) -> Catalogue.books
@@ -59,8 +51,11 @@ class Catalogue:
         with open(config.book_shelf, 'w') as f:
             for book in self.books:
                 _book_list_expanded[book] = self.process_book(book)
-            json.dump(_book_list_expanded, f)
-        return _book_list_expanded
+            if ret != 0: return _book_list_expanded
+            else:
+                import ipdb; ipdb.set_trace()
+                json.dump(_book_list_expanded, f)
+                return _book_list_expanded
 
     def process_book(self, book):
         """Return dictionary of epub file contents"""
@@ -133,6 +128,6 @@ class Catalogue:
         try:
             self.books
         except Exception:
-            self.filter_books()
+            self.filter_books(1)
         unique = set(self.books) - set(self.catalogue)
         return unique

tests/test_library.py

@@ -1,16 +1,16 @@
 import unittest
 import sys
-sys.path.insert(1, 'lib/')
-from library import Catalogue
-
+sys.path.insert(1, '../')
+from lib.library import Catalogue
+Catalogue = Catalogue()
 
 class LibraryTest(unittest.TestCase):
 
     def test_libray_catalogue(self):
-        self.assertIsNotNone(Catalogue())
+        self.assertIsNotNone(Catalogue)
 
     def test_library_catalogue_filter_books(self):
-        self.assertIsNotNone(Catalogue().filter_books())
+        self.assertIsNotNone(Catalogue.filter_books())
 
 if __name__ == '__main__':
     unittest.main()

tests/test_storage.py

@@ -1,7 +1,7 @@
 import unittest
 import sys
-sys.path.insert(1, 'lib/')
-from storage import Storage
+sys.path.insert(1, '../')
+from lib.storage import Storage
 
 storage = Storage()
 
@@ -13,4 +13,4 @@ class StorageTest(unittest.TestCase):
     def test_Storage_create_tables(self):
         self.assertIsNot(storage.create_tables(), Exception)
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()

tests/test_sysio.py

@@ -2,9 +2,9 @@ import unittest
 import os
 import shutil
 import sys
-sys.path.insert(1, 'lib/')
-from pyShelf import InitFiles
-from pyShelf import Epub
+sys.path.insert(1, '../')
+from lib.pyShelf import InitFiles
+from lib.pyShelf import Epub
 
 
 class SysIoTest(unittest.TestCase):