ajslater
diff --git a/‎NEWS.md‎
Lines changed: 12 additions & 0 deletions b/‎NEWS.md‎
Lines changed: 12 additions & 0 deletions
diff --git a/‎README.md‎
Lines changed: 5 additions & 3 deletions b/‎README.md‎
Lines changed: 5 additions & 3 deletions
diff --git a/‎codex/config_default.yaml‎
Lines changed: 13 additions & 0 deletions b/‎codex/config_default.yaml‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎codex/librarian/covers/create.py‎
Lines changed: 4 additions & 4 deletions b/‎codex/librarian/covers/create.py‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎codex/librarian/db/aggregate_metadata.py‎
Lines changed: 6 additions & 5 deletions b/‎codex/librarian/db/aggregate_metadata.py‎
Lines changed: 6 additions & 5 deletions
diff --git a/‎codex/librarian/db/clean_metadata.py‎
Lines changed: 3 additions & 0 deletions b/‎codex/librarian/db/clean_metadata.py‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎codex/templates/admin/codex/adminflag/change_list.html‎
Lines changed: 1 addition & 1 deletion b/‎codex/templates/admin/codex/adminflag/change_list.html‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎codex/version.py‎
Lines changed: 2 additions & 0 deletions b/‎codex/version.py‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎codex/views/browser.py‎
Lines changed: 20 additions & 8 deletions b/‎codex/views/browser.py‎
Lines changed: 20 additions & 8 deletions
diff --git a/‎codex/views/browser_metadata_base.py‎
Lines changed: 4 additions & 3 deletions b/‎codex/views/browser_metadata_base.py‎
Lines changed: 4 additions & 3 deletions
@@ -1,5 +1,17 @@
 # 📰 Codex News
 
+## v0.9.14
+
+- Fixes
+
+  - Fix comicbox config crash.
+  - Use codex config namespace (~/.config/codex) so codex doesn't interfere with standalone comicbox configs.
+  - Comic issue names display to one decimal point instead of ½ glyph.
+
+- Features
+
+  - Filename order by option. Disabled if the "Enable Folder View" Admin Flag is off.
+
 ## v0.9.13
 
 - Fixes
 
@@ -271,10 +271,12 @@ If this procedure goes kablooey, you may recover the original database at `confi
 
 I've tested Codex's bulk database updater to batch 100,000 filesystem events at a time. With enough RAM Codex could probably batch much more. But if you find that updating large batches of comics are failing, consider setting a the `max_db_ops` value in `hypercorn.toml` to a lower value. 1000 will probably still be pretty fast, for instance.
 
-### Bug Reports
+### 🐛 Bug Reports
 
-Issues are best filed [here on github](https://github.com/ajslater/codex/issues).
-I and other Codex users often lurk on the [Mylar support channels](https://github.com/mylar3/mylar3#live-support--conversation). It would be polite to use the `#anything-other-than-mylar` Discord channel to ask for help with Codex.
+Issues and feature requests are best filed on the [Github issue tracker](https://github.com/ajslater/codex/issues).
+
+By the generosity of the good people of [Mylar](https://github.com/mylar3/mylar3), I and other Codex users may be found answering questions on the [Mylar Discord](https://discord.gg/6UG94R7E8T).
+Please use the `#codex-support` channel to ask for help with Codex.
 
 ## <a name="out-of-scope">🚫 Out of Scope</a>
 
 
@@ -0,0 +1,13 @@
+comicbox:
+  comet: True
+  comicbookinfo: True
+  comicinfoxml: True
+  cover: False
+  delete_rar: False
+  delete_tags: False
+  dest_path: .
+  dry_run: False
+  filename: True
+  metadata: False
+  raw: False
+  recurse: False
@@ -6,7 +6,6 @@
 from pathlib import Path
 
 from comicbox.comic_archive import ComicArchive
-from comicbox.config import get_config
 from django.db.models.functions import Now
 from fnvhash import fnv1a_32
 from PIL import Image
@@ -20,6 +19,7 @@
 )
 from codex.models import Comic, Library
 from codex.settings.logging import get_logger
+from codex.version import COMICBOX_CONFIG
 
 
 THUMBNAIL_SIZE = (120, 180)
@@ -29,8 +29,6 @@
 HEX_FILL = 8
 PATH_STEP = 2
 LOG = get_logger(__name__)
-COMICBOX_CONFIG = get_config()
-COMICBOX_CONFIG.metadata = False
 
 
 def _hex_path(comic_path):
@@ -84,7 +82,9 @@ def _create_comic_cover_from_file(comic, force=False):
             if correct_cover_path != comic.cover_path:
                 update_cover_path = correct_cover_path
         else:
-            cover_image = ComicArchive(comic.path).get_cover_image()
+            cover_image = ComicArchive(
+                comic.path, config=COMICBOX_CONFIG
+            ).get_cover_image()
             update_cover_path = create_comic_cover(
                 comic.path, cover_image, correct_cover_path
             )
 
@@ -1,20 +1,20 @@
 """Aggregate metadata from comics to prepare for importing."""
-
 import time
 
+from copy import deepcopy
 from pathlib import Path
 from queue import Full
 from zipfile import BadZipFile
 
 from comicbox.comic_archive import ComicArchive
-from comicbox.config import get_config
 from comicbox.exceptions import UnsupportedArchiveTypeError
 from rarfile import BadRarFile
 
 from codex.librarian.db.clean_metadata import clean_md
 from codex.librarian.queue_mp import LIBRARIAN_QUEUE, ImageComicCoverCreateTask
 from codex.models import Comic, Imprint, Publisher, Series, Volume
 from codex.settings.logging import LOG_EVERY, get_logger
+from codex.version import COMICBOX_CONFIG
 
 
 LOG = get_logger(__name__)
@@ -24,8 +24,9 @@
 for field in Comic._meta.get_fields():
     if field.many_to_many and field.name != "folders":
         COMIC_M2M_FIELDS.add(field.name)
-COMICBOX_CONFIG = get_config()
-COMICBOX_CONFIG.cover = True
+COMICBOX_CONFIG_AGGREGATE = deepcopy(COMICBOX_CONFIG)
+COMICBOX_CONFIG_AGGREGATE.cover = True
+COMICBOX_CONFIG_AGGREGATE.metadata = True
 
 
 def _get_path_metadata(path):
@@ -35,7 +36,7 @@ def _get_path_metadata(path):
     group_tree_md = {}
     failed_import = {}
     try:
-        car = ComicArchive(path, config=COMICBOX_CONFIG)
+        car = ComicArchive(path, config=COMICBOX_CONFIG_AGGREGATE)
         md = car.get_metadata()
         md["path"] = path
         clean_md(md)
 
@@ -2,6 +2,7 @@
 from decimal import Decimal
 from typing import Any, Optional
 
+from comicbox.metadata.comic_base import ComicBaseMetadata
 from django.db.models.fields import CharField, DecimalField, PositiveSmallIntegerField
 
 from codex.models import BrowserGroupModel, Comic, NamedModel
@@ -69,6 +70,8 @@ def _clean_comic_decimals(md: dict[str, Any], md_keys: frozenset[str]) -> None:
         field: DecimalField = Comic._meta.get_field(key)  # type:ignore
         try:
             value = md[key]
+            # Comicbox now gives issues as strings, convert them to decimal here.
+            value = ComicBaseMetadata.parse_decimal(value)
             value = value.quantize(_TWO_PLACES)
             value = value.max(_DECIMAL_ZERO)
             decimal_max = Decimal(10 ** (field.max_digits - 2) - 1)
 
@@ -11,6 +11,6 @@ <h2>Enable Non Users</h2>
 <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.
+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 %}
@@ -6,6 +6,7 @@
 
 import requests
 
+from comicbox.config import get_config
 from django.utils import timezone
 
 from codex.models import LatestVersion
@@ -17,6 +18,7 @@
 CACHE_EXPIRY = timedelta(days=1)
 REPO_TIMEOUT = 5
 LOG = get_logger(__name__)
+COMICBOX_CONFIG = get_config(modname=PACKAGE_NAME)
 
 
 def get_version():
 
@@ -125,7 +125,7 @@ def _add_annotations(self, queryset, model, autoquery_pk):
         # Sortable aggregates #
         #######################
         order_by = self.params.get("order_by", self.DEFAULT_ORDER_KEY)
-        order_func = self.get_aggregate_func(order_by, is_model_comic, autoquery_pk)
+        order_func = self.get_aggregate_func(order_by, model, autoquery_pk)
         queryset = queryset.annotate(order_value=order_func)
 
         ########################
@@ -376,14 +376,9 @@ def _raise_redirect(self, route_changes, reason):
         detail = {"route": route, "settings": settings, "reason": reason}
         raise SeeOtherRedirectError(detail=detail)
 
-    def _validate_folder_settings(self):
+    def _validate_folder_settings(self, enable_folder_view):
         """Check that all the view variables for folder mode are set right."""
         # Check folder view admin flag
-        try:
-            flag = AdminFlag.objects.only("on").get(name=AdminFlag.ENABLE_FOLDER_VIEW)
-            enable_folder_view = flag.on
-        except AdminFlag.DoesNotExist:
-            enable_folder_view = False
         if not enable_folder_view:
             new_top_group = "r"
             self.params["top_group"] = new_top_group
@@ -455,10 +450,27 @@ def _validate_settings(self):
         """Validate group and top group settings."""
         group = self.kwargs.get("group")
         top_group = self.params.get("top_group")
+        order_by = self.params.get("order_by")
+        enable_folder_view = False
+        if top_group == self.FOLDER_GROUP or order_by == "path":
+            try:
+                enable_folder_view = (
+                    AdminFlag.objects.only("on")
+                    .get(name=AdminFlag.ENABLE_FOLDER_VIEW)
+                    .on
+                )
+            except Exception:
+                pass
+
         if top_group == self.FOLDER_GROUP:
-            self._validate_folder_settings()
+            self._validate_folder_settings(enable_folder_view)
         else:
             self._validate_browser_group_settings()
+
+        if order_by == "path" and not enable_folder_view:
+            self.params["order_by"] = self.DEFAULT_ORDER_KEY
+            LOG.warning("order by path not allowed by admin flag.")
+
         # save route once validated.
         pk = self.kwargs.get("pk")
         page = self.kwargs.get("page")
 
@@ -32,6 +32,7 @@ class BrowserMetadataBaseView(BrowserBaseView):
         "critical_rating": Avg,
         "date": Min,
         "page_count": Sum,
+        "path": Min,
         "size": Sum,
         "updated_at": Min,
         "searchresult__score": Min,
@@ -133,7 +134,7 @@ def _annotate_progress(queryset):
         )
         return queryset
 
-    def get_aggregate_func(self, field, is_comic_model, autoquery_pk=None):
+    def get_aggregate_func(self, field, model, autoquery_pk=None):
         """Get a complete function for aggregating an attribute."""
         if field == "search_score":
             if not autoquery_pk:
@@ -146,12 +147,12 @@ def get_aggregate_func(self, field, is_comic_model, autoquery_pk=None):
             agg_func = Max
 
         # Determine order func
-        if is_comic_model or agg_func is None:
+        if model == Comic or agg_func is None or (field == "path" and model == Folder):
             # agg_none uses group fields not comic fields.
             func = F(field)
         else:
             prefix = ""
-            if not is_comic_model:
+            if model != Comic:
                 prefix += "comic__"
             filters = Q(**{f"{prefix}searchresult__query": autoquery_pk})
             func = agg_func(prefix + field, filters=filters)