diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4fadf260e..425243163 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -208,7 +208,7 @@ jobs: tag_name: ng-${{ steps.get_version.outputs.version }} release_name: Paperless-ng ${{ steps.get_version.outputs.version }} draft: false - prerelease: true + prerelease: false body: | For a complete list of changes, see the changelog at https://paperless-ng.readthedocs.io/en/latest/changelog.html. - diff --git a/crowdin.yml b/crowdin.yml new file mode 100644 index 000000000..f5a7765dd --- /dev/null +++ b/crowdin.yml @@ -0,0 +1,5 @@ +files: + - source: /src/locale/en-us/LC_MESSAGES/django.po + translation: /src/locale/%two_letters_code%/LC_MESSAGES/django.po + - source: /src-ui/messages.xlf + translation: /src-ui/src/locale/messages.%two_letters_code%.xlf diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 8e1a21757..5919b14aa 100644 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -79,7 +79,11 @@ initialize() { fi done + echo "creating directory /tmp/paperless" + mkdir -p /tmp/paperless + chown -R paperless:paperless ../ + chown -R paperless:paperless /tmp/paperless migrations diff --git a/docs/administration.rst b/docs/administration.rst index 1690d49e2..14b986e82 100644 --- a/docs/administration.rst +++ b/docs/administration.rst @@ -20,6 +20,8 @@ Options available to any installation of paperless: metadata to a specific folder. You may import your documents into a fresh instance of paperless again or store your documents in another DMS with this export. +* The document exporter is also able to update an already existing export. + Therefore, incremental backups with ``rsync`` are entirely possible. Options available to docker installations: @@ -88,10 +90,28 @@ B. If you built the image yourself, do the following: $ docker-compose build $ docker-compose up -Running `docker-compose up` will also apply any new database migrations. +Running ``docker-compose up`` will also apply any new database migrations. If you see everything working, press CTRL+C once to gracefully stop paperless. Then you can start paperless-ng with ``-d`` to have it run in the background. + .. note:: + + In version 0.9.14, the update process was changed. In 0.9.13 and earlier, the + docker-compose files specified exact versions and pull won't automatically + update to newer versions. In order to enable updates as described above, either + get the new ``docker-compose.yml`` file from `here `_ + or edit the ``docker-compose.yml`` file, find the line that says + + .. code:: + + image: jonaswinkler/paperless-ng:0.9.x + + and replace the version with ``latest``: + + .. code:: + + image: jonaswinkler/paperless-ng:latest + Bare Metal Route ================ @@ -192,8 +212,13 @@ backup or migration to another DMS. .. code:: - document_exporter target + document_exporter target [-c] [-f] [-d] + optional arguments: + -c, --compare-checksums + -f, --use-filename-format + -d, --delete + ``target`` is a folder to which the data gets written. This includes documents, thumbnails and a ``manifest.json`` file. The manifest contains all metadata from the database (correspondents, tags, etc). @@ -202,6 +227,24 @@ When you use the provided docker compose script, specify ``../export`` as the target. This path inside the container is automatically mounted on your host on the folder ``export``. +If the target directory already exists and contains files, paperless will assume +that the contents of the export directory are a previous export and will attempt +to update the previous export. Paperless will only export changed and added files. +Paperless determines whether a file has changed by inspecting the file attributes +"date/time modified" and "size". If that does not work out for you, specify +``--compare-checksums`` and paperless will attempt to compare file checksums instead. +This is slower. + +Paperless will not remove any existing files in the export directory. If you want +paperless to also remove files that do not belong to the current export such as files +from deleted documents, specify ``--delete``. Be careful when pointing paperless to +a directory that already contains other files. + +The filenames generated by this command follow the format +``[date created] [correspondent] [title].[extension]``. +If you want paperless to use ``PAPERLESS_FILENAME_FORMAT`` for exported filenames +instead, specify ``--use-filename-format``. + .. _utilities-importer: diff --git a/docs/changelog.rst b/docs/changelog.rst index 498c53301..28bcc00e6 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -5,6 +5,29 @@ Changelog ********* +paperless-ng 1.0.0 +################## + +Nothing special about this release, but since there are relatively few bug reports coming in, I think that this is reasonably stable. + +* Document export + + * The document exporter has been rewritten to support updating an already existing export in place. + This enables incremental backups with ``rsync``. + * The document exporter supports naming exported files according to ``PAPERLESS_FILENAME_FORMAT``. + * The document exporter locks the media directory and the database during execution to ensure that + the resulting export is consistent. + * See the :ref:`updated documentation ` for more details. + +* Other changes and additions + + * Added a language selector to the settings. + * Added date format options to the settings. + * Range selection with shift clicking is now possible in the document list. + * Filtering correspondent, type and tag management pages by name. + * Focus "Name" field in dialogs by default. + + paperless-ng 0.9.14 ################### @@ -116,7 +139,7 @@ paperless-ng 0.9.10 * There are some configuration options in the settings to alter the behavior. * Other changes and additions - + * Thanks to `zjean`_, paperless now publishes a webmanifest, which is useful for adding the application to home screens on mobile devices. * The Paperless-ng logo now navigates to the dashboard. * Filter for documents that don't have any correspondents, types or tags assigned. @@ -136,7 +159,7 @@ paperless-ng 0.9.10 The bulk delete operations did not update the search index. Therefore, documents that you deleted remained in the index and caused the search to return messages about missing documents when searching. Further bulk operations will properly update the index. - + However, this change is not retroactive: If you used the delete method of the bulk editor, you need to reindex your search index by :ref:`running the management command document_index with the argument reindex `. @@ -191,12 +214,12 @@ paperless-ng 0.9.7 * Thanks to the hard work of `Michael Shamoon`_, paperless now comes with a much more streamlined UI for filtering documents. - + * `Michael Shamoon`_ replaced the document preview with another component. This should fix compatibility with Safari browsers. * Added buttons to the management pages to quickly show all documents with one specific tag, correspondent, or title. - - * Paperless now stores your saved views on the server and associates them with your user account. + + * Paperless now stores your saved views on the server and associates them with your user account. This means that you can access your views on multiple devices and have separate views for different users. You will have to recreate your views. @@ -214,7 +237,7 @@ paperless-ng 0.9.7 This option enables you to be logged in into multiple instances by specifying different cookie names for each instance. * Fixes - + * Sometimes paperless would assign dates in the future to newly consumed documents. * The filename format fields ``{created_month}`` and ``{created_day}`` now use a leading zero for single digit values. * The filename format field ``{tags}`` can no longer be used without arguments. diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 9b6324a76..6175cf700 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -394,53 +394,60 @@ 2 + + Filter by: + + src/app/components/manage/tag-list/tag-list.component.html + 8 + + Name src/app/components/manage/tag-list/tag-list.component.html - 13 + 9 Color src/app/components/manage/tag-list/tag-list.component.html - 14 + 20 Matching src/app/components/manage/tag-list/tag-list.component.html - 15 + 21 Document count src/app/components/manage/tag-list/tag-list.component.html - 16 + 22 Actions src/app/components/manage/tag-list/tag-list.component.html - 17 + 23 Documents src/app/components/manage/tag-list/tag-list.component.html - 32 + 38 Edit src/app/components/manage/tag-list/tag-list.component.html - 37 + 43 @@ -475,21 +482,35 @@ Saved view "" deleted. src/app/components/manage/settings/settings.component.ts - 55 + 63 Settings saved successfully. src/app/components/manage/settings/settings.component.ts - 68 + 79 + + + + Use system language + + src/app/components/manage/settings/settings.component.ts + 83 + + + + Use date format of display language + + src/app/components/manage/settings/settings.component.ts + 87 Error while storing settings on server: src/app/components/manage/settings/settings.component.ts - 80 + 103 @@ -510,7 +531,7 @@ Saved views src/app/components/manage/settings/settings.component.html - 64 + 114 @@ -520,109 +541,158 @@ 13 + + Display language + + src/app/components/manage/settings/settings.component.html + 17 + + + + You need to reload the page after applying a new language. + + src/app/components/manage/settings/settings.component.html + 25 + + + + Date display + + src/app/components/manage/settings/settings.component.html + 32 + + + + Date format + + src/app/components/manage/settings/settings.component.html + 45 + + + + Short: + + src/app/components/manage/settings/settings.component.html + 51 + + + + Medium: + + src/app/components/manage/settings/settings.component.html + 55 + + + + Long: + + src/app/components/manage/settings/settings.component.html + 59 + + Items per page src/app/components/manage/settings/settings.component.html - 17 + 67 Document editor src/app/components/manage/settings/settings.component.html - 33 + 83 Use PDF viewer provided by the browser src/app/components/manage/settings/settings.component.html - 37 + 87 This is usually faster for displaying large PDF documents, but it might not work on some browsers. src/app/components/manage/settings/settings.component.html - 37 + 87 Dark mode src/app/components/manage/settings/settings.component.html - 44 + 94 Use system settings src/app/components/manage/settings/settings.component.html - 47 + 97 Enable dark mode src/app/components/manage/settings/settings.component.html - 48 + 98 Bulk editing src/app/components/manage/settings/settings.component.html - 52 + 102 Show confirmation dialogs src/app/components/manage/settings/settings.component.html - 56 + 106 Deleting documents will always ask for confirmation. src/app/components/manage/settings/settings.component.html - 56 + 106 Apply on close src/app/components/manage/settings/settings.component.html - 57 + 107 Appears on src/app/components/manage/settings/settings.component.html - 76 + 126 Show on dashboard src/app/components/manage/settings/settings.component.html - 79 + 129 Show in sidebar src/app/components/manage/settings/settings.component.html - 83 + 133 No saved views defined. src/app/components/manage/settings/settings.component.html - 93 + 143 @@ -650,7 +720,7 @@ Last correspondence src/app/components/manage/correspondent-list/correspondent-list.component.html - 15 + 22 @@ -692,21 +762,21 @@ Matching algorithm src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 11 + 10 Matching pattern src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 12 + 11 Case insensitive src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 13 + 12 @@ -913,13 +983,6 @@ 46 - - Filter by: - - src/app/components/document-list/filter-editor/filter-editor.component.html - 4 - - Filter tags @@ -1019,8 +1082,8 @@ 50 - - Created: + + Created: src/app/components/document-list/document-card-large/document-card-large.component.html 67 @@ -1400,6 +1463,34 @@ 12 + + English (US) + + src/app/services/settings.service.ts + 74 + + + + German + + src/app/services/settings.service.ts + 75 + + + + Dutch + + src/app/services/settings.service.ts + 76 + + + + French + + src/app/services/settings.service.ts + 77 + + Error @@ -1558,56 +1649,56 @@ Create new item src/app/components/common/edit-dialog/edit-dialog.component.ts - 43 + 50 Edit item src/app/components/common/edit-dialog/edit-dialog.component.ts - 47 + 54 Could not save element: src/app/components/common/edit-dialog/edit-dialog.component.ts - 51 + 58 Automatic src/app/components/manage/generic-list/generic-list.component.ts - 33 + 39 Do you really want to delete this element? src/app/components/manage/generic-list/generic-list.component.ts - 76 + 97 Associated documents will not be deleted. src/app/components/manage/generic-list/generic-list.component.ts - 83 + 104 Delete src/app/components/manage/generic-list/generic-list.component.ts - 85 + 106 Error while deleting element: src/app/components/manage/generic-list/generic-list.component.ts - 93 + 114 diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index 30411c980..49e937c0b 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -13,7 +13,7 @@ import { DocumentTypeListComponent } from './components/manage/document-type-lis import { LogsComponent } from './components/manage/logs/logs.component'; import { SettingsComponent } from './components/manage/settings/settings.component'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { DatePipe } from '@angular/common'; +import { DatePipe, registerLocaleData } from '@angular/common'; import { NotFoundComponent } from './components/not-found/not-found.component'; import { CorrespondentListComponent } from './components/manage/correspondent-list/correspondent-list.component'; import { ConfirmDialogComponent } from './components/common/confirm-dialog/confirm-dialog.component'; @@ -59,6 +59,15 @@ import { SelectDialogComponent } from './components/common/select-dialog/select- import { NgSelectModule } from '@ng-select/ng-select'; import { NumberComponent } from './components/common/input/number/number.component'; import { SafePipe } from './pipes/safe.pipe'; +import { CustomDatePipe } from './pipes/custom-date.pipe'; + +import localeFr from '@angular/common/locales/fr'; +import localeNl from '@angular/common/locales/nl'; +import localeDe from '@angular/common/locales/de'; + +registerLocaleData(localeFr) +registerLocaleData(localeNl) +registerLocaleData(localeDe) @NgModule({ declarations: [ @@ -108,7 +117,8 @@ import { SafePipe } from './pipes/safe.pipe'; MetadataCollapseComponent, SelectDialogComponent, NumberComponent, - SafePipe + SafePipe, + CustomDatePipe ], imports: [ BrowserModule, diff --git a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts index 46f486167..3faf18dbb 100644 --- a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts +++ b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts @@ -27,6 +27,8 @@ export abstract class EditDialogComponent implements OnI networkActive = false + closeEnabled = false + error = null abstract getForm(): FormGroup @@ -37,6 +39,11 @@ export abstract class EditDialogComponent implements OnI if (this.object != null) { this.objectForm.patchValue(this.object) } + + // wait to enable close button so it doesnt steal focus from input since its the first clickable element in the DOM + setTimeout(() => { + this.closeEnabled = true + }); } getCreateTitle() { diff --git a/src-ui/src/app/components/dashboard/dashboard.component.html b/src-ui/src/app/components/dashboard/dashboard.component.html index 47751fe8b..c10b8ea04 100644 --- a/src-ui/src/app/components/dashboard/dashboard.component.html +++ b/src-ui/src/app/components/dashboard/dashboard.component.html @@ -1,5 +1,5 @@ -
-
- +
+
- +
@@ -17,11 +17,11 @@
- {{(document.correspondent$ | async)?.name}} + {{(document.correspondent$ | async)?.name}} {{(document.correspondent$ | async)?.name}}: {{document.title | documentTitle}} - +
#{{document.archive_serial_number}}
@@ -64,7 +64,7 @@
#{{document.archiv
- Created: {{document.created | date}} + Created: {{document.created | customDate}}
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts index e3bd4b7f7..f8bb9f518 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts @@ -15,16 +15,11 @@ export class DocumentCardLargeComponent implements OnInit { @Input() selected = false - setSelected(value: boolean) { - this.selected = value - this.selectedChange.emit(value) - } - @Output() - selectedChange = new EventEmitter() + toggleSelected = new EventEmitter() get selectable() { - return this.selectedChange.observers.length > 0 + return this.toggleSelected.observers.length > 0 } @Input() 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 c951bf281..882de71ed 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,18 +1,18 @@
-
- +
+
- +
- +
+ {{moreTags}} @@ -23,7 +23,7 @@

- {{(document.correspondent$ | async)?.name}}: + {{(document.correspondent$ | async)?.name}}: {{document.title | documentTitle}} (#{{document.archive_serial_number}})

@@ -43,14 +43,14 @@ - +
- {{document.created | date}} + {{document.created | customDate:'shortDate'}}
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts index ed69c5c50..5db0e30c0 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts @@ -14,14 +14,9 @@ export class DocumentCardSmallComponent implements OnInit { @Input() selected = false - - setSelected(value: boolean) { - this.selected = value - this.selectedChange.emit(value) - } - + @Output() - selectedChange = new EventEmitter() + toggleSelected = new EventEmitter() @Input() document: PaperlessDocument diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html index 612238215..cfc2e655d 100644 --- a/src-ui/src/app/components/document-list/document-list.component.html +++ b/src-ui/src/app/components/document-list/document-list.component.html @@ -90,7 +90,7 @@
- +
@@ -135,10 +135,10 @@ i18n>Added - +
- +
@@ -147,28 +147,28 @@ - {{(d.correspondent$ | async)?.name}} + {{(d.correspondent$ | async)?.name}} {{d.title | documentTitle}} - + - {{(d.document_type$ | async)?.name}} + {{(d.document_type$ | async)?.name}} - {{d.created | date}} + {{d.created | customDate}} - {{d.added | date}} + {{d.added | customDate}}
- +
diff --git a/src-ui/src/app/components/document-list/document-list.component.scss b/src-ui/src/app/components/document-list/document-list.component.scss index f90a94be4..28f765e29 100644 --- a/src-ui/src/app/components/document-list/document-list.component.scss +++ b/src-ui/src/app/components/document-list/document-list.component.scss @@ -1,5 +1,9 @@ @import "/src/theme"; +tr { + user-select: none; +} + .table-row-selected { background-color: $primaryFaded; } diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index fda99eb8d..509c0a735 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -160,6 +160,11 @@ export class DocumentListComponent implements OnInit { this.filterRulesModified = modified } + toggleSelected(document: PaperlessDocument, event: MouseEvent): void { + if (!event.shiftKey) this.list.toggleSelected(document) + else this.list.selectRangeTo(document) + } + clickTag(tagID: number) { this.list.selectNone() setTimeout(() => { diff --git a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html index f2063df7e..7f1d39859 100644 --- a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html +++ b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html @@ -1,7 +1,7 @@
-
diff --git a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts index e930ffaed..4f70941dd 100644 --- a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts +++ b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts @@ -20,6 +20,8 @@ export class SaveViewConfigDialogComponent implements OnInit { @Input() buttonsEnabled = true + closeEnabled = false + _defaultName = "" get defaultName() { @@ -31,7 +33,7 @@ export class SaveViewConfigDialogComponent implements OnInit { this._defaultName = value this.saveViewConfigForm.patchValue({name: value}) } - + saveViewConfigForm = new FormGroup({ name: new FormControl(''), showInSideBar: new FormControl(false), @@ -39,6 +41,10 @@ export class SaveViewConfigDialogComponent implements OnInit { }) ngOnInit(): void { + // wait to enable close button so it doesnt steal focus from input since its the first clickable element in the DOM + setTimeout(() => { + this.closeEnabled = true + }); } save() { 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 3544aeed0..bbc2c8453 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 @@ -1,12 +1,11 @@
-
- diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html index 08704190e..4cbafb817 100644 --- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html +++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html @@ -2,8 +2,15 @@ -
- +
+
+
+ + +
+
+ +
@@ -21,7 +28,7 @@ - +
{{ correspondent.name }} {{ getMatching(correspondent) }} {{ correspondent.document_count }}{{ correspondent.last_correspondence | date }}{{ correspondent.last_correspondence | customDate }}
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html index dd6e86592..613cc4fd4 100644 --- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html +++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html @@ -2,9 +2,15 @@ -
- +
+
+
+ + +
+
+ +
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 e1d5226f3..7c5dbc8e3 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 @@ -1,17 +1,19 @@ -import { Directive, OnInit, QueryList, ViewChildren } from '@angular/core'; +import { Directive, OnDestroy, OnInit, QueryList, ViewChildren } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { Subject, Subscription } from 'rxjs'; +import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; import { MatchingModel, MATCHING_ALGORITHMS, MATCH_AUTO } from 'src/app/data/matching-model'; import { ObjectWithId } from 'src/app/data/object-with-id'; import { SortableDirective, SortEvent } from 'src/app/directives/sortable.directive'; -import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service'; +import { AbstractNameFilterService } from 'src/app/services/rest/abstract-name-filter-service'; import { ToastService } from 'src/app/services/toast.service'; import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component'; @Directive() -export abstract class GenericListComponent implements OnInit { +export abstract class GenericListComponent implements OnInit, OnDestroy { constructor( - private service: AbstractPaperlessService, + private service: AbstractNameFilterService, private modalService: NgbModal, private editDialogComponent: any, private toastService: ToastService) { @@ -28,6 +30,10 @@ export abstract class GenericListComponent implements On public sortField: string public sortReverse: boolean + private nameFilterDebounce: Subject + private subscription: Subscription + private _nameFilter: string + getMatching(o: MatchingModel) { if (o.matching_algorithm == MATCH_AUTO) { return $localize`Automatic` @@ -44,12 +50,27 @@ export abstract class GenericListComponent implements On this.reloadData() } + ngOnInit(): void { this.reloadData() + + this.nameFilterDebounce = new Subject() + + this.subscription = this.nameFilterDebounce.pipe( + debounceTime(400), + distinctUntilChanged() + ).subscribe(title => { + this._nameFilter = title + this.reloadData() + }) + } + + ngOnDestroy() { + this.subscription.unsubscribe() } reloadData() { - this.service.list(this.page, null, this.sortField, this.sortReverse).subscribe(c => { + this.service.listFiltered(this.page, null, this.sortField, this.sortReverse, this._nameFilter).subscribe(c => { this.data = c.results this.collectionSize = c.count }); @@ -95,4 +116,12 @@ export abstract class GenericListComponent implements On } ) } + + get nameFilter() { + return this._nameFilter + } + + set nameFilter(nameFilter: string) { + this.nameFilterDebounce.next(nameFilter) + } } diff --git a/src-ui/src/app/components/manage/logs/logs.component.html b/src-ui/src/app/components/manage/logs/logs.component.html index d21cea60d..be14faf1d 100644 --- a/src-ui/src/app/components/manage/logs/logs.component.html +++ b/src-ui/src/app/components/manage/logs/logs.component.html @@ -20,7 +20,7 @@

- {{log.created | date:'short'}} + {{log.created | customDate:'short'}} {{getLevelText(log.level)}} {{log.message}}

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 cc4de9bf0..4ed5ad1ae 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.html +++ b/src-ui/src/app/components/manage/settings/settings.component.html @@ -12,6 +12,56 @@

Appearance

+
+
+ Display language +
+
+ + + + You need to reload the page after applying a new language. + +
+
+ +
+
+ Date display +
+
+ + + +
+
+ +
+
+ Date format +
+
+ +
+ + +
+
+ + +
+
+ + +
+ +
+
+
Items per page 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 0e364e6c5..47f714c21 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.ts +++ b/src-ui/src/app/components/manage/settings/settings.component.ts @@ -1,9 +1,9 @@ -import { Component, OnInit, Renderer2 } from '@angular/core'; +import { Component, Inject, LOCALE_ID, 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'; import { SavedViewService } from 'src/app/services/rest/saved-view.service'; -import { SettingsService, SETTINGS_KEYS } from 'src/app/services/settings.service'; +import { LanguageOption, SettingsService, SETTINGS_KEYS } from 'src/app/services/settings.service'; import { ToastService } from 'src/app/services/toast.service'; @Component({ @@ -22,16 +22,24 @@ export class SettingsComponent implements OnInit { 'darkModeUseSystem': new FormControl(this.settings.get(SETTINGS_KEYS.DARK_MODE_USE_SYSTEM)), 'darkModeEnabled': new FormControl(this.settings.get(SETTINGS_KEYS.DARK_MODE_ENABLED)), 'useNativePdfViewer': new FormControl(this.settings.get(SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER)), - 'savedViews': this.savedViewGroup + 'savedViews': this.savedViewGroup, + 'displayLanguage': new FormControl(this.settings.getLanguage()), + 'dateLocale': new FormControl(this.settings.get(SETTINGS_KEYS.DATE_LOCALE)), + 'dateFormat': new FormControl(this.settings.get(SETTINGS_KEYS.DATE_FORMAT)), }) savedViews: PaperlessSavedView[] + get computedDateLocale(): string { + return this.settingsForm.value.dateLocale || this.settingsForm.value.displayLanguage + } + constructor( public savedViewService: SavedViewService, private documentListViewService: DocumentListViewService, private toastService: ToastService, - private settings: SettingsService + private settings: SettingsService, + @Inject(LOCALE_ID) public currentLocale: string ) { } ngOnInit() { @@ -63,11 +71,26 @@ export class SettingsComponent implements OnInit { 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.settings.set(SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER, this.settingsForm.value.useNativePdfViewer) + this.settings.set(SETTINGS_KEYS.DATE_LOCALE, this.settingsForm.value.dateLocale) + this.settings.set(SETTINGS_KEYS.DATE_FORMAT, this.settingsForm.value.dateFormat) + this.settings.setLanguage(this.settingsForm.value.displayLanguage) this.documentListViewService.updatePageSize() this.settings.updateDarkModeSettings() this.toastService.showInfo($localize`Settings saved successfully.`) } + get displayLanguageOptions(): LanguageOption[] { + return [{code: "", name: $localize`Use system language`}].concat(this.settings.getLanguageOptions()) + } + + get dateLocaleOptions(): LanguageOption[] { + return [{code: "", name: $localize`Use date format of display language`}].concat(this.settings.getLanguageOptions()) + } + + get today() { + return new Date() + } + saveSettings() { let x = [] for (let id in this.savedViewGroup.value) { 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 57f3b19fd..fd4c3b7f0 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 @@ -1,7 +1,7 @@
-
diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.html b/src-ui/src/app/components/manage/tag-list/tag-list.component.html index 4af22b3cd..036beccbc 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-list.component.html +++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.html @@ -2,9 +2,15 @@ -
- +
+
+
+ + +
+
+ +
diff --git a/src-ui/src/app/pipes/custom-date.pipe.spec.ts b/src-ui/src/app/pipes/custom-date.pipe.spec.ts new file mode 100644 index 000000000..822966baf --- /dev/null +++ b/src-ui/src/app/pipes/custom-date.pipe.spec.ts @@ -0,0 +1,8 @@ +import { CustomDatePipe } from './custom-date.pipe'; + +describe('CustomDatePipe', () => { + it('create an instance', () => { + const pipe = new CustomDatePipe(); + expect(pipe).toBeTruthy(); + }); +}); diff --git a/src-ui/src/app/pipes/custom-date.pipe.ts b/src-ui/src/app/pipes/custom-date.pipe.ts new file mode 100644 index 000000000..19989fbdd --- /dev/null +++ b/src-ui/src/app/pipes/custom-date.pipe.ts @@ -0,0 +1,19 @@ +import { DatePipe } from '@angular/common'; +import { Inject, LOCALE_ID, Pipe, PipeTransform } from '@angular/core'; +import { SettingsService, SETTINGS_KEYS } from '../services/settings.service'; + +@Pipe({ + name: 'customDate' +}) +export class CustomDatePipe extends DatePipe implements PipeTransform { + + constructor(@Inject(LOCALE_ID) locale: string, private settings: SettingsService) { + super(settings.get(SETTINGS_KEYS.DATE_LOCALE) || locale) + + } + + transform(value: any, format?: string, timezone?: string, locale?: string): string | null { + return super.transform(value, format || this.settings.get(SETTINGS_KEYS.DATE_FORMAT), timezone, locale) + } + +} diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts index 1bbcca38e..4eb0c276c 100644 --- a/src-ui/src/app/services/document-list-view.service.ts +++ b/src-ui/src/app/services/document-list-view.service.ts @@ -27,6 +27,8 @@ export class DocumentListViewService { currentPage = 1 currentPageSize: number = this.settings.get(SETTINGS_KEYS.DOCUMENT_LIST_SIZE) collectionSize: number + rangeSelectionAnchorIndex: number + lastRangeSelectionToIndex: number /** * This is the current config for the document list. The service will always remember the last settings used for the document list. @@ -108,6 +110,7 @@ export class DocumentListViewService { if (onFinish) { onFinish() } + this.rangeSelectionAnchorIndex = this.lastRangeSelectionToIndex = null this.isReloading = false }, error => { @@ -218,6 +221,7 @@ export class DocumentListViewService { selectNone() { this.selected.clear() + this.rangeSelectionAnchorIndex = this.lastRangeSelectionToIndex = null } reduceSelectionToFilter() { @@ -249,14 +253,39 @@ export class DocumentListViewService { return this.selected.has(d.id) } - setSelected(d: PaperlessDocument, value: boolean) { - if (value) { - this.selected.add(d.id) - } else if (!value) { - this.selected.delete(d.id) + toggleSelected(d: PaperlessDocument): void { + if (this.selected.has(d.id)) this.selected.delete(d.id) + else this.selected.add(d.id) + this.rangeSelectionAnchorIndex = this.documentIndexInCurrentView(d.id) + this.lastRangeSelectionToIndex = null + } + + selectRangeTo(d: PaperlessDocument) { + if (this.rangeSelectionAnchorIndex !== null) { + const documentToIndex = this.documentIndexInCurrentView(d.id) + const fromIndex = Math.min(this.rangeSelectionAnchorIndex, documentToIndex) + const toIndex = Math.max(this.rangeSelectionAnchorIndex, documentToIndex) + + if (this.lastRangeSelectionToIndex !== null) { + // revert the old selection + this.documents.slice(Math.min(this.rangeSelectionAnchorIndex, this.lastRangeSelectionToIndex), Math.max(this.rangeSelectionAnchorIndex, this.lastRangeSelectionToIndex) + 1).forEach(d => { + this.selected.delete(d.id) + }) + } + + this.documents.slice(fromIndex, toIndex + 1).forEach(d => { + this.selected.add(d.id) + }) + this.lastRangeSelectionToIndex = documentToIndex + } else { // e.g. shift key but was first click + this.toggleSelected(d) } } + documentIndexInCurrentView(documentID: number): number { + return this.documents.map(d => d.id).indexOf(documentID) + } + constructor(private documentService: DocumentService, private settings: SettingsService, private router: Router) { let documentListViewConfigJson = sessionStorage.getItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG) if (documentListViewConfigJson) { diff --git a/src-ui/src/app/services/rest/abstract-name-filter-service.ts b/src-ui/src/app/services/rest/abstract-name-filter-service.ts new file mode 100644 index 000000000..d605fef49 --- /dev/null +++ b/src-ui/src/app/services/rest/abstract-name-filter-service.ts @@ -0,0 +1,14 @@ +import { ObjectWithId } from 'src/app/data/object-with-id' +import { AbstractPaperlessService } from './abstract-paperless-service' + +export abstract class AbstractNameFilterService extends AbstractPaperlessService { + + listFiltered(page?: number, pageSize?: number, sortField?: string, sortReverse?: boolean, nameFilter?: string) { + let params = {} + if (nameFilter) { + params = {'name__icontains': nameFilter} + } + return this.list(page, pageSize, sortField, sortReverse, params) + } + +} diff --git a/src-ui/src/app/services/rest/correspondent.service.ts b/src-ui/src/app/services/rest/correspondent.service.ts index a609b7dd8..7eac24971 100644 --- a/src-ui/src/app/services/rest/correspondent.service.ts +++ b/src-ui/src/app/services/rest/correspondent.service.ts @@ -1,12 +1,12 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent'; -import { AbstractPaperlessService } from './abstract-paperless-service'; +import { AbstractNameFilterService } from './abstract-name-filter-service'; @Injectable({ providedIn: 'root' }) -export class CorrespondentService extends AbstractPaperlessService { +export class CorrespondentService extends AbstractNameFilterService { constructor(http: HttpClient) { super(http, 'correspondents') diff --git a/src-ui/src/app/services/rest/document-type.service.ts b/src-ui/src/app/services/rest/document-type.service.ts index a3ba0d858..4f5b7d0ce 100644 --- a/src-ui/src/app/services/rest/document-type.service.ts +++ b/src-ui/src/app/services/rest/document-type.service.ts @@ -1,12 +1,12 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; -import { AbstractPaperlessService } from './abstract-paperless-service'; +import { AbstractNameFilterService } from './abstract-name-filter-service'; @Injectable({ providedIn: 'root' }) -export class DocumentTypeService extends AbstractPaperlessService { +export class DocumentTypeService extends AbstractNameFilterService { constructor(http: HttpClient) { super(http, 'document_types') diff --git a/src-ui/src/app/services/rest/tag.service.ts b/src-ui/src/app/services/rest/tag.service.ts index b4151dbb9..7bc55b0c9 100644 --- a/src-ui/src/app/services/rest/tag.service.ts +++ b/src-ui/src/app/services/rest/tag.service.ts @@ -1,12 +1,12 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { PaperlessTag } from 'src/app/data/paperless-tag'; -import { AbstractPaperlessService } from './abstract-paperless-service'; +import { AbstractNameFilterService } from './abstract-name-filter-service'; @Injectable({ providedIn: 'root' }) -export class TagService extends AbstractPaperlessService { +export class TagService extends AbstractNameFilterService { constructor(http: HttpClient) { super(http, 'tags') diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts index eb533e118..041fb51ca 100644 --- a/src-ui/src/app/services/settings.service.ts +++ b/src-ui/src/app/services/settings.service.ts @@ -1,5 +1,7 @@ import { DOCUMENT } from '@angular/common'; import { Inject, Injectable, Renderer2, RendererFactory2 } from '@angular/core'; +import { Meta } from '@angular/platform-browser'; +import { CookieService } from 'ngx-cookie-service'; export interface PaperlessSettings { key: string @@ -7,13 +9,21 @@ export interface PaperlessSettings { default: any } +export interface LanguageOption { + code: string, + name: string, + englishName?: string +} + 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', - USE_NATIVE_PDF_VIEWER: 'general-settings:document-details:native-pdf-viewer' + USE_NATIVE_PDF_VIEWER: 'general-settings:document-details:native-pdf-viewer', + DATE_LOCALE: 'general-settings:date-display:date-locale', + DATE_FORMAT: 'general-settings:date-display:date-format' } const SETTINGS: PaperlessSettings[] = [ @@ -22,7 +32,9 @@ const SETTINGS: PaperlessSettings[] = [ {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}, - {key: SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER, type: "boolean", default: false} + {key: SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER, type: "boolean", default: false}, + {key: SETTINGS_KEYS.DATE_LOCALE, type: "string", default: ""}, + {key: SETTINGS_KEYS.DATE_FORMAT, type: "string", default: "mediumDate"} ] @Injectable({ @@ -34,7 +46,9 @@ export class SettingsService { constructor( private rendererFactory: RendererFactory2, - @Inject(DOCUMENT) private document + @Inject(DOCUMENT) private document, + private cookieService: CookieService, + private meta: Meta ) { this.renderer = rendererFactory.createRenderer(null, null); @@ -55,6 +69,35 @@ export class SettingsService { } + getLanguageOptions(): LanguageOption[] { + return [ + {code: "en-US", name: $localize`English (US)`, englishName: "English (US)"}, + {code: "de", name: $localize`German`, englishName: "German"}, + {code: "nl", name: $localize`Dutch`, englishName: "Dutch"}, + {code: "fr", name: $localize`French`, englishName: "French"} + ] + } + + private getLanguageCookieName() { + let prefix = "" + if (this.meta.getTag('name=cookie_prefix')) { + prefix = this.meta.getTag('name=cookie_prefix').content + } + return `${prefix || ''}django_language` + } + + getLanguage(): string { + return this.cookieService.get(this.getLanguageCookieName()) + } + + setLanguage(language: string) { + if (language) { + this.cookieService.set(this.getLanguageCookieName(), language) + } else { + this.cookieService.delete(this.getLanguageCookieName()) + } + } + get(key: string): any { let setting = SETTINGS.find(s => s.key == key) diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts index c5ef431cd..fbd65d573 100644 --- a/src-ui/src/environments/environment.prod.ts +++ b/src-ui/src/environments/environment.prod.ts @@ -2,5 +2,5 @@ export const environment = { production: true, apiBaseUrl: "/api/", appTitle: "Paperless-ng", - version: "0.9.14" + version: "1.0.0" }; diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf index 077f7c92e..a898e4630 100644 --- a/src-ui/src/locale/messages.de.xlf +++ b/src-ui/src/locale/messages.de.xlf @@ -449,12 +449,20 @@ 2 + + Filter by: + Filtern nach: + + src/app/components/manage/tag-list/tag-list.component.html + 8 + + Name Name src/app/components/manage/tag-list/tag-list.component.html - 13 + 9 @@ -462,7 +470,7 @@ Farbe src/app/components/manage/tag-list/tag-list.component.html - 14 + 20 @@ -470,7 +478,7 @@ Zuweisung src/app/components/manage/tag-list/tag-list.component.html - 15 + 21 @@ -478,7 +486,7 @@ Anzahl Dokumente src/app/components/manage/tag-list/tag-list.component.html - 16 + 22 @@ -486,7 +494,7 @@ Aktionen src/app/components/manage/tag-list/tag-list.component.html - 17 + 23 @@ -494,7 +502,7 @@ Dokumente src/app/components/manage/tag-list/tag-list.component.html - 32 + 38 @@ -502,7 +510,7 @@ Bearbeiten src/app/components/manage/tag-list/tag-list.component.html - 37 + 43 @@ -542,7 +550,7 @@ Gespeicherte Ansicht "" gelöscht. src/app/components/manage/settings/settings.component.ts - 55 + 63 @@ -550,7 +558,23 @@ Einstellungen erfolgreich gespeichert. src/app/components/manage/settings/settings.component.ts - 68 + 79 + + + + Use system language + Benutze Systemsprache + + src/app/components/manage/settings/settings.component.ts + 83 + + + + Use date format of display language + Benutze Datumsformat der Anzeigesprache + + src/app/components/manage/settings/settings.component.ts + 87 @@ -558,7 +582,7 @@ Fehler beim Speichern der Einstellungen auf dem Server: src/app/components/manage/settings/settings.component.ts - 80 + 103 @@ -582,7 +606,7 @@ Gespeicherte Ansichten src/app/components/manage/settings/settings.component.html - 64 + 114 @@ -593,12 +617,68 @@ 13 + + Display language + Anzeigesprache + + src/app/components/manage/settings/settings.component.html + 17 + + + + You need to reload the page after applying a new language. + Nachdem Sie eine neue Sprache ausgewählt haben, müssen Sie die Seite neu laden. + + src/app/components/manage/settings/settings.component.html + 25 + + + + Date display + Datumsanzeige + + src/app/components/manage/settings/settings.component.html + 32 + + + + Date format + Datumsformat + + src/app/components/manage/settings/settings.component.html + 45 + + + + Short: + Kurz: + + src/app/components/manage/settings/settings.component.html + 51 + + + + Medium: + Mittel: + + src/app/components/manage/settings/settings.component.html + 55 + + + + Long: + Lang: + + src/app/components/manage/settings/settings.component.html + 59 + + Items per page Dokumente pro Seite src/app/components/manage/settings/settings.component.html - 17 + 67 @@ -606,7 +686,7 @@ Dokumenteditor src/app/components/manage/settings/settings.component.html - 33 + 83 @@ -614,7 +694,7 @@ Benutze PDF-Betrachter des Web Browsers src/app/components/manage/settings/settings.component.html - 37 + 87 @@ -622,7 +702,7 @@ Der integrierte PDF-Betrachter des Web-Browsers ist in der Regel schneller bei der Anzeige besonders großer Dokumente, funktioniert aber nicht in allen Browsern. src/app/components/manage/settings/settings.component.html - 37 + 87 @@ -630,7 +710,7 @@ Dunkler Modus src/app/components/manage/settings/settings.component.html - 44 + 94 @@ -638,7 +718,7 @@ Benutze Systemeinstellungen src/app/components/manage/settings/settings.component.html - 47 + 97 @@ -646,7 +726,7 @@ Dunklen Modus aktivieren src/app/components/manage/settings/settings.component.html - 48 + 98 @@ -654,7 +734,7 @@ Massenbearbeitung src/app/components/manage/settings/settings.component.html - 52 + 102 @@ -662,7 +742,7 @@ Bestätigungsdialoge anzeigen src/app/components/manage/settings/settings.component.html - 56 + 106 @@ -670,7 +750,7 @@ Beim Löschen von Dokumenten wird immer nach einer Bestätigung gefragt. src/app/components/manage/settings/settings.component.html - 56 + 106 @@ -678,7 +758,7 @@ Anwenden beim Schließen src/app/components/manage/settings/settings.component.html - 57 + 107 @@ -686,7 +766,7 @@ Erscheint auf src/app/components/manage/settings/settings.component.html - 76 + 126 @@ -694,7 +774,7 @@ Auf Startseite zeigen src/app/components/manage/settings/settings.component.html - 79 + 129 @@ -702,7 +782,7 @@ In Seitenleiste zeigen src/app/components/manage/settings/settings.component.html - 83 + 133 @@ -710,7 +790,7 @@ Keine gespeicherten Ansichten vorhanden. src/app/components/manage/settings/settings.component.html - 93 + 143 @@ -742,7 +822,7 @@ Letzter Kontakt src/app/components/manage/correspondent-list/correspondent-list.component.html - 15 + 22 @@ -790,7 +870,7 @@ Zuweisungsalgorithmus src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 11 + 10 @@ -798,7 +878,7 @@ Zuweisungsmuster src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 12 + 11 @@ -806,7 +886,7 @@ Groß-/Kleinschreibung irrelevant src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 13 + 12 @@ -1042,14 +1122,6 @@ 46 - - Filter by: - Filtern nach: - - src/app/components/document-list/filter-editor/filter-editor.component.html - 4 - - Filter tags Tags filtern @@ -1163,9 +1235,9 @@ 50 - - Created: - Erstellt: + + Created: + Erstellt: src/app/components/document-list/document-card-large/document-card-large.component.html 67 @@ -1598,6 +1670,38 @@ 12 + + English (US) + Englisch (US) + + src/app/services/settings.service.ts + 74 + + + + German + Deutsch + + src/app/services/settings.service.ts + 75 + + + + Dutch + Niederländisch + + src/app/services/settings.service.ts + 76 + + + + French + Französisch + + src/app/services/settings.service.ts + 77 + + Error Fehler @@ -1779,7 +1883,7 @@ Neues Element erstellen src/app/components/common/edit-dialog/edit-dialog.component.ts - 43 + 50 @@ -1787,7 +1891,7 @@ Element bearbeiten src/app/components/common/edit-dialog/edit-dialog.component.ts - 47 + 54 @@ -1795,7 +1899,7 @@ Konnte Element nicht speichern: src/app/components/common/edit-dialog/edit-dialog.component.ts - 51 + 58 @@ -1803,7 +1907,7 @@ Automatisch src/app/components/manage/generic-list/generic-list.component.ts - 33 + 39 @@ -1811,7 +1915,7 @@ Möchten Sie dieses Element wirklich löschen? src/app/components/manage/generic-list/generic-list.component.ts - 76 + 97 @@ -1819,7 +1923,7 @@ Assoziierte Dokumente werden nicht gelöscht. src/app/components/manage/generic-list/generic-list.component.ts - 83 + 104 @@ -1827,7 +1931,7 @@ Löschen src/app/components/manage/generic-list/generic-list.component.ts - 85 + 106 @@ -1835,7 +1939,7 @@ Fehler beim Löschen des Elements: src/app/components/manage/generic-list/generic-list.component.ts - 93 + 114 @@ -1912,7 +2016,7 @@ Fuzzy: Document contains a word similar to this word - Ungenau: Dokument enthält ein zum folgdendem Wort ähnliches Wort + Ungenau: Dokument enthält ein zum folgendem Wort ähnliches Wort src/app/data/matching-model.ts 16 diff --git a/src-ui/src/locale/messages.fr.xlf b/src-ui/src/locale/messages.fr.xlf index 84c8295af..4f09eab72 100644 --- a/src-ui/src/locale/messages.fr.xlf +++ b/src-ui/src/locale/messages.fr.xlf @@ -38,7 +38,7 @@ Sélectionner aucun src/app/components/document-list/document-list.component.html - 11 + 10 @@ -46,7 +46,7 @@ Sélectionner la page src/app/components/document-list/document-list.component.html - 12 + 11 @@ -54,15 +54,15 @@ Sélectionner tout src/app/components/document-list/document-list.component.html - 13 + 12 - - Sort by - Trier par + + Sort + Trier src/app/components/document-list/document-list.component.html - 41 + 39 @@ -94,7 +94,7 @@ {VAR_PLURAL, plural, =1 { document sélectionné sur 1} other { documents sélectionnés sur }} src/app/components/document-list/document-list.component.html - 87 + 85 @@ -102,7 +102,7 @@ {VAR_PLURAL, plural, =1 {Un document} other { documents}} src/app/components/document-list/document-list.component.html - 88 + 86 @@ -110,7 +110,7 @@ (filtré) src/app/components/document-list/document-list.component.html - 88 + 86 @@ -118,7 +118,7 @@ NSA src/app/components/document-list/document-list.component.html - 107 + 105 @@ -126,7 +126,7 @@ Correspondant src/app/components/document-list/document-list.component.html - 113 + 111 @@ -134,7 +134,7 @@ Titre src/app/components/document-list/document-list.component.html - 119 + 117 @@ -142,7 +142,7 @@ Type de document src/app/components/document-list/document-list.component.html - 125 + 123 @@ -150,7 +150,7 @@ Date de création src/app/components/document-list/document-list.component.html - 131 + 129 @@ -158,7 +158,7 @@ Date d'ajout src/app/components/document-list/document-list.component.html - 137 + 135 @@ -166,7 +166,7 @@ Confirmer la suppression src/app/components/document-detail/document-detail.component.ts - 186 + 192 @@ -174,7 +174,7 @@ Voulez-vous vraiment supprimer le document "" ? src/app/components/document-detail/document-detail.component.ts - 187 + 193 @@ -182,7 +182,7 @@ Les fichiers liés à ce document seront supprimés définitivement. Cette action est irréversible. src/app/components/document-detail/document-detail.component.ts - 188 + 194 @@ -190,7 +190,7 @@ Supprimer le document src/app/components/document-detail/document-detail.component.ts - 190 + 196 @@ -198,7 +198,7 @@ Une erreur s'est produite lors de la suppression du document : src/app/components/document-detail/document-detail.component.ts - 197 + 203 @@ -449,12 +449,20 @@ 2 + + Filter by: + Filtrer par : + + src/app/components/manage/tag-list/tag-list.component.html + 8 + + Name Nom src/app/components/manage/tag-list/tag-list.component.html - 13 + 9 @@ -462,7 +470,7 @@ Couleur src/app/components/manage/tag-list/tag-list.component.html - 14 + 20 @@ -470,7 +478,7 @@ Rapprochement src/app/components/manage/tag-list/tag-list.component.html - 15 + 21 @@ -478,7 +486,7 @@ Nombre de documents src/app/components/manage/tag-list/tag-list.component.html - 16 + 22 @@ -486,7 +494,7 @@ Actions src/app/components/manage/tag-list/tag-list.component.html - 17 + 23 @@ -494,7 +502,7 @@ Documents src/app/components/manage/tag-list/tag-list.component.html - 32 + 38 @@ -502,7 +510,7 @@ Éditer src/app/components/manage/tag-list/tag-list.component.html - 37 + 43 @@ -542,7 +550,7 @@ Vue "" supprimée. src/app/components/manage/settings/settings.component.ts - 54 + 63 @@ -550,7 +558,23 @@ Paramètres enregistrés avec succès. src/app/components/manage/settings/settings.component.ts - 74 + 79 + + + + Use system language + Utiliser la langue du système + + src/app/components/manage/settings/settings.component.ts + 83 + + + + Use date format of display language + Utiliser le format de date de la langue d'affichage + + src/app/components/manage/settings/settings.component.ts + 87 @@ -558,7 +582,7 @@ Une erreur s'est produite lors de l'enregistrement des paramètres sur le serveur : src/app/components/manage/settings/settings.component.ts - 86 + 103 @@ -582,7 +606,7 @@ Vues enregistrées src/app/components/manage/settings/settings.component.html - 56 + 114 @@ -593,12 +617,92 @@ 13 + + Display language + Langue d'affichage + + src/app/components/manage/settings/settings.component.html + 17 + + + + You need to reload the page after applying a new language. + Vous devez recharger la page après avoir sélectionné une nouvelle langue. + + src/app/components/manage/settings/settings.component.html + 25 + + + + Date display + Affichage de la date + + src/app/components/manage/settings/settings.component.html + 32 + + + + Date format + Format de date + + src/app/components/manage/settings/settings.component.html + 45 + + + + Short: + Court : + + src/app/components/manage/settings/settings.component.html + 51 + + + + Medium: + Moyen : + + src/app/components/manage/settings/settings.component.html + 55 + + + + Long: + Long : + + src/app/components/manage/settings/settings.component.html + 59 + + Items per page Éléments par page src/app/components/manage/settings/settings.component.html - 17 + 67 + + + + Document editor + Visionneuse de documents + + src/app/components/manage/settings/settings.component.html + 83 + + + + Use PDF viewer provided by the browser + Utiliser la visionneuse PDF fournie par le navigateur + + src/app/components/manage/settings/settings.component.html + 87 + + + + This is usually faster for displaying large PDF documents, but it might not work on some browsers. + Cette option est généralement plus rapide pour l'affichage de grands documents PDF, mais elle peut ne pas fonctionner sur certains navigateurs. + + src/app/components/manage/settings/settings.component.html + 87 @@ -606,7 +710,7 @@ Mode sombre src/app/components/manage/settings/settings.component.html - 33 + 94 @@ -614,7 +718,15 @@ Utiliser les paramètres du système src/app/components/manage/settings/settings.component.html - 36 + 97 + + + + Enable dark mode + Activer le mode sombre + + src/app/components/manage/settings/settings.component.html + 98 @@ -622,7 +734,7 @@ Edition en masse src/app/components/manage/settings/settings.component.html - 44 + 102 @@ -630,7 +742,7 @@ Afficher les messages de confirmation src/app/components/manage/settings/settings.component.html - 48 + 106 @@ -638,7 +750,7 @@ La suppression de documents requiert toujours une confirmation. src/app/components/manage/settings/settings.component.html - 48 + 106 @@ -646,15 +758,7 @@ Appliquer lors de la fermeture src/app/components/manage/settings/settings.component.html - 49 - - - - Enable dark mode - Activer le mode sombre - - src/app/components/manage/settings/settings.component.html - 39 + 107 @@ -662,7 +766,7 @@ Apparaît sur src/app/components/manage/settings/settings.component.html - 68 + 126 @@ -670,7 +774,7 @@ Montrer sur le tableau de bord src/app/components/manage/settings/settings.component.html - 71 + 129 @@ -678,7 +782,7 @@ Montrer dans la barre latérale src/app/components/manage/settings/settings.component.html - 75 + 133 @@ -686,7 +790,7 @@ Aucune vue sauvegardée n'est définie. src/app/components/manage/settings/settings.component.html - 85 + 143 @@ -718,7 +822,7 @@ Dernière correspondance src/app/components/manage/correspondent-list/correspondent-list.component.html - 15 + 22 @@ -766,7 +870,7 @@ Algorithme de rapprochement src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 11 + 10 @@ -774,7 +878,7 @@ Modèle de rapprochement src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 12 + 11 @@ -782,7 +886,7 @@ Insensible à la casse src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 13 + 12 @@ -1018,14 +1122,6 @@ 46 - - Filter by: - Filtrer par : - - src/app/components/document-list/filter-editor/filter-editor.component.html - 4 - - Filter tags Filtrer les étiquettes @@ -1039,7 +1135,7 @@ Filtrer les correspondants src/app/components/document-list/filter-editor/filter-editor.component.html - 19 + 20 @@ -1047,7 +1143,7 @@ Filtrer les types de documents src/app/components/document-list/filter-editor/filter-editor.component.html - 25 + 27 @@ -1055,7 +1151,7 @@ Réinitialiser les filtres src/app/components/document-list/filter-editor/filter-editor.component.html - 47 + 50 @@ -1063,7 +1159,7 @@ Non affecté src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts - 161 + 166 Filter drop down element to filter for documents with no correspondent/type/tag assigned @@ -1072,7 +1168,7 @@ Appliquer src/app/components/common/filterable-dropdown/filterable-dropdown.component.html - 28 + 26 @@ -1139,12 +1235,12 @@ 50 - - Created: - Créé le : + + Created: + Créé le : src/app/components/document-list/document-card-large/document-card-large.component.html - 65 + 67 @@ -1168,7 +1264,7 @@ Score : src/app/components/document-list/document-card-large/document-card-large.component.html - 61 + 62 @@ -1355,7 +1451,7 @@ Sélectionner : src/app/components/document-list/bulk-editor/bulk-editor.component.html - 11 + 10 @@ -1363,7 +1459,7 @@ Tout src/app/components/document-list/bulk-editor/bulk-editor.component.html - 21 + 20 @@ -1371,7 +1467,7 @@ Éditer : src/app/components/document-list/bulk-editor/bulk-editor.component.html - 28 + 27 @@ -1574,6 +1670,38 @@ 12 + + English (US) + Anglais (US) + + src/app/services/settings.service.ts + 74 + + + + German + Allemand + + src/app/services/settings.service.ts + 75 + + + + Dutch + Néerlandais + + src/app/services/settings.service.ts + 76 + + + + French + Français + + src/app/services/settings.service.ts + 77 + + Error Erreur @@ -1755,7 +1883,7 @@ Créer un nouvel élément src/app/components/common/edit-dialog/edit-dialog.component.ts - 43 + 50 @@ -1763,7 +1891,7 @@ Éditer l'élément src/app/components/common/edit-dialog/edit-dialog.component.ts - 47 + 54 @@ -1771,7 +1899,7 @@ Impossible d'enregistrer l'élément : src/app/components/common/edit-dialog/edit-dialog.component.ts - 51 + 58 @@ -1779,7 +1907,7 @@ Automatique src/app/components/manage/generic-list/generic-list.component.ts - 33 + 39 @@ -1787,7 +1915,7 @@ Voulez-vous vraiment supprimer cet élément ? src/app/components/manage/generic-list/generic-list.component.ts - 76 + 97 @@ -1795,7 +1923,7 @@ Les documents associés ne seront pas supprimés. src/app/components/manage/generic-list/generic-list.component.ts - 83 + 104 @@ -1803,7 +1931,7 @@ Supprimer src/app/components/manage/generic-list/generic-list.component.ts - 85 + 106 @@ -1811,7 +1939,7 @@ Une erreur s'est produite lors de la suppression de l'élément : src/app/components/manage/generic-list/generic-list.component.ts - 93 + 114 diff --git a/src-ui/src/locale/messages.nl_NL.xlf b/src-ui/src/locale/messages.nl_NL.xlf index 4ae7459da..3753bc92c 100644 --- a/src-ui/src/locale/messages.nl_NL.xlf +++ b/src-ui/src/locale/messages.nl_NL.xlf @@ -11,7 +11,7 @@ View "" saved successfully. - View "" met succes opgeslagen. + View "" met succes opgeslagen. src/app/components/document-list/document-list.component.ts 94 @@ -19,7 +19,7 @@ View "" created successfully. - View "" met succes gemaakt. + View "" met succes gemaakt. src/app/components/document-list/document-list.component.ts 115 @@ -38,7 +38,7 @@ Niets selecteren src/app/components/document-list/document-list.component.html - 11 + 10 @@ -46,7 +46,7 @@ Selecteer pagina src/app/components/document-list/document-list.component.html - 12 + 11 @@ -54,15 +54,15 @@ Alles selecteren src/app/components/document-list/document-list.component.html - 13 + 12 - - Sort by - Sorteer op + + Sort + Sorteren src/app/components/document-list/document-list.component.html - 41 + 39 @@ -83,7 +83,7 @@ Save "" - Opslaan "" + Opslaan "" src/app/components/document-list/document-list.component.html 71 @@ -94,7 +94,7 @@ {VAR_PLURAL, plural, =1 { van één document geselecteerd} other { van documenten geselecteerd}} src/app/components/document-list/document-list.component.html - 87 + 85 @@ -102,7 +102,7 @@ {VAR_PLURAL, plural, =1 {Eén document} other { documenten}} src/app/components/document-list/document-list.component.html - 88 + 86 @@ -110,7 +110,7 @@ (gefilterd) src/app/components/document-list/document-list.component.html - 88 + 86 @@ -118,7 +118,7 @@ ASN src/app/components/document-list/document-list.component.html - 107 + 105 @@ -126,7 +126,7 @@ Correspondent src/app/components/document-list/document-list.component.html - 113 + 111 @@ -134,7 +134,7 @@ Titel src/app/components/document-list/document-list.component.html - 119 + 117 @@ -142,7 +142,7 @@ Documenttype src/app/components/document-list/document-list.component.html - 125 + 123 @@ -150,7 +150,7 @@ Aangemaakt src/app/components/document-list/document-list.component.html - 131 + 129 @@ -158,7 +158,7 @@ Toegevoegd src/app/components/document-list/document-list.component.html - 137 + 135 @@ -166,15 +166,15 @@ Bevestig het verwijderen src/app/components/document-detail/document-detail.component.ts - 186 + 192 Do you really want to delete document ""? - Wilt u het document echt verwijderen ""? + Wilt u het document echt verwijderen ""? src/app/components/document-detail/document-detail.component.ts - 187 + 193 @@ -182,7 +182,7 @@ De bestanden voor dit document worden definitief verwijderd. Deze bewerking kan niet ongedaan worden gemaakt. src/app/components/document-detail/document-detail.component.ts - 188 + 194 @@ -190,7 +190,7 @@ Verwijder document src/app/components/document-detail/document-detail.component.ts - 190 + 196 @@ -198,7 +198,7 @@ Fout bij het verwijderen van het document: src/app/components/document-detail/document-detail.component.ts - 197 + 203 @@ -427,7 +427,7 @@ Do you really want to delete the tag ""? - Wil je het etiket echt verwijderen ""? + Wil je het etiket echt verwijderen ""? src/app/components/manage/tag-list/tag-list.component.ts 30 @@ -449,12 +449,20 @@ 2 + + Filter by: + Filter op: + + src/app/components/manage/tag-list/tag-list.component.html + 8 + + Name Naam src/app/components/manage/tag-list/tag-list.component.html - 13 + 9 @@ -462,7 +470,7 @@ Kleur src/app/components/manage/tag-list/tag-list.component.html - 14 + 20 @@ -470,7 +478,7 @@ Overeenkomend src/app/components/manage/tag-list/tag-list.component.html - 15 + 21 @@ -478,7 +486,7 @@ Aantal documenten src/app/components/manage/tag-list/tag-list.component.html - 16 + 22 @@ -486,7 +494,7 @@ Acties src/app/components/manage/tag-list/tag-list.component.html - 17 + 23 @@ -494,7 +502,7 @@ Documenten src/app/components/manage/tag-list/tag-list.component.html - 32 + 38 @@ -502,12 +510,12 @@ Bewerk src/app/components/manage/tag-list/tag-list.component.html - 37 + 43 Do you really want to delete the document type ""? - Wilt u het documenttype echt verwijderen ""? + Wilt u het documenttype echt verwijderen ""? src/app/components/manage/document-type-list/document-type-list.component.ts 26 @@ -539,10 +547,10 @@ Saved view "" deleted. - Opgeslagen view "" verwijderd. + Opgeslagen view "" verwijderd. src/app/components/manage/settings/settings.component.ts - 54 + 63 @@ -550,7 +558,23 @@ Instellingen succesvol opgeslagen. src/app/components/manage/settings/settings.component.ts - 74 + 79 + + + + Use system language + Gebruik de systeemtaal + + src/app/components/manage/settings/settings.component.ts + 83 + + + + Use date format of display language + Datumopmaak van weergavetaal gebruiken + + src/app/components/manage/settings/settings.component.ts + 87 @@ -558,7 +582,7 @@ Fout bij het opslaan van de instellingen: src/app/components/manage/settings/settings.component.ts - 86 + 103 @@ -582,7 +606,7 @@ Opgeslagen views src/app/components/manage/settings/settings.component.html - 56 + 114 @@ -593,12 +617,92 @@ 13 + + Display language + Taal + + src/app/components/manage/settings/settings.component.html + 17 + + + + You need to reload the page after applying a new language. + De pagina moet herladen worden nadat een andere taal werd gekozen. + + src/app/components/manage/settings/settings.component.html + 25 + + + + Date display + Datumweergave + + src/app/components/manage/settings/settings.component.html + 32 + + + + Date format + Datumopmaak + + src/app/components/manage/settings/settings.component.html + 45 + + + + Short: + Kort: + + src/app/components/manage/settings/settings.component.html + 51 + + + + Medium: + Medium: + + src/app/components/manage/settings/settings.component.html + 55 + + + + Long: + Lang: + + src/app/components/manage/settings/settings.component.html + 59 + + Items per page Resultaten per pagina src/app/components/manage/settings/settings.component.html - 17 + 67 + + + + Document editor + Documentbewerker + + src/app/components/manage/settings/settings.component.html + 83 + + + + Use PDF viewer provided by the browser + Gebruik de PDF lezer ingebouwd in uw browser + + src/app/components/manage/settings/settings.component.html + 87 + + + + This is usually faster for displaying large PDF documents, but it might not work on some browsers. + Dit is gewoonlijk sneller om grote PDF's te tonen, maar werkt niet bij elke browser. + + src/app/components/manage/settings/settings.component.html + 87 @@ -606,7 +710,7 @@ Nachtmodus src/app/components/manage/settings/settings.component.html - 33 + 94 @@ -614,7 +718,15 @@ Gebruik systeeminstellingen src/app/components/manage/settings/settings.component.html - 36 + 97 + + + + Enable dark mode + Gebruik nachtmodus + + src/app/components/manage/settings/settings.component.html + 98 @@ -622,7 +734,7 @@ Massabewerking src/app/components/manage/settings/settings.component.html - 44 + 102 @@ -630,7 +742,7 @@ Toon dialoogvenster ter bevestiging src/app/components/manage/settings/settings.component.html - 48 + 106 @@ -638,7 +750,7 @@ Er zal altijd om bevestiging gevraagd worden voor het verwijderen van documenten. src/app/components/manage/settings/settings.component.html - 48 + 106 @@ -646,15 +758,7 @@ Toepassen bij het sluiten src/app/components/manage/settings/settings.component.html - 49 - - - - Enable dark mode - Gebruik nachtmodus - - src/app/components/manage/settings/settings.component.html - 39 + 107 @@ -662,7 +766,7 @@ Komt voor bij src/app/components/manage/settings/settings.component.html - 68 + 126 @@ -670,7 +774,7 @@ Toon op het dashboard src/app/components/manage/settings/settings.component.html - 71 + 129 @@ -678,7 +782,7 @@ Toon in de zijbalk src/app/components/manage/settings/settings.component.html - 75 + 133 @@ -686,7 +790,7 @@ Geen opgeslagen views gedefinieerd. src/app/components/manage/settings/settings.component.html - 85 + 143 @@ -699,7 +803,7 @@ Do you really want to delete the correspondent ""? - Bent u zeker dat u correspondent "" wilt verwijderen? + Bent u zeker dat u correspondent "" wilt verwijderen? src/app/components/manage/correspondent-list/correspondent-list.component.ts 26 @@ -718,7 +822,7 @@ Laatste correspondentie src/app/components/manage/correspondent-list/correspondent-list.component.html - 15 + 22 @@ -766,7 +870,7 @@ Algoritme voor het bepalen van de overeenkomst src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 11 + 10 @@ -774,7 +878,7 @@ Patroon voor overeenkomst src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 12 + 11 @@ -782,7 +886,7 @@ Niet hoofdlettergevoelig src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 13 + 12 @@ -867,7 +971,7 @@ Did you mean ""? - Bedoelde u ""? + Bedoelde u ""? src/app/components/search/search.component.html 13 @@ -1018,14 +1122,6 @@ 46 - - Filter by: - Filter op: - - src/app/components/document-list/filter-editor/filter-editor.component.html - 4 - - Filter tags Etiketten filteren @@ -1039,7 +1135,7 @@ Correspondenten filteren src/app/components/document-list/filter-editor/filter-editor.component.html - 19 + 20 @@ -1047,7 +1143,7 @@ Documenttypes filteren src/app/components/document-list/filter-editor/filter-editor.component.html - 25 + 27 @@ -1055,7 +1151,7 @@ Filters terug zetten src/app/components/document-list/filter-editor/filter-editor.component.html - 47 + 50 @@ -1063,7 +1159,7 @@ Niet toegekend src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts - 161 + 166 Filter drop down element to filter for documents with no correspondent/type/tag assigned @@ -1072,7 +1168,7 @@ Toepassen src/app/components/common/filterable-dropdown/filterable-dropdown.component.html - 28 + 26 @@ -1139,12 +1235,12 @@ 50 - - Created: - Aangemaakt op: + + Created: + Aangemaakt op: src/app/components/document-list/document-card-large/document-card-large.component.html - 65 + 67 @@ -1168,7 +1264,7 @@ Score: src/app/components/document-list/document-card-large/document-card-large.component.html - 61 + 62 @@ -1189,7 +1285,7 @@ "" and "" - "" en "" + "" en "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts 114 @@ -1198,7 +1294,7 @@ "" - "" + "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts 116 @@ -1215,7 +1311,7 @@ and "" - en "" + en "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts 117 @@ -1232,7 +1328,7 @@ This operation will add the tag "" to selected document(s). - Het etiket "" zal aan geselecteerd(e) document(en) worden toegewezen. + Het etiket "" zal aan geselecteerd(e) document(en) worden toegewezen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts 129 @@ -1248,7 +1344,7 @@ This operation will remove the tag "" from selected document(s). - Het etiket "" zal verwijderd worden van geselecteerd(e) document(en). + Het etiket "" zal verwijderd worden van geselecteerd(e) document(en). src/app/components/document-list/bulk-editor/bulk-editor.component.ts 134 @@ -1280,7 +1376,7 @@ This operation will assign the correspondent "" to selected document(s). - De correspondent "" zal aan geselecteerd(e) document(en) worden toegewezen. + De correspondent "" zal aan geselecteerd(e) document(en) worden toegewezen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts 160 @@ -1304,7 +1400,7 @@ This operation will assign the document type "" to selected document(s). - Het documenttype "" zal aan geselecteerd(e) document(en) worden toegewezen. + Het documenttype "" zal aan geselecteerd(e) document(en) worden toegewezen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts 183 @@ -1355,7 +1451,7 @@ Selecteer: src/app/components/document-list/bulk-editor/bulk-editor.component.html - 11 + 10 @@ -1363,7 +1459,7 @@ Alles src/app/components/document-list/bulk-editor/bulk-editor.component.html - 21 + 20 @@ -1371,7 +1467,7 @@ Bewerk: src/app/components/document-list/bulk-editor/bulk-editor.component.html - 28 + 27 @@ -1574,6 +1670,38 @@ 12 + + English (US) + Engels (US) + + src/app/services/settings.service.ts + 74 + + + + German + Duits + + src/app/services/settings.service.ts + 75 + + + + Dutch + Nederlands + + src/app/services/settings.service.ts + 76 + + + + French + Frans + + src/app/services/settings.service.ts + 77 + + Error Fout @@ -1755,7 +1883,7 @@ Maak nieuw item src/app/components/common/edit-dialog/edit-dialog.component.ts - 43 + 50 @@ -1763,7 +1891,7 @@ Item bewerken src/app/components/common/edit-dialog/edit-dialog.component.ts - 47 + 54 @@ -1771,7 +1899,7 @@ Kon het element niet opslaan: src/app/components/common/edit-dialog/edit-dialog.component.ts - 51 + 58 @@ -1779,7 +1907,7 @@ Automatisch src/app/components/manage/generic-list/generic-list.component.ts - 33 + 39 @@ -1787,7 +1915,7 @@ Wil je dit element echt verwijderen? src/app/components/manage/generic-list/generic-list.component.ts - 76 + 97 @@ -1795,7 +1923,7 @@ Geassocieerde documenten zullen niet verwijderd worden. src/app/components/manage/generic-list/generic-list.component.ts - 83 + 104 @@ -1803,7 +1931,7 @@ Verwijderen src/app/components/manage/generic-list/generic-list.component.ts - 85 + 106 @@ -1811,7 +1939,7 @@ Fout bij het verwijderen van het element: src/app/components/manage/generic-list/generic-list.component.ts - 93 + 114 diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py index a5274a5f4..dd798e8ab 100644 --- a/src/documents/file_handling.py +++ b/src/documents/file_handling.py @@ -91,7 +91,7 @@ def generate_unique_filename(doc, root): return new_filename -def generate_filename(doc, counter=0): +def generate_filename(doc, counter=0, append_gpg=True): path = "" try: @@ -151,7 +151,7 @@ def generate_filename(doc, counter=0): filename = f"{doc.pk:07}{counter_str}{doc.file_type}" # Append .gpg for encrypted files - if doc.storage_type == doc.STORAGE_TYPE_GPG: + if append_gpg and doc.storage_type == doc.STORAGE_TYPE_GPG: filename += ".gpg" return filename diff --git a/src/documents/management/commands/document_archiver.py b/src/documents/management/commands/document_archiver.py index 7b9a123d9..01bd819c5 100644 --- a/src/documents/management/commands/document_archiver.py +++ b/src/documents/management/commands/document_archiver.py @@ -11,6 +11,7 @@ from django.conf import settings from django.core.management.base import BaseCommand from django.db import transaction +from filelock import FileLock from whoosh.writing import AsyncWriter from documents.models import Document @@ -47,8 +48,10 @@ def handle_document(document_id): archive_checksum=checksum, content=parser.get_text() ) - create_source_path_directory(document.archive_path) - shutil.move(parser.get_archive_path(), document.archive_path) + with FileLock(settings.MEDIA_LOCK): + create_source_path_directory(document.archive_path) + shutil.move(parser.get_archive_path(), + document.archive_path) with AsyncWriter(index.open_index()) as writer: index.update_document(writer, document) diff --git a/src/documents/management/commands/document_consumer.py b/src/documents/management/commands/document_consumer.py index d0c045db2..9ba1b1a87 100644 --- a/src/documents/management/commands/document_consumer.py +++ b/src/documents/management/commands/document_consumer.py @@ -5,7 +5,6 @@ from django.conf import settings from django.core.management.base import BaseCommand, CommandError -from django.utils.text import slugify from django_q.tasks import async_task from watchdog.events import FileSystemEventHandler from watchdog.observers.polling import PollingObserver diff --git a/src/documents/management/commands/document_exporter.py b/src/documents/management/commands/document_exporter.py index a7a17f124..37fcf2024 100644 --- a/src/documents/management/commands/document_exporter.py +++ b/src/documents/management/commands/document_exporter.py @@ -1,15 +1,21 @@ +import hashlib import json import os import shutil import time +import tqdm +from django.conf import settings from django.core import serializers from django.core.management.base import BaseCommand, CommandError +from django.db import transaction +from filelock import FileLock from documents.models import Document, Correspondent, Tag, DocumentType from documents.settings import EXPORTER_FILE_NAME, EXPORTER_THUMBNAIL_NAME, \ EXPORTER_ARCHIVE_NAME from paperless.db import GnuPG +from ...file_handling import generate_filename, delete_empty_directories from ...mixins import Renderable @@ -24,13 +30,47 @@ class Command(Renderable, BaseCommand): def add_arguments(self, parser): parser.add_argument("target") + parser.add_argument( + "-c", "--compare-checksums", + default=False, + action="store_true", + help="Compare file checksums when determining whether to export " + "a file or not. If not specified, file size and time " + "modified is used instead." + ) + + parser.add_argument( + "-f", "--use-filename-format", + default=False, + action="store_true", + help="Use PAPERLESS_FILENAME_FORMAT for storing files in the " + "export directory, if configured." + ) + + parser.add_argument( + "-d", "--delete", + default=False, + action="store_true", + help="After exporting, delete files in the export directory that " + "do not belong to the current export, such as files from " + "deleted documents." + ) + def __init__(self, *args, **kwargs): BaseCommand.__init__(self, *args, **kwargs) self.target = None + self.files_in_export_dir = [] + self.exported_files = [] + self.compare_checksums = False + self.use_filename_format = False + self.delete = False def handle(self, *args, **options): self.target = options["target"] + self.compare_checksums = options['compare_checksums'] + self.use_filename_format = options['use_filename_format'] + self.delete = options['delete'] if not os.path.exists(self.target): raise CommandError("That path doesn't exist") @@ -38,83 +78,148 @@ def handle(self, *args, **options): if not os.access(self.target, os.W_OK): raise CommandError("That path doesn't appear to be writable") - if os.listdir(self.target): - raise CommandError("That directory is not empty.") - - self.dump() + with FileLock(settings.MEDIA_LOCK): + self.dump() def dump(self): - - documents = Document.objects.all() - document_map = {d.pk: d for d in documents} - manifest = json.loads(serializers.serialize("json", documents)) - - for index, document_dict in enumerate(manifest): - - # Force output to unencrypted as that will be the current state. - # The importer will make the decision to encrypt or not. - manifest[index]["fields"]["storage_type"] = Document.STORAGE_TYPE_UNENCRYPTED # NOQA: E501 + # 1. Take a snapshot of what files exist in the current export folder + for root, dirs, files in os.walk(self.target): + self.files_in_export_dir.extend( + map(lambda f: os.path.abspath(os.path.join(root, f)), files) + ) + + # 2. Create manifest, containing all correspondents, types, tags and + # documents + with transaction.atomic(): + manifest = json.loads( + serializers.serialize("json", Correspondent.objects.all())) + + manifest += json.loads(serializers.serialize( + "json", Tag.objects.all())) + + manifest += json.loads(serializers.serialize( + "json", DocumentType.objects.all())) + + documents = Document.objects.order_by("id") + document_map = {d.pk: d for d in documents} + document_manifest = json.loads( + serializers.serialize("json", documents)) + manifest += document_manifest + + # 3. Export files from each document + for index, document_dict in tqdm.tqdm(enumerate(document_manifest), + total=len(document_manifest)): + # 3.1. store files unencrypted + document_dict["fields"]["storage_type"] = Document.STORAGE_TYPE_UNENCRYPTED # NOQA: E501 document = document_map[document_dict["pk"]] - print(f"Exporting: {document}") - + # 3.2. generate a unique filename filename_counter = 0 while True: - original_name = document.get_public_filename( - counter=filename_counter) - original_target = os.path.join(self.target, original_name) + if self.use_filename_format: + base_name = generate_filename( + document, counter=filename_counter, + append_gpg=False) + else: + base_name = document.get_public_filename( + counter=filename_counter) - if not os.path.exists(original_target): + if base_name not in self.exported_files: + self.exported_files.append(base_name) break else: filename_counter += 1 - thumbnail_name = original_name + "-thumbnail.png" - thumbnail_target = os.path.join(self.target, thumbnail_name) - + # 3.3. write filenames into manifest + original_name = base_name + original_target = os.path.join(self.target, original_name) document_dict[EXPORTER_FILE_NAME] = original_name + + thumbnail_name = base_name + "-thumbnail.png" + thumbnail_target = os.path.join(self.target, thumbnail_name) document_dict[EXPORTER_THUMBNAIL_NAME] = thumbnail_name if os.path.exists(document.archive_path): - archive_name = document.get_public_filename( - archive=True, counter=filename_counter, suffix="_archive") + archive_name = base_name + "-archive.pdf" archive_target = os.path.join(self.target, archive_name) document_dict[EXPORTER_ARCHIVE_NAME] = archive_name else: archive_target = None + # 3.4. write files to target folder t = int(time.mktime(document.created.timetuple())) if document.storage_type == Document.STORAGE_TYPE_GPG: + os.makedirs(os.path.dirname(original_target), exist_ok=True) with open(original_target, "wb") as f: f.write(GnuPG.decrypted(document.source_file)) os.utime(original_target, times=(t, t)) + os.makedirs(os.path.dirname(thumbnail_target), exist_ok=True) with open(thumbnail_target, "wb") as f: f.write(GnuPG.decrypted(document.thumbnail_file)) os.utime(thumbnail_target, times=(t, t)) if archive_target: + os.makedirs(os.path.dirname(archive_target), exist_ok=True) with open(archive_target, "wb") as f: f.write(GnuPG.decrypted(document.archive_path)) os.utime(archive_target, times=(t, t)) else: + self.check_and_copy(document.source_path, + document.checksum, + original_target) - shutil.copy(document.source_path, original_target) - shutil.copy(document.thumbnail_path, thumbnail_target) + self.check_and_copy(document.thumbnail_path, + None, + thumbnail_target) if archive_target: - shutil.copy(document.archive_path, archive_target) + self.check_and_copy(document.archive_path, + document.archive_checksum, + archive_target) - manifest += json.loads( - serializers.serialize("json", Correspondent.objects.all())) + # 4. write manifest to target forlder + manifest_path = os.path.abspath( + os.path.join(self.target, "manifest.json")) - manifest += json.loads(serializers.serialize( - "json", Tag.objects.all())) - - manifest += json.loads(serializers.serialize( - "json", DocumentType.objects.all())) - - with open(os.path.join(self.target, "manifest.json"), "w") as f: + with open(manifest_path, "w") as f: json.dump(manifest, f, indent=2) + + if self.delete: + # 5. Remove files which we did not explicitly export in this run + + if manifest_path in self.files_in_export_dir: + self.files_in_export_dir.remove(manifest_path) + + for f in self.files_in_export_dir: + os.remove(f) + + delete_empty_directories(os.path.abspath(os.path.dirname(f)), + os.path.abspath(self.target)) + + def check_and_copy(self, source, source_checksum, target): + if os.path.abspath(target) in self.files_in_export_dir: + self.files_in_export_dir.remove(os.path.abspath(target)) + + perform_copy = False + + if os.path.exists(target): + source_stat = os.stat(source) + target_stat = os.stat(target) + if self.compare_checksums and source_checksum: + with open(target, "rb") as f: + target_checksum = hashlib.md5(f.read()).hexdigest() + perform_copy = target_checksum != source_checksum + elif source_stat.st_mtime != target_stat.st_mtime: + perform_copy = True + elif source_stat.st_size != target_stat.st_size: + perform_copy = True + else: + # Copy if it does not exist + perform_copy = True + + if perform_copy: + os.makedirs(os.path.dirname(target), exist_ok=True) + shutil.copy2(source, target) diff --git a/src/documents/management/commands/document_importer.py b/src/documents/management/commands/document_importer.py index 6df14a82c..a2e19e3cc 100644 --- a/src/documents/management/commands/document_importer.py +++ b/src/documents/management/commands/document_importer.py @@ -148,10 +148,10 @@ def _import_files_from_manifest(self): create_source_path_directory(document.source_path) - shutil.copy(document_path, document.source_path) - shutil.copy(thumbnail_path, document.thumbnail_path) + shutil.copy2(document_path, document.source_path) + shutil.copy2(thumbnail_path, document.thumbnail_path) if archive_path: create_source_path_directory(document.archive_path) - shutil.copy(archive_path, document.archive_path) + shutil.copy2(archive_path, document.archive_path) document.save() diff --git a/src/documents/models.py b/src/documents/models.py index 928b8aa4d..86878dd7e 100755 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -63,12 +63,6 @@ class Meta: def __str__(self): return self.name - def save(self, *args, **kwargs): - - self.match = self.match.lower() - - models.Model.save(self, *args, **kwargs) - class Correspondent(MatchingModel): diff --git a/src/documents/tests/samples/documents/originals/0000002.pdf b/src/documents/tests/samples/documents/originals/0000002.pdf new file mode 100644 index 000000000..5e75266ca Binary files /dev/null and b/src/documents/tests/samples/documents/originals/0000002.pdf differ diff --git a/src/documents/tests/samples/documents/originals/0000002.pdf.gpg b/src/documents/tests/samples/documents/originals/0000002.pdf.gpg deleted file mode 100644 index 0322a8039..000000000 Binary files a/src/documents/tests/samples/documents/originals/0000002.pdf.gpg and /dev/null differ diff --git a/src/documents/tests/samples/documents/originals/0000003.pdf b/src/documents/tests/samples/documents/originals/0000003.pdf new file mode 100644 index 000000000..afbeef5c8 Binary files /dev/null and b/src/documents/tests/samples/documents/originals/0000003.pdf differ diff --git a/src/documents/tests/samples/documents/originals/0000004.pdf.gpg b/src/documents/tests/samples/documents/originals/0000004.pdf.gpg new file mode 100644 index 000000000..754efcbf6 Binary files /dev/null and b/src/documents/tests/samples/documents/originals/0000004.pdf.gpg differ diff --git a/src/documents/tests/samples/documents/thumbnails/0000002.png b/src/documents/tests/samples/documents/thumbnails/0000002.png new file mode 100644 index 000000000..a3a768401 Binary files /dev/null and b/src/documents/tests/samples/documents/thumbnails/0000002.png differ diff --git a/src/documents/tests/samples/documents/thumbnails/0000003.png b/src/documents/tests/samples/documents/thumbnails/0000003.png new file mode 100644 index 000000000..a3a768401 Binary files /dev/null and b/src/documents/tests/samples/documents/thumbnails/0000003.png differ diff --git a/src/documents/tests/samples/documents/thumbnails/0000002.png.gpg b/src/documents/tests/samples/documents/thumbnails/0000004.png.gpg similarity index 100% rename from src/documents/tests/samples/documents/thumbnails/0000002.png.gpg rename to src/documents/tests/samples/documents/thumbnails/0000004.png.gpg diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py index 5f81b83b6..2b332a873 100644 --- a/src/documents/tests/test_api.py +++ b/src/documents/tests/test_api.py @@ -228,6 +228,12 @@ def test_document_filters(self): self.assertEqual(len(results), 2) self.assertCountEqual([results[0]['id'], results[1]['id']], [doc1.id, doc3.id]) + response = self.client.get("/api/documents/?tags__id__in={},{}".format(tag_2.id, tag_3.id)) + self.assertEqual(response.status_code, 200) + results = response.data['results'] + self.assertEqual(len(results), 2) + self.assertCountEqual([results[0]['id'], results[1]['id']], [doc2.id, doc3.id]) + response = self.client.get("/api/documents/?tags__id__all={},{}".format(tag_2.id, tag_3.id)) self.assertEqual(response.status_code, 200) results = response.data['results'] @@ -923,6 +929,14 @@ def test_api_invalid_correspondent(self): doc2 = Document.objects.get(id=self.doc2.id) self.assertEqual(doc2.correspondent, self.c1) + def test_api_no_correspondent(self): + response = self.client.post("/api/documents/bulk_edit/", json.dumps({ + "documents": [self.doc2.id], + "method": "set_correspondent", + "parameters": {} + }), content_type='application/json') + self.assertEqual(response.status_code, 400) + def test_api_invalid_document_type(self): self.assertEqual(self.doc2.document_type, self.dt1) response = self.client.post("/api/documents/bulk_edit/", json.dumps({ @@ -935,6 +949,14 @@ def test_api_invalid_document_type(self): doc2 = Document.objects.get(id=self.doc2.id) self.assertEqual(doc2.document_type, self.dt1) + def test_api_no_document_type(self): + response = self.client.post("/api/documents/bulk_edit/", json.dumps({ + "documents": [self.doc2.id], + "method": "set_document_type", + "parameters": {} + }), content_type='application/json') + self.assertEqual(response.status_code, 400) + def test_api_add_invalid_tag(self): self.assertEqual(list(self.doc2.tags.all()), [self.t1]) response = self.client.post("/api/documents/bulk_edit/", json.dumps({ @@ -946,6 +968,14 @@ def test_api_add_invalid_tag(self): self.assertEqual(list(self.doc2.tags.all()), [self.t1]) + def test_api_add_tag_no_tag(self): + response = self.client.post("/api/documents/bulk_edit/", json.dumps({ + "documents": [self.doc2.id], + "method": "add_tag", + "parameters": {} + }), content_type='application/json') + self.assertEqual(response.status_code, 400) + def test_api_delete_invalid_tag(self): self.assertEqual(list(self.doc2.tags.all()), [self.t1]) response = self.client.post("/api/documents/bulk_edit/", json.dumps({ @@ -957,6 +987,14 @@ def test_api_delete_invalid_tag(self): self.assertEqual(list(self.doc2.tags.all()), [self.t1]) + def test_api_delete_tag_no_tag(self): + response = self.client.post("/api/documents/bulk_edit/", json.dumps({ + "documents": [self.doc2.id], + "method": "remove_tag", + "parameters": {} + }), content_type='application/json') + self.assertEqual(response.status_code, 400) + def test_api_modify_invalid_tags(self): self.assertEqual(list(self.doc2.tags.all()), [self.t1]) response = self.client.post("/api/documents/bulk_edit/", json.dumps({ @@ -966,6 +1004,21 @@ def test_api_modify_invalid_tags(self): }), content_type='application/json') self.assertEqual(response.status_code, 400) + def test_api_modify_tags_no_tags(self): + response = self.client.post("/api/documents/bulk_edit/", json.dumps({ + "documents": [self.doc2.id], + "method": "modify_tags", + "parameters": {"remove_tags": [1123123]} + }), content_type='application/json') + self.assertEqual(response.status_code, 400) + + response = self.client.post("/api/documents/bulk_edit/", json.dumps({ + "documents": [self.doc2.id], + "method": "modify_tags", + "parameters": {'add_tags': [self.t2.id, 1657]} + }), content_type='application/json') + self.assertEqual(response.status_code, 400) + def test_api_selection_data_empty(self): response = self.client.post("/api/documents/selection_data/", json.dumps({ "documents": [] diff --git a/src/documents/tests/test_management.py b/src/documents/tests/test_management.py index 58aaf9342..a71baa8ba 100644 --- a/src/documents/tests/test_management.py +++ b/src/documents/tests/test_management.py @@ -70,18 +70,18 @@ def test_decrypt(self, m): PASSPHRASE="test" ).enable() - doc = Document.objects.create(checksum="9c9691e51741c1f4f41a20896af31770", title="wow", filename="0000002.pdf.gpg", mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG) + doc = Document.objects.create(checksum="82186aaa94f0b98697d704b90fd1c072", title="wow", filename="0000004.pdf.gpg", mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG) - shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000002.pdf.gpg"), os.path.join(originals_dir, "0000002.pdf.gpg")) - shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", f"0000002.png.gpg"), os.path.join(thumb_dir, f"{doc.id:07}.png.gpg")) + shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000004.pdf.gpg"), os.path.join(originals_dir, "0000004.pdf.gpg")) + shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", f"0000004.png.gpg"), os.path.join(thumb_dir, f"{doc.id:07}.png.gpg")) call_command('decrypt_documents') doc.refresh_from_db() self.assertEqual(doc.storage_type, Document.STORAGE_TYPE_UNENCRYPTED) - self.assertEqual(doc.filename, "0000002.pdf") - self.assertTrue(os.path.isfile(os.path.join(originals_dir, "0000002.pdf"))) + self.assertEqual(doc.filename, "0000004.pdf") + self.assertTrue(os.path.isfile(os.path.join(originals_dir, "0000004.pdf"))) self.assertTrue(os.path.isfile(doc.source_path)) self.assertTrue(os.path.isfile(os.path.join(thumb_dir, f"{doc.id:07}.png"))) self.assertTrue(os.path.isfile(doc.thumbnail_path)) diff --git a/src/documents/tests/test_management_exporter.py b/src/documents/tests/test_management_exporter.py index d6ab7eadd..986e458b9 100644 --- a/src/documents/tests/test_management_exporter.py +++ b/src/documents/tests/test_management_exporter.py @@ -3,6 +3,8 @@ import os import shutil import tempfile +from pathlib import Path +from unittest import mock from django.core.management import call_command from django.test import TestCase, override_settings @@ -10,54 +12,87 @@ from documents.management.commands import document_exporter from documents.models import Document, Tag, DocumentType, Correspondent from documents.sanity_checker import check_sanity +from documents.settings import EXPORTER_FILE_NAME from documents.tests.utils import DirectoriesMixin, paperless_environment class TestExportImport(DirectoriesMixin, TestCase): + def setUp(self) -> None: + self.target = tempfile.mkdtemp() + self.addCleanup(shutil.rmtree, self.target) + + self.d1 = Document.objects.create(content="Content", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", title="wow1", filename="0000001.pdf", mime_type="application/pdf") + self.d2 = Document.objects.create(content="Content", checksum="9c9691e51741c1f4f41a20896af31770", title="wow2", filename="0000002.pdf", mime_type="application/pdf") + self.d3 = Document.objects.create(content="Content", checksum="d38d7ed02e988e072caf924e0f3fcb76", title="wow2", filename="0000003.pdf", mime_type="application/pdf") + self.d4 = Document.objects.create(content="Content", checksum="82186aaa94f0b98697d704b90fd1c072", title="wow_dec", filename="0000004.pdf.gpg", mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG) + + self.t1 = Tag.objects.create(name="t") + self.dt1 = DocumentType.objects.create(name="dt") + self.c1 = Correspondent.objects.create(name="c") + + self.d1.tags.add(self.t1) + self.d1.correspondent = self.c1 + self.d1.document_type = self.dt1 + self.d1.save() + super(TestExportImport, self).setUp() + + def _get_document_from_manifest(self, manifest, id): + f = list(filter(lambda d: d['model'] == "documents.document" and d['pk'] == id, manifest)) + if len(f) == 1: + return f[0] + else: + raise ValueError(f"document with id {id} does not exist in manifest") + @override_settings( PASSPHRASE="test" ) - def test_exporter(self): - shutil.rmtree(os.path.join(self.dirs.media_dir, "documents")) - shutil.copytree(os.path.join(os.path.dirname(__file__), "samples", "documents"), os.path.join(self.dirs.media_dir, "documents")) + def _do_export(self, use_filename_format=False, compare_checksums=False, delete=False): + args = ['document_exporter', self.target] + if use_filename_format: + args += ["--use-filename-format"] + if compare_checksums: + args += ["--compare-checksums"] + if delete: + args += ["--delete"] + + call_command(*args) + + with open(os.path.join(self.target, "manifest.json")) as f: + manifest = json.load(f) - file = os.path.join(self.dirs.originals_dir, "0000001.pdf") + return manifest - d1 = Document.objects.create(content="Content", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", title="wow", filename="0000001.pdf", mime_type="application/pdf") - d2 = Document.objects.create(content="Content", checksum="9c9691e51741c1f4f41a20896af31770", title="wow", filename="0000002.pdf.gpg", mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG) - t1 = Tag.objects.create(name="t") - dt1 = DocumentType.objects.create(name="dt") - c1 = Correspondent.objects.create(name="c") + def test_exporter(self, use_filename_format=False): + shutil.rmtree(os.path.join(self.dirs.media_dir, "documents")) + shutil.copytree(os.path.join(os.path.dirname(__file__), "samples", "documents"), os.path.join(self.dirs.media_dir, "documents")) - d1.tags.add(t1) - d1.correspondents = c1 - d1.document_type = dt1 - d1.save() - d2.save() + manifest = self._do_export(use_filename_format=use_filename_format) - target = tempfile.mkdtemp() - self.addCleanup(shutil.rmtree, target) - - call_command('document_exporter', target) + self.assertEqual(len(manifest), 7) + self.assertEqual(len(list(filter(lambda e: e['model'] == 'documents.document', manifest))), 4) - with open(os.path.join(target, "manifest.json")) as f: - manifest = json.load(f) + self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json"))) - self.assertEqual(len(manifest), 5) + self.assertEqual(self._get_document_from_manifest(manifest, self.d1.id)['fields']['title'], "wow1") + self.assertEqual(self._get_document_from_manifest(manifest, self.d2.id)['fields']['title'], "wow2") + self.assertEqual(self._get_document_from_manifest(manifest, self.d3.id)['fields']['title'], "wow2") + self.assertEqual(self._get_document_from_manifest(manifest, self.d4.id)['fields']['title'], "wow_dec") for element in manifest: if element['model'] == 'documents.document': - fname = os.path.join(target, element[document_exporter.EXPORTER_FILE_NAME]) + fname = os.path.join(self.target, element[document_exporter.EXPORTER_FILE_NAME]) self.assertTrue(os.path.exists(fname)) - self.assertTrue(os.path.exists(os.path.join(target, element[document_exporter.EXPORTER_THUMBNAIL_NAME]))) + self.assertTrue(os.path.exists(os.path.join(self.target, element[document_exporter.EXPORTER_THUMBNAIL_NAME]))) with open(fname, "rb") as f: checksum = hashlib.md5(f.read()).hexdigest() self.assertEqual(checksum, element['fields']['checksum']) + self.assertEqual(element['fields']['storage_type'], Document.STORAGE_TYPE_UNENCRYPTED) + if document_exporter.EXPORTER_ARCHIVE_NAME in element: - fname = os.path.join(target, element[document_exporter.EXPORTER_ARCHIVE_NAME]) + fname = os.path.join(self.target, element[document_exporter.EXPORTER_ARCHIVE_NAME]) self.assertTrue(os.path.exists(fname)) with open(fname, "rb") as f: @@ -65,24 +100,123 @@ def test_exporter(self): self.assertEqual(checksum, element['fields']['archive_checksum']) with paperless_environment() as dirs: - self.assertEqual(Document.objects.count(), 2) + self.assertEqual(Document.objects.count(), 4) Document.objects.all().delete() Correspondent.objects.all().delete() DocumentType.objects.all().delete() Tag.objects.all().delete() self.assertEqual(Document.objects.count(), 0) - call_command('document_importer', target) - self.assertEqual(Document.objects.count(), 2) + call_command('document_importer', self.target) + self.assertEqual(Document.objects.count(), 4) + self.assertEqual(Tag.objects.count(), 1) + self.assertEqual(Correspondent.objects.count(), 1) + self.assertEqual(DocumentType.objects.count(), 1) + self.assertEqual(Document.objects.get(id=self.d1.id).title, "wow1") + self.assertEqual(Document.objects.get(id=self.d2.id).title, "wow2") + self.assertEqual(Document.objects.get(id=self.d3.id).title, "wow2") + self.assertEqual(Document.objects.get(id=self.d4.id).title, "wow_dec") messages = check_sanity() # everything is alright after the test self.assertEqual(len(messages), 0, str([str(m) for m in messages])) - @override_settings( - PAPERLESS_FILENAME_FORMAT="{title}" - ) def test_exporter_with_filename_format(self): - self.test_exporter() + shutil.rmtree(os.path.join(self.dirs.media_dir, "documents")) + shutil.copytree(os.path.join(os.path.dirname(__file__), "samples", "documents"), os.path.join(self.dirs.media_dir, "documents")) + + with override_settings(PAPERLESS_FILENAME_FORMAT="{created_year}/{correspondent}/{title}"): + self.test_exporter(use_filename_format=True) + + def test_update_export_changed_time(self): + shutil.rmtree(os.path.join(self.dirs.media_dir, "documents")) + shutil.copytree(os.path.join(os.path.dirname(__file__), "samples", "documents"), os.path.join(self.dirs.media_dir, "documents")) + + self._do_export() + self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json"))) + + st_mtime_1 = os.stat(os.path.join(self.target, "manifest.json")).st_mtime + + with mock.patch("documents.management.commands.document_exporter.shutil.copy2") as m: + self._do_export() + m.assert_not_called() + + self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json"))) + st_mtime_2 = os.stat(os.path.join(self.target, "manifest.json")).st_mtime + + Path(self.d1.source_path).touch() + + with mock.patch("documents.management.commands.document_exporter.shutil.copy2") as m: + self._do_export() + self.assertEqual(m.call_count, 1) + + st_mtime_3 = os.stat(os.path.join(self.target, "manifest.json")).st_mtime + self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json"))) + + self.assertNotEqual(st_mtime_1, st_mtime_2) + self.assertNotEqual(st_mtime_2, st_mtime_3) + + def test_update_export_changed_checksum(self): + shutil.rmtree(os.path.join(self.dirs.media_dir, "documents")) + shutil.copytree(os.path.join(os.path.dirname(__file__), "samples", "documents"), os.path.join(self.dirs.media_dir, "documents")) + + self._do_export() + + self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json"))) + + with mock.patch("documents.management.commands.document_exporter.shutil.copy2") as m: + self._do_export() + m.assert_not_called() + + self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json"))) + + self.d2.checksum = "asdfasdgf3" + self.d2.save() + + with mock.patch("documents.management.commands.document_exporter.shutil.copy2") as m: + self._do_export(compare_checksums=True) + self.assertEqual(m.call_count, 1) + + self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json"))) + + def test_update_export_deleted_document(self): + shutil.rmtree(os.path.join(self.dirs.media_dir, "documents")) + shutil.copytree(os.path.join(os.path.dirname(__file__), "samples", "documents"), os.path.join(self.dirs.media_dir, "documents")) + + manifest = self._do_export() + + self.assertTrue(len(manifest), 7) + doc_from_manifest = self._get_document_from_manifest(manifest, self.d3.id) + self.assertTrue(os.path.isfile(os.path.join(self.target, doc_from_manifest[EXPORTER_FILE_NAME]))) + self.d3.delete() + + manifest = self._do_export() + self.assertRaises(ValueError, self._get_document_from_manifest, manifest, self.d3.id) + self.assertTrue(os.path.isfile(os.path.join(self.target, doc_from_manifest[EXPORTER_FILE_NAME]))) + + manifest = self._do_export(delete=True) + self.assertFalse(os.path.isfile(os.path.join(self.target, doc_from_manifest[EXPORTER_FILE_NAME]))) + + self.assertTrue(len(manifest), 6) + + @override_settings(PAPERLESS_FILENAME_FORMAT="{title}/{correspondent}") + def test_update_export_changed_location(self): + shutil.rmtree(os.path.join(self.dirs.media_dir, "documents")) + shutil.copytree(os.path.join(os.path.dirname(__file__), "samples", "documents"), os.path.join(self.dirs.media_dir, "documents")) + + m = self._do_export(use_filename_format=True) + self.assertTrue(os.path.isfile(os.path.join(self.target, "wow1", "c.pdf"))) + + self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json"))) + + self.d1.title = "new_title" + self.d1.save() + self._do_export(use_filename_format=True, delete=True) + self.assertFalse(os.path.isfile(os.path.join(self.target, "wow1", "c.pdf"))) + self.assertFalse(os.path.isdir(os.path.join(self.target, "wow1"))) + self.assertTrue(os.path.isfile(os.path.join(self.target, "new_title", "c.pdf"))) + self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json"))) + self.assertTrue(os.path.isfile(os.path.join(self.target, "wow2", "none.pdf"))) + self.assertTrue(os.path.isfile(os.path.join(self.target, "wow2", "none_01.pdf"))) def test_export_missing_files(self): diff --git a/src/documents/tests/test_migrations.py b/src/documents/tests/test_migrations.py index 33ba41444..ee7180c63 100644 --- a/src/documents/tests/test_migrations.py +++ b/src/documents/tests/test_migrations.py @@ -98,7 +98,7 @@ def setUpBeforeMigration(self, apps): doc2 = Document.objects.create(checksum="B", file_type="pdf", storage_type=STORAGE_TYPE_GPG) self.doc2_id = doc2.id - shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000002.pdf.gpg"), source_path_before(doc2)) + shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000004.pdf.gpg"), source_path_before(doc2)) def testMimeTypesMigrated(self): Document = self.apps.get_model('documents', 'Document') diff --git a/src/documents/tests/test_parsers.py b/src/documents/tests/test_parsers.py index 805e4beac..392c0504f 100644 --- a/src/documents/tests/test_parsers.py +++ b/src/documents/tests/test_parsers.py @@ -120,3 +120,4 @@ def test_file_extensions(self): self.assertTrue(is_file_ext_supported('.pdf')) self.assertFalse(is_file_ext_supported('.hsdfh')) + self.assertFalse(is_file_ext_supported('')) diff --git a/src/documents/views.py b/src/documents/views.py index eb9078f75..b99bf11c7 100755 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -159,6 +159,9 @@ class DocumentViewSet(RetrieveModelMixin, "added", "archive_serial_number") + def get_queryset(self): + return Document.objects.distinct() + def get_serializer(self, *args, **kwargs): fields_param = self.request.query_params.get('fields', None) if fields_param: diff --git a/src/paperless/version.py b/src/paperless/version.py index ac1d6312c..8dcd08521 100644 --- a/src/paperless/version.py +++ b/src/paperless/version.py @@ -1 +1 @@ -__version__ = (0, 9, 14) +__version__ = (1, 0, 0) diff --git a/src/paperless_mail/tests/test_mail.py b/src/paperless_mail/tests/test_mail.py index 0104f5023..bec0ff4b4 100644 --- a/src/paperless_mail/tests/test_mail.py +++ b/src/paperless_mail/tests/test_mail.py @@ -1,3 +1,4 @@ +import os import uuid from collections import namedtuple from typing import ContextManager @@ -9,6 +10,7 @@ from imap_tools import MailMessageFlags, MailboxFolderSelectError from documents.models import Correspondent +from documents.tests.utils import DirectoriesMixin from paperless_mail import tasks from paperless_mail.mail import MailError, MailAccountHandler from paperless_mail.models import MailRule, MailAccount @@ -130,7 +132,7 @@ def fake_magic_from_buffer(buffer, mime=False): @mock.patch('paperless_mail.mail.magic.from_buffer', fake_magic_from_buffer) -class TestMail(TestCase): +class TestMail(DirectoriesMixin, TestCase): def setUp(self): patcher = mock.patch('paperless_mail.mail.MailBox') @@ -146,6 +148,7 @@ def setUp(self): self.reset_bogus_mailbox() self.mail_account_handler = MailAccountHandler() + super(TestMail, self).setUp() def reset_bogus_mailbox(self): self.bogus_mailbox.messages = [] @@ -220,9 +223,13 @@ def test_handle_message(self): args1, kwargs1 = self.async_task.call_args_list[0] args2, kwargs2 = self.async_task.call_args_list[1] + self.assertTrue(os.path.isfile(kwargs1['path']), kwargs1['path']) + self.assertEqual(kwargs1['override_title'], "file_0") self.assertEqual(kwargs1['override_filename'], "file_0.pdf") + self.assertTrue(os.path.isfile(kwargs2['path']), kwargs1['path']) + self.assertEqual(kwargs2['override_title'], "file_1") self.assertEqual(kwargs2['override_filename'], "file_1.pdf") @@ -253,6 +260,7 @@ def test_handle_unknown_mime_type(self): self.assertEqual(self.async_task.call_count, 1) args, kwargs = self.async_task.call_args + self.assertTrue(os.path.isfile(kwargs['path']), kwargs['path']) self.assertEqual(kwargs['override_filename'], "f1.pdf") def test_handle_disposition(self):