Merge utils

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

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 paperless.utils import copy_basic_file_stats
-from documents.utils import maybe_override_pixel_limit
+from paperless.utils import maybe_override_pixel_limit
-from documents.utils import run_subprocess
+from paperless.utils import run_subprocess
 
 
 def convert_from_tiff_to_pdf(tiff_path: Path, target_directory: Path) -> Path:

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
 

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

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 paperless.utils import copy_file_with_basic_stats
-from documents.utils import run_subprocess
+from paperless.utils import run_subprocess
 
 if TYPE_CHECKING:
     import datetime

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
 
 

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):