Skip to content

Commit

Permalink
deskutils/py-paperless-ngx: Update to 2.6.3
Browse files Browse the repository at this point in the history
  • Loading branch information
grembo committed Mar 30, 2024
1 parent 6ed1bd4 commit 7d0d35b
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 29 deletions.
2 changes: 1 addition & 1 deletion deskutils/py-paperless-ngx/Makefile
@@ -1,5 +1,5 @@
PORTNAME= paperless-ngx
PORTVERSION= 2.5.0
PORTVERSION= 2.6.3
DISTVERSIONPREFIX= v
CATEGORIES= deskutils python
MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/:webui \
Expand Down
10 changes: 5 additions & 5 deletions deskutils/py-paperless-ngx/distinfo
@@ -1,5 +1,5 @@
TIMESTAMP = 1707783446
SHA256 (paperless-ngx-v2.5.0.tar.xz) = fa0b90cf9203d1aa89dbf687c43ea103cd616eb7725ae2c6cb6d2ead4d66de6a
SIZE (paperless-ngx-v2.5.0.tar.xz) = 62063416
SHA256 (paperless-ngx-paperless-ngx-v2.5.0_GH0.tar.gz) = 805345b849eb40358562e85b633cab9d6a264ff9e886c9af2d6313ebca281cce
SIZE (paperless-ngx-paperless-ngx-v2.5.0_GH0.tar.gz) = 48300940
TIMESTAMP = 1711805770
SHA256 (paperless-ngx-v2.6.3.tar.xz) = 0c74c7d6ba35b576c47481021322d7f5e8847f89c489eed47f5399588aad6d19
SIZE (paperless-ngx-v2.6.3.tar.xz) = 61884952
SHA256 (paperless-ngx-paperless-ngx-v2.6.3_GH0.tar.gz) = 06fc9b9deb0b65389edb2413a3e991913141b45d5d0ae4d8d79187ae6b39168c
SIZE (paperless-ngx-paperless-ngx-v2.6.3_GH0.tar.gz) = 48389230
9 changes: 9 additions & 0 deletions deskutils/py-paperless-ngx/files/paperless-ngx.7.in
Expand Up @@ -221,6 +221,15 @@ at /flower.
.Pp
.Em \&It is important to properly secure a public facing web server.
.Em Doing this properly is up to the administrator.
.Sh SETUP WITHOUT A WEB SERVER
Even though
.Em not
recommended, it is also possible to configure paperless to serve static
artifacts directly.
To do so, set
.Va PAPERLESS_STATICDIR=%%WWWDIR%%/static
in
.Pa %%PREFIX%%/etc/paperless.conf .
.Sh SFTP SETUP
Setting up
.Em sftp
Expand Down
19 changes: 13 additions & 6 deletions deskutils/py-paperless-ngx/files/patch-paperless.conf.example
@@ -1,6 +1,6 @@
--- paperless.conf.example.orig 2024-02-10 19:45:46 UTC
--- paperless.conf.example.orig 2024-03-18 03:45:09 UTC
+++ paperless.conf.example
@@ -17,10 +17,10 @@
@@ -17,11 +17,16 @@

# Paths and folders

Expand All @@ -10,27 +10,34 @@
+PAPERLESS_DATA_DIR=/var/db/paperless/data
#PAPERLESS_TRASH_DIR=
-#PAPERLESS_MEDIA_ROOT=../media
-#PAPERLESS_STATICDIR=../static
+PAPERLESS_MEDIA_ROOT=/var/db/paperless/media
#PAPERLESS_STATICDIR=../static
+
+# Paperless should run behind a proxy that servers static files
+# (see `man 7 paperless`)
+# For experimental deployments, set PAPERLESS_STATICDIR
+# to `%%WWWDIR%%/static`
+PAPERLESS_STATICDIR=/var/empty
#PAPERLESS_FILENAME_FORMAT=
#PAPERLESS_FILENAME_FORMAT_REMOVE_NONE=
@@ -40,6 +40,7 @@

@@ -40,6 +45,7 @@

# OCR settings

+# example: deu+eng
#PAPERLESS_OCR_LANGUAGE=eng
#PAPERLESS_OCR_MODE=skip
#PAPERLESS_OCR_SKIP_ARCHIVE_FILE=never
@@ -56,6 +57,7 @@
@@ -56,6 +62,7 @@

# Software tweaks

+PAPERLESS_CONSUMER_INOTIFY_DELAY=3
#PAPERLESS_TASK_WORKERS=1
#PAPERLESS_THREADS_PER_WORKER=1
#PAPERLESS_TIME_ZONE=UTC
@@ -92,3 +94,9 @@
@@ -92,3 +99,9 @@

#PAPERLESS_CONVERT_BINARY=/usr/bin/convert
#PAPERLESS_GS_BINARY=/usr/bin/gs
Expand Down
@@ -1,20 +1,11 @@
--- src/documents/management/commands/document_consumer.py.orig 2024-02-19 16:25:10 UTC
--- src/documents/management/commands/document_consumer.py.orig 2024-03-18 03:45:09 UTC
+++ src/documents/management/commands/document_consumer.py
@@ -292,7 +292,7 @@ class Command(BaseCommand):
logger.debug(f"Configuring timeout to {timeout}ms")
logger.debug(f"Configuring timeout to {timeout_ms}ms")

inotify = INotify()
- inotify_flags = flags.CLOSE_WRITE | flags.MOVED_TO | flags.MODIFY
+ inotify_flags = flags.CLOSE_WRITE | flags.MOVED_TO | flags.MODIFY | flags.CREATE
if recursive:
descriptor = inotify.add_watch_recursive(directory, inotify_flags)
else:
@@ -342,7 +342,7 @@ class Command(BaseCommand):
# If files are waiting, need to exit read() to check them
# Otherwise, go back to infinite sleep time, but only if not testing
if len(notified_files) > 0:
- timeout = inotify_debounce
+ timeout = inotify_debounce * 1000
elif is_testing:
timeout = self.testing_timeout_ms
else:
@@ -1,4 +1,4 @@
--- src/paperless/settings.py.orig 2024-02-10 19:45:46 UTC
--- src/paperless/settings.py.orig 2024-03-18 03:45:09 UTC
+++ src/paperless/settings.py
@@ -24,8 +24,6 @@ if configuration_path and os.path.exists(configuration
load_dotenv(configuration_path)
Expand All @@ -18,7 +18,7 @@

TRASH_DIR = os.getenv("PAPERLESS_TRASH_DIR")

@@ -1002,7 +1000,7 @@ FILENAME_FORMAT_REMOVE_NONE = __get_boolean(
@@ -1031,7 +1029,7 @@ FILENAME_FORMAT_REMOVE_NONE = __get_boolean(

THUMBNAIL_FONT_NAME = os.getenv(
"PAPERLESS_THUMBNAIL_FONT_NAME",
Expand Down
22 changes: 18 additions & 4 deletions deskutils/py-paperless-ngx/pkg-plist
Expand Up @@ -202,6 +202,8 @@ bin/paperless
%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/1042_consumptiontemplate_assign_custom_fields_and_more.py
%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/1043_alter_savedviewfilterrule_rule_type.py
%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/1044_workflow_workflowaction_workflowtrigger_and_more.py
%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/1045_alter_customfieldinstance_value_monetary.py
%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/1046_workflowaction_remove_all_correspondents_and_more.py
%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__init__.py
%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/0001_initial%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/0001_initial%%PYTHON_EXT_SUFFIX%%.pyc
Expand Down Expand Up @@ -341,6 +343,10 @@ bin/paperless
%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1043_alter_savedviewfilterrule_rule_type%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1044_workflow_workflowaction_workflowtrigger_and_more%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1044_workflow_workflowaction_workflowtrigger_and_more%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1045_alter_customfieldinstance_value_monetary%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1045_alter_customfieldinstance_value_monetary%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1046_workflowaction_remove_all_correspondents_and_more%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/1046_workflowaction_remove_all_correspondents_and_more%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/paperless/documents/migrations/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/paperless/documents/models.py
Expand All @@ -365,15 +371,19 @@ bin/paperless
%%PYTHON_SITELIBDIR%%/paperless/documents/signals/__pycache__/handlers%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/paperless/documents/signals/__pycache__/handlers%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/paperless/documents/signals/handlers.py
%%PYTHON_SITELIBDIR%%/paperless/documents/static/accounts.css
%%PYTHON_SITELIBDIR%%/paperless/documents/static/bootstrap.min.css
%%PYTHON_SITELIBDIR%%/paperless/documents/static/signin.css
%%PYTHON_SITELIBDIR%%/paperless/documents/tasks.py
%%PYTHON_SITELIBDIR%%/paperless/documents/templates/account/email/base_message.txt
%%PYTHON_SITELIBDIR%%/paperless/documents/templates/account/login.html
%%PYTHON_SITELIBDIR%%/paperless/documents/templates/account/password_reset.html
%%PYTHON_SITELIBDIR%%/paperless/documents/templates/account/password_reset_done.html
%%PYTHON_SITELIBDIR%%/paperless/documents/templates/account/password_reset_from_key.html
%%PYTHON_SITELIBDIR%%/paperless/documents/templates/account/password_reset_from_key_done.html
%%PYTHON_SITELIBDIR%%/paperless/documents/templates/account/signup.html
%%PYTHON_SITELIBDIR%%/paperless/documents/templates/index.html
%%PYTHON_SITELIBDIR%%/paperless/documents/templates/paperless-ngx/base.html
%%PYTHON_SITELIBDIR%%/paperless/documents/templates/paperless-ngx/snippets/svg_logo.html
%%PYTHON_SITELIBDIR%%/paperless/documents/templates/socialaccount/authentication_error.html
%%PYTHON_SITELIBDIR%%/paperless/documents/templates/socialaccount/login.html
%%PYTHON_SITELIBDIR%%/paperless/documents/templates/socialaccount/signup.html
Expand Down Expand Up @@ -437,6 +447,7 @@ bin/paperless
%%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_api_profile.py
%%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_api_remote_version.py
%%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_api_search.py
%%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_api_status.py
%%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_api_tasks.py
%%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_api_uisettings.py
%%PYTHON_SITELIBDIR%%/paperless/documents/tests/test_api_workflows.py
Expand Down Expand Up @@ -582,11 +593,14 @@ bin/paperless
%%PYTHON_SITELIBDIR%%/paperless/paperless/middleware.py
%%PYTHON_SITELIBDIR%%/paperless/paperless/migrations/0001_initial.py
%%PYTHON_SITELIBDIR%%/paperless/paperless/migrations/0002_applicationconfiguration_app_logo_and_more.py
%%PYTHON_SITELIBDIR%%/paperless/paperless/migrations/0003_alter_applicationconfiguration_max_image_pixels.py
%%PYTHON_SITELIBDIR%%/paperless/paperless/migrations/__init__.py
%%PYTHON_SITELIBDIR%%/paperless/paperless/migrations/__pycache__/0001_initial%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/paperless/paperless/migrations/__pycache__/0001_initial%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/paperless/paperless/migrations/__pycache__/0002_applicationconfiguration_app_logo_and_more%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/paperless/paperless/migrations/__pycache__/0002_applicationconfiguration_app_logo_and_more%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/paperless/paperless/migrations/__pycache__/0003_alter_applicationconfiguration_max_image_pixels%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/paperless/paperless/migrations/__pycache__/0003_alter_applicationconfiguration_max_image_pixels%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/paperless/paperless/migrations/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/paperless/paperless/migrations/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/paperless/paperless/models.py
Expand Down Expand Up @@ -849,6 +863,9 @@ share/man/man7/paperless-ngx.7.gz
%%DATADIR%%/logo/web/svg/Color logo with background.svg
%%DATADIR%%/logo/web/svg/White logo - no background.svg
%%DATADIR%%/logo/web/svg/square.svg
%%WWWDIR%%/static/accounts.css
%%WWWDIR%%/static/accounts.css.br
%%WWWDIR%%/static/accounts.css.gz
%%WWWDIR%%/static/admin/css/autocomplete.css
%%WWWDIR%%/static/admin/css/autocomplete.css.br
%%WWWDIR%%/static/admin/css/autocomplete.css.gz
Expand Down Expand Up @@ -2842,9 +2859,6 @@ share/man/man7/paperless-ngx.7.gz
%%WWWDIR%%/static/rest_framework/js/prettify-min.js
%%WWWDIR%%/static/rest_framework/js/prettify-min.js.br
%%WWWDIR%%/static/rest_framework/js/prettify-min.js.gz
%%WWWDIR%%/static/signin.css
%%WWWDIR%%/static/signin.css.br
%%WWWDIR%%/static/signin.css.gz
@dir(paperless,paperless) %%WWWDIR%%/static
@dir(paperless,paperless,0700) /var/db/paperless/consume/input
@dir(root,paperless,0750) /var/db/paperless/consume
Expand Down

0 comments on commit 7d0d35b

Please sign in to comment.