Merge management commands

pyproject.toml

@@ -200,18 +200,9 @@ lint.per-file-ignores."docker/wait-for-redis.py" = [
   "INP001",
   "T201",
 ]
-lint.per-file-ignores."src/documents/management/commands/document_consumer.py" = [
-  "PTH",
-] # TODO Enable & remove
-lint.per-file-ignores."src/documents/management/commands/document_exporter.py" = [
-  "PTH",
-] # TODO Enable & remove
 lint.per-file-ignores."src/documents/migrations/1012_fix_archive_files.py" = [
   "PTH",
 ] # TODO Enable & remove
-lint.per-file-ignores."src/documents/models.py" = [
-  "SIM115",
-]
 lint.per-file-ignores."src/documents/signals/handlers.py" = [
   "PTH",
 ] # TODO Enable & remove
@@ -251,6 +242,15 @@ lint.per-file-ignores."src/paperless/checks.py" = [
 lint.per-file-ignores."src/paperless/file_handling.py" = [
   "PTH",
 ] # TODO Enable & remove
+lint.per-file-ignores."src/paperless/management/commands/document_consumer.py" = [
+  "PTH",
+] # TODO Enable & remove
+lint.per-file-ignores."src/paperless/management/commands/document_exporter.py" = [
+  "PTH",
+] # TODO Enable & remove
+lint.per-file-ignores."src/paperless/models.py" = [
+  "SIM115",
+]
 lint.per-file-ignores."src/paperless/parsers.py" = [
   "PTH",
 ] # TODO Enable & remove

src/paperless/management/commands/document_archiver.py

@@ -6,8 +6,8 @@ from django import db
 from django.conf import settings
 from django.core.management.base import BaseCommand
 
-from documents.management.commands.mixins import MultiProcessMixin
+from paperless.management.commands.mixins import MultiProcessMixin
-from documents.management.commands.mixins import ProgressBarMixin
+from paperless.management.commands.mixins import ProgressBarMixin
 from paperless.models import Document
 from paperless.tasks import update_document_content_maybe_archive_file
 

src/paperless/management/commands/document_exporter.py

@@ -32,14 +32,11 @@ if TYPE_CHECKING:
 if settings.AUDIT_LOG_ENABLED:
     from auditlog.models import LogEntry
 
-from documents.management.commands.mixins import CryptMixin
-from documents.settings import EXPORTER_ARCHIVE_NAME
-from documents.settings import EXPORTER_FILE_NAME
-from documents.settings import EXPORTER_THUMBNAIL_NAME
 from paperless import version
 from paperless.db import GnuPG
 from paperless.file_handling import delete_empty_directories
 from paperless.file_handling import generate_filename
+from paperless.management.commands.mixins import CryptMixin
 from paperless.models import ApplicationConfiguration
 from paperless.models import Correspondent
 from paperless.models import CustomField
@@ -57,6 +54,9 @@ from paperless.models import WorkflowAction
 from paperless.models import WorkflowActionEmail
 from paperless.models import WorkflowActionWebhook
 from paperless.models import WorkflowTrigger
+from paperless.settings import EXPORTER_ARCHIVE_NAME
+from paperless.settings import EXPORTER_FILE_NAME
+from paperless.settings import EXPORTER_THUMBNAIL_NAME
 from paperless.utils import copy_file_with_basic_stats
 from paperless_mail.models import MailAccount
 from paperless_mail.models import MailRule

src/paperless/management/commands/document_fuzzy_match.py

@@ -7,8 +7,8 @@ import tqdm
 from django.core.management import BaseCommand
 from django.core.management import CommandError
 
-from documents.management.commands.mixins import MultiProcessMixin
+from paperless.management.commands.mixins import MultiProcessMixin
-from documents.management.commands.mixins import ProgressBarMixin
+from paperless.management.commands.mixins import ProgressBarMixin
 from paperless.models import Document
 
 

src/paperless/management/commands/document_importer.py

@@ -21,15 +21,11 @@ from django.db.models.signals import m2m_changed
 from django.db.models.signals import post_save
 from filelock import FileLock
 
-from documents.management.commands.mixins import CryptMixin
-from documents.settings import EXPORTER_ARCHIVE_NAME
-from documents.settings import EXPORTER_CRYPTO_SETTINGS_NAME
-from documents.settings import EXPORTER_FILE_NAME
-from documents.settings import EXPORTER_THUMBNAIL_NAME
 from documents.signals.handlers import check_paths_and_prune_custom_fields
 from documents.signals.handlers import update_filename_and_move_files
 from paperless import version
 from paperless.file_handling import create_source_path_directory
+from paperless.management.commands.mixins import CryptMixin
 from paperless.models import Correspondent
 from paperless.models import CustomField
 from paperless.models import CustomFieldInstance
@@ -38,6 +34,10 @@ from paperless.models import DocumentType
 from paperless.models import Note
 from paperless.models import Tag
 from paperless.parsers import run_convert
+from paperless.settings import EXPORTER_ARCHIVE_NAME
+from paperless.settings import EXPORTER_CRYPTO_SETTINGS_NAME
+from paperless.settings import EXPORTER_FILE_NAME
+from paperless.settings import EXPORTER_THUMBNAIL_NAME
 from paperless.utils import copy_file_with_basic_stats
 
 if settings.AUDIT_LOG_ENABLED:

src/paperless/management/commands/document_index.py

@@ -1,7 +1,7 @@
 from django.core.management import BaseCommand
 from django.db import transaction
 
-from documents.management.commands.mixins import ProgressBarMixin
+from paperless.management.commands.mixins import ProgressBarMixin
 from paperless.tasks import index_optimize
 from paperless.tasks import index_reindex
 

src/paperless/management/commands/document_renamer.py

@@ -4,7 +4,7 @@ import tqdm
 from django.core.management.base import BaseCommand
 from django.db.models.signals import post_save
 
-from documents.management.commands.mixins import ProgressBarMixin
+from paperless.management.commands.mixins import ProgressBarMixin
 from paperless.models import Document
 
 

src/paperless/management/commands/document_retagger.py

@@ -3,12 +3,12 @@ import logging
 import tqdm
 from django.core.management.base import BaseCommand
 
-from documents.management.commands.mixins import ProgressBarMixin
 from documents.signals.handlers import set_correspondent
 from documents.signals.handlers import set_document_type
 from documents.signals.handlers import set_storage_path
 from documents.signals.handlers import set_tags
 from paperless.classifier import load_classifier
+from paperless.management.commands.mixins import ProgressBarMixin
 from paperless.models import Document
 
 logger = logging.getLogger("paperless.management.retagger")

src/paperless/management/commands/document_sanity_checker.py

@@ -1,7 +1,7 @@
 from django.core.management.base import BaseCommand
 
-from documents.management.commands.mixins import ProgressBarMixin
 from documents.sanity_checker import check_sanity
+from paperless.management.commands.mixins import ProgressBarMixin
 
 
 class Command(ProgressBarMixin, BaseCommand):

src/paperless/management/commands/document_thumbnails.py

@@ -6,8 +6,8 @@ import tqdm
 from django import db
 from django.core.management.base import BaseCommand
 
-from documents.management.commands.mixins import MultiProcessMixin
+from paperless.management.commands.mixins import MultiProcessMixin
-from documents.management.commands.mixins import ProgressBarMixin
+from paperless.management.commands.mixins import ProgressBarMixin
 from paperless.models import Document
 from paperless.parsers import get_parser_class_for_mime_type
 

src/paperless/management/commands/prune_audit_logs.py

@@ -3,7 +3,7 @@ from django.core.management.base import BaseCommand
 from django.db import transaction
 from tqdm import tqdm
 
-from documents.management.commands.mixins import ProgressBarMixin
+from paperless.management.commands.mixins import ProgressBarMixin
 
 
 class Command(BaseCommand, ProgressBarMixin):