Feature: Enable zxing for all platforms (#8947)

diff --git a/Dockerfile b/Dockerfile
index c8fdcf62dfa3ffd07e3456333d5f24db37e3056e..2284e9f8da73a081cb498a9e9036b6f4315c1dff 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -221,12 +221,11 @@ RUN --mount=type=cache,target=/root/.cache/pip/,id=pip-cache \
     && apt-get install --yes --quiet --no-install-recommends ${BUILD_PACKAGES} \
     && python3 -m pip install --no-cache-dir --upgrade wheel \
   && echo "Installing Python requirements" \
-    && curl --fail --silent --show-error --location \
-    --output psycopg_c-3.2.4-cp312-cp312-linux_x86_64.whl \
-    https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.4/psycopg_c-3.2.4-cp312-cp312-linux_x86_64.whl \
-    && curl --fail --silent --show-error --location \
-    --output psycopg_c-3.2.4-cp312-cp312-linux_aarch64.whl  \
-    https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.4/psycopg_c-3.2.4-cp312-cp312-linux_aarch64.whl \
+    && curl --fail --silent --no-progress-meter --show-error --location --remote-name-all --parallel --parallel-max 4 \
+      https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.4/psycopg_c-3.2.4-cp312-cp312-linux_x86_64.whl \
+      https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.4/psycopg_c-3.2.4-cp312-cp312-linux_aarch64.whl \
+      https://github.com/paperless-ngx/builder/releases/download/zxing-2.3.0/zxing_cpp-2.3.0-cp312-cp312-linux_aarch64.whl \
+      https://github.com/paperless-ngx/builder/releases/download/zxing-2.3.0/zxing_cpp-2.3.0-cp312-cp312-linux_x86_64.whl \
     && python3 -m pip install --default-timeout=1000 --find-links . --requirement requirements.txt \
   && echo "Installing NLTK data" \
     && python3 -W ignore::RuntimeWarning -m nltk.downloader -d "/usr/share/nltk_data" snowball_data \

diff --git a/Pipfile b/Pipfile
index 0e2486b03e87c68c61f09470aba111ee73185d05..1e69f316de34fcaec021e6b100732d085688b80d 100644 (file)
--- a/Pipfile
+++ b/Pipfile
@@ -58,7 +58,7 @@ uvicorn = {extras = ["standard"], version = "==0.25.0"}
 watchdog = "~=6.0"
 whitenoise = "~=6.8"
 whoosh = "~=2.7"
-zxing-cpp = {version = "*", platform_machine = "== 'x86_64'"}
+zxing-cpp = "*"
 
 
 [dev-packages]

diff --git a/Pipfile.lock b/Pipfile.lock
index de4290d84ea686b4e2969f688fda76bc5763229b..1889d3d4a96de396e2f592b94e6b43a91c14aa3f 100644 (file)
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -2791,7 +2791,6 @@
                 "sha256:fbd5b253ad0f8823c5c104feaaa19acab95c217cb924b012d55ff339c42b3583",
                 "sha256:fd3f175f7b57cfbdea56afdb5335eaebaadeebc06e20a087d9aa3f99637c4aa5"
             ],
-            "markers": "platform_machine == 'x86_64'",
             "version": "==2.3.0"
         }
     },

diff --git a/docs/configuration.md b/docs/configuration.md
index 799620c055c9d1ceb229d130fef23afc9e63b603..359a51482b8b03e22e16b20e1fbae8e4ed8cd359 100644 (file)
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -1073,8 +1073,6 @@ or hidden folders some tools use to store data.
     If you have problems that your Barcodes/QR-Codes are not detected
     (especially with bad scan quality and/or small codes), try the other one.
 
-    zxing is not available on all platforms.
-
 #### [`PAPERLESS_PRE_CONSUME_SCRIPT=<filename>`](#PAPERLESS_PRE_CONSUME_SCRIPT) {#PAPERLESS_PRE_CONSUME_SCRIPT}
 
 : After some initial validation, Paperless can trigger an arbitrary