From 695967cbb28f3f75f6e468d25685bab270e06179 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 3 Nov 2024 15:33:12 +0000 Subject: [PATCH 01/12] Chore(deps): Bump stumpylog/image-cleaner-action in the actions group (#8142) Bumps the actions group with 1 update: [stumpylog/image-cleaner-action](https://github.com/stumpylog/image-cleaner-action). Updates `stumpylog/image-cleaner-action` from 0.8.0 to 0.9.0 - [Release notes](https://github.com/stumpylog/image-cleaner-action/releases) - [Changelog](https://github.com/stumpylog/image-cleaner-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/stumpylog/image-cleaner-action/compare/v0.8.0...v0.9.0) --- updated-dependencies: - dependency-name: stumpylog/image-cleaner-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/cleanup-tags.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cleanup-tags.yml b/.github/workflows/cleanup-tags.yml index 4eba9127a..2468d57e0 100644 --- a/.github/workflows/cleanup-tags.yml +++ b/.github/workflows/cleanup-tags.yml @@ -33,7 +33,7 @@ jobs: - name: Clean temporary images if: "${{ env.TOKEN != '' }}" - uses: stumpylog/image-cleaner-action/ephemeral@v0.8.0 + uses: stumpylog/image-cleaner-action/ephemeral@v0.9.0 with: token: "${{ env.TOKEN }}" owner: "${{ github.repository_owner }}" @@ -61,7 +61,7 @@ jobs: - name: Clean untagged images if: "${{ env.TOKEN != '' }}" - uses: stumpylog/image-cleaner-action/untagged@v0.8.0 + uses: stumpylog/image-cleaner-action/untagged@v0.9.0 with: token: "${{ env.TOKEN }}" owner: "${{ github.repository_owner }}" From ef329fc687100265c4da96f8bcebd029c259177b Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 3 Nov 2024 17:52:59 -0800 Subject: [PATCH 02/12] Fix: warn with proper error on ASN exists in trash (#8176) --- src/documents/serialisers.py | 16 +++++++++ src/documents/tests/test_api_documents.py | 44 +++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index aeb901f81..6f38904da 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -805,6 +805,22 @@ class DocumentSerializer( doc["content"] = doc.get("content")[0:550] return doc + def validate(self, attrs): + if ( + "archive_serial_number" in attrs + and Document.deleted_objects.filter( + archive_serial_number=attrs["archive_serial_number"], + ).exists() + ): + raise serializers.ValidationError( + { + "archive_serial_number": [ + "Document with this Archive Serial Number already exists in the trash.", + ], + }, + ) + return super().validate(attrs) + def update(self, instance: Document, validated_data): if "created_date" in validated_data and "created" not in validated_data: new_datetime = datetime.datetime.combine( diff --git a/src/documents/tests/test_api_documents.py b/src/documents/tests/test_api_documents.py index 2e2b02f0d..08d86d24e 100644 --- a/src/documents/tests/test_api_documents.py +++ b/src/documents/tests/test_api_documents.py @@ -2540,6 +2540,50 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase): self.assertEqual(resp.status_code, status.HTTP_200_OK) self.assertEqual(resp.content, b"1") + def test_asn_not_unique_with_trashed_doc(self): + """ + GIVEN: + - Existing document with ASN that is trashed + WHEN: + - API request to update document with same ASN + THEN: + - Explicit error is returned + """ + user1 = User.objects.create_superuser(username="test1") + + self.client.force_authenticate(user1) + + doc1 = Document.objects.create( + title="test", + mime_type="application/pdf", + content="this is a document 1", + checksum="1", + archive_serial_number=1, + ) + doc1.delete() + + doc2 = Document.objects.create( + title="test2", + mime_type="application/pdf", + content="this is a document 2", + checksum="2", + ) + result = self.client.patch( + f"/api/documents/{doc2.pk}/", + { + "archive_serial_number": 1, + }, + ) + self.assertEqual(result.status_code, status.HTTP_400_BAD_REQUEST) + self.assertEqual( + result.json(), + { + "archive_serial_number": [ + "Document with this Archive Serial Number already exists in the trash.", + ], + }, + ) + def test_remove_inbox_tags(self): """ GIVEN: From c57cd7e2986c900564ad4cbcb77037650a183471 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 4 Nov 2024 04:32:57 -0800 Subject: [PATCH 03/12] Fix: select checkbox should remain visible (#8185) --- src-ui/src/styles.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scss index 895e7085b..eafb3be90 100644 --- a/src-ui/src/styles.scss +++ b/src-ui/src/styles.scss @@ -501,7 +501,7 @@ ul.pagination { border-color:var(--bs-primary); .document-card-check { - display: block; + display: block !important; } .doc-img-container { From 005150c84f00bfe7388c85c164ebf47559a37693 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 4 Nov 2024 13:44:35 -0800 Subject: [PATCH 04/12] Fix: fix thumbnail clipping, select inverted color in safari (#8193) --- .../document-card-small/document-card-small.component.html | 2 +- src-ui/src/theme.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 4885212ad..2ac5cb43f 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,6 +1,6 @@
-
+
diff --git a/src-ui/src/theme.scss b/src-ui/src/theme.scss index 877bf6507..3c4208229 100644 --- a/src-ui/src/theme.scss +++ b/src-ui/src/theme.scss @@ -204,7 +204,7 @@ $form-check-radio-checked-bg-image-dark: url("data:image/svg+xml, Date: Thu, 7 Nov 2024 15:04:29 -0800 Subject: [PATCH 09/12] Fixes admin pages to show trashed documents too (#8068) --- src/documents/admin.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/documents/admin.py b/src/documents/admin.py index 5df235618..59cbf1853 100644 --- a/src/documents/admin.py +++ b/src/documents/admin.py @@ -51,6 +51,7 @@ class DocumentAdmin(GuardedModelAdmin): "archive_filename", "archive_checksum", "original_filename", + "deleted_at", ) list_display_links = ("title",) @@ -77,6 +78,12 @@ class DocumentAdmin(GuardedModelAdmin): created_.short_description = "Created" + def get_queryset(self, request): # pragma: no cover + """ + Include trashed documents + """ + return Document.global_objects.all() + def delete_queryset(self, request, queryset): from documents import index From 2806b1820e579f6454653e11d0dede9f398a9a71 Mon Sep 17 00:00:00 2001 From: Trenton H <797416+stumpylog@users.noreply.github.com> Date: Thu, 7 Nov 2024 18:14:47 -0800 Subject: [PATCH 10/12] Updates all runner images to use Ubuntu Noble (#8213) --- .github/workflows/ci.yml | 20 ++++++++++---------- .github/workflows/cleanup-tags.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/crowdin.yml | 2 +- .github/workflows/project-actions.yml | 2 +- .github/workflows/repo-maintenance.yml | 10 +++++----- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6614a9971..b99f699de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: github.repository name: Linting Checks - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout repository @@ -46,7 +46,7 @@ jobs: documentation: name: "Build & Deploy Documentation" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: - pre-commit steps: @@ -95,7 +95,7 @@ jobs: tests-backend: name: "Backend Tests (Python ${{ matrix.python-version }})" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: - pre-commit strategy: @@ -170,7 +170,7 @@ jobs: install-frontend-depedendencies: name: "Install Frontend Dependencies" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: - pre-commit steps: @@ -201,7 +201,7 @@ jobs: tests-frontend: name: "Frontend Tests (Node ${{ matrix.node-version }} - ${{ matrix.shard-index }}/${{ matrix.shard-count }})" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: - install-frontend-depedendencies strategy: @@ -261,7 +261,7 @@ jobs: tests-coverage-upload: name: "Upload to Codecov" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: - tests-backend - tests-frontend @@ -333,7 +333,7 @@ jobs: build-docker-image: name: Build Docker image for ${{ github.ref_name }} - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 if: github.event_name == 'push' && (startsWith(github.ref, 'refs/heads/feature-') || startsWith(github.ref, 'refs/heads/fix-') || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/beta' || contains(github.ref, 'beta.rc') || startsWith(github.ref, 'refs/tags/v')) concurrency: group: ${{ github.workflow }}-build-docker-image-${{ github.ref_name }} @@ -461,7 +461,7 @@ jobs: needs: - build-docker-image - documentation - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout @@ -569,7 +569,7 @@ jobs: publish-release: name: "Publish Release" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 outputs: prerelease: ${{ steps.get_version.outputs.prerelease }} changelog: ${{ steps.create-release.outputs.body }} @@ -619,7 +619,7 @@ jobs: append-changelog: name: "Append Changelog" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: - publish-release if: needs.publish-release.outputs.prerelease == 'false' diff --git a/.github/workflows/cleanup-tags.yml b/.github/workflows/cleanup-tags.yml index 2468d57e0..5d2c32984 100644 --- a/.github/workflows/cleanup-tags.yml +++ b/.github/workflows/cleanup-tags.yml @@ -21,7 +21,7 @@ jobs: cleanup-images: name: Cleanup Image Tags for ${{ matrix.primary-name }} if: github.repository_owner == 'paperless-ngx' - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: @@ -47,7 +47,7 @@ jobs: cleanup-untagged-images: name: Cleanup Untagged Images Tags for ${{ matrix.primary-name }} if: github.repository_owner == 'paperless-ngx' - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: - cleanup-images strategy: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index fc521843f..cdc0e7d6d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -23,7 +23,7 @@ on: jobs: analyze: name: Analyze - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 permissions: actions: read contents: read diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml index d5d358d9a..308b646d7 100644 --- a/.github/workflows/crowdin.yml +++ b/.github/workflows/crowdin.yml @@ -16,7 +16,7 @@ jobs: synchronize-with-crowdin: name: Crowdin Sync if: github.repository_owner == 'paperless-ngx' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout diff --git a/.github/workflows/project-actions.yml b/.github/workflows/project-actions.yml index bd788c5b3..aa6ad2d38 100644 --- a/.github/workflows/project-actions.yml +++ b/.github/workflows/project-actions.yml @@ -15,7 +15,7 @@ permissions: jobs: pr_opened_or_reopened: name: pr_opened_or_reopened - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 permissions: # write permission is required for autolabeler pull-requests: write diff --git a/.github/workflows/repo-maintenance.yml b/.github/workflows/repo-maintenance.yml index 13458713b..930b2a7b5 100644 --- a/.github/workflows/repo-maintenance.yml +++ b/.github/workflows/repo-maintenance.yml @@ -17,7 +17,7 @@ jobs: stale: name: 'Stale' if: github.repository_owner == 'paperless-ngx' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/stale@v9 with: @@ -33,7 +33,7 @@ jobs: lock-threads: name: 'Lock Old Threads' if: github.repository_owner == 'paperless-ngx' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: dessant/lock-threads@v5 with: @@ -59,7 +59,7 @@ jobs: close-answered-discussions: name: 'Close Answered Discussions' if: github.repository_owner == 'paperless-ngx' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/github-script@v7 with: @@ -116,7 +116,7 @@ jobs: close-outdated-discussions: name: 'Close Outdated Discussions' if: github.repository_owner == 'paperless-ngx' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/github-script@v7 with: @@ -208,7 +208,7 @@ jobs: close-unsupported-feature-requests: name: 'Close Unsupported Feature Requests' if: github.repository_owner == 'paperless-ngx' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/github-script@v7 with: From c22a80abd3b5dbf67481df0283d804555e6b4a36 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 8 Nov 2024 00:19:05 -0800 Subject: [PATCH 11/12] Fix: correctly track task id in list for change detection (#8230) --- src-ui/src/app/components/admin/tasks/tasks.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/app/components/admin/tasks/tasks.component.html b/src-ui/src/app/components/admin/tasks/tasks.component.html index 4178bb2c8..3d40c7897 100644 --- a/src-ui/src/app/components/admin/tasks/tasks.component.html +++ b/src-ui/src/app/components/admin/tasks/tasks.component.html @@ -43,7 +43,7 @@ - @for (task of tasks | slice: (page-1) * pageSize : page * pageSize; track task) { + @for (task of tasks | slice: (page-1) * pageSize : page * pageSize; track task.id) {
From a6f4c75a72fdef3ad05452013d208ee7fed3edc7 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 10 Nov 2024 03:33:47 -0800 Subject: [PATCH 12/12] Fix: handle page count exception for pw-protected files (#8240) --- src/paperless_tesseract/parsers.py | 11 ++++++++--- src/paperless_tesseract/tests/test_parser.py | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py index 6b9ec3d93..95c1dbfcc 100644 --- a/src/paperless_tesseract/parsers.py +++ b/src/paperless_tesseract/parsers.py @@ -43,10 +43,15 @@ class RasterisedDocumentParser(DocumentParser): def get_page_count(self, document_path, mime_type): page_count = None if mime_type == "application/pdf": - import pikepdf + try: + import pikepdf - with pikepdf.Pdf.open(document_path) as pdf: - page_count = len(pdf.pages) + with pikepdf.Pdf.open(document_path) as pdf: + page_count = len(pdf.pages) + except Exception as e: + self.log.warning( + f"Unable to determine PDF page count {document_path}: {e}", + ) return page_count def extract_metadata(self, document_path, mime_type): diff --git a/src/paperless_tesseract/tests/test_parser.py b/src/paperless_tesseract/tests/test_parser.py index 45a5939ab..f7490fbbf 100644 --- a/src/paperless_tesseract/tests/test_parser.py +++ b/src/paperless_tesseract/tests/test_parser.py @@ -81,6 +81,24 @@ class TestParser(DirectoriesMixin, FileSystemAssertsMixin, TestCase): ) self.assertEqual(page_count, 6) + def test_get_page_count_password_protected(self): + """ + GIVEN: + - Password protected PDF file + WHEN: + - The number of pages is requested + THEN: + - The method returns None + """ + parser = RasterisedDocumentParser(uuid.uuid4()) + with self.assertLogs("paperless.parsing.tesseract", level="WARNING") as cm: + page_count = parser.get_page_count( + os.path.join(self.SAMPLE_FILES, "password-protected.pdf"), + "application/pdf", + ) + self.assertEqual(page_count, None) + self.assertIn("Unable to determine PDF page count", cm.output[0]) + def test_thumbnail(self): parser = RasterisedDocumentParser(uuid.uuid4()) thumb = parser.get_thumbnail(