From 5297626816fec9e149048f0cf9c42b31c9288142 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 28 Nov 2023 20:05:53 -0800 Subject: [PATCH 1/6] Update environment.prod.ts --- src-ui/src/environments/environment.prod.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts index e32fe35e5..f0cc500c7 100644 --- a/src-ui/src/environments/environment.prod.ts +++ b/src-ui/src/environments/environment.prod.ts @@ -5,7 +5,7 @@ export const environment = { apiBaseUrl: document.baseURI + 'api/', apiVersion: '3', appTitle: 'Paperless-ngx', - version: '2.0.0', + version: '2.0.0-dev', webSocketHost: window.location.host, webSocketProtocol: window.location.protocol == 'https:' ? 'wss:' : 'ws:', webSocketBaseUrl: base_url.pathname + 'ws/', From 0913c7aa9efbd071bd5c423b5d5de5cf12617185 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 29 Nov 2023 11:10:55 -0800 Subject: [PATCH 2/6] Fix: share links for URLs containing 'api' incorrect in dropdown (#4701) --- .../share-links-dropdown.component.spec.ts | 20 +++++++++++++++++++ .../share-links-dropdown.component.ts | 5 ++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src-ui/src/app/components/common/share-links-dropdown/share-links-dropdown.component.spec.ts b/src-ui/src/app/components/common/share-links-dropdown/share-links-dropdown.component.spec.ts index 0abcd4e7c..27955a8a5 100644 --- a/src-ui/src/app/components/common/share-links-dropdown/share-links-dropdown.component.spec.ts +++ b/src-ui/src/app/components/common/share-links-dropdown/share-links-dropdown.component.spec.ts @@ -192,4 +192,24 @@ describe('ShareLinksDropdownComponent', () => { component.share(link) // expect(navigatorSpy).toHaveBeenCalledWith({ url: component.getShareUrl(link) }) }) + + it('should correctly generate share URLs', () => { + environment.apiBaseUrl = 'http://example.com/api/' + expect(component.getShareUrl({ slug: '123abc123' } as any)).toEqual( + 'http://example.com/share/123abc123' + ) + environment.apiBaseUrl = 'http://example.domainwithapiinit.com/api/' + expect(component.getShareUrl({ slug: '123abc123' } as any)).toEqual( + 'http://example.domainwithapiinit.com/share/123abc123' + ) + environment.apiBaseUrl = 'http://example.domainwithapiinit.com:1234/api/' + expect(component.getShareUrl({ slug: '123abc123' } as any)).toEqual( + 'http://example.domainwithapiinit.com:1234/share/123abc123' + ) + environment.apiBaseUrl = + 'http://example.domainwithapiinit.com:1234/subpath/api/' + expect(component.getShareUrl({ slug: '123abc123' } as any)).toEqual( + 'http://example.domainwithapiinit.com:1234/subpath/share/123abc123' + ) + }) }) diff --git a/src-ui/src/app/components/common/share-links-dropdown/share-links-dropdown.component.ts b/src-ui/src/app/components/common/share-links-dropdown/share-links-dropdown.component.ts index 3aff4823d..fa2df3a54 100644 --- a/src-ui/src/app/components/common/share-links-dropdown/share-links-dropdown.component.ts +++ b/src-ui/src/app/components/common/share-links-dropdown/share-links-dropdown.component.ts @@ -80,7 +80,10 @@ export class ShareLinksDropdownComponent implements OnInit { } getShareUrl(link: PaperlessShareLink): string { - return `${environment.apiBaseUrl.replace('api', 'share')}${link.slug}` + const apiURL = new URL(environment.apiBaseUrl) + return `${apiURL.origin}${apiURL.pathname.replace(/\/api\/$/, '/share/')}${ + link.slug + }` } getDaysRemaining(link: PaperlessShareLink): string { From e1b573adeb3f9b644fb51bd9359b51922df10732 Mon Sep 17 00:00:00 2001 From: Trenton H <797416+stumpylog@users.noreply.github.com> Date: Wed, 29 Nov 2023 11:28:27 -0800 Subject: [PATCH 3/6] Fix: Add a warning about a low image DPI which may cause OCR to fail (#4708) --- src/paperless_tesseract/parsers.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py index f64ea8adf..3523da7bd 100644 --- a/src/paperless_tesseract/parsers.py +++ b/src/paperless_tesseract/parsers.py @@ -244,6 +244,10 @@ class RasterisedDocumentParser(DocumentParser): f"no DPI information is present in this image and " f"OCR_IMAGE_DPI is not set.", ) + if ocrmypdf_args["image_dpi"] < 70: # pragma: no cover + self.log.warning( + f"Image DPI of {ocrmypdf_args['image_dpi']} is low, OCR may fail", + ) if settings.OCR_USER_ARGS and not safe_fallback: try: From e3f4e0b77572a9a784f748a79aa78c25388fb77c Mon Sep 17 00:00:00 2001 From: Trenton H <797416+stumpylog@users.noreply.github.com> Date: Wed, 29 Nov 2023 12:18:44 -0800 Subject: [PATCH 4/6] Adds new setting to control color conversions (#4709) --- docs/configuration.md | 14 ++++++++++++++ src/paperless/settings.py | 5 +++++ src/paperless_tesseract/parsers.py | 5 +++++ 3 files changed, 24 insertions(+) diff --git a/docs/configuration.md b/docs/configuration.md index e952ec41b..c0e8022ac 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -704,6 +704,20 @@ but could result in missing text content. this value if you are certain your documents are not malicious and you need the text which was not OCRed +#### [`PAPERLESS_OCR_COLOR_CONVERSION_STRATEGY=`](#PAPERLESS_OCR_COLOR_CONVERSION_STRATEGY) {#PAPERLESS_OCR_COLOR_CONVERSION_STRATEGY} + +: Controls the Ghostscript color conversion strategy when creating the archive file. This setting +will only be utilized if the output is a version of PDF/A. + + Valid options are CMYK, Gray, LeaveColorUnchanged, RGB or UseDeviceIndependentColor. + + You can find more on the settings [here](https://ghostscript.readthedocs.io/en/latest/VectorDevices.html#color-conversion-and-management) in the Ghostscript documentation. + + !!! warning + + Utilizing some of the options may result in errors when creating archive + files from PDFs. + #### [`PAPERLESS_OCR_USER_ARGS=`](#PAPERLESS_OCR_USER_ARGS) {#PAPERLESS_OCR_USER_ARGS} : OCRmyPDF offers many more options. Use this parameter to specify any diff --git a/src/paperless/settings.py b/src/paperless/settings.py index 86f1f569f..9daeb8a47 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -864,6 +864,11 @@ OCR_MAX_IMAGE_PIXELS: Optional[int] = None if os.environ.get("PAPERLESS_OCR_MAX_IMAGE_PIXELS") is not None: OCR_MAX_IMAGE_PIXELS: int = int(os.environ.get("PAPERLESS_OCR_MAX_IMAGE_PIXELS")) +OCR_COLOR_CONVERSION_STRATEGY = os.getenv( + "PAPERLESS_OCR_COLOR_CONVERSION_STRATEGY", + "RGB", +) + OCR_USER_ARGS = os.getenv("PAPERLESS_OCR_USER_ARGS", "{}") # GNUPG needs a home directory for some reason diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py index 3523da7bd..babcf6bcf 100644 --- a/src/paperless_tesseract/parsers.py +++ b/src/paperless_tesseract/parsers.py @@ -186,6 +186,11 @@ class RasterisedDocumentParser(DocumentParser): "progress_bar": False, } + if "pdfa" in ocrmypdf_args["output_type"]: + ocrmypdf_args[ + "color_conversion_strategy" + ] = settings.OCR_COLOR_CONVERSION_STRATEGY + if settings.OCR_MODE == "force" or safe_fallback: ocrmypdf_args["force_ocr"] = True elif settings.OCR_MODE in ["skip", "skip_noarchive"]: From 64cfc43891fbc7da692c138e73922d45b2e12c8c Mon Sep 17 00:00:00 2001 From: Trenton H <797416+stumpylog@users.noreply.github.com> Date: Thu, 30 Nov 2023 07:00:54 -0800 Subject: [PATCH 5/6] Inreases the length to 5, allowing for commas as well as values (#4719) --- .../1041_alter_consumptiontemplate_sources.py | 22 +++++++++++++++++++ src/documents/models.py | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 src/documents/migrations/1041_alter_consumptiontemplate_sources.py diff --git a/src/documents/migrations/1041_alter_consumptiontemplate_sources.py b/src/documents/migrations/1041_alter_consumptiontemplate_sources.py new file mode 100644 index 000000000..c96dc53cf --- /dev/null +++ b/src/documents/migrations/1041_alter_consumptiontemplate_sources.py @@ -0,0 +1,22 @@ +# Generated by Django 4.2.7 on 2023-11-30 14:29 + +import multiselectfield.db.fields +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ("documents", "1040_customfield_customfieldinstance_and_more"), + ] + + operations = [ + migrations.AlterField( + model_name="consumptiontemplate", + name="sources", + field=multiselectfield.db.fields.MultiSelectField( + choices=[(1, "Consume Folder"), (2, "Api Upload"), (3, "Mail Fetch")], + default="1,2,3", + max_length=5, + ), + ), + ] diff --git a/src/documents/models.py b/src/documents/models.py index 04a3230e6..c3eea0ac9 100644 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -754,7 +754,7 @@ class ConsumptionTemplate(models.Model): order = models.IntegerField(_("order"), default=0) sources = MultiSelectField( - max_length=3, + max_length=5, choices=DocumentSourceChoices.choices, default=f"{DocumentSource.ConsumeFolder},{DocumentSource.ApiUpload},{DocumentSource.MailFetch}", ) From 33c2398de949dd4ee97b08736e5964efab2fcc01 Mon Sep 17 00:00:00 2001 From: "Paperless-ngx Bot [bot]" <99855517+paperlessngx-bot@users.noreply.github.com> Date: Thu, 30 Nov 2023 07:08:10 -0800 Subject: [PATCH 6/6] New Crowdin updates (#4695) --- src-ui/src/locale/messages.de_DE.xlf | 2 +- src/locale/ru_RU/LC_MESSAGES/django.po | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src-ui/src/locale/messages.de_DE.xlf b/src-ui/src/locale/messages.de_DE.xlf index 01dcf75cf..264629003 100644 --- a/src-ui/src/locale/messages.de_DE.xlf +++ b/src-ui/src/locale/messages.de_DE.xlf @@ -3019,7 +3019,7 @@ src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.ts 39 - Neues benutzerdefinidertes Feld erstellen + Neues benutzerdefiniertes Feld erstellen Edit custom field diff --git a/src/locale/ru_RU/LC_MESSAGES/django.po b/src/locale/ru_RU/LC_MESSAGES/django.po index 4cd8ddf0c..9409df01d 100644 --- a/src/locale/ru_RU/LC_MESSAGES/django.po +++ b/src/locale/ru_RU/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: paperless-ngx\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-11-10 09:02-0800\n" -"PO-Revision-Date: 2023-11-13 01:31\n" +"PO-Revision-Date: 2023-11-29 08:50\n" "Last-Translator: \n" "Language-Team: Russian\n" "Language: ru_RU\n" @@ -409,7 +409,7 @@ msgstr "" #: documents/models.py:454 msgid "owner is" -msgstr "" +msgstr "владелец" #: documents/models.py:455 msgid "has owner in" @@ -417,7 +417,7 @@ msgstr "" #: documents/models.py:456 msgid "does not have owner" -msgstr "" +msgstr "не имеет владельца" #: documents/models.py:457 msgid "does not have owner in" @@ -521,7 +521,7 @@ msgstr "пользователь" #: documents/models.py:679 msgid "note" -msgstr "" +msgstr "заметка" #: documents/models.py:680 msgid "notes" @@ -529,15 +529,15 @@ msgstr "заметки" #: documents/models.py:688 msgid "Archive" -msgstr "" +msgstr "Архив" #: documents/models.py:689 msgid "Original" -msgstr "" +msgstr "Оригинал" #: documents/models.py:700 msgid "expiration" -msgstr "" +msgstr "Срок действия" #: documents/models.py:707 msgid "slug" @@ -645,7 +645,7 @@ msgstr "" #: documents/models.py:887 msgid "URL" -msgstr "" +msgstr "Ссылка" #: documents/models.py:888 msgid "Date" @@ -661,7 +661,7 @@ msgstr "" #: documents/models.py:891 msgid "Float" -msgstr "" +msgstr "С плавающей точкой" #: documents/models.py:892 msgid "Monetary" @@ -669,15 +669,15 @@ msgstr "" #: documents/models.py:904 msgid "data type" -msgstr "" +msgstr "Тип данных" #: documents/models.py:912 msgid "custom field" -msgstr "" +msgstr "Пользовательское поле" #: documents/models.py:913 msgid "custom fields" -msgstr "" +msgstr "Пользовательские поля" #: documents/models.py:973 msgid "custom field instance"