ajslater
diff --git a/‎.eslintignore‎
Lines changed: 0 additions & 4 deletions b/‎.eslintignore‎
Lines changed: 0 additions & 4 deletions
diff --git a/‎.eslintrc.cjs‎
Lines changed: 3 additions & 1 deletion b/‎.eslintrc.cjs‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎.prettierignore‎
Lines changed: 2 additions & 3 deletions b/‎.prettierignore‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎NEWS.md‎
Lines changed: 18 additions & 0 deletions b/‎NEWS.md‎
Lines changed: 18 additions & 0 deletions
diff --git a/‎README.md‎
Lines changed: 14 additions & 2 deletions b/‎README.md‎
Lines changed: 14 additions & 2 deletions
diff --git a/‎codex/librarian/janitor/crond.py‎
Lines changed: 20 additions & 10 deletions b/‎codex/librarian/janitor/crond.py‎
Lines changed: 20 additions & 10 deletions
diff --git a/‎codex/librarian/searchd.py‎
Lines changed: 4 additions & 0 deletions b/‎codex/librarian/searchd.py‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎codex/templates/admin/base_site.html‎
Lines changed: 25 additions & 23 deletions b/‎codex/templates/admin/base_site.html‎
Lines changed: 25 additions & 23 deletions
diff --git a/‎codex/templates/admin/codex/adminflag/change_list.html‎
Lines changed: 29 additions & 28 deletions b/‎codex/templates/admin/codex/adminflag/change_list.html‎
Lines changed: 29 additions & 28 deletions
diff --git a/‎codex/templates/admin/codex/failedimport/change_list.html‎
Lines changed: 45 additions & 42 deletions b/‎codex/templates/admin/codex/failedimport/change_list.html‎
Lines changed: 45 additions & 42 deletions
@@ -128,12 +128,14 @@ module.exports = {
     "codex/_vendor/haystack",
     "codex/static_build",
     "codex/static_root",
+    "codex/templates/**/*.html",
     "comics",
     "config",
     "dist",
     "frontend",
     "node_modules",
-    "test_results",
+    "package-lock.json",
+    "test-results",
     "typings",
   ],
 };
@@ -11,9 +11,8 @@ cache
 codex/_vendor/haystack
 codex/static_build
 codex/static_root
-codex/templates/*.xml
-codex/templates/admin/codex/queuejob/change_list.html
-codex/templates/site.webmanifest
+codex/templates
+!codex/templates/pwa/serviceworkerRegister.js
 comics
 frontend
 webpack-stats.json
@@ -1,5 +1,23 @@
 # 📰 Codex News
 
+## v0.10.9
+
+- Fixes
+
+  - Fix null bookmark and count fields in metadata
+  - Fix indeterminate finished state when children have bookmark progress.
+  - Fix maintenance running inappropriately on first run. Crashed xapian database.
+  - Fix reader metadata keymap
+
+- Features
+
+  - Progressive Web App support
+  - Reader "Shrink to" settings replaced by "Fit to"
+
+- Special Thanks
+
+  - To ToxicFrog, who's been finding most of these bugs I'm fixing for a while.
+
 ## v0.10.8
 
 - Fixes
 
@@ -53,10 +53,22 @@ brew install jpeg libffi libyaml libzip openssl poppler python unrar webp xapian
 
 ##### Linux
 
-###### Debian based (e.g. Ubuntu)
+###### Debian
+
+Like Ubuntu, Mint, MX and others.
+
+```sh
+apt install build-essential libffi-dev libjpeg-dev libssl-dev libwebp7 libxapian30 libyaml-dev poppler-utils python3-pip python3-xapian zlib1g-dev
+```
+
+older releases may use the `libweb6` package instead.
+
+###### Debian on ARM
+
+The python cryptography wheel needs compiling on rare architectures. Install the Rust compiler.
 
 ```sh
-apt install build-essential libffi-dev libjpeg-dev libssl-dev libwebp libxapian30 libyaml-dev poppler-utils python3-pip python3-xapian zlib1g-dev
+apt install cargo
 ```
 
 ###### Alpine
 
@@ -38,24 +38,34 @@ class Crond(NamedThread):
     NAME = "Cron"
 
     @staticmethod
-    def _get_timeout():
+    def _get_midnight(now, tomorrow=False):
+        """Get midnight relative to now."""
+        if tomorrow:
+            now += ONE_DAY
+        day = now.astimezone()
+        midnight = datetime.combine(day, time.min).astimezone()
+        return midnight
+
+    @classmethod
+    def _get_timeout(cls):
         """Get seconds until midnight."""
+        now = timezone.now()
         try:
             mtime = CRON_TIMESTAMP.stat().st_mtime
+            last_cron = datetime.fromtimestamp(mtime, tz=timezone.utc)
         except FileNotFoundError:
-            mtime = 0
+            # get last midnight. Usually only on very first run.
+            last_cron = cls._get_midnight(now)
 
-        last_cron = datetime.fromtimestamp(mtime, tz=timezone.utc)
-        now = timezone.now()
-        if now - last_cron > ONE_DAY:
-            # it's been too long
-            seconds = 0
-        else:
+        if now - last_cron < ONE_DAY:
             # wait until next midnight
-            tomorrow = (now + ONE_DAY).astimezone()
-            next_midnight = datetime.combine(tomorrow, time.min).astimezone()
+            next_midnight = cls._get_midnight(now, True)
             delta = next_midnight - now
             seconds = max(0, delta.total_seconds())
+        else:
+            # it's been too long
+            seconds = 0
+
         return int(seconds)
 
     def run(self):
 
@@ -51,6 +51,10 @@ def update_search_index(rebuild=False):
             LOG.verbose("Database update in progress, not updating search index yet.")
             return
 
+        if not rebuild and not LatestVersion.is_xapian_uuid_match():
+            LOG.warning("Database does not match search index.")
+            rebuild = True
+
         XAPIAN_INDEX_PATH.mkdir(parents=True, exist_ok=True)
 
         if rebuild:
 
@@ -1,23 +1,25 @@
-{% extends "admin/base_site.html" %} {% load static %} {% block title %}Codex
-Administration{% endblock %} {% block extrastyle %}
-<link
-  href="{% static 'admin/css/dark.css' %}"
-  type="text/css"
-  media="(prefers-color-scheme: dark)"
-  rel="stylesheet"
-/>
-<link
-  href="{% static 'admin/css/codex-admin-dark.css' %}"
-  type="text/css"
-  rel="stylesheet"
-/>
-<link
-  href="{% static 'admin/css/codex-admin.css' %}"
-  rel="stylesheet"
-  type="text/css"
-/>
-{% block extrapagestyle %}{% endblock %} {% endblock %} {% block branding %}
-<h1 id="site-name">
-  <a href="{% url 'admin:index' %}">{{ _('Codex administration') }}</a>
-</h1>
-{% endblock %}
+{% extends "admin/base_site.html" %}
+{% load static %}
+{% block title %}
+    Codex
+    Administration
+{% endblock title %}
+{% block extrastyle %}
+    <link href="{% static 'admin/css/dark.css' %}"
+          type="text/css"
+          media="(prefers-color-scheme: dark)"
+          rel="stylesheet"/>
+    <link href="{% static 'admin/css/codex-admin-dark.css' %}"
+          type="text/css"
+          rel="stylesheet"/>
+    <link href="{% static 'admin/css/codex-admin.css' %}"
+          rel="stylesheet"
+          type="text/css"/>
+    {% block extrapagestyle %}
+    {% endblock extrapagestyle %}
+{% endblock extrastyle %}
+{% block branding %}
+    <h1 id="site-name">
+        <a href="{% url 'admin:index' %}">{{ _('Codex administration') }}</a>
+    </h1>
+{% endblock branding %}
@@ -1,28 +1,29 @@
-{% extends "admin/change_list.html" %} {% block footer %}
-<div id="footer">
-  <h1>Admin Flags</h1>
-  Administration Flags that effect the operation of the entire site.
-  <h2>Enable Auto Update</h2>
-  If enabled, codex will attempt to update the codex python package once a day
-  and restart the server if an update occurred.
-  <strong>Not advisable if running from Docker</strong> as running containers
-  aren't meant to hold state and will be rebuilt if you update the image. Look
-  into <a href="https://containrrr.dev/watchtower/">Watchtower</a> for
-  automating Docker updates.
-  <h2>Enable Non Users</h2>
-  By default all Codex features, including bookmarking, are available to users
-  who are not logged in. You may disable this feature and Codex will hide its
-  browser and reader and disable its API from anyone who is not logged in as a
-  user.
-  <h2>Enable Registration</h2>
-  By default users bookmarks and preferences are saved in an anonymous browser
-  session. Users can create a username and password to save their bookmarks in
-  between browsers. You may disable this feature. Admins may still create users
-  using this Admin Panel.
-  <h2>Enable Folder View</h2>
-  By default, codex provides a "Folder View" which mimics the directory
-  hierarchy of the libraries that you've added to Codex. You may disable this
-  feature. The database style browser view is always available. This flag also
-  enables and disables the "Filename" sort option.
-</div>
-{% endblock %}
+{% extends "admin/change_list.html" %}
+{% block footer %}
+    <div id="footer">
+        <h1>Admin Flags</h1>
+        Administration Flags that effect the operation of the entire site.
+        <h2>Enable Auto Update</h2>
+        If enabled, codex will attempt to update the codex python package once a day
+        and restart the server if an update occurred.
+        <strong>Not advisable if running from Docker</strong> as running containers
+        aren't meant to hold state and will be rebuilt if you update the image. Look
+        into <a href="https://containrrr.dev/watchtower/">Watchtower</a> for
+        automating Docker updates.
+        <h2>Enable Non Users</h2>
+        By default all Codex features, including bookmarking, are available to users
+        who are not logged in. You may disable this feature and Codex will hide its
+        browser and reader and disable its API from anyone who is not logged in as a
+        user.
+        <h2>Enable Registration</h2>
+        By default users bookmarks and preferences are saved in an anonymous browser
+        session. Users can create a username and password to save their bookmarks in
+        between browsers. You may disable this feature. Admins may still create users
+        using this Admin Panel.
+        <h2>Enable Folder View</h2>
+        By default, codex provides a "Folder View" which mimics the directory
+        hierarchy of the libraries that you've added to Codex. You may disable this
+        feature. The database style browser view is always available. This flag also
+        enables and disables the "Filename" sort option.
+    </div>
+{% endblock footer %}
@@ -1,46 +1,49 @@
-{% extends "admin/change_list.html" %} {% block footer %}
-<div id="footer">
-  <h1>Failed Imports</h1>
-  <div>
-    Comic archives that have failed to import. This list is updated every time
-    the library updates. You should probably review these files and fix or
-    remove them
-  </div>
-  <h2>Fixing comics</h2>
-  <div>
-    Try using the zip fixer:
-    <pre>
+{% extends "admin/change_list.html" %}
+{% block footer %}
+    <div id="footer">
+        <h1>Failed Imports</h1>
+        <div>
+            Comic archives that have failed to import. This list is updated every time
+            the library updates. You should probably review these files and fix or
+            remove them
+        </div>
+        <h2>Fixing comics</h2>
+        <div>
+            Try using the zip fixer:
+            <pre>
 cp problem-comic.cbz /somewhere/safe/problem-comic.cbz.backup
 zip -F problem-comic.cbz --out fixed.zip
 mv fixed.zip problem-comic.cbz
     </pre>
-    to fix comics. I've found that even if the fixed comic looks exactly the
-    same as the original, replacing the original with the fixed archive can
-    often get Codex to import it properly.<br />
-    If you've removed or fixed the unimportable comics in your library you can
-    try polling the library again.<br />
-    You may also try <code>zip -FF</code> to fix comics which uses a different
-    (not necissarily better) algorithm to fix archives.
-  </div>
-  <h1>Actions</h1>
-  <h2>Delete selected failed imports</h2>
-  <div>
-    Deletes the failed imports entry from the database. May reappear after the
-    next poll if Codex fails to import it again.
-  </div>
-  <h2>Poll selected failed imports' libraries for changes.</h2>
-  <div>
-    Poll the libraries the selected failed imports come from for changes,
-    possibly clearing some failed imports if the comic archives were fixed or
-    removed.
-  </div>
-  <h1>Reporting Issues</h1>
-  <div>
-    If the comic looks good to you, but still shows up as a failed import, it
-    might be Codex's fault for not importing it correctly. Please file an
-    <a href="https://github.com/ajslater/codex/issues">Issue Report</a> and
-    include the stack trace from the logs at
-    <code>config/logs/codex.log</code> if you can.
-  </div>
-</div>
-{% endblock %}
+            to fix comics. I've found that even if the fixed comic looks exactly the
+            same as the original, replacing the original with the fixed archive can
+            often get Codex to import it properly.
+            <br />
+            If you've removed or fixed the unimportable comics in your library you can
+            try polling the library again.
+            <br />
+            You may also try <code>zip -FF</code> to fix comics which uses a different
+            (not necissarily better) algorithm to fix archives.
+        </div>
+        <h1>Actions</h1>
+        <h2>Delete selected failed imports</h2>
+        <div>
+            Deletes the failed imports entry from the database. May reappear after the
+            next poll if Codex fails to import it again.
+        </div>
+        <h2>Poll selected failed imports' libraries for changes.</h2>
+        <div>
+            Poll the libraries the selected failed imports come from for changes,
+            possibly clearing some failed imports if the comic archives were fixed or
+            removed.
+        </div>
+        <h1>Reporting Issues</h1>
+        <div>
+            If the comic looks good to you, but still shows up as a failed import, it
+            might be Codex's fault for not importing it correctly. Please file an
+            <a href="https://github.com/ajslater/codex/issues">Issue Report</a> and
+            include the stack trace from the logs at
+            <code>config/logs/codex.log</code> if you can.
+        </div>
+    </div>
+{% endblock footer %}