Merge remote-tracking branch 'upstream/main' into koreader-sync

Author: demitrix

README.md

@@ -267,6 +267,7 @@ And just like that, Calibre-Web Automated should be up and running! **HOWEVER**
 
 - CWA has been designed to make switching over as easy as possible. To migrate your CW instance to CWA, simply:
   1. Stop your instance of CW if it's still running
+  2. Whatever your `/books` bind was in Calibre-Web, should be your `/calibre-library` bind for CWA
   2. Mount the same `/config` folder in your Docker Compose that you were using for CW (or a copy of it to be extra safe)
   3. Mount the same folder containing your Calibre Library (the Docker Compose for the Linuxserver image of Calibre Web has this as `/books` by default)
 - And then you're done! All of your users, settings ect. should be automatically carried over into your new CWA instance! Enjoy!

root/app/calibre-web/cps/static/css/caliBlur.css

@@ -680,8 +680,79 @@ p.cwa-settings-disclaimer {
 }
 
 select.cwa-settings-select {
-  background-color: white;
-  color: #444444;
   text-align: center;
   border-radius: 6px;
+  width: 8rem;
+  background-color: #f8f8f8 !important;
+}
+
+.settings-section-header {
+  color: #45b29d;
+  padding-bottom: 14px;
+}
+
+.settings-container {
+  background: #f8f8f8;
+  padding-left: 4rem;
+  padding-right: 6rem;
+  margin-right: 2rem;
+  padding-top: 2rem;
+  padding-bottom: 2rem;
+  margin-bottom: 2rem;
+}
+
+.cwa_stats_container {
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr 1fr; /* Default: 4 equal columns */
+  gap: 10px; /* Space between sections */
+  padding: 20px;
+  width: 100%; /* Ensure it spans the full width */
+  height: auto; /* Allow height to adjust based on content */
+}
+
+.cwa_stats_section {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  border: none;
+  border-radius: 8px;
+  padding: 20px;
+  text-align: center;
+  background-color: #ffffff;
+}
+
+.cwa_stats_header {
+  font-size: 1.5em;
+  font-weight: bold;
+  margin-bottom: 10px;
+  color: #333333;
+}
+
+.cwa_stats_value {
+  font-size: 2.5em;
+  font-weight: bold;
+  color: #45b29d;
+}
+
+/* Media Query for Medium Screens */
+@media (max-width: 1024px) {
+  .cwa_stats_container {
+    grid-template-columns: repeat(
+      2,
+      1fr
+    ); /* 2 equal columns on medium screens */
+  }
+}
+
+/* Media Query for Mobile Screens or Thin Windows */
+@media (max-width: 480px) {
+  .cwa_stats_container {
+    grid-template-columns: 1fr; /* 1 column, 4 sections stacked vertically */
+  }
+}
+
+.stats_see_more_btn {
+  border-radius: 6px !important;
+  margin-bottom: 0px !important;
 }

root/app/calibre-web/cps/static/css/style.css

@@ -6,50 +6,7 @@
 {% endblock %}
 
 {% block header %}
-<style>
-  .settings-container {
-    background: #1f2c3554;
-    padding-left: 4rem;
-    padding-right: 6rem;
-    margin-right: 2rem;
-    padding-top: 2rem;
-    padding-bottom: 2rem;
-    margin-bottom: 2rem;
-  }
-
-  .settings-section-header {
-    color: #ffc200;
-    padding-bottom: 14px;
-  }
-
-  .settings-explanation {
-    color: #e9e9e9;
-    font-size: small !important;
-    line-height: normal;
-    max-width: 90rem;
-    font-style: normal !important;
-    padding-left: 0px !important;
-    margin: 0 !important;
-    margin-bottom: 20px !important;
-  }
-
-  .settings-disclaimer {
-    font-size: x-small !important;
-    font-style: normal !important;
-    color: #e9e9e9;
-    padding-left: 0px !important;
-    line-height: normal;
-    margin: 0 !important;
-  }
-
-  .settings-divider {
-    margin-top: 3rem;
-    margin-bottom: 3rem;
-    border-color: #5c6b74;
-    border-width: 2px;
-  }
-
-</style>
+<style></style>
 {% endblock %}
 
 {% block body %}
@@ -169,7 +126,7 @@ <h4 class="settings-section-header">CWA Auto-Conversion Target Format - EPUB by
         formats selected in the ignore list below)
       </p>
       <label for="auto_convert_target_format" style="padding-right: 10px; margin-bottom: 16px !important;">Choose a target format:</label>
-      <select class="cwa-settings-select" style="width: 8rem; background-color: #151e26 !important;" name="auto_convert_target_format" id="auto_convert_target_format">
+      <select class="cwa-settings-select" name="auto_convert_target_format" id="auto_convert_target_format">
         {% for format in target_formats -%}
           {% if cwa_settings['auto_convert_target_format'] == format %}
             <option value="{{ format }}" selected>{{ format }}</option>

root/app/calibre-web/cps/templates/cwa_settings.html

@@ -7,66 +7,6 @@
     margin: 0;
     font-family: Arial, sans-serif;
   }
-
-  .cwa_stats_container {
-    display: grid;
-    grid-template-columns: 1fr 1fr 1fr 1fr; /* Default: 4 equal columns */
-    gap: 10px; /* Space between sections */
-    padding: 20px;
-    width: 100%; /* Ensure it spans the full width */
-    height: auto; /* Allow height to adjust based on content */
-  }
-
-  .cwa_stats_section {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    border: none;
-    border-radius: 8px;
-    padding: 20px;
-    text-align: center;
-    background-color: #1520268a;
-  }
-
-  .cwa_stats_header {
-    font-size: 1.5em;
-    font-weight: bold;
-    margin-bottom: 10px;
-    color: whitesmoke;
-  }
-
-  .cwa_stats_value {
-    font-size: 2.5em;
-    font-weight: bold;
-    color: #cc7b19;
-  }
-
-  /* Styling for background colors */
-  /* .cwa_stats_section:nth-child(1) { background-color: #e0f7fa; } */
-  /* .cwa_stats_section:nth-child(2) { background-color: #c8e6c9; } */
-  /* .cwa_stats_section:nth-child(3) { background-color: #ffcdd2; } */
-  /* .cwa_stats_section:nth-child(4) { background-color: #fff9c4; } */
-
-  /* Media Query for Medium Screens */
-  @media (max-width: 1024px) {
-    .cwa_stats_container {
-      grid-template-columns: repeat(2, 1fr); /* 2 equal columns on medium screens */
-    }
-  }
-
-  /* Media Query for Mobile Screens or Thin Windows */
-  @media (max-width: 480px) {
-    .cwa_stats_container {
-      grid-template-columns: 1fr; /* 1 column, 4 sections stacked vertically */
-    }
-  }
-
-  .stats_see_more_btn {
-  border-radius: 6px !important;
-  margin-bottom: 0px !important;
-}
-
 </style>
 {% endblock %}
 

root/app/calibre-web/cps/templates/cwa_stats.html

@@ -3,18 +3,6 @@
 echo "[cwa-auto-zipper] Starting CWA-Auto-Zipper service..."
 echo "[cwa-auto-zipper] Matching internal localtime & timezone with the one provided..."
 
-mkdir -p /config/processed_books/converted
-mkdir -p /config/processed_books/imported
-mkdir -p /config/processed_books/failed
-mkdir -p /config/processed_books/fixed_originals
-mkdir -p /config/log_archive
-mkdir -p /config/.cwa_conversion_tmp
-
-chown -R abc:abc /config/processed_books
-chown -R abc:abc /config/log_archive
-chown -R abc:abc /config/.cwa_conversion_tmp
-
-
 tz=$(printcontenv TZ)
 if [[ $tz == "" ]]
 then

…uto-library/dependencies.d/cwa-set-perms …cwa-auto-library/dependencies.d/cwa-initroot/etc/s6-overlay/s6-rc.d/cwa-auto-library/dependencies.d/cwa-set-perms renamed to root/etc/s6-overlay/s6-rc.d/cwa-auto-library/dependencies.d/cwa-init root/etc/s6-overlay/s6-rc.d/cwa-auto-library/dependencies.d/cwa-set-perms renamed to root/etc/s6-overlay/s6-rc.d/cwa-auto-library/dependencies.d/cwa-init

@@ -7,7 +7,7 @@
 echo "========== STARTING CWA-INGEST SERVICE =========="
 
 WATCH_FOLDER=$(grep -o '"ingest_folder": "[^"]*' /app/calibre-web-automated/dirs.json | grep -o '[^"]*$')
-echo "[cwa-ingest-service]: Watching folder: $WATCH_FOLDER"
+echo "[cwa-ingest-service] Watching folder: $WATCH_FOLDER"
 
 # Monitor the folder for new files
 s6-setuidgid abc inotifywait -m -r --format="%e %w%f" -e close_write -e moved_to "$WATCH_FOLDER" |
@@ -16,7 +16,7 @@ while read -r events filepath ; do
         #         CURRENT_TIME=$(date +'%s')
         #         TIME_OF_MATCH=$(grep "$filepath" ingest-log-test.txt | egrep -o '[0-9]{10}')
         #         TODO NEED TO GET DIFFERENCE BETWEEN THE 2 TIMES AND IF LESS THAN 60 SECONDS, IGNORE
-        echo "[cwa-ingest-service]: New files detected - $filepath - Starting Ingest Processor..."
+        echo "[cwa-ingest-service] New files detected - $filepath - Starting Ingest Processor..."
         python3 /app/calibre-web-automated/scripts/ingest_processor.py "$filepath" # &
         # echo "'${filepath}' - $(date +'%s')" >> /config/.ingest_dupe_list
         # INGEST_PROCESSOR_PID=$!