From d00b04ac2e7921b7e2001547ee09a4c6173f18be Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 8 Apr 2025 16:30:34 -0700 Subject: [PATCH] Merge utils --- src/documents/barcodes.py | 6 +++--- src/documents/converters.py | 6 +++--- src/documents/management/commands/document_exporter.py | 2 +- src/documents/management/commands/document_importer.py | 2 +- src/documents/parsers.py | 4 ++-- src/paperless/consumer.py | 6 +++--- src/{documents => paperless}/utils.py | 0 src/paperless_tesseract/parsers.py | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) rename src/{documents => paperless}/utils.py (100%) diff --git a/src/documents/barcodes.py b/src/documents/barcodes.py index acfc779f9..ef9274c51 100644 --- 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 fcd0a8857..dd8104a07 100644 --- 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 d67b0d337..27abf7a7d 100644 --- 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 f58af53bb..5ca9cece1 100644 --- 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 1465234a9..33917d21a 100644 --- 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 4d9509e56..ddeda7367 100644 --- 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 64c3030c7..48d13021f 100644 --- 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):