Fixed CWA History tables displaying from oldest to newest, adding ser…

…ver stats to stats / history page, fixed show_full_history page after last commit and fixed 1 and 0 being stored in fixer db instead of True and False
crocodilestick · Jan 6, 2025 · 9ab6661 · 9ab6661
1 parent 81c7d17
commit 9ab6661
Show file tree

Hide file tree

Showing 5 changed files with 105 additions and 13 deletions.
diff --git a/root/app/calibre-web/cps/cwa_functions.py b/root/app/calibre-web/cps/cwa_functions.py
@@ -218,7 +218,7 @@ def set_cwa_settings():
 @admin_required
 def cwa_history_show():
     cwa_db = CWA_DB()
-    data_enforcement= cwa_db.enforce_show(paths=False, verbose=False, web_ui=True)
+    data_enforcement = cwa_db.enforce_show(paths=False, verbose=False, web_ui=True)
     data_enforcement_with_paths = cwa_db.enforce_show(paths=True, verbose=False, web_ui=True)
     data_imports = cwa_db.get_import_history(verbose=False)
     data_conversions = cwa_db.get_conversion_history(verbose=False)

diff --git a/root/app/calibre-web/cps/static/css/caliBlur.css b/root/app/calibre-web/cps/static/css/caliBlur.css
diff --git a/root/app/calibre-web/cps/templates/cwa_history.html b/root/app/calibre-web/cps/templates/cwa_history.html
@@ -3,6 +3,28 @@
 <div class="discover">
   <h2>{{title}}</h2>
 
+    <div>
+      <h3>Calibre-Web Automated - Server Stats</h3>
+      <div class="cwa_stats_container">
+        <div class="cwa_stats_section">
+          <div class="cwa_stats_header">Total Books</div>
+          <div class="cwa_stats_value">129</div>
+        </div>
+        <div class="cwa_stats_section">
+          <div class="cwa_stats_header">Books Enforced</div>
+          <div class="cwa_stats_value">123</div>
+        </div>
+        <div class="cwa_stats_section">
+          <div class="cwa_stats_header">Books Converted</div>
+          <div class="cwa_stats_value">672</div>
+        </div>
+        <div class="cwa_stats_section">
+          <div class="cwa_stats_header">Books Fixed</div>
+          <div class="cwa_stats_value">342</div>
+        </div>
+      </div>
+    </div>
+
     <div>
       <h3>Calibre-Web Automated Conversion History</h3>
       <a class="btn btn-default" href="{{ url_for('cwa_history.show_full_conversions') }}">{{_('Click to See More')}}</a><br>
@@ -12,7 +34,7 @@ <h3>Calibre-Web Automated Conversion History</h3>
           <th>{{ header }}</th>
           {% endfor %}
         </tr>
-        {% for row in data_conversions %}
+        {% for row in data_conversions|reverse %}
         <tr>
           {% for cell in row %}
           <td>{{ cell }}</td>
@@ -31,7 +53,7 @@ <h3>Calibre-Web Automated Import History</h3>
           <th>{{ header }}</th>
           {% endfor %}
         </tr>
-        {% for row in data_imports %}
+        {% for row in data_imports|reverse %}
         <tr>
           {% for cell in row %}
           <td>{{ cell }}</td>
@@ -50,7 +72,7 @@ <h3>Calibre-Web Automated EPUB Fixer History</h3>
           <th>{{ header }}</th>
           {% endfor %}
         </tr>
-        {% for row in data_epub_fixer %}
+        {% for row in data_epub_fixer|reverse %}
         <tr>
           {% for cell in row %}
           <td>{{ cell }}</td>
@@ -66,10 +88,12 @@ <h4><i>EPUB Fixer History with Paths & Fixes</i></h4>
           <th>{{ header }}</th>
           {% endfor %}
         </tr>
-        {% for row in data_epub_fixer_with_fixes %}
+        {% for row in data_epub_fixer_with_fixes|reverse %}
         <tr>
           {% for cell in row %}
-          <td style="max-height: 20rem; overflow-y: scroll; display: flex;">{{ cell | replace("\n", "<br>") | safe }}</td>
+          <td>
+            <div style="max-height: 20rem; overflow-y: auto;">{{ cell | replace("\n", "<br>") | safe }}</div>
+          </td>
           {% endfor %}
         </tr>
         {% endfor %}
@@ -85,7 +109,7 @@ <h3>Calibre-Web Automated Enforcement History</h3>
           <th>{{ header }}</th>
           {% endfor %}
         </tr>
-        {% for row in data_enforcement %}
+        {% for row in data_enforcement|reverse %}
         <tr>
           {% for cell in row %}
           <td>{{ cell }}</td>
@@ -101,7 +125,7 @@ <h4><i>Enforcement History with Paths</i></h4>
           <th>{{ header }}</th>
           {% endfor %}
         </tr>
-        {% for row in data_enforcement_with_paths %}
+        {% for row in data_enforcement_with_paths|reverse %}
         <tr>
           {% for cell in row %}
           <td>{{ cell }}</td>
@@ -112,4 +136,4 @@ <h4><i>Enforcement History with Paths</i></h4>
     </div>
 
 </div>
-{% endblock %}
+{% endblock %}
diff --git a/root/app/calibre-web/cps/templates/cwa_history_full.html b/root/app/calibre-web/cps/templates/cwa_history_full.html
@@ -10,13 +10,15 @@ <h3>{{title}}</h3><br>
           <th>{{ header }}</th>
           {% endfor %}
         </tr>
-        {% for row in data %}
+        {% for row in data|reverse %}
         <tr>
           {% for cell in row %}
-          <td style="max-height: 20rem; overflow-y: scroll; display: flex;">{{ cell | replace("\n", "<br>") | safe }}</td>
+          <td>
+            <div style="max-height: 20rem; overflow-y: auto;">{{ cell | replace("\n", "<br>") | safe }}</div>
+          </td>
           {% endfor %}
         </tr>
         {% endfor %}
       </table>
 </div>
-{% endblock %}
+{% endblock %}
diff --git a/scripts/kindle_epub_fixer.py b/scripts/kindle_epub_fixer.py
@@ -261,7 +261,7 @@ def add_entry_to_db(self, input_path, output_path):
             fixed_problems = "No fixes required"
 
         self.db.epub_fixer_add_entry(Path(input_path).stem,
-                                    self.manually_triggered,
+                                    bool(self.manually_triggered),
                                     len(self.fixed_problems),
                                     str(self.cwa_settings['auto_backup_epub_fixes']),
                                     output_path,