diff --git a/src-ui/src/app/data/paperless-document.ts b/src-ui/src/app/data/paperless-document.ts
index f5f83868c..8b038d79e 100644
--- a/src-ui/src/app/data/paperless-document.ts
+++ b/src-ui/src/app/data/paperless-document.ts
@@ -29,8 +29,6 @@ export interface PaperlessDocument extends ObjectWithId {
content?: string
- file_type?: string
-
tags$?: Observable
tags?: number[]
@@ -47,7 +45,7 @@ export interface PaperlessDocument extends ObjectWithId {
added?: Date
- file_name?: string
+ original_file_name?: string
download_url?: string
diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index ecfed31c7..a2c3b2bc9 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -5,7 +5,7 @@ export const environment = {
apiBaseUrl: document.baseURI + 'api/',
apiVersion: '2',
appTitle: 'Paperless-ngx',
- version: '1.9.0-dev',
+ version: '1.9.2-dev',
webSocketHost: window.location.host,
webSocketProtocol: window.location.protocol == 'https:' ? 'wss:' : 'ws:',
webSocketBaseUrl: base_url.pathname + 'ws/',
diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index d1b01290a..609ebed83 100644
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -111,14 +111,16 @@ class Consumer(LoggingMixin):
def pre_check_duplicate(self):
with open(self.path, "rb") as f:
checksum = hashlib.md5(f.read()).hexdigest()
- if Document.objects.filter(
+ existing_doc = Document.objects.filter(
Q(checksum=checksum) | Q(archive_checksum=checksum),
- ).exists():
+ )
+ if existing_doc.exists():
if settings.CONSUMER_DELETE_DUPLICATES:
os.unlink(self.path)
self._fail(
MESSAGE_DOCUMENT_ALREADY_EXISTS,
- f"Not consuming {self.filename}: It is a duplicate.",
+ f"Not consuming {self.filename}: It is a duplicate of"
+ f" {existing_doc.get().title} (#{existing_doc.get().pk})",
)
def pre_check_directories(self):
diff --git a/src/paperless/checks.py b/src/paperless/checks.py
index e592a5bf2..845ff2d0b 100644
--- a/src/paperless/checks.py
+++ b/src/paperless/checks.py
@@ -127,10 +127,10 @@ def settings_values_check(app_configs, **kwargs):
Error(f'OCR output type "{settings.OCR_OUTPUT_TYPE}" is not valid'),
)
- if settings.OCR_MODE not in {"force", "skip", "redo_ocr"}:
+ if settings.OCR_MODE not in {"force", "skip", "redo", "skip_noarchive"}:
msgs.append(Error(f'OCR output mode "{settings.OCR_MODE}" is not valid'))
- if settings.OCR_CLEAN not in {"clean", "clean_final"}:
+ if settings.OCR_CLEAN not in {"clean", "clean-final", "none"}:
msgs.append(Error(f'OCR clean mode "{settings.OCR_CLEAN}" is not valid'))
return msgs
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 9b5efc6b7..6836f4ea0 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -322,6 +322,7 @@ DATABASES = {
"default": {
"ENGINE": "django.db.backends.sqlite3",
"NAME": os.path.join(DATA_DIR, "db.sqlite3"),
+ "OPTIONS": {},
},
}
@@ -343,21 +344,18 @@ if os.getenv("PAPERLESS_DBHOST"):
# Leave room for future extensibility
if os.getenv("PAPERLESS_DBENGINE") == "mariadb":
engine = "django.db.backends.mysql"
- options = {"read_default_file": "/etc/mysql/my.cnf"}
+ options = {"read_default_file": "/etc/mysql/my.cnf", "charset": "utf8mb4"}
else: # Default to PostgresDB
engine = "django.db.backends.postgresql_psycopg2"
options = {"sslmode": os.getenv("PAPERLESS_DBSSLMODE", "prefer")}
DATABASES["default"]["ENGINE"] = engine
- for key, value in options.items():
- DATABASES["default"]["OPTIONS"][key] = value
+ DATABASES["default"]["OPTIONS"].update(options)
if os.getenv("PAPERLESS_DB_TIMEOUT") is not None:
- _new_opts = {"timeout": float(os.getenv("PAPERLESS_DB_TIMEOUT"))}
- if "OPTIONS" in DATABASES["default"]:
- DATABASES["default"]["OPTIONS"].update(_new_opts)
- else:
- DATABASES["default"]["OPTIONS"] = _new_opts
+ DATABASES["default"]["OPTIONS"].update(
+ {"timeout": float(os.getenv("PAPERLESS_DB_TIMEOUT"))},
+ )
DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
diff --git a/src/paperless/version.py b/src/paperless/version.py
index 1642e3f89..d196c358d 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1,7 +1,7 @@
from typing import Final
from typing import Tuple
-__version__: Final[Tuple[int, int, int]] = (1, 9, 0)
+__version__: Final[Tuple[int, int, int]] = (1, 9, 2)
# Version string like X.Y.Z
__full_version_str__: Final[str] = ".".join(map(str, __version__))
# Version string like X.Y
diff --git a/src/paperless_text/signals.py b/src/paperless_text/signals.py
index 3d025c14e..94d1ccc2e 100644
--- a/src/paperless_text/signals.py
+++ b/src/paperless_text/signals.py
@@ -11,5 +11,6 @@ def text_consumer_declaration(sender, **kwargs):
"mime_types": {
"text/plain": ".txt",
"text/csv": ".csv",
+ "application/csv": ".csv",
},
}