Merge pull request #4 from ivybowman/dev

Overhaul and re-write of AutoBooks Web

Author: Ivy Bowman

README.md

@@ -10,8 +10,8 @@ for personal use with your preferred audiobook player during the loan period.
 
 # Features
 
-- AutoBooks Web: Uses selenium and chromedriver to download the odm files from overdrive without user interaction. 
-- Uses odmpy to fulfill and convert odm files to chapterized m4b audiobooks.
+- AutoBooks Web: Uses requests to download odm files.
+- Uses odmpy to fulfill and convert odm files to m4b audiobooks with chapters.
 - Moves the generated audiobooks to a chosen folder.
 - Backs up the download files in case you need to re-download the books.
 - Logs to console and timestamped logfile.
@@ -20,7 +20,7 @@ for personal use with your preferred audiobook player during the loan period.
 
 # Prerequisites
 
-- Tools: git, ffmpeg, odmpy, chromedriver (Installed in setup guide.)
+- Tools: git, ffmpeg, odmpy (Installed in setup guide.)
 - Accounts: [Cronitor](https://cronitor.io/) For script monitoring, optional but will display errors if not setup.
 
 # Links

autobooks/AutoBooks.py

@@ -7,13 +7,10 @@
 import pandas as pd
 from discord.ext import commands
 
-from AutoBooks import web_run, main_run, version, script_dir, parser, csv_path, LOG_FILENAME, logger
+from AutoBooks import web_run, main_run, version, script_dir, config, csv_path, LOG_FILENAME, logger
 
 # Bot Settings
-try:
-    token = parser.get("DEFAULT", "discord_bot_token")
-except KeyError:
-    logger.critical("Bot token field not found in config file, exiting.")
+token = config["discord_bot_token"]
 bot = commands.Bot(command_prefix='?')
 
 
@@ -72,7 +69,7 @@ async def hello(ctx):
     try:
         df = pd.read_csv(csv_path, sep=",")
         embed_var = discord.Embed(title="Autobooks Known Books",
-                                  description=df['audiobook_title'].to_string(index=False), color=0xFFAFCC)
+                                  description=df['book_title'].to_string(index=False), color=0xFFAFCC)
         embed_var.set_footer(text="OS: " + platform.platform() + " Host: " + os.uname())
         await ctx.channel.send(embed=embed_var)
     except FileNotFoundError:

autobooks/DiscordBot.py

@@ -0,0 +1,34 @@
+import glob
+import os
+import shutil
+import sys
+from configparser import ConfigParser
+from configobj import ConfigObj
+from datetime import datetime
+from pathlib import Path
+from time import sleep
+from unittest.mock import patch
+import json
+import cronitor
+import odmpy.odm as odmpy
+import pandas as pd
+import requests
+from loguru import logger
+
+script_dir = os.path.join(Path.home(), "AutoBooks")
+#config = ConfigObj(os.path.join(script_dir, "autobooks.ini"))
+# Read config file
+parser = ConfigParser()
+parser.read(os.path.join(script_dir, "autobooks.ini"))
+print(parser.sections())
+config = parser['DEFAULT']
+print(section['cronitor_apikey'])
+section = parser.default_section
+
+#print(config.keys())
+#odm_dir = parser.get("DEFAULT", "odm_folder")
+#out_dir = parser.get("DEFAULT", "out_folder")
+#library_count = len(parser.sections())
+# Cronitor Setup https://cronitor.io/
+#cronitor.api_key = parser.get("DEFAULT", "cronitor_apikey")
+#monitor = cronitor.Monitor(parser.get("DEFAULT", "cronitor_name_main"))

autobooks/testconf.py

@@ -1,6 +1,7 @@
 import logging
-
+import lxml.etree
 from loguru import logger
+import json
 
 
 # Formatter to remove patterns from log output
@@ -45,3 +46,31 @@ def process_logfile(logfile, terms=None):
             if any(term in line for term in terms):
                 log_list.append(line)
         return "".join(log_list)
+
+
+def parse_form(box, sort):
+    form_dict = {}
+    txt = lxml.etree.HTML(box.content)
+    js = str(txt.xpath(f"//script[contains(text(), 'window.OverDrive.{sort} =')]/text()")[0]).strip()
+    split_1 = js.split(sep=" = ")
+    for i in range(0, len(split_1)):
+        if "window.OverDrive." + sort in split_1[i]:
+            form_dict = split_1[i + 1].strip().split(';')[0]
+            break
+    return dict(json.loads(form_dict))
+
+
+def craft_booklist(loans_page):
+    book_dict = parse_form(loans_page, "mediaItems")
+    book_list_parse = []
+    for i in book_dict:
+        book_format = book_dict[i]['overDriveFormat']['id']
+        book_title = book_dict[i]['title']
+        book_id = book_dict[i]['id']
+        book_parse = {
+            'id': book_id,
+            'title': book_title,
+            'format': book_format,
+        }
+        book_list_parse.append(book_parse)
+    return book_list_parse

autobooks/utils.py

@@ -13,8 +13,8 @@ Open a PowerShell window then follow the steps below.
 `Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser`
 2. Run the Scoop installer, this is a package manager used to install some prerequisites.  
 `iwr -useb get.scoop.sh | iex`
-3. Install prerequisites. Note: Chromedriver requires Google Chrome to be installed.  
-`scoop install ffmpeg chromedriver git`
+3. Install prerequisites.
+`scoop install ffmpeg git`
 
 ## macOS Setup Guide
 
@@ -23,20 +23,15 @@ Open a terminal window then follow the steps below. Works with both M1 and Intel
 2. Install Homebrew. Be sure to follow instructions at the end for adding it to path.  
 `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"`
 3. Install prerequisites. On trying to use these tools you might see an unideditifed developer pop up, this is normal just open the folder and ctrl+click or right click on the file and click open.
-Note: Chromedriver requires Google Chrome to be installed.  
-`brew install ffmpeg chromedriver`
+`brew install ffmpeg`
 
 ## Debian/Ubuntu Linux Setup Guide
 
 Open a terminal window then follow the steps below. 
 2. Update package list.  
 `sudo apt-get update`
-2. Install most prerequisites.  
-`sudo apt-get install -y unzip ffmpeg git`
-3. Run script to install the other prerequisites. Note: Chrome is required for AutoBooksWeb.
-With Google Chrome: `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/ivybowman/AutoBooks/main/ubuntusetupchrome.sh)"`
-Without Google Chrome: `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/ivybowman/AutoBooks/main/ubuntusetup.sh)"`
-Note: AutoBooks Web is not compatible with WSL, and requires X11 forwarding to run via ssh if headless mode is disabled. 
+2. Install prerequisites.  
+`sudo apt-get install -y ffmpeg git`
 
 
 ## AutoBooks Install & Setup (All Operating Systems)
@@ -45,17 +40,17 @@ Note: AutoBooks Web is not compatible with WSL, and requires X11 forwarding to r
 To install from the latest source run the following command.  
 `pip3 install git+https://git@github.com/ivybowman/autobooks.git --upgrade --force-reinstall`
 To install from a specific version run the following command.
-`pip3 install git+https://git@github.com/ivybowman/autobooks.git@v0.2.1-alpha --upgrade`
+`pip3 install git+https://git@github.com/ivybowman/autobooks.git@v0.3-alpha --upgrade`
 To uninstall AutoBooks run the following command.  
 `pip3 uninstall autobooks`
 
 ### Configuration
 
 1. Open a terminal and run `autobooks` this will run setup commands to create the data folder.
-2. Edit the `autobooks.conf` file using one of the commands below or by browsing to the autobooks folder inside your home directory.
-- Windows(GUI) PowerShell: `notepad $env:USERPROFILE\AutoBooks\autobooks.conf`
-- Windows(GUI) Command Prompt: `notepad %userprofile%\AutoBooks\autobooks.conf`
-- macOS(GUI) Terminal: `open -a TextEdit ~/AutoBooks/autobooks.conf`
-- Linux or macOS(CLI): `nano ~/AutoBooks/autobooks.conf`
+2. Edit the `autobooks.ini` file using one of the commands below or by browsing to the autobooks folder inside your home directory.
+- Windows(GUI) PowerShell: `notepad $env:USERPROFILE\AutoBooks\autobooks.ini`
+- Windows(GUI) Command Prompt: `notepad %userprofile%\AutoBooks\autobooks.ini`
+- macOS(GUI) Terminal: `open -a TextEdit ~/AutoBooks/autobooks.ini`
+- Linux or macOS(CLI): `nano ~/AutoBooks/autobooks.ini`
 
 

autobooks_template.conf renamed to autobooks_template.ini

@@ -1,6 +1,6 @@
 from setuptools import setup
 
-VERSION = '0.3'
+VERSION = '0.4'
 DESCRIPTION = 'Python tool to automate processing a batch of OverDrive audiobooks.'
 LONG_DESCRIPTION = 'Python tool to automate processing a batch of OverDrive audiobooks.'
 
@@ -21,8 +21,8 @@
             "autobooks-discord = autobooks.AutoBooksDiscord:run"
         ]
     },
-    install_requires=['odmpy @ git+https://git@github.com/ping/odmpy.git', "cronitor", "pandas", "discord.py",
-                      "selenium", "requests", "loguru"],
+    install_requires=["odmpy @ git+https://git@github.com/ping/odmpy.git", "cronitor", "pandas", "discord.py",
+                      "requests", "loguru", "lxml"],
     include_package_data=True,
     platforms="any",
     keywords=['python', 'AutoBooks'],