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/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/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/configuration.rst b/docs/configuration.rst index 5ccb80b3a..49c95bff1 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -277,6 +277,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/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 66bd81779..3c2dfcc38 100644 --- a/src-ui/angular.json +++ b/src-ui/angular.json @@ -34,7 +34,11 @@ "assets": [ "src/favicon.ico", "src/assets", - "src/manifest.webmanifest" + "src/manifest.webmanifest", { + "glob": "pdf.worker.min.js", + "input": "node_modules/pdfjs-dist/build/", + "output": "/assets/js/" + } ], "styles": [ "src/styles.scss" diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 5f12c504c..a0c94de3e 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -377,7 +377,7 @@ Do you really want to delete the tag ""? src/app/components/manage/tag-list/tag-list.component.ts - 31 + 28 @@ -440,7 +440,7 @@ Do you really want to delete the document type ""? src/app/components/manage/document-type-list/document-type-list.component.ts - 26 + 24 @@ -468,21 +468,21 @@ 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 @@ -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 @@ -580,7 +594,7 @@ 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,33 @@ 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 - - - - Manage - - src/app/components/app-frame/app-frame.component.html - 77 + 15 Settings + + src/app/components/app-frame/app-frame.component.html + 40 + + + + Logout + + src/app/components/app-frame/app-frame.component.html + 45 + + + + Manage src/app/components/app-frame/app-frame.component.html 112 @@ -805,70 +826,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 @@ -910,7 +952,7 @@ 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 @@ -1561,22 +1603,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 @@ -1589,15 +1652,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/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/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/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..56047fc1e 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: - + 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 f6128e077..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/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts index 4b62d6a51..b160ae073 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` + } } } 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..fd6b01de9 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 @@ -9,7 +9,7 @@ - +
    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..9466b433d 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 @@ -9,7 +9,7 @@ - +
    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..93c7c98b4 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.html +++ b/src-ui/src/app/components/manage/settings/settings.component.html @@ -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..0b0646157 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 @@ -53,11 +55,22 @@ export class SettingsComponent implements OnInit { }) } + 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..7efaac4b9 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 @@ -20,7 +20,7 @@ - +
    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/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/index.html b/src-ui/src/index.html index 08ab3d931..b05f9123b 100644 --- a/src-ui/src/index.html +++ b/src-ui/src/index.html @@ -5,11 +5,12 @@ Paperless-ng + - + diff --git a/src-ui/src/locale/messages.de_DE.xlf b/src-ui/src/locale/messages.de_DE.xlf new file mode 100644 index 000000000..84548bf18 --- /dev/null +++ b/src-ui/src/locale/messages.de_DE.xlf @@ -0,0 +1,1923 @@ + + + + + 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 {document} other {documents}} + {VAR_PLURAL, plural, =1 {Dokument} other {Dokumente}} + + src/app/components/document-list/document-list.component.html + 86 + + + + Selected of + von ausgewählt + + src/app/components/document-list/document-list.component.html + 86 + + + + {VAR_PLURAL, plural, =1 {1 document} other { documents}} + {VAR_PLURAL, plural, =1 {1 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. + 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 + + + + 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 + + + + Settings + Einstellungen + + src/app/components/app-frame/app-frame.component.html + 40 + + + + 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 + + + + Score: + Relevanz: + + src/app/components/document-list/document-card-large/document-card-large.component.html + 61 + + + + 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 + + + + 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 {file} =other { files}} + {VAR_PLURAL, plural, =1 {Datei} =other { Dateien}} + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 13 + + + + Uploading ... + Lade 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/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..4278029cc 100644 --- a/src/documents/apps.py +++ b/src/documents/apps.py @@ -6,29 +6,21 @@ class DocumentsConfig(AppConfig): name = "documents" def ready(self): - - from .signals import document_consumption_started 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 5a06194b7..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( @@ -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/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/models.py b/src/documents/models.py index 2349dacd1..3022b45a8 100755 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -404,7 +404,9 @@ class SavedViewFilterRule(models.Model): value = models.CharField( _("value"), - max_length=128) + max_length=128, + blank=True, + null=True) class Meta: verbose_name = _("filter rule") diff --git a/src/documents/parsers.py b/src/documents/parsers.py index 725e605a2..e14607bd0 100644 --- a/src/documents/parsers.py +++ b/src/documents/parsers.py @@ -144,6 +144,52 @@ 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. @@ -221,7 +267,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 f2743c212..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): diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py index 795ca7f95..743c43846 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.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) + + Consumer().run_post_consume_script(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") + + Consumer().run_post_consume_script(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) + + 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/paperless/settings.py b/src/paperless/settings.py index 783da188a..e8b44e8cd 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -89,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", @@ -436,3 +437,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_tesseract/parsers.py b/src/paperless_tesseract/parsers.py index 4da5af2c0..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,50 +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, - auto_orient=True, - 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, - auto_orient=True, - 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 [ @@ -130,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_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..13e937daa --- /dev/null +++ b/src/paperless_tika/parsers.py @@ -0,0 +1,86 @@ +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, 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..409daebe2 --- /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", + "application/vnd.ms-excel": ".xls", + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": ".xlsx", + "application/vnd.ms-powerpoint": ".ppt", + "application/vnd.openxmlformats-officedocument.presentationml.presentation": ".pptx", + "application/vnd.openxmlformats-officedocument.presentationml.slideshow": ".ppsx", + "application/vnd.oasis.opendocument.presentation": ".odp", + "application/vnd.oasis.opendocument.spreadsheet": ".ods", + "application/vnd.oasis.opendocument.text": ".odt", + }, + }