Merge remote-tracking branch 'upstream/main' into hardcover

Author: demitrix

README.md

@@ -4,15 +4,19 @@ services:
     image: crocodilestick/calibre-web-automated:latest
     container_name: calibre-web-automated
     environment:
+      # Only change these if you know what you're doing
       - PUID=1000
-      - PGID=100
-      - TZ=UTC
-      - DOCKER_MODS=lscr.io/linuxserver/mods:universal-calibre-v7.16.0
+      - PGID=1000
+      # Edit to match your current timezone https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+      - TZ=UTC 
     volumes:
-      - /path/to/config/folder:/config
+      # CW users migrating should stop their existing CW instance, make a copy of the config folder, and bind that here to carry over all of their user settings ect.
+      - /path/to/config/folder:/config 
+      # This is an ingest dir, NOT a library one. Anything added here will be automatically added to your library according to the settings you have configured in CWA Settings page. All files placed here are REMOVED AFTER PROCESSING
       - /path/to/the/folder/you/want/to/use/for/book/ingest:/cwa-book-ingest
-      - /path/to/your/calibre/library:/calibre-library
-      #- /path/to/your/gmail/credentials.json:/app/calibre-web/gmail.json #Optional
+      # If you don't have an existing library, CWA will automatically create one at the bind provided here
+      - /path/to/your/calibre/library:/calibre-library 
     ports:
-      - 8084:8083 # Change the first number to change the port you want to access the Web UI, not the second
-    restart: unless-stopped
+      # Change the first number to change the port you want to access the Web UI, not the second
+      - 8083:8083 
+    restart: unless-stopped

README_images/CWA-new-process-ui.gif

@@ -18,7 +18,7 @@ <h2>{{title}}</h2>
       </div>
       <div class="form-group required">
         <input type="checkbox" id="config_calibre_split" name="config_calibre_split" data-control="split_settings" data-t ="{{ config.config_calibre_split_dir  }}" {% if config.config_calibre_split %}checked{% endif %} >
-        <label for="config_calibre_split">{{_('Separate Book Files from Library - DO NOT USE! COMING IN CWA V2.2.0!')}}</label>
+        <label for="config_calibre_split">{{_('Separate Book Files from Library - DO NOT USE! COMING IN CWA V3.1.0!')}}</label>
       </div>
       <div data-related="split_settings">
        <div class="form-group required input-group">

README_images/cwa-server-stats-page.png

@@ -232,6 +232,11 @@ def set_default_settings(self, force=False) -> None:
 
     def get_cwa_settings(self) -> dict:
         """Gets the current cwa_settings values from the table of the same name in cwa.db and returns them as a dict"""
+        self.cur.execute("SELECT * FROM cwa_settings")
+        if self.cur.fetchall() == []: # If settings table is empty, populates it with default values
+            self.cur.execute("INSERT INTO cwa_settings DEFAULT VALUES;")
+            self.con.commit()
+            
         self.cur.execute("SELECT * FROM cwa_settings")
         headers = [header[0] for header in self.cur.description]
         cwa_settings = [dict(zip(headers,row)) for row in self.cur.fetchall()][0]