merge file handling

diff --git a/pyproject.toml b/pyproject.toml
index b1e0285d02e40131fd0a1ea95f53c2ab4b880058..6f11f9cee01fd2bc610c0cff60bb2457cde63c8f 100644 (file)
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -200,9 +200,6 @@ lint.per-file-ignores."docker/wait-for-redis.py" = [
   "INP001",
   "T201",
 ]
-lint.per-file-ignores."src/documents/file_handling.py" = [
-  "PTH",
-] # TODO Enable & remove
 lint.per-file-ignores."src/documents/management/commands/document_consumer.py" = [
   "PTH",
 ] # TODO Enable & remove
@@ -254,6 +251,9 @@ lint.per-file-ignores."src/documents/views.py" = [
 lint.per-file-ignores."src/paperless/checks.py" = [
   "PTH",
 ] # TODO Enable & remove
+lint.per-file-ignores."src/paperless/file_handling.py" = [
+  "PTH",
+] # TODO Enable & remove
 lint.per-file-ignores."src/paperless/settings.py" = [
   "PTH",
 ] # TODO Enable & remove

diff --git a/src/documents/management/commands/document_exporter.py b/src/documents/management/commands/document_exporter.py
index 27abf7a7d34ec2dbbf41f4c0b30c674bc090b3de..519d294be95450d672a42c259abbf779a603f9dc 100644 (file)
--- a/src/documents/management/commands/document_exporter.py
+++ b/src/documents/management/commands/document_exporter.py
@@ -32,14 +32,14 @@ if TYPE_CHECKING:
 if settings.AUDIT_LOG_ENABLED:
     from auditlog.models import LogEntry
 
-from documents.file_handling import delete_empty_directories
-from documents.file_handling import generate_filename
 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.models import ApplicationConfiguration
 from paperless.models import Correspondent
 from paperless.models import CustomField

diff --git a/src/documents/management/commands/document_importer.py b/src/documents/management/commands/document_importer.py
index 5ca9cece1c52ba7ca1fec1f33772810c1ed6c099..1120e7d1b65d9af400b96ae7741d5a2af72972c6 100644 (file)
--- a/src/documents/management/commands/document_importer.py
+++ b/src/documents/management/commands/document_importer.py
@@ -21,7 +21,6 @@ from django.db.models.signals import m2m_changed
 from django.db.models.signals import post_save
 from filelock import FileLock
 
-from documents.file_handling import create_source_path_directory
 from documents.management.commands.mixins import CryptMixin
 from documents.parsers import run_convert
 from documents.settings import EXPORTER_ARCHIVE_NAME
@@ -31,6 +30,7 @@ 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.models import Correspondent
 from paperless.models import CustomField
 from paperless.models import CustomFieldInstance

diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py
index e66b4be91518fca43bd55598ae7151eca5953b60..98ef65978057cce8960b336b690ef8924778c1c4 100644 (file)
--- a/src/documents/signals/handlers.py
+++ b/src/documents/signals/handlers.py
@@ -24,12 +24,12 @@ from filelock import FileLock
 from guardian.shortcuts import remove_perm
 
 from documents.caching import clear_document_caches
-from documents.file_handling import create_source_path_directory
-from documents.file_handling import delete_empty_directories
-from documents.file_handling import generate_unique_filename
 from documents.mail import send_email
 from documents.templating.workflows import parse_w_workflow_placeholders
 from paperless import matching
+from paperless.file_handling import create_source_path_directory
+from paperless.file_handling import delete_empty_directories
+from paperless.file_handling import generate_unique_filename
 from paperless.models import Correspondent
 from paperless.models import CustomField
 from paperless.models import CustomFieldInstance

diff --git a/src/documents/tasks.py b/src/documents/tasks.py
index bce31777325e4547b5de43f7bd39862af0a0ba82..a3b37f5a817b0b738498c15072fbce300cae5e41 100644 (file)
--- a/src/documents/tasks.py
+++ b/src/documents/tasks.py
@@ -21,8 +21,6 @@ from whoosh.writing import AsyncWriter
 
 from documents import sanity_checker
 from documents.caching import clear_document_caches
-from documents.file_handling import create_source_path_directory
-from documents.file_handling import generate_unique_filename
 from documents.parsers import DocumentParser
 from documents.parsers import get_parser_class_for_mime_type
 from documents.plugins.base import ConsumeTaskPlugin
@@ -42,6 +40,8 @@ from paperless.consumer import WorkflowTriggerPlugin
 from paperless.data_models import ConsumableDocument
 from paperless.data_models import DocumentMetadataOverrides
 from paperless.double_sided import CollatePlugin
+from paperless.file_handling import create_source_path_directory
+from paperless.file_handling import generate_unique_filename
 from paperless.models import Correspondent
 from paperless.models import CustomFieldInstance
 from paperless.models import Document

diff --git a/src/documents/tests/test_file_handling.py b/src/documents/tests/test_file_handling.py
index 3ba06ed64bfaca4f643ef625e293459271bbcc5a..207e9cf3fb7c338b28abc47ddd9d46f054970def 100644 (file)
--- a/src/documents/tests/test_file_handling.py
+++ b/src/documents/tests/test_file_handling.py
@@ -13,12 +13,12 @@ from django.test import TestCase
 from django.test import override_settings
 from django.utils import timezone
 
-from documents.file_handling import create_source_path_directory
-from documents.file_handling import delete_empty_directories
-from documents.file_handling import generate_filename
 from documents.tasks import empty_trash
 from documents.tests.utils import DirectoriesMixin
 from documents.tests.utils import FileSystemAssertsMixin
+from paperless.file_handling import create_source_path_directory
+from paperless.file_handling import delete_empty_directories
+from paperless.file_handling import generate_filename
 from paperless.models import Correspondent
 from paperless.models import CustomField
 from paperless.models import CustomFieldInstance

diff --git a/src/documents/tests/test_management.py b/src/documents/tests/test_management.py
index fede4318be647d70cd85dce7dd82b706af9da79b..902ec75a1bde7bc71c85f1dc94c0e62d3bcf4efc 100644 (file)
--- a/src/documents/tests/test_management.py
+++ b/src/documents/tests/test_management.py
@@ -13,10 +13,10 @@ from django.core.management import call_command
 from django.test import TestCase
 from django.test import override_settings
 
-from documents.file_handling import generate_filename
 from documents.tasks import update_document_content_maybe_archive_file
 from documents.tests.utils import DirectoriesMixin
 from documents.tests.utils import FileSystemAssertsMixin
+from paperless.file_handling import generate_filename
 from paperless.models import Document
 
 sample_file = os.path.join(os.path.dirname(__file__), "samples", "simple.pdf")

diff --git a/src/paperless/consumer.py b/src/paperless/consumer.py
index 834fae6a0b1923fa9fb2401af8511352bf5f2bf4..774905ce92e54783342190ea9b3ef702cb8df9f1 100644 (file)
--- a/src/paperless/consumer.py
+++ b/src/paperless/consumer.py
@@ -15,8 +15,6 @@ from django.utils import timezone
 from filelock import FileLock
 from rest_framework.reverse import reverse
 
-from documents.file_handling import create_source_path_directory
-from documents.file_handling import generate_unique_filename
 from documents.parsers import DocumentParser
 from documents.parsers import ParseError
 from documents.parsers import get_parser_class_for_mime_type
@@ -34,6 +32,8 @@ from documents.templating.workflows import parse_w_workflow_placeholders
 from paperless.classifier import load_classifier
 from paperless.data_models import ConsumableDocument
 from paperless.data_models import DocumentMetadataOverrides
+from paperless.file_handling import create_source_path_directory
+from paperless.file_handling import generate_unique_filename
 from paperless.loggers import LoggingMixin
 from paperless.models import Correspondent
 from paperless.models import CustomField

diff --git a/src/documents/file_handling.py b/src/paperless/file_handling.py
similarity index 100%
rename from src/documents/file_handling.py
rename to src/paperless/file_handling.py