Merge utils

diff --git a/src/documents/barcodes.py b/src/documents/barcodes.py
index acfc779f9989efe4b6a83ff679c8bcf2482c275e..ef9274c51fadf83da34cbe7a8aaf2e9e2b1dab36 100644 (file)
--- a/src/documents/barcodes.py
+++ b/src/documents/barcodes.py
@@ -17,11 +17,11 @@ from documents.converters import convert_from_tiff_to_pdf
 from documents.plugins.base import ConsumeTaskPlugin
 from documents.plugins.base import StopConsumeTaskError
 from documents.plugins.helpers import ProgressStatusOptions
-from documents.utils import copy_basic_file_stats
-from documents.utils import copy_file_with_basic_stats
-from documents.utils import maybe_override_pixel_limit
 from paperless.data_models import ConsumableDocument
 from paperless.models import Tag
+from paperless.utils import copy_basic_file_stats
+from paperless.utils import copy_file_with_basic_stats
+from paperless.utils import maybe_override_pixel_limit
 
 if TYPE_CHECKING:
     from collections.abc import Callable

diff --git a/src/documents/converters.py b/src/documents/converters.py
index fcd0a8857145046c457b9642a18e5b7424987f59..dd8104a075dbf984bb38b93f48f32f8324ba2af4 100644 (file)
--- a/src/documents/converters.py
+++ b/src/documents/converters.py
@@ -4,9 +4,9 @@ import img2pdf
 from django.conf import settings
 from PIL import Image
 
-from documents.utils import copy_basic_file_stats
-from documents.utils import maybe_override_pixel_limit
-from documents.utils import run_subprocess
+from paperless.utils import copy_basic_file_stats
+from paperless.utils import maybe_override_pixel_limit
+from paperless.utils import run_subprocess
 
 
 def convert_from_tiff_to_pdf(tiff_path: Path, target_directory: Path) -> Path:

diff --git a/src/documents/management/commands/document_exporter.py b/src/documents/management/commands/document_exporter.py
index d67b0d337bdebcaa2bcb005c081f4a08d8845581..27abf7a7d34ec2dbbf41f4c0b30c674bc090b3de 100644 (file)
--- a/src/documents/management/commands/document_exporter.py
+++ b/src/documents/management/commands/document_exporter.py
@@ -38,7 +38,6 @@ 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 documents.utils import copy_file_with_basic_stats
 from paperless import version
 from paperless.db import GnuPG
 from paperless.models import ApplicationConfiguration
@@ -58,6 +57,7 @@ from paperless.models import WorkflowAction
 from paperless.models import WorkflowActionEmail
 from paperless.models import WorkflowActionWebhook
 from paperless.models import WorkflowTrigger
+from paperless.utils import copy_file_with_basic_stats
 from paperless_mail.models import MailAccount
 from paperless_mail.models import MailRule
 

diff --git a/src/documents/management/commands/document_importer.py b/src/documents/management/commands/document_importer.py
index f58af53bb4c403c92e7524be9b08c3806bfe2d73..5ca9cece1c52ba7ca1fec1f33772810c1ed6c099 100644 (file)
--- a/src/documents/management/commands/document_importer.py
+++ b/src/documents/management/commands/document_importer.py
@@ -30,7 +30,6 @@ 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 documents.utils import copy_file_with_basic_stats
 from paperless import version
 from paperless.models import Correspondent
 from paperless.models import CustomField
@@ -39,6 +38,7 @@ from paperless.models import Document
 from paperless.models import DocumentType
 from paperless.models import Note
 from paperless.models import Tag
+from paperless.utils import copy_file_with_basic_stats
 
 if settings.AUDIT_LOG_ENABLED:
     from auditlog.registry import auditlog

diff --git a/src/documents/parsers.py b/src/documents/parsers.py
index 1465234a93210534ef5520478eb7bd911e7f5faf..33917d21ab44bbafcc7b1d545fc5022dfe042243 100644 (file)
--- a/src/documents/parsers.py
+++ b/src/documents/parsers.py
@@ -17,8 +17,8 @@ from django.utils import timezone
 
 from documents.loggers import LoggingMixin
 from documents.signals import document_consumer_declaration
-from documents.utils import copy_file_with_basic_stats
-from documents.utils import run_subprocess
+from paperless.utils import copy_file_with_basic_stats
+from paperless.utils import run_subprocess
 
 if TYPE_CHECKING:
     import datetime

diff --git a/src/paperless/consumer.py b/src/paperless/consumer.py
index 4d9509e565a7b7431bbbc7ddee015369193cef09..ddeda73672428ba8b135e14dcae977934f7c2164 100644 (file)
--- a/src/paperless/consumer.py
+++ b/src/paperless/consumer.py
@@ -34,9 +34,6 @@ from documents.signals import document_consumption_finished
 from documents.signals import document_consumption_started
 from documents.signals.handlers import run_workflows
 from documents.templating.workflows import parse_w_workflow_placeholders
-from documents.utils import copy_basic_file_stats
-from documents.utils import copy_file_with_basic_stats
-from documents.utils import run_subprocess
 from paperless.data_models import ConsumableDocument
 from paperless.data_models import DocumentMetadataOverrides
 from paperless.models import Correspondent
@@ -47,6 +44,9 @@ from paperless.models import DocumentType
 from paperless.models import StoragePath
 from paperless.models import Tag
 from paperless.models import WorkflowTrigger
+from paperless.utils import copy_basic_file_stats
+from paperless.utils import copy_file_with_basic_stats
+from paperless.utils import run_subprocess
 from paperless_mail.parsers import MailDocumentParser
 
 

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

diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index 64c3030c71a9632c0d9a95eaeed309ee3ccf866d..48d13021f4230fa8c281a21a8442afef26a02f61 100644 (file)
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -10,12 +10,12 @@ from PIL import Image
 from documents.parsers import DocumentParser
 from documents.parsers import ParseError
 from documents.parsers import make_thumbnail_from_pdf
-from documents.utils import maybe_override_pixel_limit
-from documents.utils import run_subprocess
 from paperless.config import OcrConfig
 from paperless.models import ArchiveFileChoices
 from paperless.models import CleanChoices
 from paperless.models import ModeChoices
+from paperless.utils import maybe_override_pixel_limit
+from paperless.utils import run_subprocess
 
 
 class NoTextFoundException(Exception):