codex 1.5.0a1__py3-none-any.whl → 1.5.0a3__py3-none-any.whl

codex/__init__.py

@@ -1,4 +1,5 @@
 """Initialize Django."""
+
 from os import environ
 
 from django import setup

codex/_vendor/haystack/apps.py

@@ -6,9 +6,8 @@ from django.conf import settings
 from ..haystack import connection_router, connections
 from ..haystack.utils import loading
 
-
 class HaystackConfig(AppConfig):
-    name = "codex._vendor.haystack"
+    name = loading.VENDOR_PREFIX + "haystack"
     signal_processor = None
     stream = None
 
@@ -24,7 +23,7 @@ class HaystackConfig(AppConfig):
             signal_processor_path = getattr(
                 settings,
                 "HAYSTACK_SIGNAL_PROCESSOR",
-                "codex._vendor.haystack.signals.BaseSignalProcessor",
+                loading.VENDOR_PREFIX + "haystack.signals.BaseSignalProcessor",
             )
             signal_processor_class = loading.import_class(signal_processor_path)
             self.signal_processor = signal_processor_class(

codex/_vendor/haystack/utils/loading.py

@@ -13,8 +13,11 @@ from ...haystack.exceptions import NotHandled, SearchFieldError
 from ...haystack.utils import importlib
 from ...haystack.utils.app_loading import haystack_get_app_modules
 
+VENDOR_PREFIX = "codex._vendor."
 
 def import_class(path):
+    if path.startswith("haystack"):
+        path = VENDOR_PREFIX + path
     path_bits = path.split(".")
     # Cut off the class name at the end.
     class_name = path_bits.pop()

codex/applications/lifespan.py

@@ -1,4 +1,5 @@
 """Start and stop daemons."""
+
 import asyncio
 from contextlib import suppress
 

codex/applications/websocket.py

@@ -1,4 +1,5 @@
 """Channels Websocket Application."""
+
 from channels.auth import AuthMiddlewareStack
 from channels.routing import URLRouter
 from channels.security.websocket import AllowedHostsOriginValidator

codex/asgi.py

@@ -5,6 +5,7 @@ It exposes the ASGI callable as a module-level variable named ``DJANGO_APPLICATI
 For more information on this file, see
 https://docs.djangoproject.com/en/dev/howto/deployment/asgi/
 """
+
 from channels.routing import ProtocolTypeRouter
 from django.core.asgi import get_asgi_application
 

codex/db_functions.py

@@ -1,4 +1,5 @@
 """Custom Django DB functions."""
+
 from django.db.models import Aggregate
 from django.db.models.fields import CharField
 

codex/exceptions.py

@@ -1,4 +1,5 @@
 """Special Redirect Error."""
+
 from django.shortcuts import redirect
 from django.urls import reverse
 from django.utils.http import urlencode

codex/integrity.py

@@ -1,4 +1,5 @@
 """Repair Database Integrity Errors."""
+
 import re
 import sqlite3
 from types import MappingProxyType

codex/librarian/covers/coverd.py

@@ -1,4 +1,5 @@
 """Functions for dealing with comic cover thumbnails."""
+
 from codex.librarian.covers.create import CoverCreateMixin
 from codex.librarian.covers.purge import CoverPurgeMixin
 from codex.librarian.covers.tasks import (

codex/librarian/covers/create.py

@@ -1,4 +1,5 @@
 """Create comic cover paths."""
+
 from io import BytesIO
 from time import time
 
@@ -75,7 +76,7 @@ class CoverCreateMixin(CoverPathMixin):
         if data:
             with cover_path.open("wb") as cover_file:
                 cover_file.write(data)
-        else:
+        elif not cover_path.exists():
             cover_path.symlink_to(self.MISSING_COVER_PATH)
 
     def _bulk_create_comic_covers(self, comic_pks):

codex/librarian/covers/path.py

@@ -1,4 +1,5 @@
 """Cover Path functions."""
+
 from pathlib import Path
 
 from fnvhash import fnv1a_32

codex/librarian/covers/purge.py

@@ -1,4 +1,5 @@
 """Purge comic covers."""
+
 import os
 import shutil
 from pathlib import Path

codex/librarian/covers/status.py

@@ -1,4 +1,5 @@
 """Cover status types."""
+
 from django.db.models import Choices
 
 

codex/librarian/covers/tasks.py

@@ -1,4 +1,5 @@
 """Covers Tasks."""
+
 from dataclasses import dataclass
 
 

codex/librarian/delayed_taskd.py

@@ -1,4 +1,5 @@
 """Delay tasks."""
+
 from queue import PriorityQueue
 from time import sleep, time
 

codex/librarian/importer/aggregate_metadata.py

@@ -1,4 +1,5 @@
 """Aggregate metadata from comcs to prepare for importing."""
+
 from collections.abc import Mapping
 from pathlib import Path
 from zipfile import BadZipFile

codex/librarian/importer/clean_metadata.py

@@ -1,4 +1,5 @@
 """Clean metadata before importing."""
+
 from contextlib import suppress
 from decimal import ROUND_DOWN, Decimal
 from typing import Any

codex/librarian/importer/const.py

@@ -1,4 +1,5 @@
 """Consts and maps for import."""
+
 from types import MappingProxyType
 
 from codex.models import (

codex/librarian/importer/create_comics.py

@@ -1,4 +1,5 @@
 """Bulk update and create comic objects and bulk update m2m fields."""
+
 from codex.librarian.importer.const import BULK_UPDATE_COMIC_FIELDS
 from codex.librarian.importer.link_comics import LinkComicsMixin
 from codex.librarian.importer.status import ImportStatusTypes, status_notify

codex/librarian/importer/create_fks.py

@@ -2,6 +2,7 @@
 
 So we may safely create the comics next.
 """
+
 from itertools import chain
 from pathlib import Path
 

codex/librarian/importer/failed_imports.py

@@ -1,4 +1,5 @@
 """Update and create failed imports."""
+
 from pathlib import Path
 
 from django.db.models.functions import Now

codex/librarian/importer/importerd.py

@@ -1,4 +1,5 @@
 """Bulk import and move comics and folders."""
+
 import logging
 from pathlib import Path
 from time import sleep, time

codex/librarian/importer/link_comics.py

@@ -1,4 +1,5 @@
 """Bulk update m2m fields."""
+
 from pathlib import Path
 
 from django.db.models import Q
@@ -214,9 +215,7 @@ class LinkComicsMixin(QueuedThread):
             unique_fields=update_fields,
         )
         if created_count := len(tms):
-            self.log.info(
-                f"Linked {created_count} new {field_name}s to altered comics."
-            )
+            self.log.info(f"Linked {created_count} new {field_name} to altered comics.")
         if status:
             status.complete = status.complete or 0
             status.complete += created_count

codex/librarian/importer/moved.py

@@ -1,4 +1,5 @@
 """Bulk import and move comics and folders."""
+
 from pathlib import Path
 
 from django.db.models.functions import Now
@@ -41,27 +42,25 @@ class MovedMixin(CreateComicsMixin, CreateForeignKeysMixin, QueryForeignKeysMixi
 
         folder_m2m_links = {}
         now = Now()
-        comic_pks = []
+        updated_comics = []
         for comic in comics.iterator():
             try:
-                comic.path = moved_paths[comic.path]
-                new_path = Path(comic.path)
-                if new_path.parent == Path(library.path):
-                    comic.parent_folder = None
-                else:
-                    comic.parent_folder = Folder.objects.get(  # type: ignore
-                        path=new_path.parent
-                    )
+                new_path = moved_paths[comic.path]
+                comic.path = new_path
+                new_path = Path(new_path)
+                comic.parent_folder = Folder.objects.get(  # type: ignore
+                    path=new_path.parent
+                )
                 comic.updated_at = now
                 comic.set_stat()
                 folder_m2m_links[comic.pk] = Folder.objects.filter(
                     path__in=new_path.parents
                 ).values_list("pk", flat=True)
-                comic_pks.append(comic.pk)
+                updated_comics.append(comic)
             except Exception:
                 self.log.exception(f"moving {comic.path}")
 
-        Comic.objects.bulk_update(comics, _MOVED_BULK_COMIC_UPDATE_FIELDS)
+        Comic.objects.bulk_update(updated_comics, _MOVED_BULK_COMIC_UPDATE_FIELDS)
 
         # Update m2m field
         if folder_m2m_links:
@@ -78,9 +77,10 @@ class MovedMixin(CreateComicsMixin, CreateForeignKeysMixin, QueryForeignKeysMixi
         dest_parent_folder_paths = set()
         for dest_folder_path in dest_folder_paths:
             dest_parent_path = str(Path(dest_folder_path).parent)
-            dest_parent_folder_paths.add(dest_parent_path)
+            if dest_parent_path not in dest_folder_paths:
+                dest_parent_folder_paths.add(dest_parent_path)
 
-        # Create intermediate subfolders.
+        # Create only intermediate subfolders.
         existing_folder_paths = Folder.objects.filter(
             library=library, path__in=dest_parent_folder_paths
         ).values_list("path", flat=True)
@@ -111,11 +111,13 @@ class MovedMixin(CreateComicsMixin, CreateForeignKeysMixin, QueryForeignKeysMixi
         )
 
         src_folder_paths = frozenset(folders_moved.keys())
-        folders = Folder.objects.filter(library=library, path__in=src_folder_paths)
+        folders_to_move = Folder.objects.filter(
+            library=library, path__in=src_folder_paths
+        ).order_by("path")
 
         update_folders = []
         now = Now()
-        for folder in folders.iterator():
+        for folder in folders_to_move.iterator():
             new_path = folders_moved[folder.path]
             folder.name = Path(new_path).name
             folder.path = new_path

codex/librarian/importer/query_fks.py

@@ -1,4 +1,5 @@
 """Query the missing foreign keys for comics and contributors."""
+
 from logging import DEBUG, INFO
 from pathlib import Path
 from types import MappingProxyType

codex/librarian/importer/status.py

@@ -1,4 +1,5 @@
 """Librarian Status for imports."""
+
 from collections.abc import Callable
 from enum import Enum
 from time import time

codex/librarian/importer/tasks.py

@@ -1,4 +1,5 @@
 """DB Import Tasks."""
+
 from dataclasses import dataclass
 
 

codex/librarian/janitor/cleanup.py

@@ -1,4 +1,5 @@
 """Clean up the database after moves or imports."""
+
 import logging
 from time import time
 

codex/librarian/janitor/failed_imports.py

@@ -1,4 +1,5 @@
 """Force update events for failed imports."""
+
 from watchdog.events import FileModifiedEvent
 
 from codex.librarian.watchdog.tasks import WatchdogEventTask

codex/librarian/janitor/janitor.py

@@ -1,4 +1,5 @@
 """Janitor task runner."""
+
 from codex.librarian.covers.status import CoverStatusTypes
 from codex.librarian.covers.tasks import CoverRemoveOrphansTask
 from codex.librarian.janitor.cleanup import TOTAL_NUM_FK_CLASSES, CleanupMixin

codex/librarian/janitor/janitord.py

@@ -1,4 +1,5 @@
 """Perform maintence tasks."""
+
 from datetime import datetime, time, timedelta
 from threading import Condition, Event
 from time import sleep

codex/librarian/janitor/status.py

@@ -1,4 +1,5 @@
 """Janitor Status Types."""
+
 from django.db.models import Choices
 
 

codex/librarian/janitor/tasks.py

@@ -1,4 +1,5 @@
 """Janitor Tasks."""
+
 from dataclasses import dataclass
 
 

codex/librarian/janitor/update.py

@@ -1,4 +1,5 @@
 """Update the codex python package."""
+
 import os
 import signal
 import subprocess

codex/librarian/janitor/vacuum.py

@@ -1,4 +1,5 @@
 """Vacuum the database."""
+
 from django.db import connection
 from humanize import naturalsize
 

codex/librarian/librariand.py

@@ -1,4 +1,5 @@
 """Library process worker for background tasks."""
+
 from multiprocessing import Manager, Process
 from threading import active_count
 from types import MappingProxyType

codex/librarian/mp_queue.py

@@ -1,4 +1,5 @@
 """Library Queue."""
+
 # This file cannot be named queue or it causes weird type checker errors
 from multiprocessing import Queue
 

codex/librarian/notifier/notifierd.py

@@ -1,6 +1,5 @@
 """Sends notifications to connections, reading from a queue."""
 
-
 from codex.threads import AggregateMessageQueuedThread
 
 

codex/librarian/notifier/tasks.py

@@ -1,4 +1,5 @@
 """Notifier Tasks."""
+
 from dataclasses import dataclass
 
 from codex.websockets.consumers import ChannelGroups

codex/librarian/search/merge.py

@@ -1,4 +1,5 @@
 """Search Index Merging for Read Optimization."""
+
 from pathlib import Path
 from time import time
 from typing import TYPE_CHECKING

codex/librarian/search/remove.py

@@ -1,4 +1,5 @@
 """Search Index cleanup."""
+
 from time import time
 
 from humanize import naturaldelta

codex/librarian/search/searchd.py

@@ -1,4 +1,5 @@
 """Haystack Search index updater."""
+
 from codex.librarian.search.merge import MergeMixin
 from codex.librarian.search.tasks import (
     SearchIndexClearTask,

codex/librarian/search/status.py

@@ -1,4 +1,5 @@
 """Search Index Status Types."""
+
 from django.db.models import Choices
 
 

codex/librarian/search/tasks.py

@@ -1,4 +1,5 @@
 """Libarian Tasks for searchd."""
+
 from dataclasses import dataclass
 
 

codex/librarian/search/update.py

@@ -1,4 +1,5 @@
 """Search Index update."""
+
 from datetime import datetime
 from math import ceil
 from multiprocessing import Pool, cpu_count

codex/librarian/search/version.py

@@ -1,4 +1,5 @@
 """Search Engine to database matching."""
+
 from uuid import uuid4
 
 from codex.librarian.search.tasks import SearchIndexUpdateTask

codex/librarian/tasks.py

@@ -1,4 +1,5 @@
 """Librarian Tasks."""
+
 from dataclasses import dataclass, field
 
 

codex/librarian/watchdog/db_snapshot.py

@@ -1,4 +1,5 @@
 """Custom directory snapshots."""
+
 import os
 from itertools import chain
 from pathlib import Path

codex/librarian/watchdog/dir_snapshot_diff.py

@@ -1,4 +1,5 @@
 """Custom directory snapshots."""
+
 from dataclasses import dataclass
 
 from watchdog.utils.dirsnapshot import DirectorySnapshot, DirectorySnapshotDiff

codex/librarian/watchdog/emitter.py

@@ -1,4 +1,5 @@
 """A Codex database event emitter for use by the observer."""
+
 from pathlib import Path
 from threading import Condition
 
@@ -24,6 +25,20 @@ from codex.models import Library
 from codex.status import Status
 from codex.worker_base import WorkerBaseMixin
 
+_CODEX_EVENT_FILTER = frozenset(
+    {
+        FileMovedEvent,
+        FileModifiedEvent,
+        FileCreatedEvent,
+        FileDeletedEvent,
+        # FileClosedEvent,
+        # FileOpenedEvent,
+        DirMovedEvent,
+        DirModifiedEvent,
+        DirDeletedEvent,
+        # DirCreatedEvent,
+    }
+)
 _DOCKER_UNMOUNTED_FN = "DOCKER_UNMOUNTED_VOLUME"
 
 
@@ -46,7 +61,9 @@ class DatabasePollingEmitter(EventEmitter, WorkerBaseMixin):
         self._force = False
         self._watch_path = Path(watch.path)
         self._watch_path_unmounted = self._watch_path / _DOCKER_UNMOUNTED_FN
-        super().__init__(event_queue, watch, timeout=timeout)
+        super().__init__(
+            event_queue, watch, timeout=timeout, event_filter=_CODEX_EVENT_FILTER
+        )
 
         self._take_dir_snapshot = lambda: DirectorySnapshot(
             self._watch.path,

codex/librarian/watchdog/event_batcherd.py

@@ -5,6 +5,7 @@ but the built-in filesystem event emitters serialize them, so the most
 consistent thing is for the DBEmitter to serialize them in the same way
 and then re-serialize everything in this batcher and the event Handler
 """
+
 from contextlib import suppress
 from copy import deepcopy
 from types import MappingProxyType

codex/librarian/watchdog/events.py

@@ -1,4 +1,5 @@
 """Watchdog Event Handlers."""
+
 import re
 from os import fsdecode
 

codex/librarian/watchdog/observers.py

@@ -1,4 +1,5 @@
 """The Codex Library Watchdog Observer threads."""
+
 from watchdog.observers import Observer
 from watchdog.observers.api import (
     DEFAULT_OBSERVER_TIMEOUT,
@@ -89,7 +90,13 @@ class UatuMixin(BaseObserver, WorkerBaseMixin):
         except Exception:
             self.log.exception(f"{self.__class__.__name__} sync library watches")
 
-    def schedule(self, event_handler, path, recursive=False):
+    def schedule(  # type: ignore
+        self,
+        event_handler,
+        path,
+        recursive=False,
+        _event_filter=None,
+    ):
         """Override BaseObserver for Codex emitter class.
 
         https://pythonhosted.org/watchdog/_modules/watchdog/observers/api.html#BaseObserver

codex/librarian/watchdog/status.py

@@ -1,4 +1,5 @@
 """Watchdog Status Types."""
+
 from django.db.models import Choices
 
 

codex/librarian/watchdog/tasks.py

@@ -1,4 +1,5 @@
 """Watchdog Tasks."""
+
 from dataclasses import dataclass
 
 from watchdog.events import FileSystemEvent

codex/logger/formatter.py

@@ -0,0 +1,36 @@
+"""Logging Color Formatter."""
+
+import logging
+from types import MappingProxyType
+
+from colors import color
+
+
+class ColorFormatter(logging.Formatter):
+    """Logging Formatter to add colors and count warning / errors."""
+
+    FORMAT_COLORS = MappingProxyType(
+        {
+            "CRITICAL": {"fg": "red", "style": "bold"},
+            "ERROR": {"fg": "red"},
+            "WARNING": {"fg": "yellow"},
+            "INFO": {"fg": "green"},
+            "DEBUG": {"fg": "black", "style": "bold"},
+            "NOTSET": {"fg": "blue"},
+        }
+    )
+
+    def __init__(self, fmt, **kwargs):
+        """Set up the FORMATS dict."""
+        super().__init__(**kwargs)
+        self.formatters = {}
+        for level_name, args in self.FORMAT_COLORS.items():
+            levelno = getattr(logging, level_name)
+            template = color(fmt, **args)
+            formatter = logging.Formatter(fmt=template, **kwargs)
+            self.formatters[levelno] = formatter
+
+    def format(self, record):
+        """Format each log message."""
+        formatter = self.formatters[record.levelno]
+        return formatter.format(record)

codex/logger/loggerd.py

@@ -1,43 +1,12 @@
 """Central Logging Thread."""
+
 import logging
 from logging.handlers import QueueListener, RotatingFileHandler
-from types import MappingProxyType
-
-from colors import color
 
+from codex.logger.formatter import ColorFormatter
 from codex.settings.settings import DEBUG, LOG_DIR, LOG_TO_CONSOLE, LOG_TO_FILE
 
 
-class ColorFormatter(logging.Formatter):
-    """Logging Formatter to add colors and count warning / errors."""
-
-    FORMAT_COLORS = MappingProxyType(
-        {
-            "CRITICAL": {"fg": "red", "style": "bold"},
-            "ERROR": {"fg": "red"},
-            "WARNING": {"fg": "yellow"},
-            "INFO": {"fg": "green"},
-            "DEBUG": {"fg": "black", "style": "bold"},
-            "NOTSET": {"fg": "blue"},
-        }
-    )
-
-    def __init__(self, fmt, **kwargs):
-        """Set up the FORMATS dict."""
-        super().__init__(**kwargs)
-        self.formatters = {}
-        for level_name, args in self.FORMAT_COLORS.items():
-            levelno = getattr(logging, level_name)
-            template = color(fmt, **args)
-            formatter = logging.Formatter(fmt=template, **kwargs)
-            self.formatters[levelno] = formatter
-
-    def format(self, record):
-        """Format each log message."""
-        formatter = self.formatters[record.levelno]
-        return formatter.format(record)
-
-
 class CodexLogQueueListener(QueueListener):
     """Host for logging queue listener."""
 

codex/logger/logging.py

@@ -1,4 +1,5 @@
 """Logging classes."""
+
 import logging
 from contextlib import suppress
 from logging.handlers import QueueHandler