From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 2 Jul 2025 19:33:36 +0000 (-0700) Subject: Support update vs create X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1458b67877baf12f9bd1415efebc7abeee58afaa;p=thirdparty%2Fpaperless-ngx.git Support update vs create --- diff --git a/src-ui/src/app/components/common/pdf-editor/pdf-editor.component.html b/src-ui/src/app/components/common/pdf-editor/pdf-editor.component.html index 648bc1ce4..2b1623c1f 100644 --- a/src-ui/src/app/components/common/pdf-editor/pdf-editor.component.html +++ b/src-ui/src/app/components/common/pdf-editor/pdf-editor.component.html @@ -41,14 +41,14 @@ -
- +
@@ -68,11 +68,31 @@ } -
-
- - +
+
+
+ + + + +
+ @if (editMode === EditMode.Create) { +
+ + +
+
+ + +
+ } + +
- -
diff --git a/src-ui/src/app/components/common/pdf-editor/pdf-editor.component.ts b/src-ui/src/app/components/common/pdf-editor/pdf-editor.component.ts index 32cc70760..c3ab30f20 100644 --- a/src-ui/src/app/components/common/pdf-editor/pdf-editor.component.ts +++ b/src-ui/src/app/components/common/pdf-editor/pdf-editor.component.ts @@ -19,6 +19,11 @@ interface PageOperation { loaded?: boolean } +enum EditMode { + Update = 'update', + Create = 'create', +} + @Component({ selector: 'pngx-pdf-editor', templateUrl: './pdf-editor.component.html', @@ -31,13 +36,18 @@ interface PageOperation { ], }) export class PDFEditorComponent extends ConfirmDialogComponent { + public EditMode = EditMode + private documentService = inject(DocumentService) - activeModal = inject(NgbActiveModal) + activeModal: NgbActiveModal = inject(NgbActiveModal) documentID: number pages: PageOperation[] = [] totalPages = 0 - deleteOriginal = false + editMode: EditMode = EditMode.Create + deleteOriginal: boolean = false + updateDocument: boolean = false + includeMetadata: boolean = true get pdfSrc(): string { return this.documentService.getPreviewUrl(this.documentID) @@ -76,6 +86,10 @@ export class PDFEditorComponent extends ConfirmDialogComponent { toggleSplit(i: number) { this.pages[i].splitAfter = !this.pages[i].splitAfter + if (this.pages[i].splitAfter) { + // force create mode + this.editMode = EditMode.Create + } } selectAll() { @@ -94,6 +108,10 @@ export class PDFEditorComponent extends ConfirmDialogComponent { return this.pages.some((p) => p.selected) } + hasSplit(): boolean { + return this.pages.some((p) => p.splitAfter) + } + drop(event: CdkDragDrop) { moveItemInArray(this.pages, event.previousIndex, event.currentIndex) } diff --git a/src-ui/src/app/components/document-detail/document-detail.component.spec.ts b/src-ui/src/app/components/document-detail/document-detail.component.spec.ts index e818239d8..38a8cd834 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.spec.ts +++ b/src-ui/src/app/components/document-detail/document-detail.component.spec.ts @@ -1175,7 +1175,8 @@ describe('DocumentDetailComponent', () => { method: 'edit_pdf', parameters: { operations: [{ page: 1, rotate: 0, doc: 0 }], - delete_original: false, + update_document: false, + include_metadata: true, }, }) req.flush(true) diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts index c5fbf8e05..d7d255975 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.ts +++ b/src-ui/src/app/components/document-detail/document-detail.component.ts @@ -1363,7 +1363,8 @@ export class DocumentDetailComponent this.documentsService .bulkEdit([this.document.id], 'edit_pdf', { operations: modal.componentInstance.getOperations(), - delete_original: modal.componentInstance.deleteOriginal, + update_document: modal.componentInstance.updateDocument, + include_metadata: modal.componentInstance.includeMetadata, }) .pipe(first(), takeUntil(this.unsubscribeNotifier)) .subscribe({ diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.py index 9b1740a65..894d0d4aa 100644 --- a/src/documents/bulk_edit.py +++ b/src/documents/bulk_edit.py @@ -502,6 +502,8 @@ def edit_pdf( operations: list[dict], *, delete_original: bool = False, + update_document: bool = False, + include_metadata: bool = True, user: User | None = None, ) -> Literal["OK"]: """ @@ -533,9 +535,25 @@ def edit_pdf( if op.get("rotate"): dst.pages[-1].rotate(op["rotate"], relative=True) + if update_document: + if len(pdf_docs) != 1: + logger.error( + "Update requested but multiple output documents specified", + ) + return "ERROR" + pdf = pdf_docs[0] + pdf.remove_unreferenced_resources() + pdf.save(doc.source_path) + doc.checksum = hashlib.md5(doc.source_path.read_bytes()).hexdigest() + doc.page_count = len(pdf.pages) + doc.save() + update_document_content_maybe_archive_file.delay(document_id=doc.id) + else: consume_tasks = [] - overrides: DocumentMetadataOverrides = ( + overrides = ( DocumentMetadataOverrides().from_document(doc) + if include_metadata + else DocumentMetadataOverrides() ) if user is not None: overrides.owner_id = user.id @@ -564,6 +582,7 @@ def edit_pdf( except Exception as e: logger.exception(f"Error editing document {doc.id}: {e}") + return "ERROR" return "OK" diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index ae7ab162c..3077d0dd1 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -1537,11 +1537,23 @@ class BulkEditSerializer( raise serializers.ValidationError("rotate must be an integer") if "doc" in op and not isinstance(op["doc"], int): raise serializers.ValidationError("doc must be an integer") - if "delete_original" in parameters: - if not isinstance(parameters["delete_original"], bool): - raise serializers.ValidationError("delete_original must be a boolean") + if "update_document" in parameters: + if not isinstance(parameters["update_document"], bool): + raise serializers.ValidationError("update_document must be a boolean") else: - parameters["delete_original"] = False + parameters["update_document"] = False + if "include_metadata" in parameters: + if not isinstance(parameters["include_metadata"], bool): + raise serializers.ValidationError("include_metadata must be a boolean") + else: + parameters["include_metadata"] = True + + if parameters["update_document"]: + max_idx = max(op.get("doc", 0) for op in parameters["operations"]) + if max_idx > 0: + raise serializers.ValidationError( + "update_document only allowed with a single output document", + ) def validate(self, attrs): method = attrs["method"] diff --git a/src/documents/views.py b/src/documents/views.py index 94329043c..003f6e09b 100644 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -1375,17 +1375,21 @@ class BulkEditView(PassUserMixin): method in [bulk_edit.merge, bulk_edit.split] and parameters["delete_originals"] ) - or (method == bulk_edit.edit_pdf and parameters["delete_original"]) + or (method == bulk_edit.edit_pdf and parameters["update_document"]) ): has_perms = user_is_owner_of_all_documents # check global add permissions for methods that create documents if ( has_perms - and method in [bulk_edit.split, bulk_edit.merge, bulk_edit.edit_pdf] - and not user.has_perm( - "documents.add_document", + and ( + method in [bulk_edit.split, bulk_edit.merge] + or ( + method == bulk_edit.edit_pdf + and not parameters["update_document"] + ) ) + and not user.has_perm("documents.add_document") ): has_perms = False @@ -1398,7 +1402,6 @@ class BulkEditView(PassUserMixin): method in [bulk_edit.merge, bulk_edit.split] and parameters["delete_originals"] ) - or (method == bulk_edit.edit_pdf and parameters["delete_original"]) ) and not user.has_perm("documents.delete_document") ):