diff --git a/.#config.py b/.#config.py deleted file mode 120000 index a046871..0000000 --- a/.#config.py +++ /dev/null @@ -1 +0,0 @@ -raelon@golumnsec.33289:1571093667 \ No newline at end of file diff --git a/lib/.#library.py b/lib/.#library.py new file mode 120000 index 0000000..9aad06b --- /dev/null +++ b/lib/.#library.py @@ -0,0 +1 @@ +raelon@golumnsec.6371:1572529288 \ No newline at end of file diff --git a/lib/library.py b/lib/library.py index 79c78f1..dde8525 100755 --- a/lib/library.py +++ b/lib/library.py @@ -7,9 +7,9 @@ import zipfile from bs4 import BeautifulSoup from PIL import Image -from api_hooks import DuckDuckGo from config import Config -from storage import Storage +from lib.api_hooks import DuckDuckGo +from lib.storage import Storage config = Config() @@ -17,6 +17,7 @@ config = Config() class Catalogue: """Decodes and stores book information""" """Step One: filter_books""" + def __init__(self): self.file_list = [] self.opf_regx = re.compile(r'\.opf') @@ -143,6 +144,8 @@ class Catalogue: extracted = self.extract_metadata(book) db.insert_book(extracted) inserted = db.commit() - if inserted != True: + if inserted is not True: print(inserted) - db.close() \ No newline at end of file + if input('Continue ? y/n') == 'y': + pass + db.close() diff --git a/main.py b/main.py index ff1d84c..083c060 100755 --- a/main.py +++ b/main.py @@ -1,16 +1,18 @@ #!/usr/bin/python import sys -sys.path.insert(1, 'lib/') -from pyShelf import InitFiles + from config import Config -from library import Catalogue +from lib.library import Catalogue +from lib.pyShelf import InitFiles + +sys.path.insert(1, 'lib/') config = Config() # Get configuration settings InitFiles(config.file_array) # Initialize file system Catalogue = Catalogue() # Open the Catalogue + # new_books = Catalogue.new_files() Catalogue.import_books() # Filter Your books -# TODO Resolve database locking after querying for book list # TODO Figure out a system to get books page count # TODO Update Documentation # TODO Requirements.txt