Preparing for version 1.0

Code cleanup, fixing instructions and example config,

Author: Ivy Bowman

README.md

@@ -29,8 +29,7 @@ for personal use with your preferred audiobook player during the loan period.
 
 # Usage
 
-- AutoBooks DL/Fulfill: `autobooks`
-- AutoBooks Web: `autobooks-web`
+- AutoBooks: `autobooks`
 - AutoBooks Discord bot: `autobooks-discord`
 
 # Credits & Tools Used

autobooks/AutoBooks.py

@@ -19,7 +19,7 @@
     query_login_form
 
 # Set Vars
-version = "0.6"  # Version number of script
+version = "1.0"  # Version number of script
 error_count = 0
 script_dir = os.path.join(Path.home(), "AutoBooks")
 csv_path = os.path.join(script_dir, 'web_known_files.csv')
@@ -51,7 +51,7 @@
 file_log_format = "{time:HH:mm:ss A} [{name}:{function}] {level}: {extra[scrubbed]}\n{exception}"
 redacting_formatter = RedactingFormatter(patterns=patterns, source_fmt=file_log_format)
 logger.configure(handlers=[
-    {'sink': sys.stderr, "format": console_log_format},
+    {'sink': sys.stderr, "format": console_log_format, 'level': 'DEBUG'},
     {'sink': LOG_FILENAME,
      "format": redacting_formatter.format, "retention": 10},
 ])
@@ -71,7 +71,7 @@
 monitor = cronitor.Monitor(config['cronitor_monitor'])
 
 
-# Function to process the books.
+# Function to process the odm files into books.
 def process(odm_list):
     global error_count
     good_odm_list = []
@@ -123,12 +123,14 @@ def cleanup(m4b_list, odm_list, odm_folder):
             logger.info("Moved file pair {} to source files", x)
 
 
+# Function to authenticate with Overdrive
 def login(library):
     login_session = requests.Session()
     logger.info("Logging into: {}", library["subdomain"])
     box = login_session.get(f'https://{library["subdomain"]}.overdrive.com/account/ozone/sign-in?forward=%2F')
     # logger.success('Fetched login page. Status Code: {}', box.status_code)
     form_list = parse_form(box, "loginForms")['forms']
+    print(form_list)
     login_form = query_login_form(form_list, library['select_box'])
     sleep(0.5)
     auth = login_session.post(f'https://{library["subdomain"]}.overdrive.com/account/signInOzone',
@@ -142,7 +144,10 @@ def login(library):
                               })
     logger.success("Logged into: {} Status Code: {} ", library["subdomain"], auth.status_code)
     # print("AUTH URL: ", auth.url)
-    return auth.url, login_form['ilsName'], login_session
+    base_url = auth.url
+    if not base_url.endswith('/'):
+        base_url = base_url + '/'
+    return base_url, login_form['ilsName'], login_session
 
 
 # Function to download loans from OverDrive page
@@ -209,12 +214,10 @@ def run():
         # For every library, open site, attempt sign in, and attempt download.
         for i in range(0, library_count):
             lib_conf = parser['library_' + str(i)]
-            logger.info("Begin Processing library: {}", lib_conf['library_name'])
+            logger.info("Begin Processing library: {}", lib_conf['name'])
             sleep(0.5)
             base_url, ils_name, session = login(lib_conf)
 
-            if not base_url.endswith('/'):
-                base_url = base_url + '/'
             loans = session.get(f'{base_url}account/loans')
             sleep(0.5)
             if loans.status_code == 200:
@@ -233,7 +236,7 @@ def run():
                     else:
                         df_out.to_csv(csv_path, mode='w', index=False, header=True)
                 else:
-                    logger.warning("Can't find books skipped library: {}", lib_conf['library_name'])
+                    logger.warning("Can't find books skipped library: {}", lib_conf['name'])
                     error_count += 1
             session.close()
         logger.info("AutoBooksWeb Complete")

autobooks/utils.py

@@ -82,4 +82,4 @@ def query_login_form(form_list, select):
         for form, index in form_list:
             if select in form['displayName']:
                 x = form_list.index(form)
-                return form_list[x]
+    return form_list[x]

autobooks_template.ini

@@ -8,18 +8,17 @@ discord_bot_token =
 test_args = False
 test_run = False
 
-# Folders .odm Location, and m4b output folder
-odm_folder =
+# Folder to output the generated m4b files to.
 out_folder = 
 
-#To add more libraries just make a copy of the below section and increment the number.
+# To add more libraries just make a copy of the below section and increment the number.
 [library_0]
-library_name =
-#Name of library, used in log messages
-library_subdomain =
-#Overdrive subdomain Ex: "examplepage" from "https://examplepage.overdrive.com/"
-library_select = False
-#Library select box contents here. If not used for sign in put "False" Ex: "Example County Library"
+name =
+# Display name of library, used in log messages.
+subdomain =
+# Overdrive subdomain Ex: "examplepage" from "https://examplepage.overdrive.com/"
+select_box = False
+# Library select box contents here. If not used for sign in put "False" Ex: "Example County Library"
 card_number =
 card_pin =
-#Library card pin here. If not used for sign in put "False"
+# Library card pin here. If not used for sign in put "False"

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup
 
-VERSION = '0.6'
+VERSION = '1.0'
 DESCRIPTION = 'Python tool to automate processing a batch of OverDrive audiobooks.'
 LONG_DESCRIPTION = 'Python tool to automate processing a batch of OverDrive audiobooks.'