diff --git a/src/documents/management/commands/document_consumer.py b/src/documents/management/commands/document_consumer.py index e8178549c..6ae370db2 100644 --- a/src/documents/management/commands/document_consumer.py +++ b/src/documents/management/commands/document_consumer.py @@ -424,11 +424,11 @@ class Command(BaseCommand): settings.SCRATCH_DIR.mkdir(parents=True, exist_ok=True) # Get settings - recursive: bool = getattr(settings, "CONSUMER_RECURSIVE", False) - subdirs_as_tags: bool = getattr(settings, "CONSUMER_SUBDIRS_AS_TAGS", False) - polling_interval: float = getattr(settings, "CONSUMER_POLLING_INTERVAL", 0) - stability_delay: float = getattr(settings, "CONSUMER_STABILITY_DELAY", 1.0) - ignore_patterns: list[str] = getattr(settings, "CONSUMER_IGNORE_PATTERNS", []) + recursive: bool = settings.CONSUMER_RECURSIVE + subdirs_as_tags: bool = settings.CONSUMER_SUBDIRS_AS_TAGS + polling_interval: float = settings.CONSUMER_POLLING_INTERVAL + stability_delay: float = settings.CONSUMER_STABILITY_DELAY + ignore_patterns: list[str] = settings.CONSUMER_IGNORE_PATTERNS is_testing: bool = options.get("testing", False) is_oneshot: bool = options.get("oneshot", False) diff --git a/src/documents/tests/test_management_consumer.py b/src/documents/tests/test_management_consumer.py index 8a6b8d390..5ba368c7c 100644 --- a/src/documents/tests/test_management_consumer.py +++ b/src/documents/tests/test_management_consumer.py @@ -716,7 +716,7 @@ def start_consumer( if thread.is_alive(): failed_threads.append(thread) - # Clean up any Tags created by threads (they bypass test transaction isolation) + # Clean up any Tags created by threads Tag.objects.all().delete() if failed_threads: diff --git a/src/documents/tests/test_management_exporter.py b/src/documents/tests/test_management_exporter.py index b01b8d47e..2c5516cd7 100644 --- a/src/documents/tests/test_management_exporter.py +++ b/src/documents/tests/test_management_exporter.py @@ -275,6 +275,8 @@ class TestExportImport( call_command("document_importer", "--no-progress-bar", self.target) self.assertEqual(Document.objects.count(), 4) + for tag in Tag.objects.all(): + print(f"id: {tag.pk}: {tag.name}") self.assertEqual(Tag.objects.count(), 1) self.assertEqual(Correspondent.objects.count(), 1) self.assertEqual(DocumentType.objects.count(), 1) diff --git a/src/paperless/settings.py b/src/paperless/settings.py index b4ac31010..21d494d42 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -1011,24 +1011,15 @@ IGNORABLE_FILES: Final[list[str]] = [ "Thumbs.db", ] -CONSUMER_POLLING = int(os.getenv("PAPERLESS_CONSUMER_POLLING", 0)) +CONSUMER_POLLING_INTERVAL = float(os.getenv("PAPERLESS_CONSUMER_POLLING_INTERVAL", 0)) -CONSUMER_POLLING_DELAY = int(os.getenv("PAPERLESS_CONSUMER_POLLING_DELAY", 5)) - -CONSUMER_POLLING_RETRY_COUNT = int( - os.getenv("PAPERLESS_CONSUMER_POLLING_RETRY_COUNT", 5), -) - -CONSUMER_INOTIFY_DELAY: Final[float] = __get_float( - "PAPERLESS_CONSUMER_INOTIFY_DELAY", - 0.5, -) +CONSUMER_STABILITY_DELAY = float(os.getenv("PAPERLESS_CONSUMER_STABILITY_DELAY", 5)) CONSUMER_DELETE_DUPLICATES = __get_boolean("PAPERLESS_CONSUMER_DELETE_DUPLICATES") CONSUMER_RECURSIVE = __get_boolean("PAPERLESS_CONSUMER_RECURSIVE") -# Ignore glob patterns, relative to PAPERLESS_CONSUMPTION_DIR +# Ignore regex patterns, relative to PAPERLESS_CONSUMPTION_DIR CONSUMER_IGNORE_PATTERNS = list( json.loads( os.getenv(