diff --git a/Pipfile b/Pipfile index 48759307c..f6301b98f 100644 --- a/Pipfile +++ b/Pipfile @@ -42,6 +42,7 @@ whoosh="~=2.7.4" inotifyrecursive = "~=0.3.4" ocrmypdf = "*" tqdm = "*" +tika = "*" [dev-packages] coveralls = "*" diff --git a/Pipfile.lock b/Pipfile.lock index 1cfccb8ff..c6621b543 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "3d576f289958226a7583e4c471c7f8c11bff6933bf093185f623cfb381a92412" + "sha256": "993e362c31af6b8094693075f614270a820cf0b557369d66d674e1a107b7bd31" }, "pipfile-spec": 6, "requires": { @@ -44,6 +44,13 @@ ], "version": "==1.17.12" }, + "certifi": { + "hashes": [ + "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c", + "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830" + ], + "version": "==2020.12.5" + }, "cffi": { "hashes": [ "sha256:00a1ba5e2e95684448de9b89888ccd02c98d512064b4cb987d48f4b40aa0421e", @@ -229,6 +236,15 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==9.0" }, + "idna": { + "hashes": [ + "sha256:4a57a6379512ade94fa99e2fa46d3cd0f2f553040548d0e2958c6ed90ee48226", + "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6", + "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==2.10" + }, "imap-tools": { "hashes": [ "sha256:72bf46dc135b039a5d5b59f4e079242ac15eac02a30038e8cb2dec7b153cab65", @@ -683,6 +699,14 @@ ], "version": "==3.5.56" }, + "requests": { + "hashes": [ + "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804", + "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==2.25.1" + }, "scikit-learn": { "hashes": [ "sha256:090bbf144fd5823c1f2efa3e1a9bf180295b24294ca8f478e75b40ed54f8036e", @@ -769,6 +793,14 @@ "markers": "python_version >= '3.5'", "version": "==2.1.0" }, + "tika": { + "hashes": [ + "sha256:c2c50f405622f74531841104f9e85c17511aede11de8e5385eab1a29a31f191b", + "sha256:d1f2eddb93caa9a2857569486aa2bc0320d0bf1796cdbe03066954cbc4b4bf62" + ], + "index": "pypi", + "version": "==1.24" + }, "tqdm": { "hashes": [ "sha256:38b658a3e4ecf9b4f6f8ff75ca16221ae3378b2e175d846b6b33ea3a20852cf5", @@ -777,6 +809,15 @@ "index": "pypi", "version": "==4.54.1" }, + "typing-extensions": { + "hashes": [ + "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918", + "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c", + "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f" + ], + "markers": "python_version < '3.8'", + "version": "==3.7.4.3" + }, "tzlocal": { "hashes": [ "sha256:643c97c5294aedc737780a49d9df30889321cbe1204eac2c2ec6134035a92e44", @@ -784,6 +825,14 @@ ], "version": "==2.1" }, + "urllib3": { + "hashes": [ + "sha256:19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08", + "sha256:d8ff90d979214d7b4f8ce956e80f4028fc6860e4431f731ea4a8c08f23f99473" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", + "version": "==1.26.2" + }, "watchdog": { "hashes": [ "sha256:3caefdcc8f06a57fdc5ef2d22aa7c0bfda4f55e71a0bee74cbf3176d97536ef3", @@ -1197,11 +1246,11 @@ }, "requests": { "hashes": [ - "sha256:7f1a0b932f4a60a1a65caa4263921bb7d9ee911957e0ae4a23a6dd08185ad5f8", - "sha256:e786fa28d8c9154e6a4de5d46a1d921b8749f8b74e28bde23768e5e16eece998" + "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804", + "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", - "version": "==2.25.0" + "version": "==2.25.1" }, "six": { "hashes": [ diff --git a/README.md b/README.md index eea41ce05..5c5fa4a76 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/jonaswinkler/paperless-ng.svg?branch=master)](https://travis-ci.org/jonaswinkler/paperless-ng) +[![Build Status](https://travis-ci.com/jonaswinkler/paperless-ng.svg?branch=master)](https://travis-ci.com/jonaswinkler/paperless-ng) [![Documentation Status](https://readthedocs.org/projects/paperless-ng/badge/?version=latest)](https://paperless-ng.readthedocs.io/en/latest/?badge=latest) [![Gitter](https://badges.gitter.im/paperless-ng/community.svg)](https://gitter.im/paperless-ng/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker Hub Pulls](https://img.shields.io/docker/pulls/jonaswinkler/paperless-ng.svg)](https://hub.docker.com/r/jonaswinkler/paperless-ng) diff --git a/docker/gunicorn.conf.py b/docker/gunicorn.conf.py index 5c9c0eb37..edfb362d9 100644 --- a/docker/gunicorn.conf.py +++ b/docker/gunicorn.conf.py @@ -1,4 +1,4 @@ -bind = ['[::]:8000', 'localhost:8000'] +bind = '0.0.0.0:8000' backlog = 2048 workers = 3 worker_class = 'sync' diff --git a/docker/hub/docker-compose.postgres.yml b/docker/hub/docker-compose.postgres.yml index c2b599e52..0779cea22 100644 --- a/docker/hub/docker-compose.postgres.yml +++ b/docker/hub/docker-compose.postgres.yml @@ -15,7 +15,7 @@ services: POSTGRES_PASSWORD: paperless webserver: - image: jonaswinkler/paperless-ng:0.9.10 + image: jonaswinkler/paperless-ng:0.9.11 restart: always depends_on: - db diff --git a/docker/hub/docker-compose.sqlite.yml b/docker/hub/docker-compose.sqlite.yml index 429d42c06..3eed96cc3 100644 --- a/docker/hub/docker-compose.sqlite.yml +++ b/docker/hub/docker-compose.sqlite.yml @@ -5,7 +5,7 @@ services: restart: always webserver: - image: jonaswinkler/paperless-ng:0.9.10 + image: jonaswinkler/paperless-ng:0.9.11 restart: always depends_on: - broker diff --git a/docker/hub/docker-compose.tika.yml b/docker/hub/docker-compose.tika.yml new file mode 100644 index 000000000..af8f575a0 --- /dev/null +++ b/docker/hub/docker-compose.tika.yml @@ -0,0 +1,43 @@ +version: "3.4" +services: + broker: + image: redis:6.0 + restart: always + + webserver: + image: jonaswinkler/paperless-ng:0.9.9 + restart: always + depends_on: + - broker + ports: + - 8000:8000 + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:8000"] + interval: 30s + timeout: 10s + retries: 5 + volumes: + - data:/usr/src/paperless/data + - media:/usr/src/paperless/media + - ./export:/usr/src/paperless/export + - ./consume:/usr/src/paperless/consume + env_file: docker-compose.env + environment: + PAPERLESS_REDIS: redis://broker:6379 + PAPERLESS_TIKA_ENABLED: 1 + PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000 + PAPERLESS_TIKA_ENDPOINT: http://tika:9998 + + gotenberg: + image: thecodingmachine/gotenberg + restart: unless-stopped + environment: + DISABLE_GOOGLE_CHROME: 1 + + tika: + image: apache/tika + restart: unless-stopped + +volumes: + data: + media: diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile index 1fd5e24fa..1160cc9a6 100644 --- a/docker/local/Dockerfile +++ b/docker/local/Dockerfile @@ -63,6 +63,8 @@ WORKDIR /usr/src/paperless/src/ RUN sudo -HEu paperless python3 manage.py collectstatic --clear --no-input +RUN sudo -HEu paperless python3 manage.py compilemessages + VOLUME ["/usr/src/paperless/data", "/usr/src/paperless/media", "/usr/src/paperless/consume", "/usr/src/paperless/export"] ENTRYPOINT ["/sbin/docker-entrypoint.sh"] EXPOSE 8000 diff --git a/docker/local/docker-compose.tika.yml b/docker/local/docker-compose.tika.yml new file mode 100644 index 000000000..889713908 --- /dev/null +++ b/docker/local/docker-compose.tika.yml @@ -0,0 +1,43 @@ +version: "3.4" +services: + broker: + image: redis:6.0 + restart: always + + webserver: + build: . + restart: always + depends_on: + - broker + ports: + - 8000:8000 + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:8000"] + interval: 30s + timeout: 10s + retries: 5 + volumes: + - data:/usr/src/paperless/data + - media:/usr/src/paperless/media + - ./export:/usr/src/paperless/export + - ./consume:/usr/src/paperless/consume + env_file: docker-compose.env + environment: + PAPERLESS_REDIS: redis://broker:6379 + PAPERLESS_TIKA_ENABLED: 1 + PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000 + PAPERLESS_TIKA_ENDPOINT: http://tika:9998 + + gotenberg: + image: thecodingmachine/gotenberg + restart: unless-stopped + environment: + DISABLE_GOOGLE_CHROME: 1 + + tika: + image: apache/tika + restart: unless-stopped + +volumes: + data: + media: diff --git a/docs/administration.rst b/docs/administration.rst index 8885b7322..727d9a9d5 100644 --- a/docs/administration.rst +++ b/docs/administration.rst @@ -148,7 +148,13 @@ After grabbing the new release and unpacking the contents, do the following: $ cd src $ pipenv run python3 manage.py migrate + +5. Update translation files. + .. code:: shell-session + + $ cd src + $ pipenv run python3 manage.py compilemessages Management utilities #################### diff --git a/docs/changelog.rst b/docs/changelog.rst index 4357a981b..70f5cf683 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -5,6 +5,13 @@ Changelog ********* + +paperless-ng 0.9.11 +################### + +* Fixed an issue with the docker image not starting at all due to a configuration change of the web server. + + paperless-ng 0.9.10 ################### @@ -15,6 +22,7 @@ paperless-ng 0.9.10 * Other changes and additions + * Thanks to `zjean`_, paperless now publishes a webmanifest, which is useful for adding the application to home screens on mobile devices. * The Paperless-ng logo now navigates to the dashboard. * Filter for documents that don't have any correspondents, types or tags assigned. * Tags, types and correspondents are now sorted case insensitive. @@ -25,6 +33,8 @@ paperless-ng 0.9.10 * Added missing dependencies for Raspberry Pi builds. * Fixed an issue with plain text file consumption: Thumbnail generation failed due to missing fonts. * An issue with the search index reporting missing documents after bulk deletes was fixed. + * Issue with the tag selector not clearing input correctly. + * The consumer used to stop working when encountering an incomplete classifier model file. .. note:: @@ -956,6 +966,7 @@ bulk of the work on this big change. * Initial release +.. _zjean: https://github.com/zjean .. _rYR79435: https://github.com/rYR79435 .. _Michael Shamoon: https://github.com/shamoon .. _jayme-github: http://github.com/jayme-github diff --git a/docs/configuration.rst b/docs/configuration.rst index c72027574..0271df270 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -283,6 +283,35 @@ PAPERLESS_OCR_USER_ARG= {"deskew": true, "optimize": 3, "unpaper_args": "--pre-rotate 90"} +.. _configuration-tika: + +Tika settings +############# + +Paperless can make use of `Tika `_ and +`Gotenberg `_ for parsing and +converting "Office" documents (such as ".doc", ".xlsx" and ".odt"). If you +wish to use this, you must provide a Tika server and a Gotenberg server, +configure their endpoints, and enable the feature. + +If you run paperless on docker, you can add those services to the docker-compose +file (see the examples provided). + +PAPERLESS_TIKA_ENABLED= + Enable (or disable) the Tika parser. + + Defaults to false. + +PAPERLESS_TIKA_ENDPOINT= + Set the endpoint URL were Paperless can reach your Tika server. + + Defaults to "http://localhost:9998". + +PAPERLESS_TIKA_GOTENBERG_ENDPOINT= + Set the endpoint URL were Paperless can reach your Gotenberg server. + + Defaults to "http://localhost:3000". + Software tweaks ############### diff --git a/docs/setup.rst b/docs/setup.rst index 437409194..e51c4c878 100644 --- a/docs/setup.rst +++ b/docs/setup.rst @@ -292,6 +292,9 @@ writing. Windows is not and will never be supported. # This creates the database schema. python3 manage.py migrate + + # This creates the translation files for paperless. + python3 manage.py compilemessages # This creates your first paperless user python3 manage.py createsuperuser diff --git a/paperless.conf.example b/paperless.conf.example index c55b7f5f4..b74a1aeac 100644 --- a/paperless.conf.example +++ b/paperless.conf.example @@ -40,7 +40,7 @@ #PAPERLESS_OCR_OUTPUT_TYPE=pdfa #PAPERLESS_OCR_PAGES=1 #PAPERLESS_OCR_IMAGE_DPI=300 -#PAPERLESS_OCR_USER_ARG={} +#PAPERLESS_OCR_USER_ARGS={} #PAPERLESS_CONVERT_MEMORY_LIMIT=0 #PAPERLESS_CONVERT_TMPDIR=/var/tmp/paperless @@ -57,6 +57,12 @@ #PAPERLESS_FILENAME_PARSE_TRANSFORMS=[] #PAPERLESS_THUMBNAIL_FONT_NAME= +# Tika settings + +#PAPERLESS_TIKA_ENABLED=false +#PAPERLESS_TIKA_ENDPOINT=http://localhost:9998 +#PAPERLESS_TIKA_GOTENBERG_ENDPOINT=http://localhost:3000 + # Binaries #PAPERLESS_CONVERT_BINARY=/usr/bin/convert diff --git a/scripts/start_services.sh b/scripts/start_services.sh index e566f59b3..cbab7ac9e 100755 --- a/scripts/start_services.sh +++ b/scripts/start_services.sh @@ -1,2 +1,4 @@ docker run -p 5432:5432 -v paperless_pgdata:/var/lib/postgresql/data -d postgres:13 docker run -d -p 6379:6379 redis:latest +docker run -p 3000:3000 -d thecodingmachine/gotenberg +docker run -p 9998:9998 -d apache/tika diff --git a/src-ui/angular.json b/src-ui/angular.json index 79233eeda..df53224ca 100644 --- a/src-ui/angular.json +++ b/src-ui/angular.json @@ -13,6 +13,12 @@ "root": "", "sourceRoot": "src", "prefix": "app", + "i18n": { + "sourceLocale": "en-US", + "locales": { + "de": "src/locale/messages.de.xlf" + } + }, "architect": { "build": { "builder": "@angular-devkit/build-angular:browser", @@ -23,10 +29,16 @@ "main": "src/main.ts", "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", + "localize": true, "aot": true, "assets": [ "src/favicon.ico", - "src/assets" + "src/assets", + "src/manifest.webmanifest", { + "glob": "pdf.worker.min.js", + "input": "node_modules/pdfjs-dist/build/", + "output": "/assets/js/" + } ], "styles": [ "src/styles.scss" @@ -64,13 +76,16 @@ "maximumError": "10kb" } ] + }, + "en-US": { + "localize": ["en-US"] } } }, "serve": { "builder": "@angular-devkit/build-angular:dev-server", "options": { - "browserTarget": "paperless-ui:build" + "browserTarget": "paperless-ui:build:en-US" }, "configurations": { "production": { @@ -93,7 +108,8 @@ "karmaConfig": "karma.conf.js", "assets": [ "src/favicon.ico", - "src/assets" + "src/assets", + "src/manifest.webmanifest" ], "styles": [ "src/styles.scss" diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 6270f5373..4a84cfd64 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -79,22 +79,15 @@ 71 - - {VAR_PLURAL, plural, =1 {document} other {documents}} + + {VAR_PLURAL, plural, =1 {Selected of one document} other {Selected of documents}} src/app/components/document-list/document-list.component.html 86 - - Selected of - - src/app/components/document-list/document-list.component.html - 86 - - - - {VAR_PLURAL, plural, =1 {1 document} other { documents}} + + {VAR_PLURAL, plural, =1 {One document} other { documents}} src/app/components/document-list/document-list.component.html 87 @@ -149,8 +142,8 @@ 161 - - Do you really want to delete document ''? + + Do you really want to delete document ""? src/app/components/document-detail/document-detail.component.ts 162 @@ -373,11 +366,11 @@ 1 - - Do you really want to delete the tag ? + + Do you really want to delete the tag ""? src/app/components/manage/tag-list/tag-list.component.ts - 30 + 28 @@ -436,11 +429,11 @@ 37 - - Do you really want to delete the document type ? + + Do you really want to delete the document type ""? src/app/components/manage/document-type-list/document-type-list.component.ts - 26 + 24 @@ -464,25 +457,32 @@ 7 - - Saved view " deleted. + + Saved view "" deleted. src/app/components/manage/settings/settings.component.ts - 52 + 54 Settings saved successfully. src/app/components/manage/settings/settings.component.ts - 61 + 74 Error while storing settings on server: src/app/components/manage/settings/settings.component.ts - 73 + 86 + + + + Settings + + src/app/components/manage/settings/settings.component.html + 1 @@ -496,11 +496,11 @@ Saved views src/app/components/manage/settings/settings.component.html - 41 + 56 - - Document list + + Appearance src/app/components/manage/settings/settings.component.html 13 @@ -513,60 +513,74 @@ 17 + + Dark mode + + src/app/components/manage/settings/settings.component.html + 33 + + + + Use system settings + + src/app/components/manage/settings/settings.component.html + 36 + + Bulk editing src/app/components/manage/settings/settings.component.html - 33 + 44 Show confirmation dialogs src/app/components/manage/settings/settings.component.html - 35 + 48 Deleting documents will always ask for confirmation. src/app/components/manage/settings/settings.component.html - 35 + 48 Apply on close src/app/components/manage/settings/settings.component.html - 36 + 49 Appears on src/app/components/manage/settings/settings.component.html - 53 + 68 Show on dashboard src/app/components/manage/settings/settings.component.html - 56 + 71 Show in sidebar src/app/components/manage/settings/settings.component.html - 60 + 75 No saved views defined. src/app/components/manage/settings/settings.component.html - 70 + 85 @@ -576,11 +590,11 @@ 7 - - Do you really want to delete the correspondent ? + + Do you really want to delete the correspondent ""? src/app/components/manage/correspondent-list/correspondent-list.component.ts - 26 + 24 @@ -639,8 +653,8 @@ 11 - - Match + + Matching pattern src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html 12 @@ -776,26 +790,26 @@ Paperless-ng src/app/components/app-frame/app-frame.component.html - 4 + 11 app title - - Search for documents + + Search documents src/app/components/app-frame/app-frame.component.html - 12 + 15 + + + + Logout + + src/app/components/app-frame/app-frame.component.html + 45 Manage - - src/app/components/app-frame/app-frame.component.html - 77 - - - - Settings src/app/components/app-frame/app-frame.component.html 112 @@ -805,70 +819,91 @@ Admin src/app/components/app-frame/app-frame.component.html - 119 + 147 Misc src/app/components/app-frame/app-frame.component.html - 125 + 153 Documentation src/app/components/app-frame/app-frame.component.html - 132 + 160 GitHub src/app/components/app-frame/app-frame.component.html - 139 + 167 - - Logout + + Logged in as src/app/components/app-frame/app-frame.component.html - 146 + 34 Open documents src/app/components/app-frame/app-frame.component.html - 57 + 92 Close all src/app/components/app-frame/app-frame.component.html - 71 + 106 Correspondent: src/app/components/document-list/filter-editor/filter-editor.component.ts - 28 + 29 + + + + Without correspondent + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 31 Type: src/app/components/document-list/filter-editor/filter-editor.component.ts - 31 + 36 + + + + Without document type + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 38 Tag: src/app/components/document-list/filter-editor/filter-editor.component.ts - 34 + 42 + + + + Without any tag + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 46 @@ -878,19 +913,41 @@ 4 + + Filter tags + + src/app/components/document-list/filter-editor/filter-editor.component.html + 12 + + + + Filter correspondents + + src/app/components/document-list/filter-editor/filter-editor.component.html + 19 + + + + Filter document types + + src/app/components/document-list/filter-editor/filter-editor.component.html + 25 + + Clear all filters src/app/components/document-list/filter-editor/filter-editor.component.html - 23 + 47 Not assigned src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts - 145 + 161 + Filter drop down element to filter for documents with no correspondent/type/tag assigned Apply @@ -955,13 +1012,6 @@ 50 - - Score: - - src/app/components/document-list/document-card-large/document-card-large.component.html - 61 - - Created: @@ -983,6 +1033,13 @@ 24 + + Score: + + src/app/components/document-list/document-card-large/document-card-large.component.html + 61 + + View in browser @@ -990,12 +1047,20 @@ 40 - - and + + "" and "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts 103 + This is for messages like 'modify "tag1" and "tag2"' + + + "" + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 105 + , @@ -1003,6 +1068,15 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts 105 + this is used to separate enumerations and should probably be a comma and a whitespace in most languages + + + and "" + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 106 + + this is for messages like 'modify "tag1", "tag2" and "tag3"' Confirm tags assignment @@ -1011,36 +1085,36 @@ 115 - - This operation will add the tag to all selected document(s). + + This operation will add the tag "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts 118 - - This operation will add the tags to all selected document(s). + + This operation will add the tags to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts 120 - - This operation will remove the tag from all selected document(s). + + This operation will remove the tag "" from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts 123 - - This operation will remove the tags from all selected document(s). + + This operation will remove the tags from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts 125 - - This operation will add the tags and remove the tags on all selected document(s). + + This operation will add the tags and remove the tags on selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts 127 @@ -1053,15 +1127,15 @@ 157 - - This operation will assign the correspondent to all selected document(s). + + This operation will assign the correspondent "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts 159 - - This operation will remove the correspondent from all selected document(s). + + This operation will remove the correspondent from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts 161 @@ -1074,15 +1148,15 @@ 190 - - This operation will assign the document type to all selected document(s). + + This operation will assign the document type "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts 192 - - This operation will remove the document type from all selected document(s). + + This operation will remove the document type from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts 194 @@ -1095,8 +1169,8 @@ 219 - - This operation will permanently delete all selected document(s). + + This operation will permanently delete selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts 220 @@ -1214,8 +1288,8 @@ 5 - - Uploading file(s) + + {VAR_PLURAL, plural, =1 {Uploading file...} =other {Uploading files...}} src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html 13 @@ -1235,15 +1309,15 @@ 5 - - You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list. After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and have them displayed on the dashboard instead of this message. + + You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list. After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and they will appear on the dashboard instead of this message. src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html 6,7 - - Paperless offers some more features that try to make your life easier, such as: + + Paperless offers some more features that try to make your life easier: src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html 8 @@ -1515,22 +1589,43 @@ 97 - - Any + + Any word src/app/data/matching-model.ts 12 - - All + + Any: Document contains any of these words (space separated) + + src/app/data/matching-model.ts + 12 + + + + All words src/app/data/matching-model.ts 13 - - Literal + + All: Document contains all of these words (space separated) + + src/app/data/matching-model.ts + 13 + + + + Exact match + + src/app/data/matching-model.ts + 14 + + + + Exact: Document contains this string src/app/data/matching-model.ts 14 @@ -1543,15 +1638,29 @@ 15 - - Fuzzy match + + Regular expression: Document matches this regular expression + + src/app/data/matching-model.ts + 15 + + + + Fuzzy word src/app/data/matching-model.ts 16 - - Auto + + Fuzzy: Document contains a word similar to this word + + src/app/data/matching-model.ts + 16 + + + + Auto: Learn matching automatically src/app/data/matching-model.ts 17 diff --git a/src-ui/src/app/app.component.ts b/src-ui/src/app/app.component.ts index 84c173a18..73c5fc861 100644 --- a/src-ui/src/app/app.component.ts +++ b/src-ui/src/app/app.component.ts @@ -1,4 +1,5 @@ import { Component } from '@angular/core'; +import { SettingsService } from './services/settings.service'; @Component({ selector: 'app-root', @@ -6,9 +7,11 @@ import { Component } from '@angular/core'; styleUrls: ['./app.component.scss'] }) export class AppComponent { - - constructor () { + + constructor (private settings: SettingsService) { + let anyWindow = (window as any) + anyWindow.pdfWorkerSrc = '/assets/js/pdf.worker.min.js'; + this.settings.updateDarkModeSettings() } - } diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html index d191ec0de..42273ca3a 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.html +++ b/src-ui/src/app/components/app-frame/app-frame.component.html @@ -1,17 +1,52 @@
@@ -105,13 +140,6 @@  Logs -
  • - - - -  Settings - -
  • @@ -139,13 +167,6 @@  GitHub
    • -
  • - - - -  Logout - -
    • diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss index 5ace8a2ff..6809875eb 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.scss +++ b/src-ui/src/app/components/app-frame/app-frame.component.scss @@ -1,36 +1,30 @@ - @import "/src/theme"; - - /* +/* * Sidebar */ - - .sidebar { +.sidebar { position: fixed; top: 0; bottom: 0; left: 0; z-index: 100; /* Behind the navbar */ - padding: 48px 0 0; /* Height of navbar */ + padding: 50px 0 0; /* Height of navbar */ box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1); } - @media (max-width: 767.98px) { .sidebar { - top: 3rem; + top: 3.5rem; } } .sidebar-sticky { position: relative; top: 0; - /* height: calc(100vh - 48px); */ height: 100%; - padding-top: .5rem; + padding-top: 0.5rem; overflow-x: hidden; overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ } - @supports ((position: -webkit-sticky) or (position: sticky)) { .sidebar-sticky { position: -webkit-sticky; @@ -53,36 +47,85 @@ font-weight: bold; } -.sidebar .nav-link:hover .sidebaricon, -.sidebar .nav-link.active .sidebaricon { +.sidebar .nav-link.active .sidebaricon, +.sidebar .nav-link:hover .sidebaricon { color: inherit; } .sidebar-heading { - font-size: .75rem; + font-size: 0.75rem; text-transform: uppercase; } - /* * Navbar */ - .navbar-brand { - padding-top: .75rem; - padding-bottom: .75rem; +.navbar-brand { + padding-top: 0.75rem; + padding-bottom: 0.75rem; font-size: 1rem; - background-color: rgba(0, 0, 0, .25); - box-shadow: inset -1px 0 0 rgba(0, 0, 0, .25); } -.navbar .navbar-toggler { - top: .25rem; - right: 1rem; +.dropdown.show .dropdown-toggle, +.dropdown-toggle:hover { + opacity: 0.7; } -.navbar .form-control { - padding: .75rem 1rem; - border-width: 0; - border-radius: 0; +.dropdown-toggle::after { + margin-left: 0.4em; + vertical-align: 0.155em; +} + +.navbar .dropdown-menu { + font-size: 0.875rem; // body size + + a svg { + opacity: 0.6; + } +} + +.navbar .search-form-container { + max-width: 550px; + + form { + position: relative; + } + + svg { + position: absolute; + left: 0.6rem; + color: rgba(255, 255, 255, 0.6); + } + + &:focus-within { + svg { + display: none; + } + + .form-control::placeholder { + color: rgba(255, 255, 255, 0); + } + } + + .form-control { + color: rgba(255, 255, 255, 0.3); + background-color: rgba(0, 0, 0, 0.15); + padding-left: 1.8rem; + border-color: rgba(255, 255, 255, 0.2); + transition: flex 0.3s ease; + max-width: 600px; + min-width: 300px; // 1/2 max + + &::placeholder { + color: rgba(255, 255, 255, 0.4); + } + + &:focus { + background-color: #fff; + color: #212529; + flex-grow: 1; + padding-left: 0.5rem; + } + } } diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts index c4c00843d..ad4460f16 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.ts +++ b/src-ui/src/app/components/app-frame/app-frame.component.ts @@ -9,7 +9,8 @@ import { SavedViewService } from 'src/app/services/rest/saved-view.service'; import { SearchService } from 'src/app/services/rest/search.service'; import { environment } from 'src/environments/environment'; import { DocumentDetailComponent } from '../document-detail/document-detail.component'; - +import { Meta } from '@angular/platform-browser'; + @Component({ selector: 'app-app-frame', templateUrl: './app-frame.component.html', @@ -22,8 +23,10 @@ export class AppFrameComponent implements OnInit, OnDestroy { private activatedRoute: ActivatedRoute, private openDocumentsService: OpenDocumentsService, private searchService: SearchService, - public savedViewService: SavedViewService + public savedViewService: SavedViewService, + private meta: Meta ) { + } versionString = `${environment.appTitle} ${environment.version}` @@ -55,7 +58,7 @@ export class AppFrameComponent implements OnInit, OnDestroy { term.length < 2 ? from([[]]) : this.searchService.autocomplete(term) ) ) - + itemSelected(event) { event.preventDefault() let currentSearch: string = this.searchField.value @@ -98,4 +101,17 @@ export class AppFrameComponent implements OnInit, OnDestroy { } } + get displayName() { + // TODO: taken from dashboard component, is this the best way to pass around username? + let tagFullName = this.meta.getTag('name=full_name') + let tagUsername = this.meta.getTag('name=username') + if (tagFullName && tagFullName.content) { + return tagFullName.content + } else if (tagUsername && tagUsername.content) { + return tagUsername.content + } else { + return null + } + } + } diff --git a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts index ea96be90a..8f7af1418 100644 --- a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts +++ b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts @@ -2,7 +2,7 @@ import { Directive, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FormGroup } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { Observable } from 'rxjs'; -import { MATCHING_ALGORITHMS } from 'src/app/data/matching-model'; +import { MATCHING_ALGORITHMS, MATCH_AUTO } from 'src/app/data/matching-model'; import { ObjectWithId } from 'src/app/data/object-with-id'; import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service'; import { ToastService } from 'src/app/services/toast.service'; @@ -61,6 +61,10 @@ export abstract class EditDialogComponent implements OnI return MATCHING_ALGORITHMS } + get patternRequired(): boolean { + return this.objectForm?.value.matching_algorithm !== MATCH_AUTO + } + save() { var newObject = Object.assign(Object.assign({}, this.object), this.objectForm.value) var serverResponse: Observable diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html index 7215faa79..a0e833c98 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html @@ -16,11 +16,11 @@
    - +
    - +
    diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts index 915d10677..b51923c27 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts @@ -18,6 +18,18 @@ export class FilterableDropdownSelectionModel { items: MatchingModel[] = [] + get itemsSorted(): MatchingModel[] { + return this.items.sort((a,b) => { + if (this.getNonTemporary(a.id) == ToggleableItemState.NotSelected && this.getNonTemporary(b.id) != ToggleableItemState.NotSelected) { + return 1 + } else if (this.getNonTemporary(a.id) != ToggleableItemState.NotSelected && this.getNonTemporary(b.id) == ToggleableItemState.NotSelected) { + return -1 + } else { + return a.name.localeCompare(b.name) + } + }) + } + private selectionStates = new Map() private temporarySelectionStates = new Map() @@ -69,6 +81,10 @@ export class FilterableDropdownSelectionModel { } + private getNonTemporary(id: number) { + return this.selectionStates.get(id) || ToggleableItemState.NotSelected + } + get(id: number) { return this.temporarySelectionStates.get(id) || ToggleableItemState.NotSelected } @@ -142,7 +158,7 @@ export class FilterableDropdownComponent { if (items) { this._selectionModel.items = Array.from(items) this._selectionModel.items.unshift({ - name: $localize`Not assigned`, + name: $localize`:Filter drop down element to filter for documents with no correspondent/type/tag assigned:Not assigned`, id: null }) } @@ -186,6 +202,9 @@ export class FilterableDropdownComponent { @Input() title: string + @Input() + filterPlaceholder: string = "" + @Input() icon: string diff --git a/src-ui/src/app/components/common/input/tags/tags.component.html b/src-ui/src/app/components/common/input/tags/tags.component.html index 8a5dbc4f2..01b3fe755 100644 --- a/src-ui/src/app/components/common/input/tags/tags.component.html +++ b/src-ui/src/app/components/common/input/tags/tags.component.html @@ -5,7 +5,9 @@ diff --git a/src-ui/src/app/components/dashboard/dashboard.component.html b/src-ui/src/app/components/dashboard/dashboard.component.html index 5b76dd242..50bd44a4e 100644 --- a/src-ui/src/app/components/dashboard/dashboard.component.html +++ b/src-ui/src/app/components/dashboard/dashboard.component.html @@ -1,5 +1,8 @@ - +
    diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.scss b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.scss index e69de29bb..40d1c836b 100644 --- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.scss +++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.scss @@ -0,0 +1,7 @@ +table { + overflow-wrap: anywhere; +} + +th:first-child { + min-width: 5rem; +} diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html index 91fff4e83..aa317bd52 100644 --- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html +++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html @@ -10,7 +10,7 @@
    -

    Uploading {{uploadStatus.length}} file(s)

    +

    {uploadStatus.length, plural, =1 {Uploading file...} =other {Uploading {{uploadStatus.length}} files...}}

    diff --git a/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html b/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html index 6c9c34d5b..6320189cc 100644 --- a/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html +++ b/src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html @@ -4,8 +4,8 @@

    Paperless is running! :)

    You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list. - After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and have them displayed on the dashboard instead of this message.

    -

    Paperless offers some more features that try to make your life easier, such as:

    + After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and they will appear on the dashboard instead of this message.

    +

    Paperless offers some more features that try to make your life easier:

    • Once you've got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically.
    • You can configure paperless to read your mails and add documents from attached files.
      • diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts index 2efd32f27..053258f34 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.ts +++ b/src-ui/src/app/components/document-detail/document-detail.component.ts @@ -159,7 +159,7 @@ export class DocumentDetailComponent implements OnInit { delete() { let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) modal.componentInstance.title = $localize`Confirm delete` - modal.componentInstance.messageBold = $localize`Do you really want to delete document '${this.document.title}'?` + modal.componentInstance.messageBold = $localize`Do you really want to delete document "${this.document.title}"?` modal.componentInstance.message = $localize`The files for this document will be deleted permanently. This operation cannot be undone.` modal.componentInstance.btnClass = "btn-danger" modal.componentInstance.btnCaption = $localize`Delete document` diff --git a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.html b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.html index e8fda1d0b..ac42860c9 100644 --- a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.html +++ b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.html @@ -16,7 +16,7 @@ {{m.prefix}}:{{m.key}} - {{m.value}} + {{m.value}} diff --git a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.scss b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.scss index e69de29bb..b946da146 100644 --- a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.scss +++ b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.scss @@ -0,0 +1,3 @@ +.metadata-column { + overflow-wrap: anywhere; +} \ No newline at end of file diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html index 62a2bb95d..b9912ec1d 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -26,7 +26,8 @@
      - - - i.name).join($localize`, `) - return $localize`${list} and ${items[items.length - 1].name}` + let list = items.slice(0, items.length - 1).map(i => $localize`"${i.name}"`).join($localize`:this is used to separate enumerations and should probably be a comma and a whitespace in most languages:, `) + return $localize`:this is for messages like 'modify "tag1", "tag2" and "tag3"':${list} and "${items[items.length - 1].name}"` } } @@ -115,16 +115,16 @@ export class BulkEditorComponent { modal.componentInstance.title = $localize`Confirm tags assignment` if (changedTags.itemsToAdd.length == 1 && changedTags.itemsToRemove.length == 0) { let tag = changedTags.itemsToAdd[0] - modal.componentInstance.message = $localize`This operation will add the tag ${tag.name} to all ${this.list.selected.size} selected document(s).` + modal.componentInstance.message = $localize`This operation will add the tag "${tag.name}" to ${this.list.selected.size} selected document(s).` } else if (changedTags.itemsToAdd.length > 1 && changedTags.itemsToRemove.length == 0) { - modal.componentInstance.message = $localize`This operation will add the tags ${this._localizeList(changedTags.itemsToAdd)} to all ${this.list.selected.size} selected document(s).` + modal.componentInstance.message = $localize`This operation will add the tags ${this._localizeList(changedTags.itemsToAdd)} to ${this.list.selected.size} selected document(s).` } else if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length == 1) { let tag = changedTags.itemsToRemove[0] - modal.componentInstance.message = $localize`This operation will remove the tag ${tag.name} from all ${this.list.selected.size} selected document(s).` + modal.componentInstance.message = $localize`This operation will remove the tag "${tag.name}" from ${this.list.selected.size} selected document(s).` } else if (changedTags.itemsToAdd.length == 0 && changedTags.itemsToRemove.length > 1) { - modal.componentInstance.message = $localize`This operation will remove the tags ${this._localizeList(changedTags.itemsToRemove)} from all ${this.list.selected.size} selected document(s).` + modal.componentInstance.message = $localize`This operation will remove the tags ${this._localizeList(changedTags.itemsToRemove)} from ${this.list.selected.size} selected document(s).` } else { - modal.componentInstance.message = $localize`This operation will add the tags ${this._localizeList(changedTags.itemsToAdd)} and remove the tags ${this._localizeList(changedTags.itemsToRemove)} on all ${this.list.selected.size} selected document(s).` + modal.componentInstance.message = $localize`This operation will add the tags ${this._localizeList(changedTags.itemsToAdd)} and remove the tags ${this._localizeList(changedTags.itemsToRemove)} on ${this.list.selected.size} selected document(s).` } modal.componentInstance.btnClass = "btn-warning" @@ -156,9 +156,9 @@ export class BulkEditorComponent { let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) modal.componentInstance.title = $localize`Confirm correspondent assignment` if (correspondent) { - modal.componentInstance.message = $localize`This operation will assign the correspondent ${correspondent.name} to all ${this.list.selected.size} selected document(s).` + modal.componentInstance.message = $localize`This operation will assign the correspondent "${correspondent.name}" to ${this.list.selected.size} selected document(s).` } else { - modal.componentInstance.message = $localize`This operation will remove the correspondent from all ${this.list.selected.size} selected document(s).` + modal.componentInstance.message = $localize`This operation will remove the correspondent from ${this.list.selected.size} selected document(s).` } modal.componentInstance.btnClass = "btn-warning" modal.componentInstance.btnCaption = $localize`Confirm` @@ -189,9 +189,9 @@ export class BulkEditorComponent { let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) modal.componentInstance.title = $localize`Confirm document type assignment` if (documentType) { - modal.componentInstance.message = $localize`This operation will assign the document type ${documentType.name} to all ${this.list.selected.size} selected document(s).` + modal.componentInstance.message = $localize`This operation will assign the document type "${documentType.name}" to ${this.list.selected.size} selected document(s).` } else { - modal.componentInstance.message = $localize`This operation will remove the document type from all ${this.list.selected.size} selected document(s).` + modal.componentInstance.message = $localize`This operation will remove the document type from ${this.list.selected.size} selected document(s).` } modal.componentInstance.btnClass = "btn-warning" modal.componentInstance.btnCaption = $localize`Confirm` @@ -217,7 +217,7 @@ export class BulkEditorComponent { let modal = this.modalService.open(ConfirmDialogComponent, {backdrop: 'static'}) modal.componentInstance.delayConfirm(5) modal.componentInstance.title = $localize`Delete confirm` - modal.componentInstance.messageBold = $localize`This operation will permanently delete all ${this.list.selected.size} selected document(s).` + modal.componentInstance.messageBold = $localize`This operation will permanently delete ${this.list.selected.size} selected document(s).` modal.componentInstance.message = $localize`This operation cannot be undone.` modal.componentInstance.btnClass = "btn-danger" modal.componentInstance.btnCaption = $localize`Delete document(s)` diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html index c1757eb35..d2f5ebba2 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html @@ -1,7 +1,7 @@ -
      +
      -
      - +
      +
      @@ -12,7 +12,7 @@
      -
      +
      @@ -55,16 +55,16 @@  Download - +
      - Score: + Score: - - Created: {{document.created | date}} + + Created: {{document.created | date}}
      - +
      diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss index eb744d2af..0b1604d90 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss @@ -30,10 +30,6 @@ border-color: $primary; } -.doc-img-background { - background-color: white; -} - .doc-img-background-selected { background-color: $primaryFaded; -} \ No newline at end of file +} diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html index e0d8d28e1..83ba8c274 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html @@ -1,7 +1,7 @@
      -
      -
      - +
      +
      +
      diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html index bc1047ba9..e4d7256e1 100644 --- a/src-ui/src/app/components/document-list/document-list.component.html +++ b/src-ui/src/app/components/document-list/document-list.component.html @@ -78,13 +78,13 @@
      - - + +
      -

      Selected {{list.selected.size}} of {{list.collectionSize || 0}} {list.collectionSize, plural, =1 {document} other {documents}}

      -

      {list.collectionSize, plural, =1 {1 document} other {{{list.collectionSize || 0}} documents}}

      +

      {list.collectionSize, plural, =1 {Selected {{list.selected.size}} of one document} other {Selected {{list.selected.size}} of {{list.collectionSize || 0}} documents}}

      +

      {list.collectionSize, plural, =1 {One document} other {{{list.collectionSize || 0}} documents}}

      diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html index f0c83ae73..efbf6ce7e 100644 --- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html @@ -6,13 +6,37 @@
      -
      -
      - - - - - +
      +
      + + + + +
      diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts index 4b62d6a51..e6565beac 100644 --- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts @@ -25,13 +25,26 @@ export class FilterEditorComponent implements OnInit, OnDestroy { switch(this.filterRules[0].rule_type) { case FILTER_CORRESPONDENT: - return $localize`Correspondent: ${this.correspondents.find(c => c.id == +rule.value)?.name}` + if (rule.value) { + return $localize`Correspondent: ${this.correspondents.find(c => c.id == +rule.value)?.name}` + } else { + return $localize`Without correspondent` + } case FILTER_DOCUMENT_TYPE: - return $localize`Type: ${this.documentTypes.find(dt => dt.id == +rule.value)?.name}` + if (rule.value) { + return $localize`Type: ${this.documentTypes.find(dt => dt.id == +rule.value)?.name}` + } else { + return $localize`Without document type` + } case FILTER_HAS_TAG: return $localize`Tag: ${this.tags.find(t => t.id == +rule.value)?.name}` + + case FILTER_HAS_ANY_TAG: + if (rule.value == "false") { + return $localize`Without any tag` + } } } @@ -65,6 +78,11 @@ export class FilterEditorComponent implements OnInit, OnDestroy { this.documentTypeSelectionModel.clear(false) this.tagSelectionModel.clear(false) this.correspondentSelectionModel.clear(false) + this._titleFilter = null + this.dateAddedBefore = null + this.dateAddedAfter = null + this.dateCreatedBefore = null + this.dateCreatedAfter = null value.forEach(rule => { switch (rule.rule_type) { diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html index e35c57e26..48477b229 100644 --- a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html +++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html @@ -6,14 +6,14 @@
      - + - - + +
      - \ No newline at end of file + diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts index bc3bf7b02..37b6fa66e 100644 --- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts +++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts @@ -1,5 +1,4 @@ -import { Component, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; +import { Component } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { FILTER_CORRESPONDENT } from 'src/app/data/filter-rule-type'; import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent'; @@ -16,20 +15,16 @@ import { CorrespondentEditDialogComponent } from './correspondent-edit-dialog/co export class CorrespondentListComponent extends GenericListComponent { constructor(correspondentsService: CorrespondentService, modalService: NgbModal, - private router: Router, private list: DocumentListViewService ) { super(correspondentsService,modalService,CorrespondentEditDialogComponent) } getDeleteMessage(object: PaperlessCorrespondent) { - return $localize`Do you really want to delete the correspondent ${object.name}?` + return $localize`Do you really want to delete the correspondent "${object.name}"?` } filterDocuments(object: PaperlessCorrespondent) { - this.list.documentListView.filter_rules = [ - {rule_type: FILTER_CORRESPONDENT, value: object.id.toString()} - ] - this.router.navigate(["documents"]) + this.list.quickFilter([{rule_type: FILTER_CORRESPONDENT, value: object.id.toString()}]) } } diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html index 458fbb4bc..ba017faf7 100644 --- a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html +++ b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html @@ -6,15 +6,15 @@
      - + - - + +
      - \ No newline at end of file + diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts index b376b2576..68c8b6f91 100644 --- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts +++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts @@ -1,5 +1,4 @@ import { Component } from '@angular/core'; -import { Router } from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { FILTER_DOCUMENT_TYPE } from 'src/app/data/filter-rule-type'; import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; @@ -16,21 +15,17 @@ import { DocumentTypeEditDialogComponent } from './document-type-edit-dialog/doc export class DocumentTypeListComponent extends GenericListComponent { constructor(service: DocumentTypeService, modalService: NgbModal, - private router: Router, private list: DocumentListViewService ) { super(service, modalService, DocumentTypeEditDialogComponent) } getDeleteMessage(object: PaperlessDocumentType) { - return $localize`Do you really want to delete the document type ${object.name}?` + return $localize`Do you really want to delete the document type "${object.name}"?` } filterDocuments(object: PaperlessDocumentType) { - this.list.documentListView.filter_rules = [ - {rule_type: FILTER_DOCUMENT_TYPE, value: object.id.toString()} - ] - this.router.navigate(["documents"]) + this.list.quickFilter([{rule_type: FILTER_DOCUMENT_TYPE, value: object.id.toString()}]) } } diff --git a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts index 1f9cc65f9..b31231bc8 100644 --- a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts +++ b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts @@ -30,7 +30,7 @@ export abstract class GenericListComponent implements On if (o.matching_algorithm == MATCH_AUTO) { return $localize`Automatic` } else if (o.match && o.match.length > 0) { - return `${o.match} (${MATCHING_ALGORITHMS.find(a => a.id == o.matching_algorithm).name})` + return `${MATCHING_ALGORITHMS.find(a => a.id == o.matching_algorithm).shortName}: ${o.match}` } else { return "-" } diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html index 1f5374dba..103b5bb65 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.html +++ b/src-ui/src/app/components/manage/settings/settings.component.html @@ -1,4 +1,4 @@ - + @@ -10,30 +10,45 @@ General settings -

      Document list

      - +

      Appearance

      +
      Items per page
      - + - -
      - +
      -

      Bulk editing

      +
      +
      + Dark mode +
      +
      + +
      + + +
      +
      +
      - - +

      Bulk editing

      + +
      +
      + + +
      +
      @@ -42,7 +57,7 @@
      - +
      @@ -68,7 +83,7 @@
      No saved views defined.
      - +
      @@ -78,4 +93,4 @@
      - \ No newline at end of file + diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts index c26c63384..559ffe00f 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.ts +++ b/src-ui/src/app/components/manage/settings/settings.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, Renderer2 } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { PaperlessSavedView } from 'src/app/data/paperless-saved-view'; import { DocumentListViewService } from 'src/app/services/document-list-view.service'; @@ -19,9 +19,13 @@ export class SettingsComponent implements OnInit { 'bulkEditConfirmationDialogs': new FormControl(this.settings.get(SETTINGS_KEYS.BULK_EDIT_CONFIRMATION_DIALOGS)), 'bulkEditApplyOnClose': new FormControl(this.settings.get(SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE)), 'documentListItemPerPage': new FormControl(this.settings.get(SETTINGS_KEYS.DOCUMENT_LIST_SIZE)), + 'darkModeUseSystem': new FormControl(this.settings.get(SETTINGS_KEYS.DARK_MODE_USE_SYSTEM)), + 'darkModeEnabled': new FormControl(this.settings.get(SETTINGS_KEYS.DARK_MODE_ENABLED)), 'savedViews': this.savedViewGroup }) + savedViews: PaperlessSavedView[] + constructor( public savedViewService: SavedViewService, private documentListViewService: DocumentListViewService, @@ -29,8 +33,6 @@ export class SettingsComponent implements OnInit { private settings: SettingsService ) { } - savedViews: PaperlessSavedView[] - ngOnInit() { this.savedViewService.listAll().subscribe(r => { this.savedViews = r.results @@ -49,15 +51,26 @@ export class SettingsComponent implements OnInit { this.savedViewService.delete(savedView).subscribe(() => { this.savedViewGroup.removeControl(savedView.id.toString()) this.savedViews.splice(this.savedViews.indexOf(savedView), 1) - this.toastService.showInfo($localize`Saved view "${savedView.name} deleted.`) + this.toastService.showInfo($localize`Saved view "${savedView.name}" deleted.`) }) } + toggleDarkModeSetting() { + if (this.settingsForm.value.darkModeUseSystem) { + (this.settingsForm.controls.darkModeEnabled as FormControl).disable() + } else { + (this.settingsForm.controls.darkModeEnabled as FormControl).enable() + } + } + private saveLocalSettings() { this.settings.set(SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE, this.settingsForm.value.bulkEditApplyOnClose) this.settings.set(SETTINGS_KEYS.BULK_EDIT_CONFIRMATION_DIALOGS, this.settingsForm.value.bulkEditConfirmationDialogs) this.settings.set(SETTINGS_KEYS.DOCUMENT_LIST_SIZE, this.settingsForm.value.documentListItemPerPage) + this.settings.set(SETTINGS_KEYS.DARK_MODE_USE_SYSTEM, this.settingsForm.value.darkModeUseSystem) + this.settings.set(SETTINGS_KEYS.DARK_MODE_ENABLED, (this.settingsForm.value.darkModeEnabled == true).toString()) this.documentListViewService.updatePageSize() + this.settings.updateDarkModeSettings() this.toastService.showInfo($localize`Settings saved successfully.`) } diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html index bbb96fb6b..9929b54d5 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html +++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html @@ -17,11 +17,11 @@
      - + - - + +
      diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts index e43410f41..2c70ffef1 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts +++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts @@ -1,5 +1,4 @@ import { Component } from '@angular/core'; -import { Router } from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { FILTER_HAS_TAG } from 'src/app/data/filter-rule-type'; import { TAG_COLOURS, PaperlessTag } from 'src/app/data/paperless-tag'; @@ -16,7 +15,6 @@ import { TagEditDialogComponent } from './tag-edit-dialog/tag-edit-dialog.compon export class TagListComponent extends GenericListComponent { constructor(tagService: TagService, modalService: NgbModal, - private router: Router, private list: DocumentListViewService ) { super(tagService, modalService, TagEditDialogComponent) @@ -27,13 +25,11 @@ export class TagListComponent extends GenericListComponent { } getDeleteMessage(object: PaperlessTag) { - return $localize`Do you really want to delete the tag ${object.name}?` + return $localize`Do you really want to delete the tag "${object.name}"?` } filterDocuments(object: PaperlessTag) { - this.list.documentListView.filter_rules = [ - {rule_type: FILTER_HAS_TAG, value: object.id.toString()} - ] - this.router.navigate(["documents"]) + this.list.quickFilter([{rule_type: FILTER_HAS_TAG, value: object.id.toString()}]) + } } diff --git a/src-ui/src/app/data/matching-model.ts b/src-ui/src/app/data/matching-model.ts index dfb007ecb..49cb5cad4 100644 --- a/src-ui/src/app/data/matching-model.ts +++ b/src-ui/src/app/data/matching-model.ts @@ -9,12 +9,12 @@ export const MATCH_FUZZY = 5 export const MATCH_AUTO = 6 export const MATCHING_ALGORITHMS = [ - {id: MATCH_ANY, name: $localize`Any`}, - {id: MATCH_ALL, name: $localize`All`}, - {id: MATCH_LITERAL, name: $localize`Literal`}, - {id: MATCH_REGEX, name: $localize`Regular expression`}, - {id: MATCH_FUZZY, name: $localize`Fuzzy match`}, - {id: MATCH_AUTO, name: $localize`Auto`}, + {id: MATCH_ANY, shortName: $localize`Any word`, name: $localize`Any: Document contains any of these words (space separated)`}, + {id: MATCH_ALL, shortName: $localize`All words`, name: $localize`All: Document contains all of these words (space separated)`}, + {id: MATCH_LITERAL, shortName: $localize`Exact match`, name: $localize`Exact: Document contains this string`}, + {id: MATCH_REGEX, shortName: $localize`Regular expression`, name: $localize`Regular expression: Document matches this regular expression`}, + {id: MATCH_FUZZY, shortName: $localize`Fuzzy word`, name: $localize`Fuzzy: Document contains a word similar to this word`}, + {id: MATCH_AUTO, shortName: $localize`Automatic`, name: $localize`Auto: Learn matching automatically`}, ] export interface MatchingModel extends ObjectWithId { diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts index dfcf9c0c5..eb69439ec 100644 --- a/src-ui/src/app/services/document-list-view.service.ts +++ b/src-ui/src/app/services/document-list-view.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; +import { Router } from '@angular/router'; import { Observable } from 'rxjs'; import { cloneFilterRules, FilterRule } from '../data/filter-rule'; import { PaperlessDocument } from '../data/paperless-document'; @@ -155,6 +156,14 @@ export class DocumentListViewService { sessionStorage.setItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG, JSON.stringify(this.documentListView)) } + quickFilter(filterRules: FilterRule[]) { + this.savedView = null + this.view.filter_rules = filterRules + this.reduceSelectionToFilter() + this.saveDocumentListView() + this.router.navigate(["documents"]) + } + getLastPage(): number { return Math.ceil(this.collectionSize / this.currentPageSize) } @@ -240,7 +249,7 @@ export class DocumentListViewService { } } - constructor(private documentService: DocumentService, private settings: SettingsService) { + constructor(private documentService: DocumentService, private settings: SettingsService, private router: Router) { let documentListViewConfigJson = sessionStorage.getItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG) if (documentListViewConfigJson) { try { diff --git a/src-ui/src/app/services/open-documents.service.ts b/src-ui/src/app/services/open-documents.service.ts index c91031f83..9e5746c10 100644 --- a/src-ui/src/app/services/open-documents.service.ts +++ b/src-ui/src/app/services/open-documents.service.ts @@ -28,6 +28,9 @@ export class OpenDocumentsService { if (index > -1) { this.documentService.get(id).subscribe(doc => { this.openDocuments[index] = doc + }, error => { + this.openDocuments.splice(index, 1) + this.save() }) } } diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts index 00e6ff639..a8f85972d 100644 --- a/src-ui/src/app/services/settings.service.ts +++ b/src-ui/src/app/services/settings.service.ts @@ -1,4 +1,5 @@ -import { Injectable } from '@angular/core'; +import { DOCUMENT } from '@angular/common'; +import { Inject, Injectable, Renderer2, RendererFactory2 } from '@angular/core'; export interface PaperlessSettings { key: string @@ -10,12 +11,16 @@ export const SETTINGS_KEYS = { BULK_EDIT_CONFIRMATION_DIALOGS: 'general-settings:bulk-edit:confirmation-dialogs', BULK_EDIT_APPLY_ON_CLOSE: 'general-settings:bulk-edit:apply-on-close', DOCUMENT_LIST_SIZE: 'general-settings:documentListSize', + DARK_MODE_USE_SYSTEM: 'general-settings:dark-mode:use-system', + DARK_MODE_ENABLED: 'general-settings:dark-mode:enabled' } const SETTINGS: PaperlessSettings[] = [ {key: SETTINGS_KEYS.BULK_EDIT_CONFIRMATION_DIALOGS, type: "boolean", default: true}, {key: SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE, type: "boolean", default: false}, - {key: SETTINGS_KEYS.DOCUMENT_LIST_SIZE, type: "number", default: 50} + {key: SETTINGS_KEYS.DOCUMENT_LIST_SIZE, type: "number", default: 50}, + {key: SETTINGS_KEYS.DARK_MODE_USE_SYSTEM, type: "boolean", default: true}, + {key: SETTINGS_KEYS.DARK_MODE_ENABLED, type: "boolean", default: false} ] @Injectable({ @@ -23,7 +28,30 @@ const SETTINGS: PaperlessSettings[] = [ }) export class SettingsService { - constructor() { } + private renderer: Renderer2; + + constructor( + private rendererFactory: RendererFactory2, + @Inject(DOCUMENT) private document + ) { + this.renderer = rendererFactory.createRenderer(null, null); + + this.updateDarkModeSettings() + } + + updateDarkModeSettings(): void { + let darkModeUseSystem = this.get(SETTINGS_KEYS.DARK_MODE_USE_SYSTEM) + let darkModeEnabled = this.get(SETTINGS_KEYS.DARK_MODE_ENABLED) + + if (darkModeUseSystem) { + this.renderer.addClass(this.document.body, 'color-scheme-system') + this.renderer.removeClass(this.document.body, 'color-scheme-dark') + } else { + this.renderer.removeClass(this.document.body, 'color-scheme-system') + darkModeEnabled ? this.renderer.addClass(this.document.body, 'color-scheme-dark') : this.renderer.removeClass(this.document.body, 'color-scheme-dark') + } + + } get(key: string): any { let setting = SETTINGS.find(s => s.key == key) diff --git a/src-ui/src/assets/logo-dark-notext.svg b/src-ui/src/assets/logo-dark-notext.svg index 38ca9e700..74eb142c8 100644 --- a/src-ui/src/assets/logo-dark-notext.svg +++ b/src-ui/src/assets/logo-dark-notext.svg @@ -1,69 +1,19 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - + + + + + + + + + + diff --git a/src-ui/src/assets/logo-dark.svg b/src-ui/src/assets/logo-dark.svg index bc8ba2b80..111d8d32f 100644 --- a/src-ui/src/assets/logo-dark.svg +++ b/src-ui/src/assets/logo-dark.svg @@ -1,93 +1,5 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/src-ui/src/assets/logo-white-notext.svg b/src-ui/src/assets/logo-white-notext.svg new file mode 100644 index 000000000..38ca9e700 --- /dev/null +++ b/src-ui/src/assets/logo-white-notext.svg @@ -0,0 +1,69 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts index 7b707f014..1ac69bc39 100644 --- a/src-ui/src/environments/environment.prod.ts +++ b/src-ui/src/environments/environment.prod.ts @@ -2,5 +2,5 @@ export const environment = { production: true, apiBaseUrl: "/api/", appTitle: "Paperless-ng", - version: "0.9.10" + version: "0.9.11" }; diff --git a/src-ui/src/index.html b/src-ui/src/index.html index f82399ce6..b05f9123b 100644 --- a/src-ui/src/index.html +++ b/src-ui/src/index.html @@ -5,9 +5,12 @@ Paperless-ng + + + - + diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf new file mode 100644 index 000000000..98a3b057c --- /dev/null +++ b/src-ui/src/locale/messages.de.xlf @@ -0,0 +1,1907 @@ + + + + + Documents + Dokumente + + src/app/components/document-list/document-list.component.ts + 38 + + + + View "" saved successfully. + Ansicht "" erfolgreich gespeichert. + + src/app/components/document-list/document-list.component.ts + 84 + + + + View "" created successfully. + Ansicht "" erfolgreich erstellt. + + src/app/components/document-list/document-list.component.ts + 103 + + + + Select + Auswählen + + src/app/components/document-list/document-list.component.html + 7 + + + + Select none + Nichts auswählen + + src/app/components/document-list/document-list.component.html + 11 + + + + Select page + Seite auswählen + + src/app/components/document-list/document-list.component.html + 12 + + + + Select all + Alles auswählen + + src/app/components/document-list/document-list.component.html + 13 + + + + Sort by + Sortieren + + src/app/components/document-list/document-list.component.html + 41 + + + + Views + Ansicht + + src/app/components/document-list/document-list.component.html + 64 + + + + Save as... + Speichern als... + + src/app/components/document-list/document-list.component.html + 72 + + + + Save "" + "" speichern + + src/app/components/document-list/document-list.component.html + 71 + + + + {VAR_PLURAL, plural, =1 {Selected of one document} other {Selected of documents}} + {VAR_PLURAL, plural, =1 { von 1 Dokumente ausgewählt} other { von Dokumente ausgewählt}} + + src/app/components/document-list/document-list.component.html + 86 + + + + {VAR_PLURAL, plural, =1 {One document} other { documents}} + {VAR_PLURAL, plural, =1 {Ein Dokument} other { Dokumente}} + + src/app/components/document-list/document-list.component.html + 87 + + + + ASN + ASN + + src/app/components/document-list/document-list.component.html + 100 + + + + Correspondent + Korrespondent + + src/app/components/document-list/document-list.component.html + 101 + + + + Title + Titel + + src/app/components/document-list/document-list.component.html + 102 + + + + Document type + Dokumenttyp + + src/app/components/document-list/document-list.component.html + 103 + + + + Created + Erstellt + + src/app/components/document-list/document-list.component.html + 104 + + + + Added + Hinzugefügt + + src/app/components/document-list/document-list.component.html + 105 + + + + Confirm delete + Löschen bestätigen + + src/app/components/document-detail/document-detail.component.ts + 161 + + + + Do you really want to delete document ""? + Möchten Sie das Dokument "" wirklich löschen? + + src/app/components/document-detail/document-detail.component.ts + 162 + + + + The files for this document will be deleted permanently. This operation cannot be undone. + Die Dateien dieses Dokuments werden permanent gelöscht. Diese Aktion kann nicht rückgängig gemacht werden. + + src/app/components/document-detail/document-detail.component.ts + 163 + + + + Delete document + Dokument löschen + + src/app/components/document-detail/document-detail.component.ts + 165 + + + + Delete + Löschen + + src/app/components/document-detail/document-detail.component.html + 15 + + + + Download + Herunterladen + + src/app/components/document-detail/document-detail.component.html + 23 + + + + More like this + Ähnliche Dokumente + + src/app/components/document-detail/document-detail.component.html + 38 + + + + Close + Schließen + + src/app/components/document-detail/document-detail.component.html + 44 + + + + Details + Details + + src/app/components/document-detail/document-detail.component.html + 56 + + + + Content + Inhalt + + src/app/components/document-detail/document-detail.component.html + 76 + + + + Metadata + Metadaten + + src/app/components/document-detail/document-detail.component.html + 85 + + + + Discard + Verwerfen + + src/app/components/document-detail/document-detail.component.html + 134 + + + + Save + Speichern + + src/app/components/document-detail/document-detail.component.html + 136 + + + + Page + Seite + + src/app/components/document-detail/document-detail.component.html + 4 + + + + of + von + + src/app/components/document-detail/document-detail.component.html + 8 + + + + Download original + Original herunterladen + + src/app/components/document-detail/document-detail.component.html + 29 + + + + Archive serial number + Archiv-Seriennummer + + src/app/components/document-detail/document-detail.component.html + 61 + + + + Date created + Erstellt am + + src/app/components/document-detail/document-detail.component.html + 65 + + + + Tags + Tags + + src/app/components/document-detail/document-detail.component.html + 70 + + + + Date modified + Geändert am + + src/app/components/document-detail/document-detail.component.html + 91 + + + + Date added + Hinzugefügt am + + src/app/components/document-detail/document-detail.component.html + 95 + + + + Media filename + Media-Dateiname + + src/app/components/document-detail/document-detail.component.html + 99 + + + + Original MD5 checksum + MD5-Prüfsumme Original + + src/app/components/document-detail/document-detail.component.html + 103 + + + + Original file size + Dateigröße Original + + src/app/components/document-detail/document-detail.component.html + 107 + + + + Original mime type + MIME-Typ Original + + src/app/components/document-detail/document-detail.component.html + 111 + + + + Archive MD5 checksum + MD5-Prüfsumme Archiv + + src/app/components/document-detail/document-detail.component.html + 115 + + + + Archive file size + Dateigröße Archiv + + src/app/components/document-detail/document-detail.component.html + 119 + + + + Original document metadata + Original-Metadaten + + src/app/components/document-detail/document-detail.component.html + 125 + + + + Archived document metadata + Metadaten des archivierten Dokuments + + src/app/components/document-detail/document-detail.component.html + 126 + + + + Save & next + Speichern & weiter + + src/app/components/document-detail/document-detail.component.html + 135 + + + + Hello , welcome to Paperless-ng! + Hallo , Willkommen zu Paperless-ng + + src/app/components/dashboard/dashboard.component.ts + 33 + + + + Welcome to Paperless-ng! + Willkommen zu Paperless-ng! + + src/app/components/dashboard/dashboard.component.ts + 35 + + + + Dashboard + Startseite + + src/app/components/dashboard/dashboard.component.html + 1 + + + + Do you really want to delete the tag ""? + Möchten Sie das Tag "" wirklich löschen? + + src/app/components/manage/tag-list/tag-list.component.ts + 28 + + + + Create + Erstellen + + src/app/components/manage/tag-list/tag-list.component.html + 2 + + + + Name + Name + + src/app/components/manage/tag-list/tag-list.component.html + 13 + + + + Color + Farbe + + src/app/components/manage/tag-list/tag-list.component.html + 14 + + + + Matching + Zuweisung + + src/app/components/manage/tag-list/tag-list.component.html + 15 + + + + Document count + Anzahl Dokumente + + src/app/components/manage/tag-list/tag-list.component.html + 16 + + + + Actions + Aktionen + + src/app/components/manage/tag-list/tag-list.component.html + 17 + + + + Documents + Dokumente + + src/app/components/manage/tag-list/tag-list.component.html + 32 + + + + Edit + Bearbeiten + + src/app/components/manage/tag-list/tag-list.component.html + 37 + + + + Do you really want to delete the document type ""? + Möchten Sie den Dokumenttyp "" wirklich löschen? + + src/app/components/manage/document-type-list/document-type-list.component.ts + 24 + + + + Document types + Dokumenttypen + + src/app/components/manage/document-type-list/document-type-list.component.html + 1 + + + + Logs + Protokoll + + src/app/components/manage/logs/logs.component.html + 1 + + + + Filter + Filtern + + src/app/components/manage/logs/logs.component.html + 7 + + + + Saved view "" deleted. + Gespeicherte Ansicht "" gelöscht. + + src/app/components/manage/settings/settings.component.ts + 54 + + + + Settings saved successfully. + Einstellungen erfolgreich gespeichert. + + src/app/components/manage/settings/settings.component.ts + 74 + + + + Error while storing settings on server: + Fehler beim Speichern der Einstellungen auf dem Server: + + src/app/components/manage/settings/settings.component.ts + 86 + + + + Settings + Einstellungen + + src/app/components/manage/settings/settings.component.html + 1 + + + + General settings + Allgemeine Einstellungen + + src/app/components/manage/settings/settings.component.html + 10 + + + + Saved views + Gespeicherte Ansichten + + src/app/components/manage/settings/settings.component.html + 56 + + + + Appearance + Erscheinungsbild + + src/app/components/manage/settings/settings.component.html + 13 + + + + Items per page + Dokumente pro Seite + + src/app/components/manage/settings/settings.component.html + 17 + + + + Dark mode + Dunkler Modus + + src/app/components/manage/settings/settings.component.html + 33 + + + + Use system settings + Benutze Systemeinstellungen + + src/app/components/manage/settings/settings.component.html + 36 + + + + Bulk editing + Massenbearbeitung + + src/app/components/manage/settings/settings.component.html + 44 + + + + Show confirmation dialogs + Bestätigungsdialoge anzeigen + + src/app/components/manage/settings/settings.component.html + 48 + + + + Deleting documents will always ask for confirmation. + Beim Löschen von Dokumenten wird immer nach einer Bestätigung gefragt. + + src/app/components/manage/settings/settings.component.html + 48 + + + + Apply on close + Anwenden beim Schließen + + src/app/components/manage/settings/settings.component.html + 49 + + + + Appears on + Erscheint auf + + src/app/components/manage/settings/settings.component.html + 68 + + + + Show on dashboard + Auf Startseite zeigen + + src/app/components/manage/settings/settings.component.html + 71 + + + + Show in sidebar + In Seitenleiste zeigen + + src/app/components/manage/settings/settings.component.html + 75 + + + + No saved views defined. + Keine gespeicherten Ansichten vorhanden. + + src/app/components/manage/settings/settings.component.html + 85 + + + + 404 Not Found + 404 Nicht gefunden + + src/app/components/not-found/not-found.component.html + 7 + + + + Do you really want to delete the correspondent ""? + Möchten Sie den Korrespondenten "" wirklich löschen? + + src/app/components/manage/correspondent-list/correspondent-list.component.ts + 24 + + + + Correspondents + Korrespondenten + + src/app/components/manage/correspondent-list/correspondent-list.component.html + 1 + + + + Last correspondence + Letzter Kontakt + + src/app/components/manage/correspondent-list/correspondent-list.component.html + 15 + + + + Confirmation + Bestätigung + + src/app/components/common/confirm-dialog/confirm-dialog.component.ts + 17 + + + + Confirm + Bestätigen + + src/app/components/common/confirm-dialog/confirm-dialog.component.ts + 29 + + + + Create new correspondent + Neuen Korrespondenten erstellen + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts + 21 + + + + Edit correspondent + Korrespondenten bearbeiten + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts + 25 + + + + Could not save correspondent: + Konnte Korrespondent nicht speichern: + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts + 29 + + + + Matching algorithm + Zuweisungsalgorithmus + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html + 11 + + + + Matching pattern + Zuweisungsmuster + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html + 12 + + + + Auto matching does not require you to fill in this field. + Für Automatische Zuweisung muss dieses Feld nicht ausgefüllt werden. + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html + 12 + + + + Case insensitive + Groß-/Kleinschreibung irrelevant + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html + 13 + + + + Auto matching ignores this option. + Automatische Zuweisung beachtet diese Einstellung nicht. + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html + 13 + + + + Cancel + Abbrechen + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html + 16 + + + + Create new tag + Neues Tag erstellen + + src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts + 21 + + + + Edit tag + Tag bearbeiten + + src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts + 25 + + + + Could not save tag: + Konnte Tag nicht speichern: + + src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts + 29 + + + + Inbox tag + Posteingangs-Tag + + src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html + 21 + + + + Inbox tags are automatically assigned to all consumed documents. + Ein Tag mit dieser Option wird automatisch allen neuen Dokumenten zugewiesen. + + src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html + 21 + + + + Create new document type + Neuen Dokumenttyp erstellen + + src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts + 21 + + + + Edit document type + Dokumenttyp bearbeiten + + src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts + 25 + + + + Could not save document type: + Konnte Dokumenttyp nicht speichern: + + src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts + 29 + + + + Search results + Suchergebnisse + + src/app/components/search/search.component.html + 1 + + + + Invalid search query: + Ungültige Suchanfrage: + + src/app/components/search/search.component.html + 4 + + + + Showing documents similar to + Zeige ähnliche Dokumente zu + + src/app/components/search/search.component.html + 7 + + + + Search query: + Suchanfrage: + + src/app/components/search/search.component.html + 11 + + + + Did you mean ""? + Meinten Sie ""? + + src/app/components/search/search.component.html + 13 + + + + {VAR_PLURAL, plural, =0 {No results} =1 {One result} other { results}} + {VAR_PLURAL, plural, =0 {Keine Ergebnisse} =1 {Ein Ergebnis} other { Ergebnisse}} + + src/app/components/search/search.component.html + 18 + + + + Paperless-ng + Paperless-ng + + src/app/components/app-frame/app-frame.component.html + 11 + + app title + + + Search documents + Dokumente suchen + + src/app/components/app-frame/app-frame.component.html + 15 + + + + Logout + Abmelden + + src/app/components/app-frame/app-frame.component.html + 45 + + + + Manage + Verwalten + + src/app/components/app-frame/app-frame.component.html + 112 + + + + Admin + Administration + + src/app/components/app-frame/app-frame.component.html + 147 + + + + Misc + Weiteres + + src/app/components/app-frame/app-frame.component.html + 153 + + + + Documentation + Dokumentation + + src/app/components/app-frame/app-frame.component.html + 160 + + + + GitHub + GitHub + + src/app/components/app-frame/app-frame.component.html + 167 + + + + Logged in as + Angemeldet als + + src/app/components/app-frame/app-frame.component.html + 34 + + + + Open documents + Geöffnete Dokumente + + src/app/components/app-frame/app-frame.component.html + 92 + + + + Close all + Alle schließen + + src/app/components/app-frame/app-frame.component.html + 106 + + + + Correspondent: + Korrespondent: + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 29 + + + + Without correspondent + Ohne Korrespondent + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 31 + + + + Type: + Typ: + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 36 + + + + Without document type + Ohne Dokumenttyp + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 38 + + + + Tag: + Tag: + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 42 + + + + Without any tag + Ohne Tag + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 46 + + + + Filter by: + Filtern nach: + + src/app/components/document-list/filter-editor/filter-editor.component.html + 4 + + + + Filter tags + Tags filtern + + src/app/components/document-list/filter-editor/filter-editor.component.html + 12 + + + + Filter correspondents + Korrespondenten filtern + + src/app/components/document-list/filter-editor/filter-editor.component.html + 19 + + + + Filter document types + Dokumenttypen filtern + + src/app/components/document-list/filter-editor/filter-editor.component.html + 25 + + + + Clear all filters + Filter zurücksetzen + + src/app/components/document-list/filter-editor/filter-editor.component.html + 47 + + + + Not assigned + Nicht zugewiesen + + src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts + 161 + + Filter drop down element to filter for documents with no correspondent/type/tag assigned + + + Apply + Anwenden + + src/app/components/common/filterable-dropdown/filterable-dropdown.component.html + 28 + + + + Last 7 days + Letzte 7 Tage + + src/app/components/common/date-dropdown/date-dropdown.component.ts + 24 + + + + Last month + Letzten Monat + + src/app/components/common/date-dropdown/date-dropdown.component.ts + 25 + + + + Last 3 months + Letzte 3 Monate + + src/app/components/common/date-dropdown/date-dropdown.component.ts + 26 + + + + Last year + Letztes Jahr + + src/app/components/common/date-dropdown/date-dropdown.component.ts + 27 + + + + After + Nach + + src/app/components/common/date-dropdown/date-dropdown.component.html + 13 + + + + Before + Vor + + src/app/components/common/date-dropdown/date-dropdown.component.html + 29 + + + + Clear + Zurücksetzen + + src/app/components/common/date-dropdown/date-dropdown.component.html + 18 + + + + View + Anzeigen + + src/app/components/document-list/document-card-large/document-card-large.component.html + 50 + + + + Created: + Erstellt: + + src/app/components/document-list/document-card-large/document-card-large.component.html + 65 + + + + Filter by correspondent + Nach Korrespondent filtern + + src/app/components/document-list/document-card-large/document-card-large.component.html + 20 + + + + Filter by tag + Nach Tag filtern + + src/app/components/document-list/document-card-large/document-card-large.component.html + 24 + + + + Score: + Relevanz: + + src/app/components/document-list/document-card-large/document-card-large.component.html + 61 + + + + View in browser + Im Browser anzeigen + + src/app/components/document-list/document-card-small/document-card-small.component.html + 40 + + + + "" and "" + "" und "" + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 103 + + This is for messages like 'modify "tag1" and "tag2"' + + + "" + "" + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 105 + + + + , + , + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 105 + + this is used to separate enumerations and should probably be a comma and a whitespace in most languages + + + and "" + und "" + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 106 + + this is for messages like 'modify "tag1", "tag2" and "tag3"' + + + Confirm tags assignment + Tag-Zuweisung bestätigen + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 115 + + + + This operation will add the tag "" to selected document(s). + Diese Aktion wird ausgewählten Dokumenten das Tag "" hinzufügen. + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 118 + + + + This operation will add the tags to selected document(s). + Diese Aktion wird ausgewählten Dokumenten die Tags hinzufügen. + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 120 + + + + This operation will remove the tag "" from selected document(s). + Diese Aktion wird das Tag "" von ausgewählten Dokumenten entfernen. + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 123 + + + + This operation will remove the tags from selected document(s). + Diese Aktion wird die Tags von ausgewählten Dokumenten entfernen. + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 125 + + + + This operation will add the tags and remove the tags on selected document(s). + Diese Aktion wird die Tags den ausgewählten Dokumenten hinzufügen und die Tags entfernen. + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 127 + + + + Confirm correspondent assignment + Korrespondent-Zuweisung bestätigen + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 157 + + + + This operation will assign the correspondent "" to selected document(s). + Diese Aktion wird ausgewählten Dokumenten den Korrespondent "" zuweisen. + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 159 + + + + This operation will remove the correspondent from selected document(s). + Diese Aktion wird bei ausgewählten Dokumenten den Korrespondent entfernen. + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 161 + + + + Confirm document type assignment + Dokumenttyp-Zuweisung bestätigen + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 190 + + + + This operation will assign the document type "" to selected document(s). + Diese Aktion wird ausgewählten Dokumenten den Dokumenttyp "" zuweisen. + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 192 + + + + This operation will remove the document type from selected document(s). + Diese Aktion wird bei ausgewählten Dokumenten den Dokumenttyp entfernen. + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 194 + + + + Delete confirm + Löschen bestätigen + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 219 + + + + This operation will permanently delete selected document(s). + Diese Aktion wird ausgewählte Dokumente unwiderruflich löschen. + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 220 + + + + This operation cannot be undone. + Diese Aktion kann nicht rückgängig gemacht werden. + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 221 + + + + Delete document(s) + Dokument(e) löschen + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 223 + + + + Select: + Auswählen: + + src/app/components/document-list/bulk-editor/bulk-editor.component.html + 11 + + + + All + Alle + + src/app/components/document-list/bulk-editor/bulk-editor.component.html + 21 + + + + Edit: + Bearbeiten: + + src/app/components/document-list/bulk-editor/bulk-editor.component.html + 28 + + + + Save current view + Aktuelle Ansicht speichern + + src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html + 3 + + + + Show all + Alle anzeigen + + src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html + 3 + + + + Statistics + Statistiken + + src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html + 1 + + + + Documents in inbox: + Dokumente im Posteingang: + + src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html + 3 + + + + Total documents: + Anzahl Dokumente gesamt: + + src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html + 4 + + + + The document has been uploaded and will be processed by the consumer shortly. + Das Dokument wurde hochgeladen und wird in Kürze durch Paperless-ng verarbeitet. + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 63 + + + + There was an error while uploading the document: + Konnte Dokument nicht hochladen: + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 71 + + + + An error has occurred while uploading the document. Sorry! + Beim Hochladen trat ein Fehler auf. Entschuldigung! + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 75 + + + + Upload new documents + Neue Dokumente hochladen + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 1 + + + + Drop documents here or + Dokumente hier ablegen oder + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 5 + + + + Browse files + Datei auswählen + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 5 + + + + {VAR_PLURAL, plural, =1 {Uploading file...} =other {Uploading files...}} + {VAR_PLURAL, plural, =1 {Lade Datei hoch...} =other {Lade Dateien hoch...}} + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 13 + + + + First steps + Erste Schritte + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 1 + + + + Paperless is running! :) + Paperless ist startbereit! :) + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 5 + + + + You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list. After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and they will appear on the dashboard instead of this message. + Sie können Ihre Dokumente hochladen, indem Sie sie in die Hochladebox auf der rechten Seite ziehen oder in den konfigurierten Ablageordner kopieren/verschieben. Danach werden sie inder Dokumentliste erscheinen. Nachdem Sie den Dokumenten einige Metadaten zugewiesen haben, können Sie die Filtermechanismen zur Erstellung individueller Ansichten benutzen (zum Beispiel "Kürzlich hinzugefügt" oder "Mit TODO markiert") und die Ansichten werden auf der Startseite erscheinen und diese Nachricht ersetzen. + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 6,7 + + + + Paperless offers some more features that try to make your life easier: + Paperless bietet darüber hinaus einige erweiterte Funktionen: + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 8 + + + + Once you've got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically. + Nachdem Sie einige Dokumente hochgeladen und mit Metadatebn haben, kann Paperless diese Metadaten automatisch passenden neuen Dokumenten zuweisen. + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 10 + + + + You can configure paperless to read your mails and add documents from attached files. + Sie können in Paperless Ihre E-Mail-Konten einrichten und Paperless wird automatisch Dokumente aus Dateianhängen erzeugen. + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 11 + + + + Consult the documentation on how to use these features. The section on basic usage also has some information on how to use paperless in general. + Die Dokumentation enthält mehr Informationen, wie diese Funktionen benutzt werden. Der Abschnitt zur allgemeinen Verwendung enthält zudem wertvolle Informationen zur generellen Verwendung von Paperless. + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 13 + + + + Metadata + Metadaten + + src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts + 18 + + + + Select + Auswählen + + src/app/components/common/select-dialog/select-dialog.component.ts + 18 + + + + Please select an object + Bitte wählen Sie ein Element aus + + src/app/components/common/select-dialog/select-dialog.component.ts + 21 + + + + Yes + Ja + + src/app/pipes/yes-no.pipe.ts + 9 + + + + No + Nein + + src/app/pipes/yes-no.pipe.ts + 9 + + + + (no title) + (kein Titel) + + src/app/pipes/document-title.pipe.ts + 12 + + + + Error + Fehler + + src/app/services/toast.service.ts + 31 + + + + Information + Information + + src/app/services/toast.service.ts + 35 + + + + Correspondent + Korrespondent + + src/app/services/rest/document.service.ts + 16 + + + + Document type + Dokumenttyp + + src/app/services/rest/document.service.ts + 17 + + + + Title + Titel + + src/app/services/rest/document.service.ts + 18 + + + + ASN + ASN + + src/app/services/rest/document.service.ts + 19 + + + + Created + Erstellt am + + src/app/services/rest/document.service.ts + 20 + + + + Added + Hinzugefügt am + + src/app/services/rest/document.service.ts + 21 + + + + Modified + Geändert am + + src/app/services/rest/document.service.ts + 22 + + + + Light blue + Hellblau + + src/app/data/paperless-tag.ts + 6 + + + + Blue + Blau + + src/app/data/paperless-tag.ts + 7 + + + + Light green + Hellgrün + + src/app/data/paperless-tag.ts + 8 + + + + Green + Grün + + src/app/data/paperless-tag.ts + 9 + + + + Light red + Hellrot + + src/app/data/paperless-tag.ts + 10 + + + + Red + Rot + + src/app/data/paperless-tag.ts + 11 + + + + Light orange + Hellorange + + src/app/data/paperless-tag.ts + 12 + + + + Orange + Orange + + src/app/data/paperless-tag.ts + 13 + + + + Light violet + Hellviolet + + src/app/data/paperless-tag.ts + 14 + + + + Violet + Violet + + src/app/data/paperless-tag.ts + 15 + + + + Brown + Braun + + src/app/data/paperless-tag.ts + 16 + + + + Black + Schwarz + + src/app/data/paperless-tag.ts + 17 + + + + Light grey + Hellgrau + + src/app/data/paperless-tag.ts + 18 + + + + Create new item + Neues Element erstellen + + src/app/components/common/edit-dialog/edit-dialog.component.ts + 38 + + + + Edit item + Element bearbeiten + + src/app/components/common/edit-dialog/edit-dialog.component.ts + 42 + + + + Could not save element: + Konnte Element nicht speichern: + + src/app/components/common/edit-dialog/edit-dialog.component.ts + 46 + + + + Automatic + Automatisch + + src/app/components/manage/generic-list/generic-list.component.ts + 31 + + + + Do you really want to delete this element? + Möchten Sie dieses Element wirklich löschen? + + src/app/components/manage/generic-list/generic-list.component.ts + 88 + + + + Associated documents will not be deleted. + Assoziierte Dokumente werden nicht gelöscht. + + src/app/components/manage/generic-list/generic-list.component.ts + 95 + + + + Delete + Löschen + + src/app/components/manage/generic-list/generic-list.component.ts + 97 + + + + Any word + Irgendein Wort + + src/app/data/matching-model.ts + 12 + + + + Any: Document contains any of these words (space separated) + Irgendein Wort: Dokument enthält eins der folgender Wörter + + src/app/data/matching-model.ts + 12 + + + + All words + Alle Wörter + + src/app/data/matching-model.ts + 13 + + + + All: Document contains all of these words (space separated) + Alle: Dokument enthält alle folgenden Wörter + + src/app/data/matching-model.ts + 13 + + + + Exact match + Exakte Übereinstimmung + + src/app/data/matching-model.ts + 14 + + + + Exact: Document contains this string + Exakt: Dokument enthält die folgende Zeichenkette + + src/app/data/matching-model.ts + 14 + + + + Regular expression + Regulärer Ausdruck + + src/app/data/matching-model.ts + 15 + + + + Regular expression: Document matches this regular expression + Regulärer Ausdruck: Dokument passt zum folgenden Audruck + + src/app/data/matching-model.ts + 15 + + + + Fuzzy word + Ungenaues Wort + + src/app/data/matching-model.ts + 16 + + + + Fuzzy: Document contains a word similar to this word + Ungenau: Dokument enthält ein zum folgdendem Wort ähnliches Wort + + src/app/data/matching-model.ts + 16 + + + + Auto: Learn matching automatically + Auto: Zuweisung automatisch erlernen + + src/app/data/matching-model.ts + 17 + + + + + \ No newline at end of file diff --git a/src-ui/src/manifest.webmanifest b/src-ui/src/manifest.webmanifest new file mode 100644 index 000000000..60151bb5c --- /dev/null +++ b/src-ui/src/manifest.webmanifest @@ -0,0 +1,14 @@ +{ + "background_color": "white", + "description": "A supercharged version of paperless: scan, index and archive all your physical documents", + "display": "fullscreen", + "icons": [ + { + "src": "favicon.ico", + "sizes": "128x128" + } + ], + "name": "Paperless NG", + "short_name": "Paperless NG", + "start_url": "/" +} diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scss index 7e9a9377a..8cf4a93f6 100644 --- a/src-ui/src/styles.scss +++ b/src-ui/src/styles.scss @@ -1,4 +1,5 @@ @import "theme"; +@import "theme_dark"; @import "node_modules/bootstrap/scss/bootstrap"; @import "~@ng-select/ng-select/themes/default.theme.css"; diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss new file mode 100644 index 000000000..88c2b8014 --- /dev/null +++ b/src-ui/src/theme_dark.scss @@ -0,0 +1,337 @@ +$primary-dark-mode: #45973a; +$danger-dark-mode: #b71631; +$bg-dark-mode: #161618; +$bg-light-dark-mode: #1c1c1f; +$text-color-dark-mode: #abb2bf; +$text-color-dark-mode-accent: lighten($text-color-dark-mode, 10%); +$border-color-dark-mode: #47494f; + +* { + transition: background-color 0.3s ease, border-color 0.3s ease; +} + +@mixin dark-mode { + background-color: $bg-dark-mode !important; + color: $text-color-dark-mode; + + .navbar-brand { + color: $text-color-dark-mode; + } + + svg.logo { + .leaf { + color: $primary-dark-mode !important; + } + .text { + fill: $text-color-dark-mode !important; + } + } + + .bg-light { + background-color: $bg-light-dark-mode !important; + + a, + div { + color: $text-color-dark-mode; + } + } + + .text-light { + color: $text-color-dark-mode !important; + } + + .border { + border-color: $border-color-dark-mode !important; + } + + .border-right { + border-right: 1px solid $border-color-dark-mode !important; + } + + .border-left { + border-left: 1px solid $border-color-dark-mode !important; + } + + .border-bottom { + border-bottom: 1px solid $border-color-dark-mode !important; + } + + .nav-link { + color: $text-color-dark-mode !important; + + &.active { + background-color: $bg-dark-mode; + color: $text-color-dark-mode; + border-color: $border-color-dark-mode $border-color-dark-mode $bg-dark-mode; + } + + &:hover { + color: $text-color-dark-mode-accent !important; + border-color: $border-color-dark-mode $border-color-dark-mode $bg-dark-mode; + } + } + + .nav-tabs { + border-color: $border-color-dark-mode; + + .nav-link { + color: $primary-dark-mode !important; + + &.active { + color: $text-color-dark-mode !important; + } + } + } + + .dropdown-menu { + background-color: $bg-dark-mode; + + .dropdown-divider { + border-color: $border-color-dark-mode; + } + + .dropdown-item { + color: $text-color-dark-mode; + + &:hover { + background-color: $bg-light-dark-mode; + color: $text-color-dark-mode; + } + } + + .dropdown-item.disabled { + color: darken($text-color-dark-mode, 20%); + } + } + + .card { + background-color: $bg-light-dark-mode; + + .card-text { + color: $text-color-dark-mode; + } + } + + .text-dark { + color: $text-color-dark-mode !important; + } + + .modal-content, .modal-header, .modal-body, .modal-footer { + background-color: $bg-light-dark-mode; + border-color: $border-color-dark-mode; + } + + app-tag .badge { + filter: brightness(.8); + } + + .badge-light { + background-color: darken($bg-dark-mode, 20%); + color: $text-color-dark-mode-accent; + } + + .doc-img-container { + border: none !important; + border-top-left-radius: .25rem; + border-top-right-radius: .25rem; + overflow: hidden; + } + + .doc-img { + mix-blend-mode: normal; + filter: invert(95%) hue-rotate(180deg); + border-radius: 0; + border-color: $bg-dark-mode; + + &.border-right { + border-right: none !important; + } + } + + .card-selected .doc-img { + mix-blend-mode: luminosity; + } + + .toast { + background-color: opacify($bg-light-dark-mode, .85); + } + + .toast-header { + background-color: opacify($bg-dark-mode, .85); + } + + a, + .card-title a { + color: $primary-dark-mode; + + &:hover { + color: lighten($primary, 10%); + } + } + + table { + background-color: $bg-dark-mode; + color: $text-color-dark-mode; + border-color: $border-color-dark-mode; + + tr:hover { + background-color: $bg-light-dark-mode; + color: $text-color-dark-mode-accent; + } + } + + .table td, + .table th { + border-color: $border-color-dark-mode; + } + + .table-row-selected { + background-color: $bg-light-dark-mode; + } + + .close { + color: $text-color-dark-mode; + text-shadow: 0 1px 0 #666; + } + + .btn-outline-primary { + border-color: $primary-dark-mode; + color: $primary-dark-mode; + + &:not(:disabled):not(.disabled).active, + &:not(:disabled):not(.disabled):hover { + background-color: darken($primary-dark-mode, 10%); + border-color: darken($primary-dark-mode, 10%); + color: $text-color-dark-mode-accent; + } + } + + .btn-outline-secondary { + border-color: $text-color-dark-mode; + color: $text-color-dark-mode; + + &:not(:disabled):not(.disabled):hover { + background-color: $bg-dark-mode; + } + } + + .btn-outline-danger { + border-color: $danger-dark-mode; + color: $danger-dark-mode; + + &:not(:disabled):not(.disabled):hover { + background-color: darken($danger-dark-mode, 10%); + border-color: darken($danger-dark-mode, 10%); + color: $text-color-dark-mode-accent; + } + } + + .btn-outline-dark { + border-color: $border-color-dark-mode; + color: $text-color-dark-mode; + + &:not(:disabled):not(.disabled):hover { + color: $text-color-dark-mode-accent; + } + } + + .btn-link:not(:disabled):not(.disabled) { + color: $primary-dark-mode; + } + + .btn-link:hover, + .btn-outline-primary:not(:disabled):not(.disabled).active, + .btn-outline-primary:not(:disabled):not(.disabled):active, + .show > .btn-outline-primary.dropdown-toggle { + color: $text-color-dark-mode-accent; + } + + button.bg-light:hover { + background-color: $bg-dark-mode !important; + } + + .form-control, + input, + select, + textarea { + background-color: $bg-dark-mode; + color: $text-color-dark-mode; + border-color: $border-color-dark-mode; + + &::placeholder { + color: $text-color-dark-mode; + } + + &:focus { + background-color: $bg-light-dark-mode !important; + color: darken($text-color-dark-mode, 10%) !important; + } + } + + .ng-select-container, + .ng-select.ng-select-opened > .ng-select-container, + .ng-dropdown-panel, + .ng-dropdown-panel .ng-dropdown-panel-items .ng-option { + background-color: $bg-dark-mode; + color: $text-color-dark-mode; + border-color: $border-color-dark-mode; + + input:focus { + background-color: transparent !important; + } + } + + .ng-dropdown-panel .ng-dropdown-panel-items .ng-option:hover { + background-color: $bg-light-dark-mode; + } + + .custom-control-label:before { + background-color: $bg-dark-mode; + color: $text-color-dark-mode; + } + + .custom-control-input:checked ~ .custom-control-label::before { + color: $text-color-dark-mode-accent; + } + + .input-group-text { + color: $text-color-dark-mode; + background-color: $bg-light-dark-mode; + border-color: $border-color-dark-mode; + } + + .list-group-item { + color: $text-color-dark-mode; + background-color: $bg-light-dark-mode; + border-color: $border-color-dark-mode; + } + + .page-item.disabled .page-link { + background-color: $bg-dark-mode; + border-color: $border-color-dark-mode; + } + + .list-group-item, + .page-link { + background-color: $bg-light-dark-mode; + border-color: $border-color-dark-mode; + } + + .page-item.active .page-link { + border-color: $border-color-dark-mode; + color: $text-color-dark-mode-accent; + } + + .progress { + background-color: $border-color-dark-mode; + } +} + +body.color-scheme-dark { + @include dark-mode; +} +body.color-scheme-system { + @media (prefers-color-scheme: dark) { + @include dark-mode; + } +} diff --git a/src/documents/apps.py b/src/documents/apps.py index 2cd7d6c0e..e21e14097 100644 --- a/src/documents/apps.py +++ b/src/documents/apps.py @@ -1,34 +1,30 @@ from django.apps import AppConfig +from django.utils.translation import gettext_lazy as _ + class DocumentsConfig(AppConfig): name = "documents" - def ready(self): + verbose_name = _("Documents") - from .signals import document_consumption_started + def ready(self): from .signals import document_consumption_finished from .signals.handlers import ( add_inbox_tags, - run_pre_consume_script, - run_post_consume_script, set_log_entry, set_correspondent, set_document_type, set_tags, add_to_index - ) - document_consumption_started.connect(run_pre_consume_script) - document_consumption_finished.connect(add_inbox_tags) document_consumption_finished.connect(set_correspondent) document_consumption_finished.connect(set_document_type) document_consumption_finished.connect(set_tags) document_consumption_finished.connect(set_log_entry) document_consumption_finished.connect(add_to_index) - document_consumption_finished.connect(run_post_consume_script) AppConfig.ready(self) diff --git a/src/documents/consumer.py b/src/documents/consumer.py index 4bcb6d1d9..480537279 100755 --- a/src/documents/consumer.py +++ b/src/documents/consumer.py @@ -1,7 +1,7 @@ import datetime import hashlib -import logging import os +from subprocess import Popen import magic from django.conf import settings @@ -9,6 +9,7 @@ from django.db import transaction from django.db.models import Q from django.utils import timezone from filelock import FileLock +from rest_framework.reverse import reverse from .classifier import DocumentClassifier, IncompatibleClassifierVersionError from .file_handling import create_source_path_directory, \ @@ -66,6 +67,39 @@ class Consumer(LoggingMixin): os.makedirs(settings.ORIGINALS_DIR, exist_ok=True) os.makedirs(settings.ARCHIVE_DIR, exist_ok=True) + def run_pre_consume_script(self): + if not settings.PRE_CONSUME_SCRIPT: + return + + try: + Popen((settings.PRE_CONSUME_SCRIPT, self.path)).wait() + except Exception as e: + raise ConsumerError( + f"Error while executing pre-consume script: {e}" + ) + + def run_post_consume_script(self, document): + if not settings.POST_CONSUME_SCRIPT: + return + + try: + Popen(( + settings.POST_CONSUME_SCRIPT, + str(document.pk), + document.get_public_filename(), + os.path.normpath(document.source_path), + os.path.normpath(document.thumbnail_path), + reverse("document-download", kwargs={"pk": document.pk}), + reverse("document-thumb", kwargs={"pk": document.pk}), + str(document.correspondent), + str(",".join(document.tags.all().values_list( + "name", flat=True))) + )).wait() + except Exception as e: + raise ConsumerError( + f"Error while executing pre-consume script: {e}" + ) + def try_consume_file(self, path, override_filename=None, @@ -119,6 +153,8 @@ class Consumer(LoggingMixin): logging_group=self.logging_group ) + self.run_pre_consume_script() + # This doesn't parse the document yet, but gives us a parser. document_parser = parser_class(self.logging_group) @@ -130,7 +166,7 @@ class Consumer(LoggingMixin): try: self.log("debug", "Parsing {}...".format(self.filename)) - document_parser.parse(self.path, mime_type) + document_parser.parse(self.path, mime_type, self.filename) self.log("debug", f"Generating thumbnail for {self.filename}...") thumbnail = document_parser.get_optimised_thumbnail( @@ -158,7 +194,7 @@ class Consumer(LoggingMixin): try: classifier = DocumentClassifier() classifier.reload() - except (FileNotFoundError, IncompatibleClassifierVersionError) as e: + except (OSError, EOFError, IncompatibleClassifierVersionError) as e: self.log( "warning", f"Cannot classify documents: {e}.") @@ -215,6 +251,9 @@ class Consumer(LoggingMixin): # Delete the file only if it was successfully consumed self.log("debug", "Deleting file {}".format(self.path)) os.unlink(self.path) + + self.run_post_consume_script(document) + except Exception as e: self.log( "error", diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py index 5643756ac..a5274a5f4 100644 --- a/src/documents/file_handling.py +++ b/src/documents/file_handling.py @@ -100,7 +100,9 @@ def generate_filename(doc, counter=0): many_to_dictionary(doc.tags)) tag_list = pathvalidate.sanitize_filename( - ",".join([tag.name for tag in doc.tags.all()]), + ",".join(sorted( + [tag.name for tag in doc.tags.all()] + )), replacement_text="-" ) diff --git a/src/documents/management/commands/document_retagger.py b/src/documents/management/commands/document_retagger.py index cf014dc6f..0fb9782c1 100755 --- a/src/documents/management/commands/document_retagger.py +++ b/src/documents/management/commands/document_retagger.py @@ -73,7 +73,7 @@ class Command(Renderable, BaseCommand): classifier = DocumentClassifier() try: classifier.reload() - except (FileNotFoundError, IncompatibleClassifierVersionError) as e: + except (OSError, EOFError, IncompatibleClassifierVersionError) as e: logging.getLogger(__name__).warning( f"Cannot classify documents: {e}.") classifier = None diff --git a/src/documents/management/commands/document_thumbnails.py b/src/documents/management/commands/document_thumbnails.py new file mode 100644 index 000000000..01df14624 --- /dev/null +++ b/src/documents/management/commands/document_thumbnails.py @@ -0,0 +1,68 @@ +import logging +import multiprocessing +import shutil + +import tqdm +from django import db +from django.core.management.base import BaseCommand + +from documents.models import Document +from ...mixins import Renderable +from ...parsers import get_parser_class_for_mime_type + + +def _process_document(doc_in): + document = Document.objects.get(id=doc_in) + parser = get_parser_class_for_mime_type(document.mime_type)( + logging_group=None) + try: + thumb = parser.get_optimised_thumbnail( + document.source_path, document.mime_type) + + shutil.move(thumb, document.thumbnail_path) + finally: + parser.cleanup() + + +class Command(Renderable, BaseCommand): + + help = """ + This will regenerate the thumbnails for all documents. + """.replace(" ", "") + + def __init__(self, *args, **kwargs): + self.verbosity = 0 + BaseCommand.__init__(self, *args, **kwargs) + + def add_arguments(self, parser): + parser.add_argument( + "-d", "--document", + default=None, + type=int, + required=False, + help="Specify the ID of a document, and this command will only " + "run on this specific document." + ) + + def handle(self, *args, **options): + + self.verbosity = options["verbosity"] + + logging.getLogger().handlers[0].level = logging.ERROR + + if options['document']: + documents = Document.objects.filter(pk=options['document']) + else: + documents = Document.objects.all() + + ids = [doc.id for doc in documents] + + # Note to future self: this prevents django from reusing database + # conncetions between processes, which is bad and does not work + # with postgres. + db.connections.close_all() + + with multiprocessing.Pool() as pool: + list(tqdm.tqdm( + pool.imap_unordered(_process_document, ids), total=len(ids) + )) diff --git a/src/documents/migrations/1010_auto_20210101_2159.py b/src/documents/migrations/1010_auto_20210101_2159.py new file mode 100644 index 000000000..4c30125be --- /dev/null +++ b/src/documents/migrations/1010_auto_20210101_2159.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.4 on 2021-01-01 21:59 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('documents', '1009_auto_20201216_2005'), + ] + + operations = [ + migrations.AlterField( + model_name='savedviewfilterrule', + name='value', + field=models.CharField(blank=True, max_length=128, null=True), + ), + ] diff --git a/src/documents/migrations/1011_auto_20210101_2340.py b/src/documents/migrations/1011_auto_20210101_2340.py new file mode 100644 index 000000000..9405a5210 --- /dev/null +++ b/src/documents/migrations/1011_auto_20210101_2340.py @@ -0,0 +1,250 @@ +# Generated by Django 3.1.4 on 2021-01-01 23:40 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('documents', '1010_auto_20210101_2159'), + ] + + operations = [ + migrations.AlterModelOptions( + name='correspondent', + options={'ordering': ('name',), 'verbose_name': 'correspondent', 'verbose_name_plural': 'correspondents'}, + ), + migrations.AlterModelOptions( + name='document', + options={'ordering': ('-created',), 'verbose_name': 'document', 'verbose_name_plural': 'documents'}, + ), + migrations.AlterModelOptions( + name='documenttype', + options={'verbose_name': 'document type', 'verbose_name_plural': 'document types'}, + ), + migrations.AlterModelOptions( + name='log', + options={'ordering': ('-created',), 'verbose_name': 'log', 'verbose_name_plural': 'logs'}, + ), + migrations.AlterModelOptions( + name='savedview', + options={'ordering': ('name',), 'verbose_name': 'saved view', 'verbose_name_plural': 'saved views'}, + ), + migrations.AlterModelOptions( + name='savedviewfilterrule', + options={'verbose_name': 'filter rule', 'verbose_name_plural': 'filter rules'}, + ), + migrations.AlterModelOptions( + name='tag', + options={'verbose_name': 'tag', 'verbose_name_plural': 'tags'}, + ), + migrations.AlterField( + model_name='correspondent', + name='is_insensitive', + field=models.BooleanField(default=True, verbose_name='is insensitive'), + ), + migrations.AlterField( + model_name='correspondent', + name='match', + field=models.CharField(blank=True, max_length=256, verbose_name='match'), + ), + migrations.AlterField( + model_name='correspondent', + name='matching_algorithm', + field=models.PositiveIntegerField(choices=[(1, 'Any word'), (2, 'All words'), (3, 'Exact match'), (4, 'Regular expression'), (5, 'Fuzzy word'), (6, 'Automatic')], default=1, verbose_name='matching algorithm'), + ), + migrations.AlterField( + model_name='correspondent', + name='name', + field=models.CharField(max_length=128, unique=True, verbose_name='name'), + ), + migrations.AlterField( + model_name='document', + name='added', + field=models.DateTimeField(db_index=True, default=django.utils.timezone.now, editable=False, verbose_name='added'), + ), + migrations.AlterField( + model_name='document', + name='archive_checksum', + field=models.CharField(blank=True, editable=False, help_text='The checksum of the archived document.', max_length=32, null=True, verbose_name='archive checksum'), + ), + migrations.AlterField( + model_name='document', + name='archive_serial_number', + field=models.IntegerField(blank=True, db_index=True, help_text='The position of this document in your physical document archive.', null=True, unique=True, verbose_name='archive serial number'), + ), + migrations.AlterField( + model_name='document', + name='checksum', + field=models.CharField(editable=False, help_text='The checksum of the original document.', max_length=32, unique=True, verbose_name='checksum'), + ), + migrations.AlterField( + model_name='document', + name='content', + field=models.TextField(blank=True, help_text='The raw, text-only data of the document. This field is primarily used for searching.', verbose_name='content'), + ), + migrations.AlterField( + model_name='document', + name='correspondent', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='documents', to='documents.correspondent', verbose_name='correspondent'), + ), + migrations.AlterField( + model_name='document', + name='created', + field=models.DateTimeField(db_index=True, default=django.utils.timezone.now, verbose_name='created'), + ), + migrations.AlterField( + model_name='document', + name='document_type', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='documents', to='documents.documenttype', verbose_name='document type'), + ), + migrations.AlterField( + model_name='document', + name='filename', + field=models.FilePathField(default=None, editable=False, help_text='Current filename in storage', max_length=1024, null=True, verbose_name='filename'), + ), + migrations.AlterField( + model_name='document', + name='mime_type', + field=models.CharField(editable=False, max_length=256, verbose_name='mime type'), + ), + migrations.AlterField( + model_name='document', + name='modified', + field=models.DateTimeField(auto_now=True, db_index=True, verbose_name='modified'), + ), + migrations.AlterField( + model_name='document', + name='storage_type', + field=models.CharField(choices=[('unencrypted', 'Unencrypted'), ('gpg', 'Encrypted with GNU Privacy Guard')], default='unencrypted', editable=False, max_length=11, verbose_name='storage type'), + ), + migrations.AlterField( + model_name='document', + name='tags', + field=models.ManyToManyField(blank=True, related_name='documents', to='documents.Tag', verbose_name='tags'), + ), + migrations.AlterField( + model_name='document', + name='title', + field=models.CharField(blank=True, db_index=True, max_length=128, verbose_name='title'), + ), + migrations.AlterField( + model_name='documenttype', + name='is_insensitive', + field=models.BooleanField(default=True, verbose_name='is insensitive'), + ), + migrations.AlterField( + model_name='documenttype', + name='match', + field=models.CharField(blank=True, max_length=256, verbose_name='match'), + ), + migrations.AlterField( + model_name='documenttype', + name='matching_algorithm', + field=models.PositiveIntegerField(choices=[(1, 'Any word'), (2, 'All words'), (3, 'Exact match'), (4, 'Regular expression'), (5, 'Fuzzy word'), (6, 'Automatic')], default=1, verbose_name='matching algorithm'), + ), + migrations.AlterField( + model_name='documenttype', + name='name', + field=models.CharField(max_length=128, unique=True, verbose_name='name'), + ), + migrations.AlterField( + model_name='log', + name='created', + field=models.DateTimeField(auto_now_add=True, verbose_name='created'), + ), + migrations.AlterField( + model_name='log', + name='group', + field=models.UUIDField(blank=True, null=True, verbose_name='group'), + ), + migrations.AlterField( + model_name='log', + name='level', + field=models.PositiveIntegerField(choices=[(10, 'debug'), (20, 'information'), (30, 'warning'), (40, 'error'), (50, 'critical')], default=20, verbose_name='level'), + ), + migrations.AlterField( + model_name='log', + name='message', + field=models.TextField(verbose_name='message'), + ), + migrations.AlterField( + model_name='savedview', + name='name', + field=models.CharField(max_length=128, verbose_name='name'), + ), + migrations.AlterField( + model_name='savedview', + name='show_in_sidebar', + field=models.BooleanField(verbose_name='show in sidebar'), + ), + migrations.AlterField( + model_name='savedview', + name='show_on_dashboard', + field=models.BooleanField(verbose_name='show on dashboard'), + ), + migrations.AlterField( + model_name='savedview', + name='sort_field', + field=models.CharField(max_length=128, verbose_name='sort field'), + ), + migrations.AlterField( + model_name='savedview', + name='sort_reverse', + field=models.BooleanField(default=False, verbose_name='sort reverse'), + ), + migrations.AlterField( + model_name='savedview', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='user'), + ), + migrations.AlterField( + model_name='savedviewfilterrule', + name='rule_type', + field=models.PositiveIntegerField(choices=[(0, 'title contains'), (1, 'content contains'), (2, 'ASN is'), (3, 'correspondent is'), (4, 'document type is'), (5, 'is in inbox'), (6, 'has tag'), (7, 'has any tag'), (8, 'created before'), (9, 'created after'), (10, 'created year is'), (11, 'created month is'), (12, 'created day is'), (13, 'added before'), (14, 'added after'), (15, 'modified before'), (16, 'modified after'), (17, 'does not have tag')], verbose_name='rule type'), + ), + migrations.AlterField( + model_name='savedviewfilterrule', + name='saved_view', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='filter_rules', to='documents.savedview', verbose_name='saved view'), + ), + migrations.AlterField( + model_name='savedviewfilterrule', + name='value', + field=models.CharField(blank=True, max_length=128, null=True, verbose_name='value'), + ), + migrations.AlterField( + model_name='tag', + name='colour', + field=models.PositiveIntegerField(choices=[(1, '#a6cee3'), (2, '#1f78b4'), (3, '#b2df8a'), (4, '#33a02c'), (5, '#fb9a99'), (6, '#e31a1c'), (7, '#fdbf6f'), (8, '#ff7f00'), (9, '#cab2d6'), (10, '#6a3d9a'), (11, '#b15928'), (12, '#000000'), (13, '#cccccc')], default=1, verbose_name='color'), + ), + migrations.AlterField( + model_name='tag', + name='is_inbox_tag', + field=models.BooleanField(default=False, help_text='Marks this tag as an inbox tag: All newly consumed documents will be tagged with inbox tags.', verbose_name='is inbox tag'), + ), + migrations.AlterField( + model_name='tag', + name='is_insensitive', + field=models.BooleanField(default=True, verbose_name='is insensitive'), + ), + migrations.AlterField( + model_name='tag', + name='match', + field=models.CharField(blank=True, max_length=256, verbose_name='match'), + ), + migrations.AlterField( + model_name='tag', + name='matching_algorithm', + field=models.PositiveIntegerField(choices=[(1, 'Any word'), (2, 'All words'), (3, 'Exact match'), (4, 'Regular expression'), (5, 'Fuzzy word'), (6, 'Automatic')], default=1, verbose_name='matching algorithm'), + ), + migrations.AlterField( + model_name='tag', + name='name', + field=models.CharField(max_length=128, unique=True, verbose_name='name'), + ), + ] diff --git a/src/documents/models.py b/src/documents/models.py index 168dd8c7b..3f0e331d0 100755 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -13,6 +13,8 @@ from django.contrib.auth.models import User from django.db import models from django.utils import timezone +from django.utils.translation import gettext_lazy as _ + from documents.file_handling import archive_name_from_filename from documents.parsers import get_default_file_extension @@ -27,36 +29,31 @@ class MatchingModel(models.Model): MATCH_AUTO = 6 MATCHING_ALGORITHMS = ( - (MATCH_ANY, "Any"), - (MATCH_ALL, "All"), - (MATCH_LITERAL, "Literal"), - (MATCH_REGEX, "Regular Expression"), - (MATCH_FUZZY, "Fuzzy Match"), - (MATCH_AUTO, "Automatic Classification"), + (MATCH_ANY, _("Any word")), + (MATCH_ALL, _("All words")), + (MATCH_LITERAL, _("Exact match")), + (MATCH_REGEX, _("Regular expression")), + (MATCH_FUZZY, _("Fuzzy word")), + (MATCH_AUTO, _("Automatic")), ) - name = models.CharField(max_length=128, unique=True) + name = models.CharField( + _("name"), + max_length=128, unique=True) + + match = models.CharField( + _("match"), + max_length=256, blank=True) - match = models.CharField(max_length=256, blank=True) matching_algorithm = models.PositiveIntegerField( + _("matching algorithm"), choices=MATCHING_ALGORITHMS, - default=MATCH_ANY, - help_text=( - "Which algorithm you want to use when matching text to the OCR'd " - "PDF. Here, \"any\" looks for any occurrence of any word " - "provided in the PDF, while \"all\" requires that every word " - "provided appear in the PDF, albeit not in the order provided. A " - "\"literal\" match means that the text you enter must appear in " - "the PDF exactly as you've entered it, and \"regular expression\" " - "uses a regex to match the PDF. (If you don't know what a regex " - "is, you probably don't want this option.) Finally, a \"fuzzy " - "match\" looks for words or phrases that are mostly—but not " - "exactly—the same, which can be useful for matching against " - "documents containg imperfections that foil accurate OCR." - ) + default=MATCH_ANY ) - is_insensitive = models.BooleanField(default=True) + is_insensitive = models.BooleanField( + _("is insensitive"), + default=True) class Meta: abstract = True @@ -80,6 +77,8 @@ class Correspondent(MatchingModel): class Meta: ordering = ("name",) + verbose_name = _("correspondent") + verbose_name_plural = _("correspondents") class Tag(MatchingModel): @@ -100,18 +99,27 @@ class Tag(MatchingModel): (13, "#cccccc") ) - colour = models.PositiveIntegerField(choices=COLOURS, default=1) + colour = models.PositiveIntegerField( + _("color"), + choices=COLOURS, default=1) is_inbox_tag = models.BooleanField( + _("is inbox tag"), default=False, - help_text="Marks this tag as an inbox tag: All newly consumed " - "documents will be tagged with inbox tags." + help_text=_("Marks this tag as an inbox tag: All newly consumed " + "documents will be tagged with inbox tags.") ) + class Meta: + verbose_name = _("tag") + verbose_name_plural = _("tags") + class DocumentType(MatchingModel): - pass + class Meta: + verbose_name = _("document type") + verbose_name_plural = _("document types") class Document(models.Model): @@ -119,8 +127,8 @@ class Document(models.Model): STORAGE_TYPE_UNENCRYPTED = "unencrypted" STORAGE_TYPE_GPG = "gpg" STORAGE_TYPES = ( - (STORAGE_TYPE_UNENCRYPTED, "Unencrypted"), - (STORAGE_TYPE_GPG, "Encrypted with GNU Privacy Guard") + (STORAGE_TYPE_UNENCRYPTED, _("Unencrypted")), + (STORAGE_TYPE_GPG, _("Encrypted with GNU Privacy Guard")) ) correspondent = models.ForeignKey( @@ -128,55 +136,68 @@ class Document(models.Model): blank=True, null=True, related_name="documents", - on_delete=models.SET_NULL + on_delete=models.SET_NULL, + verbose_name=_("correspondent") ) - title = models.CharField(max_length=128, blank=True, db_index=True) + title = models.CharField( + _("title"), + max_length=128, blank=True, db_index=True) document_type = models.ForeignKey( DocumentType, blank=True, null=True, related_name="documents", - on_delete=models.SET_NULL + on_delete=models.SET_NULL, + verbose_name=_("document type") ) content = models.TextField( + _("content"), blank=True, - help_text="The raw, text-only data of the document. This field is " - "primarily used for searching." + help_text=_("The raw, text-only data of the document. This field is " + "primarily used for searching.") ) mime_type = models.CharField( + _("mime type"), max_length=256, editable=False ) tags = models.ManyToManyField( - Tag, related_name="documents", blank=True) + Tag, related_name="documents", blank=True, + verbose_name=_("tags") + ) checksum = models.CharField( + _("checksum"), max_length=32, editable=False, unique=True, - help_text="The checksum of the original document." + help_text=_("The checksum of the original document.") ) archive_checksum = models.CharField( + _("archive checksum"), max_length=32, editable=False, blank=True, null=True, - help_text="The checksum of the archived document." + help_text=_("The checksum of the archived document.") ) created = models.DateTimeField( + _("created"), default=timezone.now, db_index=True) modified = models.DateTimeField( + _("modified"), auto_now=True, editable=False, db_index=True) storage_type = models.CharField( + _("storage type"), max_length=11, choices=STORAGE_TYPES, default=STORAGE_TYPE_UNENCRYPTED, @@ -184,27 +205,32 @@ class Document(models.Model): ) added = models.DateTimeField( + _("added"), default=timezone.now, editable=False, db_index=True) filename = models.FilePathField( + _("filename"), max_length=1024, editable=False, default=None, null=True, - help_text="Current filename in storage" + help_text=_("Current filename in storage") ) archive_serial_number = models.IntegerField( + _("archive serial number"), blank=True, null=True, unique=True, db_index=True, - help_text="The position of this document in your physical document " - "archive." + help_text=_("The position of this document in your physical document " + "archive.") ) class Meta: ordering = ("-created",) + verbose_name = _("document") + verbose_name_plural = _("documents") def __str__(self): created = datetime.date.isoformat(self.created) @@ -286,20 +312,29 @@ class Document(models.Model): class Log(models.Model): LEVELS = ( - (logging.DEBUG, "Debugging"), - (logging.INFO, "Informational"), - (logging.WARNING, "Warning"), - (logging.ERROR, "Error"), - (logging.CRITICAL, "Critical"), + (logging.DEBUG, _("debug")), + (logging.INFO, _("information")), + (logging.WARNING, _("warning")), + (logging.ERROR, _("error")), + (logging.CRITICAL, _("critical")), ) - group = models.UUIDField(blank=True, null=True) - message = models.TextField() - level = models.PositiveIntegerField(choices=LEVELS, default=logging.INFO) - created = models.DateTimeField(auto_now_add=True) + group = models.UUIDField( + _("group"), + blank=True, null=True) + + message = models.TextField(_("message")) + + level = models.PositiveIntegerField( + _("level"), + choices=LEVELS, default=logging.INFO) + + created = models.DateTimeField(_("created"), auto_now_add=True) class Meta: ordering = ("-created",) + verbose_name = _("log") + verbose_name_plural = _("logs") def __str__(self): return self.message @@ -310,48 +345,72 @@ class SavedView(models.Model): class Meta: ordering = ("name",) + verbose_name = _("saved view") + verbose_name_plural = _("saved views") - user = models.ForeignKey(User, on_delete=models.CASCADE) - name = models.CharField(max_length=128) + user = models.ForeignKey(User, on_delete=models.CASCADE, + verbose_name=_("user")) + name = models.CharField( + _("name"), + max_length=128) - show_on_dashboard = models.BooleanField() - show_in_sidebar = models.BooleanField() + show_on_dashboard = models.BooleanField( + _("show on dashboard"), + ) + show_in_sidebar = models.BooleanField( + _("show in sidebar"), + ) - sort_field = models.CharField(max_length=128) - sort_reverse = models.BooleanField(default=False) + sort_field = models.CharField( + _("sort field"), + max_length=128) + sort_reverse = models.BooleanField( + _("sort reverse"), + default=False) class SavedViewFilterRule(models.Model): RULE_TYPES = [ - (0, "Title contains"), - (1, "Content contains"), - (2, "ASN is"), - (3, "Correspondent is"), - (4, "Document type is"), - (5, "Is in inbox"), - (6, "Has tag"), - (7, "Has any tag"), - (8, "Created before"), - (9, "Created after"), - (10, "Created year is"), - (11, "Created month is"), - (12, "Created day is"), - (13, "Added before"), - (14, "Added after"), - (15, "Modified before"), - (16, "Modified after"), - (17, "Does not have tag"), + (0, _("title contains")), + (1, _("content contains")), + (2, _("ASN is")), + (3, _("correspondent is")), + (4, _("document type is")), + (5, _("is in inbox")), + (6, _("has tag")), + (7, _("has any tag")), + (8, _("created before")), + (9, _("created after")), + (10, _("created year is")), + (11, _("created month is")), + (12, _("created day is")), + (13, _("added before")), + (14, _("added after")), + (15, _("modified before")), + (16, _("modified after")), + (17, _("does not have tag")), ] saved_view = models.ForeignKey( SavedView, on_delete=models.CASCADE, - related_name="filter_rules" + related_name="filter_rules", + verbose_name=_("saved view") ) - rule_type = models.PositiveIntegerField(choices=RULE_TYPES) + rule_type = models.PositiveIntegerField( + _("rule type"), + choices=RULE_TYPES) - value = models.CharField(max_length=128) + value = models.CharField( + _("value"), + max_length=128, + blank=True, + null=True) + + class Meta: + verbose_name = _("filter rule") + verbose_name_plural = _("filter rules") # TODO: why is this in the models file? diff --git a/src/documents/parsers.py b/src/documents/parsers.py index cbbb912de..371a53c4b 100644 --- a/src/documents/parsers.py +++ b/src/documents/parsers.py @@ -117,6 +117,7 @@ def run_convert(input_file, trim=False, type=None, depth=None, + auto_orient=False, extra=None, logging_group=None): @@ -134,6 +135,7 @@ def run_convert(input_file, args += ['-trim'] if trim else [] args += ['-type', str(type)] if type else [] args += ['-depth', str(depth)] if depth else [] + args += ['-auto-orient'] if auto_orient else [] args += [input_file, output_file] logger.debug("Execute: " + " ".join(args), extra={'group': logging_group}) @@ -142,6 +144,53 @@ def run_convert(input_file, raise ParseError("Convert failed at {}".format(args)) +def make_thumbnail_from_pdf(in_path, temp_dir, logging_group=None): + """ + The thumbnail of a PDF is just a 500px wide image of the first page. + """ + out_path = os.path.join(temp_dir, "convert.png") + + # Run convert to get a decent thumbnail + try: + run_convert(density=300, + scale="500x5000>", + alpha="remove", + strip=True, + trim=False, + auto_orient=True, + input_file="{}[0]".format(in_path), + output_file=out_path, + logging_group=logging_group) + except ParseError: + # if convert fails, fall back to extracting + # the first PDF page as a PNG using Ghostscript + logger.warning( + "Thumbnail generation with ImageMagick failed, falling back " + "to ghostscript. Check your /etc/ImageMagick-x/policy.xml!", + extra={'group': logging_group} + ) + gs_out_path = os.path.join(temp_dir, "gs_out.png") + cmd = [settings.GS_BINARY, + "-q", + "-sDEVICE=pngalpha", + "-o", gs_out_path, + in_path] + if not subprocess.Popen(cmd).wait() == 0: + raise ParseError("Thumbnail (gs) failed at {}".format(cmd)) + # then run convert on the output from gs + run_convert(density=300, + scale="500x5000>", + alpha="remove", + strip=True, + trim=False, + auto_orient=True, + input_file=gs_out_path, + output_file=out_path, + logging_group=logging_group) + + return out_path + + def parse_date(filename, text): """ Returns the date of the document. @@ -219,7 +268,7 @@ class DocumentParser(LoggingMixin): def extract_metadata(self, document_path, mime_type): return [] - def parse(self, document_path, mime_type): + def parse(self, document_path, mime_type, file_name=None): raise NotImplementedError() def get_archive_path(self): diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py index 586897585..be101b3af 100755 --- a/src/documents/signals/handlers.py +++ b/src/documents/signals/handlers.py @@ -11,7 +11,6 @@ from django.db.models import Q from django.dispatch import receiver from django.utils import timezone from filelock import FileLock -from rest_framework.reverse import reverse from .. import index, matching from ..file_handling import delete_empty_directories, \ @@ -147,32 +146,6 @@ def set_tags(sender, document.tags.add(*relevant_tags) -def run_pre_consume_script(sender, filename, **kwargs): - - if not settings.PRE_CONSUME_SCRIPT: - return - - Popen((settings.PRE_CONSUME_SCRIPT, filename)).wait() - - -def run_post_consume_script(sender, document, **kwargs): - - if not settings.POST_CONSUME_SCRIPT: - return - - Popen(( - settings.POST_CONSUME_SCRIPT, - str(document.pk), - document.get_public_filename(), - os.path.normpath(document.source_path), - os.path.normpath(document.thumbnail_path), - reverse("document-download", kwargs={"pk": document.pk}), - reverse("document-thumb", kwargs={"pk": document.pk}), - str(document.correspondent), - str(",".join(document.tags.all().values_list("name", flat=True))) - )).wait() - - @receiver(models.signals.post_delete, sender=Document) def cleanup_document_deletion(sender, instance, using, **kwargs): with FileLock(settings.MEDIA_LOCK): @@ -276,13 +249,6 @@ def update_filename_and_move_files(sender, instance, **kwargs): Document.objects.filter(pk=instance.pk).update( filename=new_filename) - logging.getLogger(__name__).debug( - f"Moved file {old_source_path} to {new_source_path}.") - - if instance.archive_checksum: - logging.getLogger(__name__).debug( - f"Moved file {old_archive_path} to {new_archive_path}.") - except OSError as e: instance.filename = old_filename # this happens when we can't move a file. If that's the case for diff --git a/src/documents/tasks.py b/src/documents/tasks.py index f9937c177..38ff532b5 100644 --- a/src/documents/tasks.py +++ b/src/documents/tasks.py @@ -35,9 +35,9 @@ def train_classifier(): try: # load the classifier, since we might not have to train it again. classifier.reload() - except (FileNotFoundError, IncompatibleClassifierVersionError): + except (OSError, EOFError, IncompatibleClassifierVersionError): # This is what we're going to fix here. - pass + classifier = DocumentClassifier() try: if classifier.train(): @@ -94,7 +94,10 @@ def bulk_update_documents(document_ids): documents = Document.objects.filter(id__in=document_ids) ix = index.open_index() + + for doc in documents: + post_save.send(Document, instance=doc, created=False) + with AsyncWriter(ix) as writer: for doc in documents: index.update_document(writer, doc) - post_save.send(Document, instance=doc, created=False) diff --git a/src/documents/templates/index.html b/src/documents/templates/index.html index 47a352cd5..21112b643 100644 --- a/src/documents/templates/index.html +++ b/src/documents/templates/index.html @@ -12,11 +12,13 @@ - + + + Loading... - - - + + + diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py index 795ca7f95..5049c1dd2 100644 --- a/src/documents/tests/test_consumer.py +++ b/src/documents/tests/test_consumer.py @@ -177,7 +177,7 @@ class DummyParser(DocumentParser): def get_optimised_thumbnail(self, document_path, mime_type): return self.fake_thumb - def parse(self, document_path, mime_type): + def parse(self, document_path, mime_type, file_name=None): self.text = "The Text" @@ -194,7 +194,7 @@ class FaultyParser(DocumentParser): def get_optimised_thumbnail(self, document_path, mime_type): return self.fake_thumb - def parse(self, document_path, mime_type): + def parse(self, document_path, mime_type, file_name=None): raise ParseError("Does not compute.") @@ -466,3 +466,53 @@ class TestConsumer(DirectoriesMixin, TestCase): self.assertTrue(os.path.isfile(dst)) self.assertRaises(ConsumerError, self.consumer.try_consume_file, dst) self.assertTrue(os.path.isfile(dst)) + + +class PostConsumeTestCase(TestCase): + + @mock.patch("documents.consumer.Popen") + @override_settings(POST_CONSUME_SCRIPT=None) + def test_no_post_consume_script(self, m): + doc = Document.objects.create(title="Test", mime_type="application/pdf") + tag1 = Tag.objects.create(name="a") + tag2 = Tag.objects.create(name="b") + doc.tags.add(tag1) + doc.tags.add(tag2) + + Consumer().run_post_consume_script(doc) + + m.assert_not_called() + + @mock.patch("documents.consumer.Popen") + @override_settings(POST_CONSUME_SCRIPT="script") + def test_post_consume_script_simple(self, m): + doc = Document.objects.create(title="Test", mime_type="application/pdf") + + Consumer().run_post_consume_script(doc) + + m.assert_called_once() + + @mock.patch("documents.consumer.Popen") + @override_settings(POST_CONSUME_SCRIPT="script") + def test_post_consume_script_with_correspondent(self, m): + c = Correspondent.objects.create(name="my_bank") + doc = Document.objects.create(title="Test", mime_type="application/pdf", correspondent=c) + tag1 = Tag.objects.create(name="a") + tag2 = Tag.objects.create(name="b") + doc.tags.add(tag1) + doc.tags.add(tag2) + + Consumer().run_post_consume_script(doc) + + m.assert_called_once() + + args, kwargs = m.call_args + + command = args[0] + + self.assertEqual(command[0], "script") + self.assertEqual(command[1], str(doc.pk)) + self.assertEqual(command[5], f"/api/documents/{doc.pk}/download/") + self.assertEqual(command[6], f"/api/documents/{doc.pk}/thumb/") + self.assertEqual(command[7], "my_bank") + self.assertCountEqual(command[8].split(","), ["a", "b"]) diff --git a/src/documents/tests/test_post_consume_handlers.py b/src/documents/tests/test_post_consume_handlers.py deleted file mode 100644 index b4357448c..000000000 --- a/src/documents/tests/test_post_consume_handlers.py +++ /dev/null @@ -1,56 +0,0 @@ -from unittest import mock - -from django.test import TestCase, override_settings - -from documents.models import Document, Tag, Correspondent -from documents.signals.handlers import run_post_consume_script - - -class PostConsumeTestCase(TestCase): - - @mock.patch("documents.signals.handlers.Popen") - @override_settings(POST_CONSUME_SCRIPT=None) - def test_no_post_consume_script(self, m): - doc = Document.objects.create(title="Test", mime_type="application/pdf") - tag1 = Tag.objects.create(name="a") - tag2 = Tag.objects.create(name="b") - doc.tags.add(tag1) - doc.tags.add(tag2) - - run_post_consume_script(None, doc) - - m.assert_not_called() - - @mock.patch("documents.signals.handlers.Popen") - @override_settings(POST_CONSUME_SCRIPT="script") - def test_post_consume_script_simple(self, m): - doc = Document.objects.create(title="Test", mime_type="application/pdf") - - run_post_consume_script(None, doc) - - m.assert_called_once() - - @mock.patch("documents.signals.handlers.Popen") - @override_settings(POST_CONSUME_SCRIPT="script") - def test_post_consume_script_with_correspondent(self, m): - c = Correspondent.objects.create(name="my_bank") - doc = Document.objects.create(title="Test", mime_type="application/pdf", correspondent=c) - tag1 = Tag.objects.create(name="a") - tag2 = Tag.objects.create(name="b") - doc.tags.add(tag1) - doc.tags.add(tag2) - - run_post_consume_script(None, doc) - - m.assert_called_once() - - args, kwargs = m.call_args - - command = args[0] - - self.assertEqual(command[0], "script") - self.assertEqual(command[1], str(doc.pk)) - self.assertEqual(command[5], f"/api/documents/{doc.pk}/download/") - self.assertEqual(command[6], f"/api/documents/{doc.pk}/thumb/") - self.assertEqual(command[7], "my_bank") - self.assertCountEqual(command[8].split(","), ["a", "b"]) diff --git a/src/documents/views.py b/src/documents/views.py index 32b88a18f..8af29ce05 100755 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -7,6 +7,7 @@ from django.conf import settings from django.db.models import Count, Max, Case, When, IntegerField from django.db.models.functions import Lower from django.http import HttpResponse, HttpResponseBadRequest, Http404 +from django.utils.translation import get_language from django.views.decorators.cache import cache_control from django.views.generic import TemplateView from django_filters.rest_framework import DjangoFilterBackend @@ -56,11 +57,29 @@ from .serialisers import ( class IndexView(TemplateView): template_name = "index.html" + def get_language(self): + # This is here for the following reason: + # Django identifies languages in the form "en-us" + # However, angular generates locales as "en-US". + # this translates between these two forms. + lang = get_language() + if "-" in lang: + first = lang[:lang.index("-")] + second = lang[lang.index("-")+1:] + return f"{first}-{second.upper()}" + else: + return lang + def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) context['cookie_prefix'] = settings.COOKIE_PREFIX context['username'] = self.request.user.username context['full_name'] = self.request.user.get_full_name() + context['styles_css'] = f"frontend/{self.get_language()}/styles.css" + context['runtime_js'] = f"frontend/{self.get_language()}/runtime.js" + context['polyfills_js'] = f"frontend/{self.get_language()}/polyfills.js" # NOQA: E501 + context['main_js'] = f"frontend/{self.get_language()}/main.js" + context['manifest'] = f"frontend/{self.get_language()}/manifest.webmanifest" # NOQA: E501 return context diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po new file mode 100644 index 000000000..76cc28bec --- /dev/null +++ b/src/locale/de/LC_MESSAGES/django.po @@ -0,0 +1,567 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +# Translators: +# Jonas Winkler , 2021 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-01-02 00:26+0000\n" +"PO-Revision-Date: 2020-12-30 19:27+0000\n" +"Last-Translator: Jonas Winkler , 2021\n" +"Language-Team: German (https://www.transifex.com/paperless/teams/115905/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: documents/apps.py:10 +msgid "Documents" +msgstr "Dokumente" + +#: documents/models.py:32 +msgid "Any word" +msgstr "Irgendein Wort" + +#: documents/models.py:33 +msgid "All words" +msgstr "Alle Wörter" + +#: documents/models.py:34 +msgid "Exact match" +msgstr "Exakte Übereinstimmung" + +#: documents/models.py:35 +msgid "Regular expression" +msgstr "Regulärer Ausdruck" + +#: documents/models.py:36 +msgid "Fuzzy word" +msgstr "Ungenaues Wort" + +#: documents/models.py:37 +msgid "Automatic" +msgstr "Automatisch" + +#: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25 +#: paperless_mail/models.py:100 +msgid "name" +msgstr "Name" + +#: documents/models.py:45 +msgid "match" +msgstr "Zuweisungsmuster" + +#: documents/models.py:49 +msgid "matching algorithm" +msgstr "Zuweisungsalgorithmus" + +#: documents/models.py:55 +msgid "is insensitive" +msgstr "Groß-/Kleinschreibung irrelevant" + +#: documents/models.py:80 documents/models.py:140 +msgid "correspondent" +msgstr "Korrespondent" + +#: documents/models.py:81 +msgid "correspondents" +msgstr "Korrespondenten" + +#: documents/models.py:103 +msgid "color" +msgstr "Farbe" + +#: documents/models.py:107 +msgid "is inbox tag" +msgstr "Posteingangs-Tag" + +#: documents/models.py:109 +msgid "" +"Marks this tag as an inbox tag: All newly consumed documents will be tagged " +"with inbox tags." +msgstr "" +"Markiert das Tag als Posteingangs-Tag. Neue Dokumente werden immer mit " +"diesem Tag versehen." + +#: documents/models.py:114 +msgid "tag" +msgstr "Tag" + +#: documents/models.py:115 documents/models.py:171 +msgid "tags" +msgstr "Tags" + +#: documents/models.py:121 documents/models.py:153 +msgid "document type" +msgstr "Dokumenttyp" + +#: documents/models.py:122 +msgid "document types" +msgstr "Dokumenttypen" + +#: documents/models.py:130 +msgid "Unencrypted" +msgstr "Nicht verschlüsselt" + +#: documents/models.py:131 +msgid "Encrypted with GNU Privacy Guard" +msgstr "Verschlüsselt mit GNU Privacy Guard" + +#: documents/models.py:144 +msgid "title" +msgstr "Titel" + +#: documents/models.py:157 +msgid "content" +msgstr "Inhalt" + +#: documents/models.py:159 +msgid "" +"The raw, text-only data of the document. This field is primarily used for " +"searching." +msgstr "" +"Der Inhalt des Dokuments in Textform. Dieses Feld wird primär für die Suche " +"verwendet." + +#: documents/models.py:164 +msgid "mime type" +msgstr "MIME-Typ" + +#: documents/models.py:175 +msgid "checksum" +msgstr "Prüfsumme" + +#: documents/models.py:179 +msgid "The checksum of the original document." +msgstr "Die Prüfsumme des originalen Dokuments." + +#: documents/models.py:183 +msgid "archive checksum" +msgstr "Archiv-Prüfsumme" + +#: documents/models.py:188 +msgid "The checksum of the archived document." +msgstr "Die Prüfsumme des archivierten Dokuments." + +#: documents/models.py:192 documents/models.py:332 +msgid "created" +msgstr "Erstellt" + +#: documents/models.py:196 +msgid "modified" +msgstr "Geändert" + +#: documents/models.py:200 +msgid "storage type" +msgstr "Speichertyp" + +#: documents/models.py:208 +msgid "added" +msgstr "Hinzugefügt" + +#: documents/models.py:212 +msgid "filename" +msgstr "Dateiname" + +#: documents/models.py:217 +msgid "Current filename in storage" +msgstr "Aktueller Dateiname im Datenspeicher" + +#: documents/models.py:221 +msgid "archive serial number" +msgstr "Archiv-Seriennummer" + +#: documents/models.py:226 +msgid "The position of this document in your physical document archive." +msgstr "Die Position dieses Dokuments in Ihrem physischen Dokumentenarchiv." + +#: documents/models.py:232 +msgid "document" +msgstr "Dokument" + +#: documents/models.py:233 +msgid "documents" +msgstr "Dokumente" + +#: documents/models.py:315 +msgid "debug" +msgstr "Debug" + +#: documents/models.py:316 +msgid "information" +msgstr "Information" + +#: documents/models.py:317 +msgid "warning" +msgstr "Warnung" + +#: documents/models.py:318 +msgid "error" +msgstr "Fehler" + +#: documents/models.py:319 +msgid "critical" +msgstr "Kritisch" + +#: documents/models.py:323 +msgid "group" +msgstr "Gruppe" + +#: documents/models.py:326 +msgid "message" +msgstr "Nachricht" + +#: documents/models.py:329 +msgid "level" +msgstr "Level" + +#: documents/models.py:336 +msgid "log" +msgstr "Protokoll" + +#: documents/models.py:337 +msgid "logs" +msgstr "Protokoll" + +#: documents/models.py:348 documents/models.py:398 +msgid "saved view" +msgstr "Gespeicherte Ansicht" + +#: documents/models.py:349 +msgid "saved views" +msgstr "Gespeicherte Ansichten" + +#: documents/models.py:352 +msgid "user" +msgstr "Benutzer" + +#: documents/models.py:358 +msgid "show on dashboard" +msgstr "Auf Startseite zeigen" + +#: documents/models.py:361 +msgid "show in sidebar" +msgstr "In Seitenleiste zeigen" + +#: documents/models.py:365 +msgid "sort field" +msgstr "Sortierfeld" + +#: documents/models.py:368 +msgid "sort reverse" +msgstr "Umgekehrte Sortierung" + +#: documents/models.py:374 +msgid "title contains" +msgstr "Titel enthält" + +#: documents/models.py:375 +msgid "content contains" +msgstr "Inhalt enthält" + +#: documents/models.py:376 +msgid "ASN is" +msgstr "ASN ist" + +#: documents/models.py:377 +msgid "correspondent is" +msgstr "Korrespondent ist" + +#: documents/models.py:378 +msgid "document type is" +msgstr "Dokumenttyp ist" + +#: documents/models.py:379 +msgid "is in inbox" +msgstr "Ist im Posteingang" + +#: documents/models.py:380 +msgid "has tag" +msgstr "Hat Tag" + +#: documents/models.py:381 +msgid "has any tag" +msgstr "Hat irgendein Tag" + +#: documents/models.py:382 +msgid "created before" +msgstr "Erstellt vor" + +#: documents/models.py:383 +msgid "created after" +msgstr "Erstellt nach" + +#: documents/models.py:384 +msgid "created year is" +msgstr "Erstellt im Jahr" + +#: documents/models.py:385 +msgid "created month is" +msgstr "Erstellt im Monat" + +#: documents/models.py:386 +msgid "created day is" +msgstr "Erstellt am Tag" + +#: documents/models.py:387 +msgid "added before" +msgstr "Hinzugefügt vor" + +#: documents/models.py:388 +msgid "added after" +msgstr "Hinzugefügt nach" + +#: documents/models.py:389 +msgid "modified before" +msgstr "Geändert vor" + +#: documents/models.py:390 +msgid "modified after" +msgstr "Geändert nach" + +#: documents/models.py:391 +msgid "does not have tag" +msgstr "Hat nicht folgendes Tag" + +#: documents/models.py:402 +msgid "rule type" +msgstr "Regeltyp" + +#: documents/models.py:406 +msgid "value" +msgstr "Wert" + +#: documents/models.py:412 +msgid "filter rule" +msgstr "Filterregel" + +#: documents/models.py:413 +msgid "filter rules" +msgstr "Filterregeln" + +#: paperless/settings.py:254 +msgid "English" +msgstr "Englisch" + +#: paperless/settings.py:255 +msgid "German" +msgstr "Deutsch" + +#: paperless/urls.py:108 +msgid "Paperless-ng administration" +msgstr "Paperless-ng Administration" + +#: paperless_mail/admin.py:24 +msgid "Filter" +msgstr "Filter" + +#: paperless_mail/admin.py:26 +msgid "" +"Paperless will only process mails that match ALL of the filters given below." +msgstr "" +"Paperless wird nur E-Mails verarbeiten, für die alle der hier angegebenen " +"Filter zutreffen." + +#: paperless_mail/admin.py:34 +msgid "Actions" +msgstr "Aktionen" + +#: paperless_mail/admin.py:36 +msgid "" +"The action applied to the mail. This action is only performed when documents" +" were consumed from the mail. Mails without attachments will remain entirely" +" untouched." +msgstr "" +"Die Aktion, die auf E-Mails angewendet werden soll. Diese Aktion wird nur " +"auf E-Mails angewendet, aus denen Anhänge verarbeitet wurden. E-Mails ohne " +"Anhänge werden vollständig ignoriert." + +#: paperless_mail/admin.py:43 +msgid "Metadata" +msgstr "Metadaten" + +#: paperless_mail/admin.py:45 +msgid "" +"Assign metadata to documents consumed from this rule automatically. If you " +"do not assign tags, types or correspondents here, paperless will still " +"process all matching rules that you have defined." +msgstr "" +"Folgende Metadaten werden Dokumenten dieser Regel automatisch zugewiesen. " +"Wenn Sie hier nichts auswählen wird Paperless weiterhin alle " +"Zuweisungsalgorithmen ausführen und Metadaten auf Basis des Dokumentinhalts " +"zuweisen." + +#: paperless_mail/apps.py:9 +msgid "Paperless mail" +msgstr "Paperless E-Mail" + +#: paperless_mail/models.py:11 +msgid "mail account" +msgstr "E-Mail-Konto" + +#: paperless_mail/models.py:12 +msgid "mail accounts" +msgstr "E-Mail-Konten" + +#: paperless_mail/models.py:19 +msgid "No encryption" +msgstr "Keine Verschlüsselung" + +#: paperless_mail/models.py:20 +msgid "Use SSL" +msgstr "SSL benutzen" + +#: paperless_mail/models.py:21 +msgid "Use STARTTLS" +msgstr "STARTTLS benutzen" + +#: paperless_mail/models.py:29 +msgid "IMAP server" +msgstr "IMAP-Server" + +#: paperless_mail/models.py:33 +msgid "IMAP port" +msgstr "IMAP-Port" + +#: paperless_mail/models.py:36 +msgid "" +"This is usually 143 for unencrypted and STARTTLS connections, and 993 for " +"SSL connections." +msgstr "" +"Dies ist in der Regel 143 für unverschlüsselte und STARTTLS-Verbindungen und" +" 993 für SSL-Verbindungen." + +#: paperless_mail/models.py:40 +msgid "IMAP security" +msgstr "IMAP-Sicherheit" + +#: paperless_mail/models.py:46 +msgid "username" +msgstr "Benutzername" + +#: paperless_mail/models.py:50 +msgid "password" +msgstr "Password" + +#: paperless_mail/models.py:60 +msgid "mail rule" +msgstr "E-Mail-Regel" + +#: paperless_mail/models.py:61 +msgid "mail rules" +msgstr "E-Mail-Regeln" + +#: paperless_mail/models.py:69 +msgid "Mark as read, don't process read mails" +msgstr "Als gelesen markieren, gelesene E-Mails nicht verarbeiten" + +#: paperless_mail/models.py:70 +msgid "Flag the mail, don't process flagged mails" +msgstr "Als wichtig markieren, markierte E-Mails nicht verarbeiten" + +#: paperless_mail/models.py:71 +msgid "Move to specified folder" +msgstr "In angegebenen Ordner verschieben" + +#: paperless_mail/models.py:72 +msgid "Delete" +msgstr "Löschen" + +#: paperless_mail/models.py:79 +msgid "Use subject as title" +msgstr "Betreff als Titel verwenden" + +#: paperless_mail/models.py:80 +msgid "Use attachment filename as title" +msgstr "Dateiname des Anhangs als Titel verwenden" + +#: paperless_mail/models.py:90 +msgid "Do not assign a correspondent" +msgstr "Keinen Korrespondenten zuweisen" + +#: paperless_mail/models.py:92 +msgid "Use mail address" +msgstr "E-Mail-Adresse benutzen" + +#: paperless_mail/models.py:94 +msgid "Use name (or mail address if not available)" +msgstr "Absendername benutzen (oder E-Mail-Adressen, wenn nicht verfügbar)" + +#: paperless_mail/models.py:96 +msgid "Use correspondent selected below" +msgstr "Nachfolgend ausgewählten Korrespondent verwenden" + +#: paperless_mail/models.py:104 +msgid "order" +msgstr "Reihenfolge" + +#: paperless_mail/models.py:111 +msgid "account" +msgstr "Konto" + +#: paperless_mail/models.py:115 +msgid "folder" +msgstr "Ordner" + +#: paperless_mail/models.py:119 +msgid "filter from" +msgstr "Absender filtern" + +#: paperless_mail/models.py:122 +msgid "filter subject" +msgstr "Betreff filtern" + +#: paperless_mail/models.py:125 +msgid "filter body" +msgstr "Nachrichteninhalt filtern" + +#: paperless_mail/models.py:129 +msgid "maximum age" +msgstr "Maximales Alter" + +#: paperless_mail/models.py:131 +msgid "Specified in days." +msgstr "Angegeben in Tagen." + +#: paperless_mail/models.py:134 +msgid "action" +msgstr "Aktion" + +#: paperless_mail/models.py:140 +msgid "action parameter" +msgstr "Parameter für Aktion" + +#: paperless_mail/models.py:142 +msgid "" +"Additional parameter for the action selected above, i.e., the target folder " +"of the move to folder action." +msgstr "" +"Zusätzlicher Parameter für die oben ausgewählte Aktion, zum Beispiel der " +"Zielordner für die Aktion \"In angegebenen Ordner verschieben\"" + +#: paperless_mail/models.py:148 +msgid "assign title from" +msgstr "Titel zuweisen von" + +#: paperless_mail/models.py:158 +msgid "assign this tag" +msgstr "Dieses Tag zuweisen" + +#: paperless_mail/models.py:166 +msgid "assign this document type" +msgstr "Diesen Dokumenttyp zuweisen" + +#: paperless_mail/models.py:170 +msgid "assign correspondent from" +msgstr "Korrespondent zuweisen von" + +#: paperless_mail/models.py:180 +msgid "assign this correspondent" +msgstr "Diesen Korrespondent zuweisen" diff --git a/src/locale/en-us/LC_MESSAGES/django.po b/src/locale/en-us/LC_MESSAGES/django.po new file mode 100644 index 000000000..9af185626 --- /dev/null +++ b/src/locale/en-us/LC_MESSAGES/django.po @@ -0,0 +1,546 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-01-02 00:26+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: documents/apps.py:10 +msgid "Documents" +msgstr "" + +#: documents/models.py:32 +msgid "Any word" +msgstr "" + +#: documents/models.py:33 +msgid "All words" +msgstr "" + +#: documents/models.py:34 +msgid "Exact match" +msgstr "" + +#: documents/models.py:35 +msgid "Regular expression" +msgstr "" + +#: documents/models.py:36 +msgid "Fuzzy word" +msgstr "" + +#: documents/models.py:37 +msgid "Automatic" +msgstr "" + +#: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25 +#: paperless_mail/models.py:100 +msgid "name" +msgstr "" + +#: documents/models.py:45 +msgid "match" +msgstr "" + +#: documents/models.py:49 +msgid "matching algorithm" +msgstr "" + +#: documents/models.py:55 +msgid "is insensitive" +msgstr "" + +#: documents/models.py:80 documents/models.py:140 +msgid "correspondent" +msgstr "" + +#: documents/models.py:81 +msgid "correspondents" +msgstr "" + +#: documents/models.py:103 +msgid "color" +msgstr "" + +#: documents/models.py:107 +msgid "is inbox tag" +msgstr "" + +#: documents/models.py:109 +msgid "" +"Marks this tag as an inbox tag: All newly consumed documents will be tagged " +"with inbox tags." +msgstr "" + +#: documents/models.py:114 +msgid "tag" +msgstr "" + +#: documents/models.py:115 documents/models.py:171 +msgid "tags" +msgstr "" + +#: documents/models.py:121 documents/models.py:153 +msgid "document type" +msgstr "" + +#: documents/models.py:122 +msgid "document types" +msgstr "" + +#: documents/models.py:130 +msgid "Unencrypted" +msgstr "" + +#: documents/models.py:131 +msgid "Encrypted with GNU Privacy Guard" +msgstr "" + +#: documents/models.py:144 +msgid "title" +msgstr "" + +#: documents/models.py:157 +msgid "content" +msgstr "" + +#: documents/models.py:159 +msgid "" +"The raw, text-only data of the document. This field is primarily used for " +"searching." +msgstr "" + +#: documents/models.py:164 +msgid "mime type" +msgstr "" + +#: documents/models.py:175 +msgid "checksum" +msgstr "" + +#: documents/models.py:179 +msgid "The checksum of the original document." +msgstr "" + +#: documents/models.py:183 +msgid "archive checksum" +msgstr "" + +#: documents/models.py:188 +msgid "The checksum of the archived document." +msgstr "" + +#: documents/models.py:192 documents/models.py:332 +msgid "created" +msgstr "" + +#: documents/models.py:196 +msgid "modified" +msgstr "" + +#: documents/models.py:200 +msgid "storage type" +msgstr "" + +#: documents/models.py:208 +msgid "added" +msgstr "" + +#: documents/models.py:212 +msgid "filename" +msgstr "" + +#: documents/models.py:217 +msgid "Current filename in storage" +msgstr "" + +#: documents/models.py:221 +msgid "archive serial number" +msgstr "" + +#: documents/models.py:226 +msgid "The position of this document in your physical document archive." +msgstr "" + +#: documents/models.py:232 +msgid "document" +msgstr "" + +#: documents/models.py:233 +msgid "documents" +msgstr "" + +#: documents/models.py:315 +msgid "debug" +msgstr "" + +#: documents/models.py:316 +msgid "information" +msgstr "" + +#: documents/models.py:317 +msgid "warning" +msgstr "" + +#: documents/models.py:318 +msgid "error" +msgstr "" + +#: documents/models.py:319 +msgid "critical" +msgstr "" + +#: documents/models.py:323 +msgid "group" +msgstr "" + +#: documents/models.py:326 +msgid "message" +msgstr "" + +#: documents/models.py:329 +msgid "level" +msgstr "" + +#: documents/models.py:336 +msgid "log" +msgstr "" + +#: documents/models.py:337 +msgid "logs" +msgstr "" + +#: documents/models.py:348 documents/models.py:398 +msgid "saved view" +msgstr "" + +#: documents/models.py:349 +msgid "saved views" +msgstr "" + +#: documents/models.py:352 +msgid "user" +msgstr "" + +#: documents/models.py:358 +msgid "show on dashboard" +msgstr "" + +#: documents/models.py:361 +msgid "show in sidebar" +msgstr "" + +#: documents/models.py:365 +msgid "sort field" +msgstr "" + +#: documents/models.py:368 +msgid "sort reverse" +msgstr "" + +#: documents/models.py:374 +msgid "title contains" +msgstr "" + +#: documents/models.py:375 +msgid "content contains" +msgstr "" + +#: documents/models.py:376 +msgid "ASN is" +msgstr "" + +#: documents/models.py:377 +msgid "correspondent is" +msgstr "" + +#: documents/models.py:378 +msgid "document type is" +msgstr "" + +#: documents/models.py:379 +msgid "is in inbox" +msgstr "" + +#: documents/models.py:380 +msgid "has tag" +msgstr "" + +#: documents/models.py:381 +msgid "has any tag" +msgstr "" + +#: documents/models.py:382 +msgid "created before" +msgstr "" + +#: documents/models.py:383 +msgid "created after" +msgstr "" + +#: documents/models.py:384 +msgid "created year is" +msgstr "" + +#: documents/models.py:385 +msgid "created month is" +msgstr "" + +#: documents/models.py:386 +msgid "created day is" +msgstr "" + +#: documents/models.py:387 +msgid "added before" +msgstr "" + +#: documents/models.py:388 +msgid "added after" +msgstr "" + +#: documents/models.py:389 +msgid "modified before" +msgstr "" + +#: documents/models.py:390 +msgid "modified after" +msgstr "" + +#: documents/models.py:391 +msgid "does not have tag" +msgstr "" + +#: documents/models.py:402 +msgid "rule type" +msgstr "" + +#: documents/models.py:406 +msgid "value" +msgstr "" + +#: documents/models.py:412 +msgid "filter rule" +msgstr "" + +#: documents/models.py:413 +msgid "filter rules" +msgstr "" + +#: paperless/settings.py:254 +msgid "English" +msgstr "" + +#: paperless/settings.py:255 +msgid "German" +msgstr "" + +#: paperless/urls.py:108 +msgid "Paperless-ng administration" +msgstr "" + +#: paperless_mail/admin.py:24 +msgid "Filter" +msgstr "" + +#: paperless_mail/admin.py:26 +msgid "" +"Paperless will only process mails that match ALL of the filters given below." +msgstr "" + +#: paperless_mail/admin.py:34 +msgid "Actions" +msgstr "" + +#: paperless_mail/admin.py:36 +msgid "" +"The action applied to the mail. This action is only performed when documents " +"were consumed from the mail. Mails without attachments will remain entirely " +"untouched." +msgstr "" + +#: paperless_mail/admin.py:43 +msgid "Metadata" +msgstr "" + +#: paperless_mail/admin.py:45 +msgid "" +"Assign metadata to documents consumed from this rule automatically. If you " +"do not assign tags, types or correspondents here, paperless will still " +"process all matching rules that you have defined." +msgstr "" + +#: paperless_mail/apps.py:9 +msgid "Paperless mail" +msgstr "" + +#: paperless_mail/models.py:11 +msgid "mail account" +msgstr "" + +#: paperless_mail/models.py:12 +msgid "mail accounts" +msgstr "" + +#: paperless_mail/models.py:19 +msgid "No encryption" +msgstr "" + +#: paperless_mail/models.py:20 +msgid "Use SSL" +msgstr "" + +#: paperless_mail/models.py:21 +msgid "Use STARTTLS" +msgstr "" + +#: paperless_mail/models.py:29 +msgid "IMAP server" +msgstr "" + +#: paperless_mail/models.py:33 +msgid "IMAP port" +msgstr "" + +#: paperless_mail/models.py:36 +msgid "" +"This is usually 143 for unencrypted and STARTTLS connections, and 993 for " +"SSL connections." +msgstr "" + +#: paperless_mail/models.py:40 +msgid "IMAP security" +msgstr "" + +#: paperless_mail/models.py:46 +msgid "username" +msgstr "" + +#: paperless_mail/models.py:50 +msgid "password" +msgstr "" + +#: paperless_mail/models.py:60 +msgid "mail rule" +msgstr "" + +#: paperless_mail/models.py:61 +msgid "mail rules" +msgstr "" + +#: paperless_mail/models.py:69 +msgid "Mark as read, don't process read mails" +msgstr "" + +#: paperless_mail/models.py:70 +msgid "Flag the mail, don't process flagged mails" +msgstr "" + +#: paperless_mail/models.py:71 +msgid "Move to specified folder" +msgstr "" + +#: paperless_mail/models.py:72 +msgid "Delete" +msgstr "" + +#: paperless_mail/models.py:79 +msgid "Use subject as title" +msgstr "" + +#: paperless_mail/models.py:80 +msgid "Use attachment filename as title" +msgstr "" + +#: paperless_mail/models.py:90 +msgid "Do not assign a correspondent" +msgstr "" + +#: paperless_mail/models.py:92 +msgid "Use mail address" +msgstr "" + +#: paperless_mail/models.py:94 +msgid "Use name (or mail address if not available)" +msgstr "" + +#: paperless_mail/models.py:96 +msgid "Use correspondent selected below" +msgstr "" + +#: paperless_mail/models.py:104 +msgid "order" +msgstr "" + +#: paperless_mail/models.py:111 +msgid "account" +msgstr "" + +#: paperless_mail/models.py:115 +msgid "folder" +msgstr "" + +#: paperless_mail/models.py:119 +msgid "filter from" +msgstr "" + +#: paperless_mail/models.py:122 +msgid "filter subject" +msgstr "" + +#: paperless_mail/models.py:125 +msgid "filter body" +msgstr "" + +#: paperless_mail/models.py:129 +msgid "maximum age" +msgstr "" + +#: paperless_mail/models.py:131 +msgid "Specified in days." +msgstr "" + +#: paperless_mail/models.py:134 +msgid "action" +msgstr "" + +#: paperless_mail/models.py:140 +msgid "action parameter" +msgstr "" + +#: paperless_mail/models.py:142 +msgid "" +"Additional parameter for the action selected above, i.e., the target folder " +"of the move to folder action." +msgstr "" + +#: paperless_mail/models.py:148 +msgid "assign title from" +msgstr "" + +#: paperless_mail/models.py:158 +msgid "assign this tag" +msgstr "" + +#: paperless_mail/models.py:166 +msgid "assign this document type" +msgstr "" + +#: paperless_mail/models.py:170 +msgid "assign correspondent from" +msgstr "" + +#: paperless_mail/models.py:180 +msgid "assign this correspondent" +msgstr "" diff --git a/src/paperless/settings.py b/src/paperless/settings.py index f522c4c0b..dd0d4a7d9 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -6,6 +6,8 @@ import re from dotenv import load_dotenv +from django.utils.translation import gettext_lazy as _ + # Tap paperless.conf if it's available if os.path.exists("../paperless.conf"): load_dotenv("../paperless.conf") @@ -87,6 +89,7 @@ INSTALLED_APPS = [ "documents.apps.DocumentsConfig", "paperless_tesseract.apps.PaperlessTesseractConfig", "paperless_text.apps.PaperlessTextConfig", + "paperless_tika.apps.PaperlessTikaConfig", "paperless_mail.apps.PaperlessMailConfig", "django.contrib.admin", @@ -124,6 +127,7 @@ MIDDLEWARE = [ 'whitenoise.middleware.WhiteNoiseMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'corsheaders.middleware.CorsMiddleware', + 'django.middleware.locale.LocaleMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', @@ -253,6 +257,15 @@ if os.getenv("PAPERLESS_DBHOST"): LANGUAGE_CODE = 'en-us' +LANGUAGES = [ + ("en-us", _("English")), + ("de", _("German")) +] + +LOCALE_PATHS = [ + os.path.join(BASE_DIR, "locale") +] + TIME_ZONE = os.getenv("PAPERLESS_TIME_ZONE", "UTC") USE_I18N = True @@ -431,3 +444,10 @@ for t in json.loads(os.getenv("PAPERLESS_FILENAME_PARSE_TRANSFORMS", "[]")): PAPERLESS_FILENAME_FORMAT = os.getenv("PAPERLESS_FILENAME_FORMAT") THUMBNAIL_FONT_NAME = os.getenv("PAPERLESS_THUMBNAIL_FONT_NAME", "/usr/share/fonts/liberation/LiberationSerif-Regular.ttf") + +# Tika settings +PAPERLESS_TIKA_ENABLED = __get_boolean("PAPERLESS_TIKA_ENABLED", "NO") +PAPERLESS_TIKA_ENDPOINT = os.getenv("PAPERLESS_TIKA_ENDPOINT", "http://localhost:9998") +PAPERLESS_TIKA_GOTENBERG_ENDPOINT = os.getenv( + "PAPERLESS_TIKA_GOTENBERG_ENDPOINT", "http://localhost:3000" +) diff --git a/src/paperless/urls.py b/src/paperless/urls.py index 39e99a7a4..49e6e8b7a 100755 --- a/src/paperless/urls.py +++ b/src/paperless/urls.py @@ -7,6 +7,8 @@ from django.views.generic import RedirectView from rest_framework.authtoken import views from rest_framework.routers import DefaultRouter +from django.utils.translation import gettext_lazy as _ + from documents.views import ( CorrespondentViewSet, DocumentViewSet, @@ -88,7 +90,8 @@ urlpatterns = [ # Frontend assets TODO: this is pretty bad, but it works. path('assets/', - RedirectView.as_view(url='/static/frontend/assets/%(path)s')), + RedirectView.as_view(url='/static/frontend/en-US/assets/%(path)s')), + # TODO: with localization, this is even worse! :/ # login, logout path('accounts/', include('django.contrib.auth.urls')), @@ -102,4 +105,4 @@ admin.site.site_header = 'Paperless-ng' # Text at the end of each page's . admin.site.site_title = 'Paperless-ng' # Text at the top of the admin index page. -admin.site.index_title = 'Paperless-ng administration' +admin.site.index_title = _('Paperless-ng administration') diff --git a/src/paperless/version.py b/src/paperless/version.py index facb097fc..e1ba14cb4 100644 --- a/src/paperless/version.py +++ b/src/paperless/version.py @@ -1 +1 @@ -__version__ = (0, 9, 10) +__version__ = (0, 9, 11) diff --git a/src/paperless_mail/admin.py b/src/paperless_mail/admin.py index 0440234b7..4c63c2b29 100644 --- a/src/paperless_mail/admin.py +++ b/src/paperless_mail/admin.py @@ -1,6 +1,8 @@ from django.contrib import admin from paperless_mail.models import MailAccount, MailRule +from django.utils.translation import gettext_lazy as _ + class MailAccountAdmin(admin.ModelAdmin): @@ -19,31 +21,31 @@ class MailRuleAdmin(admin.ModelAdmin): (None, { 'fields': ('name', 'order', 'account', 'folder') }), - ("Filter", { + (_("Filter"), { 'description': - "Paperless will only process mails that match ALL of the " - "filters given below.", + _("Paperless will only process mails that match ALL of the " + "filters given below."), 'fields': ('filter_from', 'filter_subject', 'filter_body', 'maximum_age') }), - ("Actions", { + (_("Actions"), { 'description': - "The action applied to the mail. This action is only " - "performed when documents were consumed from the mail. Mails " - "without attachments will remain entirely untouched.", + _("The action applied to the mail. This action is only " + "performed when documents were consumed from the mail. " + "Mails without attachments will remain entirely untouched."), 'fields': ( 'action', 'action_parameter') }), - ("Metadata", { + (_("Metadata"), { 'description': - "Assign metadata to documents consumed from this rule " - "automatically. If you do not assign tags, types or " - "correspondents here, paperless will still process all " - "matching rules that you have defined.", + _("Assign metadata to documents consumed from this rule " + "automatically. If you do not assign tags, types or " + "correspondents here, paperless will still process all " + "matching rules that you have defined."), "fields": ( 'assign_title_from', 'assign_tag', diff --git a/src/paperless_mail/apps.py b/src/paperless_mail/apps.py index 18c15a4f4..efbea745b 100644 --- a/src/paperless_mail/apps.py +++ b/src/paperless_mail/apps.py @@ -1,7 +1,9 @@ from django.apps import AppConfig +from django.utils.translation import gettext_lazy as _ + class PaperlessMailConfig(AppConfig): name = 'paperless_mail' - verbose_name = 'Paperless Mail' + verbose_name = _('Paperless mail') diff --git a/src/paperless_mail/migrations/0006_auto_20210101_2340.py b/src/paperless_mail/migrations/0006_auto_20210101_2340.py new file mode 100644 index 000000000..c03ee627d --- /dev/null +++ b/src/paperless_mail/migrations/0006_auto_20210101_2340.py @@ -0,0 +1,128 @@ +# Generated by Django 3.1.4 on 2021-01-01 23:40 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('documents', '1011_auto_20210101_2340'), + ('paperless_mail', '0005_help_texts'), + ] + + operations = [ + migrations.AlterModelOptions( + name='mailaccount', + options={'verbose_name': 'mail account', 'verbose_name_plural': 'mail accounts'}, + ), + migrations.AlterModelOptions( + name='mailrule', + options={'verbose_name': 'mail rule', 'verbose_name_plural': 'mail rules'}, + ), + migrations.AlterField( + model_name='mailaccount', + name='imap_port', + field=models.IntegerField(blank=True, help_text='This is usually 143 for unencrypted and STARTTLS connections, and 993 for SSL connections.', null=True, verbose_name='IMAP port'), + ), + migrations.AlterField( + model_name='mailaccount', + name='imap_security', + field=models.PositiveIntegerField(choices=[(1, 'No encryption'), (2, 'Use SSL'), (3, 'Use STARTTLS')], default=2, verbose_name='IMAP security'), + ), + migrations.AlterField( + model_name='mailaccount', + name='imap_server', + field=models.CharField(max_length=256, verbose_name='IMAP server'), + ), + migrations.AlterField( + model_name='mailaccount', + name='name', + field=models.CharField(max_length=256, unique=True, verbose_name='name'), + ), + migrations.AlterField( + model_name='mailaccount', + name='password', + field=models.CharField(max_length=256, verbose_name='password'), + ), + migrations.AlterField( + model_name='mailaccount', + name='username', + field=models.CharField(max_length=256, verbose_name='username'), + ), + migrations.AlterField( + model_name='mailrule', + name='account', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rules', to='paperless_mail.mailaccount', verbose_name='account'), + ), + migrations.AlterField( + model_name='mailrule', + name='action', + field=models.PositiveIntegerField(choices=[(3, "Mark as read, don't process read mails"), (4, "Flag the mail, don't process flagged mails"), (2, 'Move to specified folder'), (1, 'Delete')], default=3, verbose_name='action'), + ), + migrations.AlterField( + model_name='mailrule', + name='action_parameter', + field=models.CharField(blank=True, help_text='Additional parameter for the action selected above, i.e., the target folder of the move to folder action.', max_length=256, null=True, verbose_name='action parameter'), + ), + migrations.AlterField( + model_name='mailrule', + name='assign_correspondent', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='documents.correspondent', verbose_name='assign this correspondent'), + ), + migrations.AlterField( + model_name='mailrule', + name='assign_correspondent_from', + field=models.PositiveIntegerField(choices=[(1, 'Do not assign a correspondent'), (2, 'Use mail address'), (3, 'Use name (or mail address if not available)'), (4, 'Use correspondent selected below')], default=1, verbose_name='assign correspondent from'), + ), + migrations.AlterField( + model_name='mailrule', + name='assign_document_type', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='documents.documenttype', verbose_name='assign this document type'), + ), + migrations.AlterField( + model_name='mailrule', + name='assign_tag', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='documents.tag', verbose_name='assign this tag'), + ), + migrations.AlterField( + model_name='mailrule', + name='assign_title_from', + field=models.PositiveIntegerField(choices=[(1, 'Use subject as title'), (2, 'Use attachment filename as title')], default=1, verbose_name='assign title from'), + ), + migrations.AlterField( + model_name='mailrule', + name='filter_body', + field=models.CharField(blank=True, max_length=256, null=True, verbose_name='filter body'), + ), + migrations.AlterField( + model_name='mailrule', + name='filter_from', + field=models.CharField(blank=True, max_length=256, null=True, verbose_name='filter from'), + ), + migrations.AlterField( + model_name='mailrule', + name='filter_subject', + field=models.CharField(blank=True, max_length=256, null=True, verbose_name='filter subject'), + ), + migrations.AlterField( + model_name='mailrule', + name='folder', + field=models.CharField(default='INBOX', max_length=256, verbose_name='folder'), + ), + migrations.AlterField( + model_name='mailrule', + name='maximum_age', + field=models.PositiveIntegerField(default=30, help_text='Specified in days.', verbose_name='maximum age'), + ), + migrations.AlterField( + model_name='mailrule', + name='name', + field=models.CharField(max_length=256, unique=True, verbose_name='name'), + ), + migrations.AlterField( + model_name='mailrule', + name='order', + field=models.IntegerField(default=0, verbose_name='order'), + ), + ] diff --git a/src/paperless_mail/models.py b/src/paperless_mail/models.py index aa1ac5684..ddfb4d43c 100644 --- a/src/paperless_mail/models.py +++ b/src/paperless_mail/models.py @@ -2,37 +2,53 @@ from django.db import models import documents.models as document_models +from django.utils.translation import gettext_lazy as _ + class MailAccount(models.Model): + class Meta: + verbose_name = _("mail account") + verbose_name_plural = _("mail accounts") + IMAP_SECURITY_NONE = 1 IMAP_SECURITY_SSL = 2 IMAP_SECURITY_STARTTLS = 3 IMAP_SECURITY_OPTIONS = ( - (IMAP_SECURITY_NONE, "No encryption"), - (IMAP_SECURITY_SSL, "Use SSL"), - (IMAP_SECURITY_STARTTLS, "Use STARTTLS"), + (IMAP_SECURITY_NONE, _("No encryption")), + (IMAP_SECURITY_SSL, _("Use SSL")), + (IMAP_SECURITY_STARTTLS, _("Use STARTTLS")), ) - name = models.CharField(max_length=256, unique=True) + name = models.CharField( + _("name"), + max_length=256, unique=True) - imap_server = models.CharField(max_length=256) + imap_server = models.CharField( + _("IMAP server"), + max_length=256) imap_port = models.IntegerField( + _("IMAP port"), blank=True, null=True, - help_text="This is usually 143 for unencrypted and STARTTLS " - "connections, and 993 for SSL connections.") + help_text=_("This is usually 143 for unencrypted and STARTTLS " + "connections, and 993 for SSL connections.")) imap_security = models.PositiveIntegerField( + _("IMAP security"), choices=IMAP_SECURITY_OPTIONS, default=IMAP_SECURITY_SSL ) - username = models.CharField(max_length=256) + username = models.CharField( + _("username"), + max_length=256) - password = models.CharField(max_length=256) + password = models.CharField( + _("password"), + max_length=256) def __str__(self): return self.name @@ -40,24 +56,28 @@ class MailAccount(models.Model): class MailRule(models.Model): + class Meta: + verbose_name = _("mail rule") + verbose_name_plural = _("mail rules") + ACTION_DELETE = 1 ACTION_MOVE = 2 ACTION_MARK_READ = 3 ACTION_FLAG = 4 ACTIONS = ( - (ACTION_MARK_READ, "Mark as read, don't process read mails"), - (ACTION_FLAG, "Flag the mail, don't process flagged mails"), - (ACTION_MOVE, "Move to specified folder"), - (ACTION_DELETE, "Delete"), + (ACTION_MARK_READ, _("Mark as read, don't process read mails")), + (ACTION_FLAG, _("Flag the mail, don't process flagged mails")), + (ACTION_MOVE, _("Move to specified folder")), + (ACTION_DELETE, _("Delete")), ) TITLE_FROM_SUBJECT = 1 TITLE_FROM_FILENAME = 2 TITLE_SELECTOR = ( - (TITLE_FROM_SUBJECT, "Use subject as title"), - (TITLE_FROM_FILENAME, "Use attachment filename as title") + (TITLE_FROM_SUBJECT, _("Use subject as title")), + (TITLE_FROM_FILENAME, _("Use attachment filename as title")) ) CORRESPONDENT_FROM_NOTHING = 1 @@ -67,47 +87,65 @@ class MailRule(models.Model): CORRESPONDENT_SELECTOR = ( (CORRESPONDENT_FROM_NOTHING, - "Do not assign a correspondent"), + _("Do not assign a correspondent")), (CORRESPONDENT_FROM_EMAIL, - "Use mail address"), + _("Use mail address")), (CORRESPONDENT_FROM_NAME, - "Use name (or mail address if not available)"), + _("Use name (or mail address if not available)")), (CORRESPONDENT_FROM_CUSTOM, - "Use correspondent selected below") + _("Use correspondent selected below")) ) - name = models.CharField(max_length=256, unique=True) + name = models.CharField( + _("name"), + max_length=256, unique=True) - order = models.IntegerField(default=0) + order = models.IntegerField( + _("order"), + default=0) account = models.ForeignKey( MailAccount, related_name="rules", - on_delete=models.CASCADE + on_delete=models.CASCADE, + verbose_name=_("account") ) - folder = models.CharField(default='INBOX', max_length=256) + folder = models.CharField( + _("folder"), + default='INBOX', max_length=256) - filter_from = models.CharField(max_length=256, null=True, blank=True) - filter_subject = models.CharField(max_length=256, null=True, blank=True) - filter_body = models.CharField(max_length=256, null=True, blank=True) + filter_from = models.CharField( + _("filter from"), + max_length=256, null=True, blank=True) + filter_subject = models.CharField( + _("filter subject"), + max_length=256, null=True, blank=True) + filter_body = models.CharField( + _("filter body"), + max_length=256, null=True, blank=True) maximum_age = models.PositiveIntegerField( + _("maximum age"), default=30, - help_text="Specified in days.") + help_text=_("Specified in days.")) action = models.PositiveIntegerField( + _("action"), choices=ACTIONS, default=ACTION_MARK_READ, ) action_parameter = models.CharField( + _("action parameter"), max_length=256, blank=True, null=True, - help_text="Additional parameter for the action selected above, i.e., " - "the target folder of the move to folder action." + help_text=_("Additional parameter for the action selected above, " + "i.e., " + "the target folder of the move to folder action.") ) assign_title_from = models.PositiveIntegerField( + _("assign title from"), choices=TITLE_SELECTOR, default=TITLE_FROM_SUBJECT ) @@ -116,17 +154,20 @@ class MailRule(models.Model): document_models.Tag, null=True, blank=True, - on_delete=models.SET_NULL + on_delete=models.SET_NULL, + verbose_name=_("assign this tag"), ) assign_document_type = models.ForeignKey( document_models.DocumentType, null=True, blank=True, - on_delete=models.SET_NULL + on_delete=models.SET_NULL, + verbose_name=_("assign this document type"), ) assign_correspondent_from = models.PositiveIntegerField( + _("assign correspondent from"), choices=CORRESPONDENT_SELECTOR, default=CORRESPONDENT_FROM_NOTHING ) @@ -135,7 +176,8 @@ class MailRule(models.Model): document_models.Correspondent, null=True, blank=True, - on_delete=models.SET_NULL + on_delete=models.SET_NULL, + verbose_name=_("assign this correspondent") ) def __str__(self): diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py index 80e200f27..31e956284 100644 --- a/src/paperless_tesseract/parsers.py +++ b/src/paperless_tesseract/parsers.py @@ -1,7 +1,6 @@ import json import os import re -import subprocess import ocrmypdf import pdftotext @@ -10,7 +9,8 @@ from PIL import Image from django.conf import settings from ocrmypdf import InputFileError, EncryptedPdfError -from documents.parsers import DocumentParser, ParseError, run_convert +from documents.parsers import DocumentParser, ParseError, \ + make_thumbnail_from_pdf class RasterisedDocumentParser(DocumentParser): @@ -47,48 +47,8 @@ class RasterisedDocumentParser(DocumentParser): return result def get_thumbnail(self, document_path, mime_type): - """ - The thumbnail of a PDF is just a 500px wide image of the first page. - """ - - out_path = os.path.join(self.tempdir, "convert.png") - - # Run convert to get a decent thumbnail - try: - run_convert(density=300, - scale="500x5000>", - alpha="remove", - strip=True, - trim=False, - input_file="{}[0]".format(document_path), - output_file=out_path, - logging_group=self.logging_group) - except ParseError: - # if convert fails, fall back to extracting - # the first PDF page as a PNG using Ghostscript - self.log( - 'warning', - "Thumbnail generation with ImageMagick failed, falling back " - "to ghostscript. Check your /etc/ImageMagick-x/policy.xml!") - gs_out_path = os.path.join(self.tempdir, "gs_out.png") - cmd = [settings.GS_BINARY, - "-q", - "-sDEVICE=pngalpha", - "-o", gs_out_path, - document_path] - if not subprocess.Popen(cmd).wait() == 0: - raise ParseError("Thumbnail (gs) failed at {}".format(cmd)) - # then run convert on the output from gs - run_convert(density=300, - scale="500x5000>", - alpha="remove", - strip=True, - trim=False, - input_file=gs_out_path, - output_file=out_path, - logging_group=self.logging_group) - - return out_path + return make_thumbnail_from_pdf( + document_path, self.tempdir, self.logging_group) def is_image(self, mime_type): return mime_type in [ @@ -128,7 +88,7 @@ class RasterisedDocumentParser(DocumentParser): f"Error while calculating DPI for image {image}: {e}") return None - def parse(self, document_path, mime_type): + def parse(self, document_path, mime_type, file_name=None): mode = settings.OCR_MODE text_original = get_text_from_pdf(document_path) diff --git a/src/paperless_tesseract/tests/test_parser.py b/src/paperless_tesseract/tests/test_parser.py index 7be176663..644587de0 100644 --- a/src/paperless_tesseract/tests/test_parser.py +++ b/src/paperless_tesseract/tests/test_parser.py @@ -78,7 +78,7 @@ class TestParser(DirectoriesMixin, TestCase): parser.get_thumbnail(os.path.join(self.SAMPLE_FILES, 'simple-digital.pdf'), "application/pdf") # dont really know how to test it, just call it and assert that it does not raise anything. - @mock.patch("paperless_tesseract.parsers.run_convert") + @mock.patch("documents.parsers.run_convert") def test_thumbnail_fallback(self, m): def call_convert(input_file, output_file, **kwargs): diff --git a/src/paperless_text/parsers.py b/src/paperless_text/parsers.py index a38bd7a91..c1afe07fc 100644 --- a/src/paperless_text/parsers.py +++ b/src/paperless_text/parsers.py @@ -32,6 +32,6 @@ class TextDocumentParser(DocumentParser): return out_path - def parse(self, document_path, mime_type): + def parse(self, document_path, mime_type, file_name=None): with open(document_path, 'r') as f: self.text = f.read() diff --git a/src/paperless_tika/apps.py b/src/paperless_tika/apps.py new file mode 100644 index 000000000..5cab21427 --- /dev/null +++ b/src/paperless_tika/apps.py @@ -0,0 +1,14 @@ +from django.apps import AppConfig +from django.conf import settings +from paperless_tika.signals import tika_consumer_declaration + + +class PaperlessTikaConfig(AppConfig): + name = "paperless_tika" + + def ready(self): + from documents.signals import document_consumer_declaration + + if settings.PAPERLESS_TIKA_ENABLED: + document_consumer_declaration.connect(tika_consumer_declaration) + AppConfig.ready(self) diff --git a/src/paperless_tika/parsers.py b/src/paperless_tika/parsers.py new file mode 100644 index 000000000..cde6543be --- /dev/null +++ b/src/paperless_tika/parsers.py @@ -0,0 +1,87 @@ +import os +import requests +import dateutil.parser + +from django.conf import settings + +from documents.parsers import DocumentParser, ParseError, \ + make_thumbnail_from_pdf +from tika import parser + + +class TikaDocumentParser(DocumentParser): + """ + This parser sends documents to a local tika server + """ + + def get_thumbnail(self, document_path, mime_type): + if not self.archive_path: + self.archive_path = self.convert_to_pdf(document_path) + + return make_thumbnail_from_pdf( + self.archive_path, self.tempdir, self.logging_group) + + def extract_metadata(self, document_path, mime_type): + tika_server = settings.PAPERLESS_TIKA_ENDPOINT + try: + parsed = parser.from_file(document_path, tika_server) + except Exception as e: + self.log("warning", f"Error while fetching document metadata for " + f"{document_path}: {e}") + return [] + + return [ + { + "namespace": "", + "prefix": "", + "key": key, + "value": parsed['metadata'][key] + } for key in parsed['metadata'] + ] + + def parse(self, document_path, mime_type, file_name=None): + self.log("info", f"Sending {document_path} to Tika server") + tika_server = settings.PAPERLESS_TIKA_ENDPOINT + + try: + parsed = parser.from_file(document_path, tika_server) + except Exception as err: + raise ParseError( + f"Could not parse {document_path} with tika server at " + f"{tika_server}: {err}" + ) + + self.text = parsed["content"].strip() + + try: + self.date = dateutil.parser.isoparse( + parsed["metadata"]["Creation-Date"]) + except Exception as e: + self.log("warning", f"Unable to extract date for document " + f"{document_path}: {e}") + + self.archive_path = self.convert_to_pdf(document_path, file_name) + + def convert_to_pdf(self, document_path, file_name): + pdf_path = os.path.join(self.tempdir, "convert.pdf") + gotenberg_server = settings.PAPERLESS_TIKA_GOTENBERG_ENDPOINT + url = gotenberg_server + "/convert/office" + + self.log("info", f"Converting {document_path} to PDF as {pdf_path}") + files = {"files": (file_name or os.path.basename(document_path), + open(document_path, "rb"))} + headers = {} + + try: + response = requests.post(url, files=files, headers=headers) + response.raise_for_status() # ensure we notice bad responses + except Exception as err: + raise ParseError( + f"Error while converting document to PDF: {err}" + ) + + file = open(pdf_path, "wb") + file.write(response.content) + file.close() + + return pdf_path diff --git a/src/paperless_tika/signals.py b/src/paperless_tika/signals.py new file mode 100644 index 000000000..137416abb --- /dev/null +++ b/src/paperless_tika/signals.py @@ -0,0 +1,20 @@ +from .parsers import TikaDocumentParser + + +def tika_consumer_declaration(sender, **kwargs): + return { + "parser": TikaDocumentParser, + "weight": 10, + "mime_types": { + "application/msword": ".doc", + "application/vnd.openxmlformats-officedocument.wordprocessingml.document": ".docx", # NOQA: E501 + "application/vnd.ms-excel": ".xls", + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": ".xlsx", # NOQA: E501 + "application/vnd.ms-powerpoint": ".ppt", + "application/vnd.openxmlformats-officedocument.presentationml.presentation": ".pptx", # NOQA: E501 + "application/vnd.openxmlformats-officedocument.presentationml.slideshow": ".ppsx", # NOQA: E501 + "application/vnd.oasis.opendocument.presentation": ".odp", + "application/vnd.oasis.opendocument.spreadsheet": ".ods", + "application/vnd.oasis.opendocument.text": ".odt", + }, + } diff --git a/src/paperless_tika/tests/test_tika_parser.py b/src/paperless_tika/tests/test_tika_parser.py new file mode 100644 index 000000000..67563e5fe --- /dev/null +++ b/src/paperless_tika/tests/test_tika_parser.py @@ -0,0 +1,60 @@ +import datetime +import os +from pathlib import Path +from unittest import mock + +from django.test import TestCase +from requests import Response + +from paperless_tika.parsers import TikaDocumentParser + + +class TestTikaParser(TestCase): + + def setUp(self) -> None: + self.parser = TikaDocumentParser(logging_group=None) + + def tearDown(self) -> None: + self.parser.cleanup() + + @mock.patch("paperless_tika.parsers.parser.from_file") + @mock.patch("paperless_tika.parsers.requests.post") + def test_parse(self, post, from_file): + from_file.return_value = { + "content": "the content", + "metadata": { + "Creation-Date": "2020-11-21" + } + } + response = Response() + response._content = b"PDF document" + response.status_code = 200 + post.return_value = response + + file = os.path.join(self.parser.tempdir, "input.odt") + Path(file).touch() + self.parser.parse(file, "application/vnd.oasis.opendocument.text") + + self.assertEqual(self.parser.text, "the content") + self.assertIsNotNone(self.parser.archive_path) + with open(self.parser.archive_path, "rb") as f: + self.assertEqual(f.read(), b"PDF document") + + self.assertEqual(self.parser.date, datetime.datetime(2020, 11, 21)) + + @mock.patch("paperless_tika.parsers.parser.from_file") + def test_metadata(self, from_file): + from_file.return_value = { + "metadata": { + "Creation-Date": "2020-11-21", + "Some-key": "value" + } + } + + file = os.path.join(self.parser.tempdir, "input.odt") + Path(file).touch() + + metadata = self.parser.extract_metadata(file, "application/vnd.oasis.opendocument.text") + + self.assertTrue("Creation-Date" in [m['key'] for m in metadata]) + self.assertTrue("Some-key" in [m['key'] for m in metadata])