diff --git a/.dockerignore b/.dockerignore index 065d2a7e6..a332c2ee7 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,4 @@ +**/__pycache__ /src-ui/.vscode /src-ui/node_modules /src-ui/dist @@ -10,3 +11,9 @@ .pytest_cache /dist /scripts +/resources +**/tests +**/*.spec.ts +**/htmlcov +/src/.pytest_cache +.idea diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml new file mode 100644 index 000000000..646c7ff81 --- /dev/null +++ b/.github/workflows/ansible.yml @@ -0,0 +1,64 @@ +--- +name: Ansible Role + +on: [push, pull_request] + +jobs: + # https://molecule.readthedocs.io/en/latest/ci.html#github-actions + test: + runs-on: ubuntu-latest + # https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#github-context + if: github.event_name == 'pull_request' || (github.event_name == 'push' && contains(github.ref, 'refs/heads/')) + steps: + - name: Check out the codebase + uses: actions/checkout@v2 + with: + path: "${{ github.repository }}" + - name: Set up Python + uses: actions/setup-python@v2 + - name: Set up Docker + uses: docker-practice/actions-setup-docker@master + - name: Install dependencies + run: | + python3 -m pip install --upgrade pip + python3 -m pip install molecule[ansible,docker] + ansible --version + docker --version + molecule --version + python --version + - name: Test fresh installation with molecule + run: | + cd ansible + molecule test -s fresh + working-directory: "${{ github.repository }}" + - name: Test release update with molecule + run: | + cd ansible + molecule test -s update + working-directory: "${{ github.repository }}" + # # https://galaxy.ansible.com/docs/contributing/importing.html + # release: + # runs-on: ubuntu-latest + # needs: + # - test + # # https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#github-context + # if: contains(github.ref, 'refs/tags/') + # steps: + # - name: Check out the codebase + # uses: actions/checkout@v2 + # with: + # path: "${{ github.repository }}" + # - name: Set up Python + # uses: actions/setup-python@v2 + # - name: Install dependencies + # run: | + # python3 -m pip install --upgrade ansible-base + # ansible --version + # python --version + # - name: Trigger a new import on Galaxy + # # TODO Check if source if pulled from cwd or imported from github + # # https://github.com/ansible/ansible/blob/devel/lib/ansible/cli/galaxy.py + # run: | + # cd ansible + # ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2) + # working-directory: "${{ github.repository }}" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..425243163 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,291 @@ +name: ci + +on: [push, pull_request] + +jobs: + documentation: + runs-on: ubuntu-20.04 + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: 3.8 + - + name: Get pip cache dir + id: pip-cache + run: | + echo "::set-output name=dir::$(pip cache dir)" + - + name: Persistent Github pip cache + uses: actions/cache@v2 + with: + path: ${{ steps.pip-cache.outputs.dir }} + key: ${{ runner.os }}-pip3.8} + - + name: Install dependencies + run: | + sudo apt-get update -qq + sudo apt-get install -qq --no-install-recommends libpoppler-cpp-dev + pip install --upgrade pipenv + pipenv install --system --dev --ignore-pipfile + - + name: Make documentation + run: | + cd docs/ + make html + - + name: Upload artifact + uses: actions/upload-artifact@v2 + with: + name: documentation + path: docs/_build/html/ + + tests: + runs-on: ubuntu-20.04 + strategy: + matrix: + python-version: ['3.6', '3.7', '3.8'] + fail-fast: false + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: "${{ matrix.python-version }}" + - + name: Get pip cache dir + id: pip-cache + run: | + echo "::set-output name=dir::$(pip cache dir)" + - + name: Persistent Github pip cache + uses: actions/cache@v2 + with: + path: ${{ steps.pip-cache.outputs.dir }} + key: ${{ runner.os }}-pip${{ matrix.python-version }} + - + name: Prepare tests + run: | + sudo apt-get update -qq + sudo apt-get install -qq --no-install-recommends libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng + pip install --upgrade pipenv + pipenv install --system --dev --ignore-pipfile + - + name: Tests + run: | + cd src/ + pytest + - + name: Codestyle + run: | + cd src/ + pycodestyle + - + name: Publish coverage results + if: matrix.python-version == '3.8' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # https://github.com/coveralls-clients/coveralls-python/issues/251 + run: | + cd src/ + coveralls --service=github + + frontend: + runs-on: ubuntu-20.04 + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + uses: actions/setup-node@v2 + with: + node-version: '15' + - + name: Build frontend + run: ./compile-frontend.sh + - + name: Upload artifact + uses: actions/upload-artifact@v2 + with: + name: frontend-compiled + path: src/documents/static/frontend/ + + build-release: + needs: [frontend, documentation, tests] + runs-on: ubuntu-20.04 + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: 3.7 + - + name: Install dependencies + run: | + sudo apt-get update -qq + sudo apt-get install -qq --no-install-recommends libpoppler-cpp-dev gettext liblept5 + pip3 install -r requirements.txt + - + name: Download frontend artifact + uses: actions/download-artifact@v2 + with: + name: frontend-compiled + path: src/documents/static/frontend/ + - + name: Download documentation artifact + uses: actions/download-artifact@v2 + with: + name: documentation + path: docs/_build/html/ + - + name: Move files + run: | + mkdir dist + mkdir dist/paperless-ng + mkdir dist/paperless-ng/scripts + cp .dockerignore .env Dockerfile Pipfile Pipfile.lock LICENSE README.md requirements.txt dist/paperless-ng/ + cp paperless.conf.example dist/paperless-ng/paperless.conf + cp docker/ dist/paperless-ng/docker -r + cp scripts/*.service scripts/*.sh dist/paperless-ng/scripts/ + cp src/ dist/paperless-ng/src -r + cp docs/_build/html/ dist/paperless-ng/docs -r + - + name: Compile messages + run: | + cd dist/paperless-ng/src + python3 manage.py compilemessages + - + name: Collect static files + run: | + cd dist/paperless-ng/src + python3 manage.py collectstatic --no-input + - + name: Make release package + run: | + cd dist + find . -name __pycache__ | xargs rm -r + tar -cJf paperless-ng.tar.xz paperless-ng/ + - + name: Upload release artifact + uses: actions/upload-artifact@v2 + with: + name: release + path: dist/paperless-ng.tar.xz + + publish-release: + runs-on: ubuntu-latest + needs: build-release + if: contains(github.ref, 'refs/tags/ng-') + steps: + - + name: Download release artifact + uses: actions/download-artifact@v2 + with: + name: release + path: ./ + - + name: Get version + id: get_version + run: | + echo ::set-output name=version::${GITHUB_REF#refs/tags/ng-} + - + name: Create release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ng-${{ steps.get_version.outputs.version }} + release_name: Paperless-ng ${{ steps.get_version.outputs.version }} + draft: false + prerelease: false + body: | + For a complete list of changes, see the changelog at https://paperless-ng.readthedocs.io/en/latest/changelog.html. + - + name: Upload release archive + id: upload-release-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps + asset_path: ./paperless-ng.tar.xz + asset_name: paperless-ng-${{ steps.get_version.outputs.version }}.tar.xz + asset_content_type: application/x-xz + + # build and push image to docker hub. + build-docker-image: + if: github.event_name == 'push' && (github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/ng-')) + runs-on: ubuntu-latest + needs: [frontend, tests] + steps: + - + name: Prepare + id: prepare + run: | + IMAGE_NAME=jonaswinkler/paperless-ng + if [[ $GITHUB_REF == refs/tags/ng-* ]]; then + TAGS=${IMAGE_NAME}:${GITHUB_REF#refs/tags/ng-},${IMAGE_NAME}:latest + INSPECT_TAG=${IMAGE_NAME}:latest + elif [[ $GITHUB_REF == refs/heads/* ]]; then + TAGS=${IMAGE_NAME}:${GITHUB_REF#refs/heads/} + INSPECT_TAG=${TAGS} + else + exit 1 + fi + echo ::set-output name=tags::${TAGS} + echo ::set-output name=inspect_tag::${INSPECT_TAG} + - + name: Checkout + uses: actions/checkout@v2 + - + name: Download frontend artifact + uses: actions/download-artifact@v2 + with: + name: frontend-compiled + path: src/documents/static/frontend/ + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - + name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - + name: Cache Docker layers + uses: actions/cache@v2 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - + name: Build and push + uses: docker/build-push-action@v2 + with: + context: . + file: ./Dockerfile + platforms: linux/amd64,linux/arm/v7,linux/arm64 + push: true + tags: ${{ steps.prepare.outputs.tags }} + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache + - + name: Inspect image + run: | + docker buildx imagetools inspect ${{ steps.prepare.outputs.inspect_tag }} diff --git a/.gitignore b/.gitignore index e58fb12e7..b427d5c5c 100644 --- a/.gitignore +++ b/.gitignore @@ -65,8 +65,8 @@ target/ .virtualenv virtualenv /venv -docker-compose.env -docker-compose.yml +/docker-compose.env +/docker-compose.yml # Used for development scripts/import-for-development diff --git a/.readthedocs.yml b/.readthedocs.yml new file mode 100644 index 000000000..05a8e0c62 --- /dev/null +++ b/.readthedocs.yml @@ -0,0 +1,16 @@ +# .readthedocs.yml +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details + +# Required +version: 2 + +# Build documentation in the docs/ directory with Sphinx +sphinx: + configuration: docs/conf.py + +# Optionally set the version of Python and requirements required to build your docs +python: + version: 3.7 + install: + - requirements: docs/requirements.txt diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b745d6bd7..000000000 --- a/.travis.yml +++ /dev/null @@ -1,51 +0,0 @@ -language: python - -dist: focal -os: linux - -jobs: - include: - - name: "Paperless on Python 3.6" - python: "3.6" - - - name: "Paperless on Python 3.7" - python: "3.7" - - - name: "Paperless on Python 3.8" - python: "3.8" - - - name: "Documentation" - script: - - cd docs/ - - make html - after_success: true - - - name: "Front end" - language: node_js - node_js: - - 15 - before_install: true - install: - - cd src-ui/ - - npm install -g @angular/cli - - npm install - script: - - ng build --prod - after_success: true - - -before_install: - - sudo apt-get update -qq - - sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng - -install: - - pip install --upgrade pipenv - - pipenv install --system --dev - -script: - - cd src/ - - pipenv run pytest --cov - - pipenv run pycodestyle - -after_success: - - pipenv run coveralls diff --git a/docker/local/Dockerfile b/Dockerfile similarity index 55% rename from docker/local/Dockerfile rename to Dockerfile index 1160cc9a6..291036f55 100644 --- a/docker/local/Dockerfile +++ b/Dockerfile @@ -1,48 +1,79 @@ +FROM ubuntu:20.04 AS jbig2enc + +WORKDIR /usr/src/jbig2enc + +RUN apt-get update && apt-get install -y --no-install-recommends build-essential automake libtool libleptonica-dev zlib1g-dev git ca-certificates + +RUN git clone https://github.com/agl/jbig2enc . +RUN ./autogen.sh +RUN ./configure && make + FROM python:3.7-slim WORKDIR /usr/src/paperless/ COPY requirements.txt ./ -#Dependencies +# Binary dependencies RUN apt-get update \ && apt-get -y --no-install-recommends install \ - build-essential \ + # Basic dependencies curl \ file \ + # fonts for text file thumbnail generation fonts-liberation \ - ghostscript \ + # for making translations further down + gettext \ gnupg \ - icc-profiles-free \ imagemagick \ + # for Numpy libatlas-base-dev \ - liblept5 \ - libmagic-dev \ - libpoppler-cpp-dev \ - libpq-dev \ - libqpdf-dev \ - libxml2 \ libxslt1-dev \ + mime-support \ + # thumbnail size reduction optipng \ + sudo \ + tzdata \ + # OCRmyPDF dependencies + ghostscript \ + icc-profiles-free \ + liblept5 \ + libxml2 \ pngquant \ qpdf \ - sudo \ tesseract-ocr \ tesseract-ocr-eng \ tesseract-ocr-deu \ tesseract-ocr-fra \ tesseract-ocr-ita \ tesseract-ocr-spa \ - tzdata \ unpaper \ zlib1g \ - && pip3 install --upgrade supervisor setuptools \ - && pip install --no-cache-dir -r requirements.txt \ + && rm -rf /var/lib/apt/lists/* + +# This pulls in updated dependencies from bullseye to fix some issues with file type detection. +# TODO: Remove this once bullseye releases. +RUN echo "deb http://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list \ + && apt-get update \ + && apt-get install --no-install-recommends -y file libmagic-dev \ + && rm -rf /var/lib/apt/lists/* \ + && rm /etc/apt/sources.list.d/bullseye.list + +# Python dependencies +RUN apt-get update \ + && apt-get -y --no-install-recommends install \ + build-essential \ + libpoppler-cpp-dev \ + libpq-dev \ + libqpdf-dev \ + && python3 -m pip install --upgrade --no-cache-dir supervisor \ + && python3 -m pip install --no-cache-dir -r requirements.txt \ && apt-get -y purge build-essential libqpdf-dev \ && apt-get -y autoremove --purge \ && rm -rf /var/lib/apt/lists/* \ && mkdir /var/log/supervisord /var/run/supervisord + # copy scripts # this fixes issues with imagemagick and PDF COPY docker/imagemagick-policy.xml /etc/ImageMagick-6/policy.xml @@ -50,6 +81,12 @@ COPY docker/gunicorn.conf.py ./ COPY docker/supervisord.conf /etc/supervisord.conf COPY docker/docker-entrypoint.sh /sbin/docker-entrypoint.sh +# copy jbig2enc +COPY --from=jbig2enc /usr/src/jbig2enc/src/.libs/libjbig2enc* /usr/local/lib/ +COPY --from=jbig2enc /usr/src/jbig2enc/src/jbig2 /usr/local/bin/ +COPY --from=jbig2enc /usr/src/jbig2enc/src/*.h /usr/local/include/ + + # copy app COPY src/ ./src/ diff --git a/Pipfile b/Pipfile index 23c31f1f2..adb41f314 100644 --- a/Pipfile +++ b/Pipfile @@ -8,9 +8,6 @@ url = "https://www.piwheels.org/simple" verify_ssl = true name = "piwheels" -[requires] -python_version = "3.6" - [packages] dateparser = "~=0.7.6" django = "~=3.1.3" @@ -26,8 +23,9 @@ imap-tools = "*" langdetect = "*" pdftotext = "*" pathvalidate = "*" -pillow = "*" -pikepdf = "*" +# pinned to 8.1.0, since aarch64 wheels might not be available beyond that https://github.com/python-pillow/Pillow/issues/5202 +pillow = "==8.1.0" +pikepdf = "~=2.2.5" python-gnupg = "*" python-dotenv = "*" python-dateutil = "*" @@ -35,12 +33,12 @@ python-Levenshtein = "*" python-magic = "*" psycopg2-binary = "*" redis = "*" -scikit-learn="~=0.23.2" +scikit-learn="~=0.24.0" whitenoise = "~=5.2.0" watchdog = "*" whoosh="~=2.7.4" inotifyrecursive = "~=0.3.4" -ocrmypdf = "*" +ocrmypdf = "~=11.4.5" tqdm = "*" tika = "*" channels = "~=3.0" @@ -57,6 +55,6 @@ pytest-django = "*" pytest-env = "*" pytest-sugar = "*" pytest-xdist = "*" -sphinx = "~=3.3" +sphinx = "~=3.4.2" sphinx_rtd_theme = "*" tox = "*" diff --git a/Pipfile.lock b/Pipfile.lock index 068b7cd07..dab52dbbd 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,12 +1,10 @@ { "_meta": { "hash": { - "sha256": "8dbe59054648cdfec443bad9f73c25263e43f18f35e74dc72a8429a0035ecbeb" + "sha256": "3c85a487240f18b3feb44f8899395696cb79630f320f0df9ef5ee37b914c89f2" }, "pipfile-spec": 6, - "requires": { - "python_version": "3.6" - }, + "requires": {}, "sources": [ { "name": "pypi", @@ -21,13 +19,6 @@ ] }, "default": { - "aioredis": { - "hashes": [ - "sha256:15f8af30b044c771aee6787e5ec24694c048184c7b9e54c3b60c750a4b93273a", - "sha256:b61808d7e97b7cd5a92ed574937a079c9387fdadd22bfbfa7ad2fd319ecc26e3" - ], - "version": "==1.3.1" - }, "arrow": { "hashes": [ "sha256:e098abbd9af3665aea81bdd6c869e93af4feb078e98468dd351c383af187aac5", @@ -44,38 +35,6 @@ "markers": "python_version >= '3.5'", "version": "==3.3.1" }, - "async-timeout": { - "hashes": [ - "sha256:0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f", - "sha256:4291ca197d287d274d0b6cb5d6f8f8f82d434ed288f962539ff18cc9012f9ea3" - ], - "markers": "python_full_version >= '3.5.3'", - "version": "==3.0.1" - }, - "attrs": { - "hashes": [ - "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6", - "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700" - ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==20.3.0" - }, - "autobahn": { - "hashes": [ - "sha256:410a93e0e29882c8b5d5ab05d220b07609b886ef5f23c0b8d39153254ffd6895", - "sha256:52ee4236ff9a1fcbbd9500439dcf3284284b37f8a6b31ecc8a36e00cf9f95049" - ], - "markers": "python_version >= '3.6'", - "version": "==20.12.3" - }, - "automat": { - "hashes": [ - "sha256:7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33", - "sha256:b6feb6455337df834f6c9962d6ccf771515b7d939bca142b29c20c2376bc6111", - "sha256:d6d976cf8da698fc85fa7def46e2544493f78cb7ee72d2f4acd1a5c759a3060e" - ], - "version": "==20.2.0" - }, "blessed": { "hashes": [ "sha256:0a74a8d3f0366db600d061273df77d44f0db07daade7bb7a4d49c8bc22ed9f74", @@ -133,22 +92,6 @@ ], "version": "==1.14.4" }, - "channels": { - "hashes": [ - "sha256:056b72e51080a517a0f33a0a30003e03833b551d75394d6636c885d4edb8188f", - "sha256:3f15bdd2138bb4796e76ea588a0a344b12a7964ea9b2e456f992fddb988a4317" - ], - "index": "pypi", - "version": "==3.0.3" - }, - "channels-redis": { - "hashes": [ - "sha256:18d63f6462a58011740dc8eeb57ea4b31ec220eb551cb71b27de9c6779a549de", - "sha256:2fb31a63b05373f6402da2e6a91a22b9e66eb8b56626c6bfc93e156c734c5ae6" - ], - "index": "pypi", - "version": "==3.2.0" - }, "chardet": { "hashes": [ "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa", @@ -165,13 +108,6 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==15.0" }, - "constantly": { - "hashes": [ - "sha256:586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35", - "sha256:dd2fa9d6b1a51a83f0d7dd76293d734046aa176e384bf6e33b7e44880eb37c5d" - ], - "version": "==15.1.0" - }, "cryptography": { "hashes": [ "sha256:0003a52a123602e1acee177dc90dd201f9bb1e73f24a070db7d36c588e8f5c7d", @@ -193,14 +129,6 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", "version": "==3.3.1" }, - "daphne": { - "hashes": [ - "sha256:0052c9887600c57054a5867d4b0240159fa009faa3bcf6a1627271d9cdcb005a", - "sha256:c22b692707f514de9013651ecb687f2abe4f35cf6fe292ece634e9f1737bc7e3" - ], - "index": "pypi", - "version": "==3.0.1" - }, "dateparser": { "hashes": [ "sha256:7552c994f893b5cb8fcf103b4cd2ff7f57aab9bfd2619fdf0cf571c0740fd90b", @@ -259,7 +187,8 @@ }, "djangorestframework": { "hashes": [ - "sha256:0209bafcb7b5010fdfec784034f059d512256424de2a0f084cb82b096d6dd6a7" + "sha256:0209bafcb7b5010fdfec784034f059d512256424de2a0f084cb82b096d6dd6a7", + "sha256:0898182b4737a7b584a2c73735d89816343369f259fea932d90dc78e35d8ac33" ], "index": "pypi", "version": "==3.12.2" @@ -288,60 +217,6 @@ "index": "pypi", "version": "==20.0.4" }, - "hiredis": { - "hashes": [ - "sha256:06a039208f83744a702279b894c8cf24c14fd63c59cd917dcde168b79eef0680", - "sha256:0a909bf501459062aa1552be1461456518f367379fdc9fdb1f2ca5e4a1fdd7c0", - "sha256:18402d9e54fb278cb9a8c638df6f1550aca36a009d47ecf5aa263a38600f35b0", - "sha256:1e4cbbc3858ec7e680006e5ca590d89a5e083235988f26a004acf7244389ac01", - "sha256:23344e3c2177baf6975fbfa361ed92eb7d36d08f454636e5054b3faa7c2aff8a", - "sha256:289b31885b4996ce04cadfd5fc03d034dce8e2a8234479f7c9e23b9e245db06b", - "sha256:2c1c570ae7bf1bab304f29427e2475fe1856814312c4a1cf1cd0ee133f07a3c6", - "sha256:2c227c0ed371771ffda256034427320870e8ea2e4fd0c0a618c766e7c49aad73", - "sha256:3bb9b63d319402cead8bbd9dd55dca3b667d2997e9a0d8a1f9b6cc274db4baee", - "sha256:3ef2183de67b59930d2db8b8e8d4d58e00a50fcc5e92f4f678f6eed7a1c72d55", - "sha256:43b8ed3dbfd9171e44c554cb4acf4ee4505caa84c5e341858b50ea27dd2b6e12", - "sha256:47bcf3c5e6c1e87ceb86cdda2ee983fa0fe56a999e6185099b3c93a223f2fa9b", - "sha256:5263db1e2e1e8ae30500cdd75a979ff99dcc184201e6b4b820d0de74834d2323", - "sha256:5b1451727f02e7acbdf6aae4e06d75f66ee82966ff9114550381c3271a90f56c", - "sha256:6996883a8a6ff9117cbb3d6f5b0dcbbae6fb9e31e1a3e4e2f95e0214d9a1c655", - "sha256:6c96f64a54f030366657a54bb90b3093afc9c16c8e0dfa29fc0d6dbe169103a5", - "sha256:7332d5c3e35154cd234fd79573736ddcf7a0ade7a986db35b6196b9171493e75", - "sha256:7885b6f32c4a898e825bb7f56f36a02781ac4a951c63e4169f0afcf9c8c30dfb", - "sha256:7b0f63f10a166583ab744a58baad04e0f52cfea1ac27bfa1b0c21a48d1003c23", - "sha256:819f95d4eba3f9e484dd115ab7ab72845cf766b84286a00d4ecf76d33f1edca1", - "sha256:8968eeaa4d37a38f8ca1f9dbe53526b69628edc9c42229a5b2f56d98bb828c1f", - "sha256:89ebf69cb19a33d625db72d2ac589d26e936b8f7628531269accf4a3196e7872", - "sha256:8daecd778c1da45b8bd54fd41ffcd471a86beed3d8e57a43acf7a8d63bba4058", - "sha256:955ba8ea73cf3ed8bd2f963b4cb9f8f0dcb27becd2f4b3dd536fd24c45533454", - "sha256:964f18a59f5a64c0170f684c417f4fe3e695a536612e13074c4dd5d1c6d7c882", - "sha256:969843fbdfbf56cdb71da6f0bdf50f9985b8b8aeb630102945306cf10a9c6af2", - "sha256:996021ef33e0f50b97ff2d6b5f422a0fe5577de21a8873b58a779a5ddd1c3132", - "sha256:9e9c9078a7ce07e6fce366bd818be89365a35d2e4b163268f0ca9ba7e13bb2f6", - "sha256:9f4e67f87e072de981570eaf7cb41444bbac7e92b05c8651dbab6eb1fb8d5a14", - "sha256:a04901757cb0fb0f5602ac11dda48f5510f94372144d06c2563ba56c480b467c", - "sha256:a7bf1492429f18d205f3a818da3ff1f242f60aa59006e53dee00b4ef592a3363", - "sha256:aa0af2deb166a5e26e0d554b824605e660039b161e37ed4f01b8d04beec184f3", - "sha256:abfb15a6a7822f0fae681785cb38860e7a2cb1616a708d53df557b3d76c5bfd4", - "sha256:b253fe4df2afea4dfa6b1fa8c5fef212aff8bcaaeb4207e81eed05cb5e4a7919", - "sha256:b27f082f47d23cffc4cf1388b84fdc45c4ef6015f906cd7e0d988d9e35d36349", - "sha256:b33aea449e7f46738811fbc6f0b3177c6777a572207412bbbf6f525ffed001ae", - "sha256:b39989b49e8aca9d224324d2650029eda410a4faf43f6afb0eb4f9acb7be6097", - "sha256:b44f9421c4505c548435244d74037618f452844c5d3c67719d8a55e2613549da", - "sha256:bcc371151d1512201d0214c36c0c150b1dc64f19c2b1a8c9cb1d7c7c15ebd93f", - "sha256:c2851deeabd96d3f6283e9c6b26e0bfed4de2dc6fb15edf913e78b79fc5909ed", - "sha256:cdfd501c7ac5b198c15df800a3a34c38345f5182e5f80770caf362bccca65628", - "sha256:d2c0caffa47606d6d7c8af94ba42547bd2a441f06c74fd90a1ffe328524a6c64", - "sha256:dcb2db95e629962db5a355047fb8aefb012df6c8ae608930d391619dbd96fd86", - "sha256:e0eeb9c112fec2031927a1745788a181d0eecbacbed941fc5c4f7bc3f7b273bf", - "sha256:e154891263306200260d7f3051982774d7b9ef35af3509d5adbbe539afd2610c", - "sha256:e2e023a42dcbab8ed31f97c2bcdb980b7fbe0ada34037d87ba9d799664b58ded", - "sha256:e64be68255234bb489a574c4f2f8df7029c98c81ec4d160d6cd836e7f0679390", - "sha256:e82d6b930e02e80e5109b678c663a9ed210680ded81c1abaf54635d88d1da298" - ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==1.1.0" - }, "humanfriendly": { "hashes": [ "sha256:066562956639ab21ff2676d1fda0b5987e985c534fc76700a19bd54bcb81121d", @@ -350,14 +225,6 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==9.1" }, - "hyperlink": { - "hashes": [ - "sha256:402c1b5fa066ea368f3118fc5a6f8505440b4d1a4ef12a844ca39332a4a29944", - "sha256:47fcc7cd339c6cb2444463ec3277bdcfe142c8b1daf2160bdd52248deec815af", - "sha256:c528d405766f15a2c536230de7e160b65a08e20264d8891b3eb03307b0df3c63" - ], - "version": "==20.0.1" - }, "idna": { "hashes": [ "sha256:4a57a6379512ade94fa99e2fa46d3cd0f2f553040548d0e2958c6ed90ee48226", @@ -382,12 +249,13 @@ ], "version": "==0.4.0" }, - "incremental": { + "importlib-metadata": { "hashes": [ - "sha256:717e12246dddf231a349175f48d74d93e2897244939173b01974ab6661406b9f", - "sha256:7b751696aaf36eebfab537e458929e194460051ccad279c72b755a167eebd4b3" + "sha256:ace61d5fc652dc280e7b6b4ff732a9c2d40db2c0f92bc6cb74e07b73d53a1771", + "sha256:fa5daa4477a7414ae34e95942e4dd07f62adf589143c875c133c1e53c4eff38d" ], - "version": "==17.5.0" + "markers": "python_version < '3.8'", + "version": "==3.4.0" }, "inotify-simple": { "hashes": [ @@ -467,89 +335,54 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==4.6.2" }, - "msgpack": { - "hashes": [ - "sha256:0cb94ee48675a45d3b86e61d13c1e6f1696f0183f0715544976356ff86f741d9", - "sha256:1026dcc10537d27dd2d26c327e552f05ce148977e9d7b9f1718748281b38c841", - "sha256:26a1759f1a88df5f1d0b393eb582ec022326994e311ba9c5818adc5374736439", - "sha256:2a5866bdc88d77f6e1370f82f2371c9bc6fc92fe898fa2dec0c5d4f5435a2694", - "sha256:31c17bbf2ae5e29e48d794c693b7ca7a0c73bd4280976d408c53df421e838d2a", - "sha256:497d2c12426adcd27ab83144057a705efb6acc7e85957a51d43cdcf7f258900f", - "sha256:5a9ee2540c78659a1dd0b110f73773533ee3108d4e1219b5a15a8d635b7aca0e", - "sha256:7307e86f7ce75b49e65b55660b10b258e9e7b5e0f80d31d7a86a278d8204d1b4", - "sha256:8521e5be9e3b93d4d5e07cb80b7e32353264d143c1f072309e1863174c6aadb1", - "sha256:87869ba567fe371c4555d2e11e4948778ab6b59d6cc9d8460d543e4cfbbddd1c", - "sha256:8ffb24a3b7518e843cd83538cf859e026d24ec41ac5721c18ed0c55101f9775b", - "sha256:92be4b12de4806d3c36810b0fe2aeedd8d493db39e2eb90742b9c09299eb5759", - "sha256:9ea52fff0473f9f3000987f313310208c879493491ef3ccf66268eff8d5a0326", - "sha256:a4355d2193106c7aa77c98fc955252a737d8550320ecdb2e9ac701e15e2943bc", - "sha256:a99b144475230982aee16b3d249170f1cccebf27fb0a08e9f603b69637a62192", - "sha256:ac25f3e0513f6673e8b405c3a80500eb7be1cf8f57584be524c4fa78fe8e0c83", - "sha256:b28c0876cce1466d7c2195d7658cf50e4730667196e2f1355c4209444717ee06", - "sha256:b55f7db883530b74c857e50e149126b91bb75d35c08b28db12dcb0346f15e46e", - "sha256:b6d9e2dae081aa35c44af9c4298de4ee72991305503442a5c74656d82b581fe9", - "sha256:c747c0cc08bd6d72a586310bda6ea72eeb28e7505990f342552315b229a19b33", - "sha256:c82dc0ba34d620fb94d12a7725e9362958bb1be3938688a061f53ed86bee005a", - "sha256:d6c64601af8f3893d17ec233237030e3110f11b8a962cb66720bf70c0141aa54", - "sha256:d8167b84af26654c1124857d71650404336f4eb5cc06900667a493fc619ddd9f", - "sha256:de6bd7990a2c2dabe926b7e62a92886ccbf809425c347ae7de277067f97c2887", - "sha256:e36a812ef4705a291cdb4a2fd352f013134f26c6ff63477f20235138d1d21009", - "sha256:e89ec55871ed5473a041c0495b7b4e6099f6263438e0bd04ccd8418f92d5d7f2", - "sha256:f3e6aaf217ac1c7ce1563cf52a2f4f5d5b1f64e8729d794165db71da57257f0c", - "sha256:f484cd2dca68502de3704f056fa9b318c94b1539ed17a4c784266df5d6978c87", - "sha256:fae04496f5bc150eefad4e9571d1a76c55d021325dcd484ce45065ebbdd00984", - "sha256:fe07bc6735d08e492a327f496b7850e98cb4d112c56df69b0c844dbebcbb47f6" - ], - "version": "==1.0.2" - }, "numpy": { "hashes": [ - "sha256:08308c38e44cc926bdfce99498b21eec1f848d24c302519e64203a8da99a97db", - "sha256:09c12096d843b90eafd01ea1b3307e78ddd47a55855ad402b157b6c4862197ce", - "sha256:13d166f77d6dc02c0a73c1101dd87fdf01339febec1030bd810dcd53fff3b0f1", - "sha256:141ec3a3300ab89c7f2b0775289954d193cc8edb621ea05f99db9cb181530512", - "sha256:16c1b388cc31a9baa06d91a19366fb99ddbe1c7b205293ed072211ee5bac1ed2", - "sha256:18bed2bcb39e3f758296584337966e68d2d5ba6aab7e038688ad53c8f889f757", - "sha256:1aeef46a13e51931c0b1cf8ae1168b4a55ecd282e6688fdb0a948cc5a1d5afb9", - "sha256:27d3f3b9e3406579a8af3a9f262f5339005dd25e0ecf3cf1559ff8a49ed5cbf2", - "sha256:2a2740aa9733d2e5b2dfb33639d98a64c3b0f24765fed86b0fd2aec07f6a0a08", - "sha256:4377e10b874e653fe96985c05feed2225c912e328c8a26541f7fc600fb9c637b", - "sha256:448ebb1b3bf64c0267d6b09a7cba26b5ae61b6d2dbabff7c91b660c7eccf2bdb", - "sha256:50e86c076611212ca62e5a59f518edafe0c0730f7d9195fec718da1a5c2bb1fc", - "sha256:5734bdc0342aba9dfc6f04920988140fb41234db42381cf7ccba64169f9fe7ac", - "sha256:5ddd1dfa2be066595c1993165b4cae84b9866b12339d0c903db7f21a094324a3", - "sha256:64324f64f90a9e4ef732be0928be853eee378fd6a01be21a0a8469c4f2682c83", - "sha256:6ae6c680f3ebf1cf7ad1d7748868b39d9f900836df774c453c11c5440bc15b36", - "sha256:6d7593a705d662be5bfe24111af14763016765f43cb6923ed86223f965f52387", - "sha256:8cac8790a6b1ddf88640a9267ee67b1aee7a57dfa2d2dd33999d080bc8ee3a0f", - "sha256:8ece138c3a16db8c1ad38f52eb32be6086cc72f403150a79336eb2045723a1ad", - "sha256:9eeb7d1d04b117ac0d38719915ae169aa6b61fca227b0b7d198d43728f0c879c", - "sha256:a09f98011236a419ee3f49cedc9ef27d7a1651df07810ae430a6b06576e0b414", - "sha256:a5d897c14513590a85774180be713f692df6fa8ecf6483e561a6d47309566f37", - "sha256:ad6f2ff5b1989a4899bf89800a671d71b1612e5ff40866d1f4d8bcf48d4e5764", - "sha256:c42c4b73121caf0ed6cd795512c9c09c52a7287b04d105d112068c1736d7c753", - "sha256:cb1017eec5257e9ac6209ac172058c430e834d5d2bc21961dceeb79d111e5909", - "sha256:d6c7bb82883680e168b55b49c70af29b84b84abb161cbac2800e8fcb6f2109b6", - "sha256:e452dc66e08a4ce642a961f134814258a082832c78c90351b75c41ad16f79f63", - "sha256:e5b6ed0f0b42317050c88022349d994fe72bfe35f5908617512cd8c8ef9da2a9", - "sha256:e9b30d4bd69498fc0c3fe9db5f62fffbb06b8eb9321f92cc970f2969be5e3949", - "sha256:ec149b90019852266fec2341ce1db513b843e496d5a8e8cdb5ced1923a92faab", - "sha256:edb01671b3caae1ca00881686003d16c2209e07b7ef8b7639f1867852b948f7c", - "sha256:f0d3929fe88ee1c155129ecd82f981b8856c5d97bcb0d5f23e9b4242e79d1de3", - "sha256:f29454410db6ef8126c83bd3c968d143304633d45dc57b51252afbd79d700893", - "sha256:fe45becb4c2f72a0907c1d0246ea6449fe7a9e2293bb0e11c4e9a32bb0930a15", - "sha256:fedbd128668ead37f33917820b704784aff695e0019309ad446a6d0b065b57e4" + "sha256:012426a41bc9ab63bb158635aecccc7610e3eff5d31d1eb43bc099debc979d94", + "sha256:06fab248a088e439402141ea04f0fffb203723148f6ee791e9c75b3e9e82f080", + "sha256:0eef32ca3132a48e43f6a0f5a82cb508f22ce5a3d6f67a8329c81c8e226d3f6e", + "sha256:1ded4fce9cfaaf24e7a0ab51b7a87be9038ea1ace7f34b841fe3b6894c721d1c", + "sha256:2e55195bc1c6b705bfd8ad6f288b38b11b1af32f3c8289d6c50d47f950c12e76", + "sha256:2ea52bd92ab9f768cc64a4c3ef8f4b2580a17af0a5436f6126b08efbd1838371", + "sha256:36674959eed6957e61f11c912f71e78857a8d0604171dfd9ce9ad5cbf41c511c", + "sha256:384ec0463d1c2671170901994aeb6dce126de0a95ccc3976c43b0038a37329c2", + "sha256:39b70c19ec771805081578cc936bbe95336798b7edf4732ed102e7a43ec5c07a", + "sha256:400580cbd3cff6ffa6293df2278c75aef2d58d8d93d3c5614cd67981dae68ceb", + "sha256:43d4c81d5ffdff6bae58d66a3cd7f54a7acd9a0e7b18d97abb255defc09e3140", + "sha256:50a4a0ad0111cc1b71fa32dedd05fa239f7fb5a43a40663269bb5dc7877cfd28", + "sha256:603aa0706be710eea8884af807b1b3bc9fb2e49b9f4da439e76000f3b3c6ff0f", + "sha256:6149a185cece5ee78d1d196938b2a8f9d09f5a5ebfbba66969302a778d5ddd1d", + "sha256:6373751c4b6fd325606d29dd98dc2bf7092485ad20aafbfc6a177acd3b89059e", + "sha256:759e4095edc3c1b3ac031f34d9459fa781777a93ccc633a472a5468587a190ff", + "sha256:7fb43004bce0ca31d8f13a6eb5e943fa73371381e53f7074ed21a4cb786c32f8", + "sha256:811daee36a58dc79cf3d8bdd4a490e4277d0e4b7d103a001a4e73ddb48e7e6aa", + "sha256:8b5e972b43c8fc27d56550b4120fe6257fdc15f9301914380b27f74856299fea", + "sha256:99abf4f353c3d1a0c7a5f27699482c987cf663b1eac20db59b8c7b061eabd7fc", + "sha256:a0d53e51a6cb6f0d9082decb7a4cb6dfb33055308c4c44f53103c073f649af73", + "sha256:a12ff4c8ddfee61f90a1633a4c4afd3f7bcb32b11c52026c92a12e1325922d0d", + "sha256:a4646724fba402aa7504cd48b4b50e783296b5e10a524c7a6da62e4a8ac9698d", + "sha256:a76f502430dd98d7546e1ea2250a7360c065a5fdea52b2dffe8ae7180909b6f4", + "sha256:a9d17f2be3b427fbb2bce61e596cf555d6f8a56c222bd2ca148baeeb5e5c783c", + "sha256:ab83f24d5c52d60dbc8cd0528759532736b56db58adaa7b5f1f76ad551416a1e", + "sha256:aeb9ed923be74e659984e321f609b9ba54a48354bfd168d21a2b072ed1e833ea", + "sha256:c843b3f50d1ab7361ca4f0b3639bf691569493a56808a0b0c54a051d260b7dbd", + "sha256:cae865b1cae1ec2663d8ea56ef6ff185bad091a5e33ebbadd98de2cfa3fa668f", + "sha256:cc6bd4fd593cb261332568485e20a0712883cf631f6f5e8e86a52caa8b2b50ff", + "sha256:cf2402002d3d9f91c8b01e66fbb436a4ed01c6498fffed0e4c7566da1d40ee1e", + "sha256:d051ec1c64b85ecc69531e1137bb9751c6830772ee5c1c426dbcfe98ef5788d7", + "sha256:d6631f2e867676b13026e2846180e2c13c1e11289d67da08d71cacb2cd93d4aa", + "sha256:dbd18bcf4889b720ba13a27ec2f2aac1981bd41203b3a3b27ba7a33f88ae4827", + "sha256:df609c82f18c5b9f6cb97271f03315ff0dbe481a2a02e56aeb1b1a985ce38e60" ], "markers": "python_version >= '3.6'", - "version": "==1.19.4" + "version": "==1.19.5" }, "ocrmypdf": { "hashes": [ - "sha256:161c9dffb61485d30d4caea07dcb6d1b73ffa43f6e8767504a9128c510cc0c8c", - "sha256:404e564d0eac076cc520f0742b3e711f2611ae12a7adbc05f1232a77a81d6d61" + "sha256:416a9c4321bfc844f250694b8c68ebb538f60609bbc8686bd9f84a13c5127d68", + "sha256:f45fc7e844e6026d6080a623a2936be120fc077d99aaa599df022acf35fb31e6" ], "index": "pypi", - "version": "==11.4.4" + "version": "==11.4.5" }, "pathvalidate": { "hashes": [ @@ -576,34 +409,35 @@ }, "pikepdf": { "hashes": [ - "sha256:05fac9db7d5f5871f7b6598714386ffe56c1589e1d984859fb9e6a4ec8f0ebd0", - "sha256:267f76dc2ca107498d9cd90df8b26d36c57faebff933ef4069dffa8d2e14a9e4", - "sha256:28d9f436086faf03306d321465a9384aaefe7fb023a46fc177921bc899656c6b", - "sha256:2e66e15122f18b1dfbe6f48b90ebfd72c666b16330af5c4849e9b9aa930c8983", - "sha256:3147bd0b4f4c6ed42b8dce724aa76d041aa071ebf4b500da302e1b368eb57811", - "sha256:385da233cb211f00a154597b437214392b25ba83b88da53124ff01856f4e0753", - "sha256:497000a07a1549239a83b3753e38b30257a5978d0c3f1b0ddaf698c2e1722616", - "sha256:497c2d9212ec4d08582bdb4bb75d383de9f3d91308092dd23b84fdecffc08fbc", - "sha256:62df5bed7aefbfadf29063d1c6bb9d5132bea0f6f40a186b75e068805ba96d45", - "sha256:80380933b1423adb25ebee33659614b9e4cd7fdfb655184d5bb8becc2ea5109a", - "sha256:8a72fff7adff10f7459670cc7950988cb2863ccfef107460432a7f290d00a9a1", - "sha256:a59fe04e67db87a63bc9f3722210e672c0b0577707e51dd121d1480afdec0c28", - "sha256:ac163f12a1e07a441976261367e2dfd374e050ec81a199099b9ef01143d3b01b", - "sha256:b63b0f6a73df3533181c310af48a5acc6acdb64deb3a36e4082264a7e98f3ca2", - "sha256:c3bba19636181cbe9b20dd382eec2c64c1df7ae410089c63ee20aa1d5d14dfa4", - "sha256:c8f70fb7453825bcbbe77da56132a22567d4ffbfe8ab8cb801d06fb56b624f6a", - "sha256:dd6dd1c15f770da01c03531095b8fbd1932df225297dc13f4987ca1260c2d723", - "sha256:e6f5dc7e2a969e73134f7fd7876a7bd2a186e6284e0ed56745d7836626abed15", - "sha256:ef8f2935b4380b3ed797bfbb12d143cf01fe62bdec14018813fd4cb029495999", - "sha256:f2a75b290f2740ccaad077240ec8d5f963991efd63369b2e4b5d2d046b22632e", - "sha256:f81ea51e868f075515bc9f805710105ca759fc01c29ee3cd500186a2d17e21c2" + "sha256:0e67e5beeeed5422b3b8e862e4777fed5a4cd3c72e711e2a449a65d9ee641448", + "sha256:138155ae1f71634cd6eca79f5517f77b2067ef0bd5b627ea9414e308fe868dc5", + "sha256:15cf648dd760a47c55a4106b601b92bb653ae98155b10f04310553629c6695dd", + "sha256:1d6a011ae4c501c78509caf19cbe152c2e3cb5c267f7b47bc3db8cd3436585a7", + "sha256:211f529313953e44ae42eb896c2b688668385e6e8f9d04d21484bddb3c42b34c", + "sha256:22049ad288d603a7fc68e90a0722770d307886788373ddfe71fbf614ced0f5b2", + "sha256:24f7c371f6ecbee8f0ae30030992fc75cd32cd575dcfca8d466a03a8290377ca", + "sha256:26cdf561632866d584fedb6b1c1fce78cefa49b5cae54c65aa6a6ca5fe6de4ac", + "sha256:2c37afcd21a2eb1da1773687e853327fa8ec7d2c5cd90cdcd70180f55f0221e1", + "sha256:65b8ec6403814f51e1b9c7e18a8ff26087fcc7a199b1405583e5ff9eb931db56", + "sha256:66a03103aadb2e2738271cb18c89837ac3980fa0b4687195c4c150228b7e79de", + "sha256:6e8f0124354c53a66f83ec5a18111b760aeff1a64db3a86e7ee5fed8e8624707", + "sha256:70f2836cd468aa25bc8b09a2b9561364bd75d3e6ddb0e50a25d248d7da6cff25", + "sha256:82cebf68952cfb65c86d880eb782a0c558b37531cdae59f2e11fcd0f2bb4669c", + "sha256:84ad3e8fd5f3251fb5b534614da64b04a264ce9348f0fe35b781c0fb378b0f82", + "sha256:af13fbc022efa85d1ae161129d4cde66493479db52b9adb74d525b890a078208", + "sha256:c1d40fb8f8192c75f54f0e74a569ccf45e4e13bed8da78a78a5b488be29979bf", + "sha256:d147ec1ab58512871fdf40a161809f698eaa75720b4a230198e7e028582b20a1", + "sha256:dedad1f68d6b0b54000f7f99386351f1c6e19c8cf70a9700d8dd06b9809c54fb", + "sha256:e72c3f5b624b9c7341fd6a7e657926d4cf12a7ea453681ffd7332cabc3530c62", + "sha256:eb75f22e261b3bc69b6fc9a17b1d6966c95e79d3e792b7737a018a2bf6a2b07f" ], "index": "pypi", - "version": "==2.2.4" + "version": "==2.2.5" }, "pillow": { "hashes": [ "sha256:165c88bc9d8dba670110c689e3cc5c71dbe4bfb984ffa7cbebf1fac9554071d6", + "sha256:1d208e670abfeb41b6143537a681299ef86e92d2a3dac299d3cd6830d5c7bded", "sha256:22d070ca2e60c99929ef274cfced04294d2368193e935c5d6febfd8b601bf865", "sha256:2353834b2c49b95e1313fb34edf18fca4d57446675d05298bb694bca4b194174", "sha256:39725acf2d2e9c17356e6835dccebe7a697db55f25a09207e38b835d5e1bc032", @@ -629,9 +463,12 @@ "sha256:ca20739e303254287138234485579b28cb0d524401f83d5129b5ff9d606cb0a8", "sha256:cb192176b477d49b0a327b2a5a4979552b7a58cd42037034316b8018ac3ebb59", "sha256:cdbbe7dff4a677fb555a54f9bc0450f2a21a93c5ba2b44e09e54fcb72d2bd13d", + "sha256:cf6e33d92b1526190a1de904df21663c46a456758c0424e4f947ae9aa6088bf7", "sha256:d355502dce85ade85a2511b40b4c61a128902f246504f7de29bbeec1ae27933a", + "sha256:d673c4990acd016229a5c1c4ee8a9e6d8f481b27ade5fc3d95938697fa443ce0", "sha256:dc577f4cfdda354db3ae37a572428a90ffdbe4e51eda7849bf442fb803f09c9b", - "sha256:dd9eef866c70d2cbbea1ae58134eaffda0d4bfea403025f4db6859724b18ab3d" + "sha256:dd9eef866c70d2cbbea1ae58134eaffda0d4bfea403025f4db6859724b18ab3d", + "sha256:f50e7a98b0453f39000619d845be8b06e611e56ee6e8186f7f60c3b1e2f0feae" ], "index": "pypi", "version": "==8.1.0" @@ -687,42 +524,6 @@ "index": "pypi", "version": "==2.8.6" }, - "pyasn1": { - "hashes": [ - "sha256:014c0e9976956a08139dc0712ae195324a75e142284d5f87f1a87ee1b068a359", - "sha256:03840c999ba71680a131cfaee6fab142e1ed9bbd9c693e285cc6aca0d555e576", - "sha256:0458773cfe65b153891ac249bcf1b5f8f320b7c2ce462151f8fa74de8934becf", - "sha256:08c3c53b75eaa48d71cf8c710312316392ed40899cb34710d092e96745a358b7", - "sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d", - "sha256:5c9414dcfede6e441f7e8f81b43b34e834731003427e5b09e4e00e3172a10f00", - "sha256:6e7545f1a61025a4e58bb336952c5061697da694db1cae97b116e9c46abcf7c8", - "sha256:78fa6da68ed2727915c4767bb386ab32cdba863caa7dbe473eaae45f9959da86", - "sha256:7ab8a544af125fb704feadb008c99a88805126fb525280b2270bb25cc1d78a12", - "sha256:99fcc3c8d804d1bc6d9a099921e39d827026409a58f2a720dcdb89374ea0c776", - "sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba", - "sha256:e89bf84b5437b532b0803ba5c9a5e054d21fec423a89952a74f87fa2c9b7bce2", - "sha256:fec3e9d8e36808a28efb59b489e4528c10ad0f480e57dcc32b4de5c9d8c9fdf3" - ], - "version": "==0.4.8" - }, - "pyasn1-modules": { - "hashes": [ - "sha256:0845a5582f6a02bb3e1bde9ecfc4bfcae6ec3210dd270522fee602365430c3f8", - "sha256:0fe1b68d1e486a1ed5473f1302bd991c1611d319bba158e98b106ff86e1d7199", - "sha256:15b7c67fabc7fc240d87fb9aabf999cf82311a6d6fb2c70d00d3d0604878c811", - "sha256:426edb7a5e8879f1ec54a1864f16b882c2837bfd06eee62f2c982315ee2473ed", - "sha256:65cebbaffc913f4fe9e4808735c95ea22d7a7775646ab690518c056784bc21b4", - "sha256:905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e", - "sha256:a50b808ffeb97cb3601dd25981f6b016cbb3d31fbf57a8b8a87428e6158d0c74", - "sha256:a99324196732f53093a84c4369c996713eb8c89d360a496b599fb1a9c47fc3eb", - "sha256:b80486a6c77252ea3a3e9b1e360bc9cf28eaac41263d173c032581ad2f20fe45", - "sha256:c29a5e5cc7a3f05926aff34e097e84f8589cd790ce0ed41b67aed6857b26aafd", - "sha256:cbac4bc38d117f2a49aeedec4407d23e8866ea4ac27ff2cf7fb3e5b570df19e0", - "sha256:f39edd8c4ecaa4556e989147ebf219227e2cd2e8a43c7e7fcb1f1c18c5fd6a3d", - "sha256:fe0644d9ab041506b62782e92b06b8c68cca799e1a9636ec398675459e031405" - ], - "version": "==0.2.8" - }, "pycparser": { "hashes": [ "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0", @@ -731,22 +532,6 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.20" }, - "pyhamcrest": { - "hashes": [ - "sha256:412e00137858f04bde0729913874a48485665f2d36fe9ee449f26be864af9316", - "sha256:7ead136e03655af85069b6f47b23eb7c3e5c221aa9f022a4fbb499f5b7308f29" - ], - "markers": "python_version >= '3.5'", - "version": "==2.0.2" - }, - "pyopenssl": { - "hashes": [ - "sha256:4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51", - "sha256:818ae18e06922c066f777a33f1fca45786d85edfe71cd043de6379337a7f274b" - ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", - "version": "==20.0.1" - }, "python-dateutil": { "hashes": [ "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c", @@ -910,59 +695,67 @@ }, "scikit-learn": { "hashes": [ - "sha256:090bbf144fd5823c1f2efa3e1a9bf180295b24294ca8f478e75b40ed54f8036e", - "sha256:0a127cc70990d4c15b1019680bfedc7fec6c23d14d3719fdf9b64b22d37cdeca", - "sha256:0d39748e7c9669ba648acf40fb3ce96b8a07b240db6888563a7cb76e05e0d9cc", - "sha256:1b8a391de95f6285a2f9adffb7db0892718950954b7149a70c783dc848f104ea", - "sha256:20766f515e6cd6f954554387dfae705d93c7b544ec0e6c6a5d8e006f6f7ef480", - "sha256:2aa95c2f17d2f80534156215c87bee72b6aa314a7f8b8fe92a2d71f47280570d", - "sha256:5ce7a8021c9defc2b75620571b350acc4a7d9763c25b7593621ef50f3bd019a2", - "sha256:6c28a1d00aae7c3c9568f61aafeaad813f0f01c729bee4fd9479e2132b215c1d", - "sha256:7671bbeddd7f4f9a6968f3b5442dac5f22bf1ba06709ef888cc9132ad354a9ab", - "sha256:914ac2b45a058d3f1338d7736200f7f3b094857758895f8667be8a81ff443b5b", - "sha256:98508723f44c61896a4e15894b2016762a55555fbf09365a0bb1870ecbd442de", - "sha256:a64817b050efd50f9abcfd311870073e500ae11b299683a519fbb52d85e08d25", - "sha256:cb3e76380312e1f86abd20340ab1d5b3cc46a26f6593d3c33c9ea3e4c7134028", - "sha256:d0dcaa54263307075cb93d0bee3ceb02821093b1b3d25f66021987d305d01dce", - "sha256:d9a1ce5f099f29c7c33181cc4386660e0ba891b21a60dc036bf369e3a3ee3aec", - "sha256:da8e7c302003dd765d92a5616678e591f347460ac7b53e53d667be7dfe6d1b10", - "sha256:daf276c465c38ef736a79bd79fc80a249f746bcbcae50c40945428f7ece074f8" + "sha256:076369634ee72b5a5941440661e2f306ff4ac30903802dc52031c7e9199ac640", + "sha256:18f7131e62265bf2691ed1d0303c640313894ccfe4278427478c6b2f45094b53", + "sha256:26f66b3726b54dfb76ea51c5d9c2431ed17ebc066cb4527662b9e851a3e7ba61", + "sha256:2951f87d35e72f007701c6e028aa230f6df6212a3194677c0c950486066a454d", + "sha256:2a5348585aa793bc8cc5a72f8e9067c9380834b0aadbd55f924843b071f13282", + "sha256:3eeff086f7329521d27249a082ea3c48c085cedb110db5f65968ab55c3ba2e09", + "sha256:4395e91b3548005f4a645018435b5a94f8cce232b5b70753020e606c6a750656", + "sha256:44e452ea8491225c5783d49577aad0f36202dfd52aec7f82c0fdfe5fbd5f7400", + "sha256:490436b44b3a1957cb625e871764b0aa330b34cc416aea4abc6c38ca63d0d682", + "sha256:5e6e3c042cea83f2e20a45e563b8eabc1f8f72446251fe23ebefdf111a173a33", + "sha256:66f27bf21202a850bcd7b6303916e4907f6e22ec59a14974ede4955aed5c7ed0", + "sha256:743b6edd98c98991be46c08e6b21df3861d5ae915f91d59f988384d93f7263e7", + "sha256:758619e49cd7c17282e6cc60d5cc73c02c072b47c9a10010bb3bb47e0d976e50", + "sha256:7f654befc5ad413690cc58f3f34a3e906caf825195ce0fda00a8e9565e1403e6", + "sha256:800aaf63f8838c00e85db2267dd226f89858594843fd03932a9eda95746d2c40", + "sha256:80ca024154b84b6ac4cfc86930ba13fdc348a209753bf2c16129db6f9eb8a80b", + "sha256:890d7d588f65acb0c4f6c083347c9076916bda5e6bd8400f06244b1afc1009af", + "sha256:905d8934d1e27a686698864a5863ff2c0e13a2ae1adb78a8a848aacc8a49927d", + "sha256:a83fcd9d59c42a2f66b307e3b0b0f08aa8e6e45be33da055697ea499f0e4f7c2", + "sha256:afeb06dc69847927634e58579b9cdc72e1390b79497336b2324b1b173f33bd47", + "sha256:b0d13fd56d26cf3de0314a4fd48037108c638fe126d813f5c1222bb0f08b6a76", + "sha256:c08b27cb78ee8d2dc781a7affed09859441f5b624f9f92da59ac0791c8774dfc", + "sha256:c912247e42114f389858ae05d63f4359d4e667ea72aaabee191aee9ad3f9774a", + "sha256:d7fe05fcb44eadd6d6c874c768f085f5de1239db3a3b7be4d3d23d12e4120589", + "sha256:d819d625832fb2969911a243e009cfa135cb8ef1e150866e417d6e9d75290087", + "sha256:e534f5f3796db6781c87e9835dcd51b7854c8c5a379c9210b93605965c1941fd" ], "index": "pypi", - "version": "==0.23.2" + "version": "==0.24.0" }, "scipy": { "hashes": [ - "sha256:155225621df90fcd151e25d51c50217e412de717475999ebb76e17e310176981", - "sha256:1bc5b446600c4ff7ab36bade47180673141322f0febaa555f1c433fe04f2a0e3", - "sha256:2f1c2ebca6fd867160e70102200b1bd07b3b2d31a3e6af3c58d688c15d0d07b7", - "sha256:313785c4dab65060f9648112d025f6d2fec69a8a889c714328882d678a95f053", - "sha256:31ab217b5c27ab429d07428a76002b33662f98986095bbce5d55e0788f7e8b15", - "sha256:3d4303e3e21d07d9557b26a1707bb9fc065510ee8501c9bf22a0157249a82fd0", - "sha256:4f1d9cc977ac6a4a63c124045c1e8bf67ec37098f67c699887a93736961a00ae", - "sha256:58731bbe0103e96b89b2f41516699db9b63066e4317e31b8402891571f6d358f", - "sha256:8629135ee00cc2182ac8be8e75643b9f02235942443732c2ed69ab48edcb6614", - "sha256:876badc33eec20709d4e042a09834f5953ebdac4088d45a4f3a1f18b56885718", - "sha256:8840a9adb4ede3751f49761653d3ebf664f25195fdd42ada394ffea8903dd51d", - "sha256:aef3a2dbc436bbe8f6e0b635f0b5fe5ed024b522eee4637dbbe0b974129ca734", - "sha256:b8af26839ae343655f3ca377a5d5e5466f1d3b3ac7432a43449154fe958ae0e0", - "sha256:c0911f3180de343643f369dc5cfedad6ba9f939c2d516bddea4a6871eb000722", - "sha256:cb6dc9f82dfd95f6b9032a8d7ea70efeeb15d5b5fd6ed4e8537bb3c673580566", - "sha256:cdbc47628184a0ebeb5c08f1892614e1bd4a51f6e0d609c6eed253823a960f5b", - "sha256:d902d3a5ad7f28874c0a82db95246d24ca07ad932741df668595fe00a4819870", - "sha256:eab389aba0ad8b5e6b5abdc3337ade46823df75f80a8edd4c67833567577cb3d", - "sha256:eb7928275f3560d47e5538e15e9f32b3d64cd30ea8f85f3e82987425476f53f6", - "sha256:f68d5761a2d2376e2b194c8e9192bbf7c51306ca176f1a0889990a52ef0d551f" + "sha256:168c45c0c32e23f613db7c9e4e780bc61982d71dcd406ead746c7c7c2f2004ce", + "sha256:213bc59191da2f479984ad4ec39406bf949a99aba70e9237b916ce7547b6ef42", + "sha256:25b241034215247481f53355e05f9e25462682b13bd9191359075682adcd9554", + "sha256:2c872de0c69ed20fb1a9b9cf6f77298b04a26f0b8720a5457be08be254366c6e", + "sha256:3397c129b479846d7eaa18f999369a24322d008fac0782e7828fa567358c36ce", + "sha256:368c0f69f93186309e1b4beb8e26d51dd6f5010b79264c0f1e9ca00cd92ea8c9", + "sha256:3d5db5d815370c28d938cf9b0809dade4acf7aba57eaf7ef733bfedc9b2474c4", + "sha256:4598cf03136067000855d6b44d7a1f4f46994164bcd450fb2c3d481afc25dd06", + "sha256:4a453d5e5689de62e5d38edf40af3f17560bfd63c9c5bd228c18c1f99afa155b", + "sha256:4f12d13ffbc16e988fa40809cbbd7a8b45bc05ff6ea0ba8e3e41f6f4db3a9e47", + "sha256:634568a3018bc16a83cda28d4f7aed0d803dd5618facb36e977e53b2df868443", + "sha256:65923bc3809524e46fb7eb4d6346552cbb6a1ffc41be748535aa502a2e3d3389", + "sha256:6b0ceb23560f46dd236a8ad4378fc40bad1783e997604ba845e131d6c680963e", + "sha256:8c8d6ca19c8497344b810b0b0344f8375af5f6bb9c98bd42e33f747417ab3f57", + "sha256:9ad4fcddcbf5dc67619379782e6aeef41218a79e17979aaed01ed099876c0e62", + "sha256:a254b98dbcc744c723a838c03b74a8a34c0558c9ac5c86d5561703362231107d", + "sha256:b03c4338d6d3d299e8ca494194c0ae4f611548da59e3c038813f1a43976cb437", + "sha256:b5e9d3e4474644915809d6aa1416ff20430a3ed9ae723a5d295da5ddb24985e2", + "sha256:cc1f78ebc982cd0602c9a7615d878396bec94908db67d4ecddca864d049112f2", + "sha256:d6d25c41a009e3c6b7e757338948d0076ee1dd1770d1c09ec131f11946883c54", + "sha256:d84cadd7d7998433334c99fa55bcba0d8b4aeff0edb123b2a1dfcface538e474", + "sha256:e360cb2299028d0b0d0f65a5c5e51fc16a335f1603aa2357c25766c8dab56938", + "sha256:e98d49a5717369d8241d6cf33ecb0ca72deee392414118198a8e5b4c35c56340", + "sha256:ed572470af2438b526ea574ff8f05e7f39b44ac37f712105e57fc4d53a6fb660", + "sha256:f87b39f4d69cf7d7529d7b1098cb712033b17ea7714aed831b95628f483fd012", + "sha256:fa789583fc94a7689b45834453fec095245c7e69c58561dc159b5d5277057e4c" ], - "markers": "python_version >= '3.7'", - "version": "==1.6.0" - }, - "service-identity": { - "hashes": [ - "sha256:001c0707759cb3de7e49c078a7c0c9cd12594161d3bf06b9c254fdcb1a60dc36", - "sha256:0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d" - ], - "version": "==18.1.0" + "markers": "python_version >= '3.6'", + "version": "==1.5.4" }, "six": { "hashes": [ @@ -1005,53 +798,20 @@ }, "tqdm": { "hashes": [ - "sha256:556c55b081bd9aa746d34125d024b73f0e2a0e62d5927ff0e400e20ee0a03b9a", - "sha256:b8b46036fd00176d0870307123ef06bb851096964fa7fc578d789f90ce82c3e4" + "sha256:4621f6823bab46a9cc33d48105753ccbea671b68bab2c50a9f0be23d4065cb5a", + "sha256:fe3d08dd00a526850568d542ff9de9bbc2a09a791da3c334f3213d8d0bbbca65" ], "index": "pypi", - "version": "==4.55.1" + "version": "==4.56.0" }, - "twisted": { - "extras": [ - "tls" - ], + "typing-extensions": { "hashes": [ - "sha256:0150dae5adc962d15e00054cc6926f1e64763fb8dd26e1632593ac06e592104b", - "sha256:040eb6641125d2a9a09cf198ec7b83dd8858c6f51f6770325ed9959c00f5098f", - "sha256:147780b8caf21ba2aef3688628eaf13d7e7fe02a86747cd54bfaf2140538f042", - "sha256:158ddb80719a4813d292293ac44ba41d8b56555ed009d90994a278237ee63d2c", - "sha256:15e52271f08f62e2230ff093e0278aa01c9dac057c4557cadadd2429eed86a3e", - "sha256:2182000d6ffc05d269e6c03bfcec8b57e20259ca1086180edaedec3f1e689292", - "sha256:25ffcf37944bdad4a99981bc74006d735a678d2b5c193781254fbbb6d69e3b22", - "sha256:3281d9ce889f7b21bdb73658e887141aa45a102baf3b2320eafcfba954fcefec", - "sha256:356e8d8dd3590e790e3dba4db139eb8a17aca64b46629c622e1b1597a4a92478", - "sha256:70952c56e4965b9f53b180daecf20a9595cf22b8d0935cd3bd664c90273c3ab2", - "sha256:7408c6635ee1b96587289283ebe90ee15dbf9614b05857b446055116bc822d29", - "sha256:7c547fd0215db9da8a1bc23182b309e84a232364cc26d829e9ee196ce840b114", - "sha256:894f6f3cfa57a15ea0d0714e4283913a5f2511dbd18653dd148eba53b3919797", - "sha256:94ac3d55a58c90e2075c5fe1853f2aa3892b73e3bf56395f743aefde8605eeaa", - "sha256:a58e61a2a01e5bcbe3b575c0099a2bcb8d70a75b1a087338e0c48dd6e01a5f15", - "sha256:c09c47ff9750a8e3aa60ad169c4b95006d455a29b80ad0901f031a103b2991cd", - "sha256:ca3a0b8c9110800e576d89b5337373e52018b41069bc879f12fa42b7eb2d0274", - "sha256:cd1dc5c85b58494138a3917752b54bb1daa0045d234b7c132c37a61d5483ebad", - "sha256:cdbc4c7f0cd7a2218b575844e970f05a1be1861c607b0e048c9bceca0c4d42f7", - "sha256:d267125cc0f1e8a0eed6319ba4ac7477da9b78a535601c49ecd20c875576433a", - "sha256:d72c55b5d56e176563b91d11952d13b01af8725c623e498db5507b6614fc1e10", - "sha256:d95803193561a243cb0401b0567c6b7987d3f2a67046770e1dccd1c9e49a9780", - "sha256:e92703bed0cc21d6cb5c61d66922b3b1564015ca8a51325bd164a5e33798d504", - "sha256:f058bd0168271de4dcdc39845b52dd0a4a2fecf5f1246335f13f5e96eaebb467", - "sha256:f3c19e5bd42bbe4bf345704ad7c326c74d3fd7a1b3844987853bef180be638d4" + "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918", + "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c", + "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", - "version": "==20.3.0" - }, - "txaio": { - "hashes": [ - "sha256:1488d31d564a116538cc1265ac3f7979fb6223bb5a9e9f1479436ee2c17d8549", - "sha256:a8676d6c68aea1f0e2548c4afdb8e6253873af3bc2659bb5bcd9f39dff7ff90f" - ], - "markers": "python_version >= '3.6'", - "version": "==20.12.1" + "markers": "python_version < '3.8'", + "version": "==3.7.4.3" }, "tzlocal": { "hashes": [ @@ -1115,65 +875,13 @@ "index": "pypi", "version": "==2.7.4" }, - "zope.interface": { + "zipp": { "hashes": [ - "sha256:05a97ba92c1c7c26f25c9f671aa1ef85ffead6cdad13770e5b689cf983adc7e1", - "sha256:07d61722dd7d85547b7c6b0f5486b4338001fab349f2ac5cabc0b7182eb3425d", - "sha256:09fc3922f235703c0b76f8234867685eee68a24a49fffa2220975f6142db45f1", - "sha256:0a990dcc97806e5980bbb54b2e46b9cde9e48932d8e6984daf71ef1745516123", - "sha256:150e8bcb7253a34a4535aeea3de36c0bb3b1a6a47a183a95d65a194b3e07f232", - "sha256:1743bcfe45af8846b775086471c28258f4c6e9ee8ef37484de4495f15a98b549", - "sha256:1b5f6c8fff4ed32aa2dd43e84061bc8346f32d3ba6ad6e58f088fe109608f102", - "sha256:21e49123f375703cf824214939d39df0af62c47d122d955b2a8d9153ea08cfd5", - "sha256:21f579134a47083ffb5ddd1307f0405c91aa8b61ad4be6fd5af0171474fe0c45", - "sha256:27c267dc38a0f0079e96a2945ee65786d38ef111e413c702fbaaacbab6361d00", - "sha256:299bde0ab9e5c4a92f01a152b7fbabb460f31343f1416f9b7b983167ab1e33bc", - "sha256:2ab88d8f228f803fcb8cb7d222c579d13dab2d3622c51e8cf321280da01102a7", - "sha256:2ced4c35061eea623bc84c7711eedce8ecc3c2c51cd9c6afa6290df3bae9e104", - "sha256:2dcab01c660983ba5e5a612e0c935141ccbee67d2e2e14b833e01c2354bd8034", - "sha256:32546af61a9a9b141ca38d971aa6eb9800450fa6620ce6323cc30eec447861f3", - "sha256:32b40a4c46d199827d79c86bb8cb88b1bbb764f127876f2cb6f3a47f63dbada3", - "sha256:3cc94c69f6bd48ed86e8e24f358cb75095c8129827df1298518ab860115269a4", - "sha256:42b278ac0989d6f5cf58d7e0828ea6b5951464e3cf2ff229dd09a96cb6ba0c86", - "sha256:495b63fd0302f282ee6c1e6ea0f1c12cb3d1a49c8292d27287f01845ff252a96", - "sha256:4af87cdc0d4b14e600e6d3d09793dce3b7171348a094ba818e2a68ae7ee67546", - "sha256:4b94df9f2fdde7b9314321bab8448e6ad5a23b80542dcab53e329527d4099dcb", - "sha256:4c48ddb63e2b20fba4c6a2bf81b4d49e99b6d4587fb67a6cd33a2c1f003af3e3", - "sha256:4df9afd17bd5477e9f8c8b6bb8507e18dd0f8b4efe73bb99729ff203279e9e3b", - "sha256:518950fe6a5d56f94ba125107895f938a4f34f704c658986eae8255edb41163b", - "sha256:538298e4e113ccb8b41658d5a4b605bebe75e46a30ceca22a5a289cf02c80bec", - "sha256:55465121e72e208a7b69b53de791402affe6165083b2ea71b892728bd19ba9ae", - "sha256:588384d70a0f19b47409cfdb10e0c27c20e4293b74fc891df3d8eb47782b8b3e", - "sha256:6278c080d4afffc9016e14325f8734456831124e8c12caa754fd544435c08386", - "sha256:64ea6c221aeee4796860405e1aedec63424cda4202a7ad27a5066876db5b0fd2", - "sha256:681dbb33e2b40262b33fd383bae63c36d33fd79fa1a8e4092945430744ffd34a", - "sha256:6936aa9da390402d646a32a6a38d5409c2d2afb2950f045a7d02ab25a4e7d08d", - "sha256:778d0ec38bbd288b150a3ae363c8ffd88d2207a756842495e9bffd8a8afbc89a", - "sha256:8251f06a77985a2729a8bdbefbae79ee78567dddc3acbd499b87e705ca59fe24", - "sha256:83b4aa5344cce005a9cff5d0321b2e318e871cc1dfc793b66c32dd4f59e9770d", - "sha256:844fad925ac5c2ad4faaceb3b2520ad016b5280105c6e16e79838cf951903a7b", - "sha256:8ceb3667dd13b8133f2e4d637b5b00f240f066448e2aa89a41f4c2d78a26ce50", - "sha256:92dc0fb79675882d0b6138be4bf0cec7ea7c7eede60aaca78303d8e8dbdaa523", - "sha256:974f5957e66a7524ea81df7b2686a456bfaf0408dbb7353ddfbedb594eadfef6", - "sha256:9789bd945e9f5bd026ed3f5b453d640befb8b1fc33a779c1fe8d3eb21fe3fb4a", - "sha256:a2b6d6eb693bc2fc6c484f2e5d93bd0b0da803fa77bf974f160533e555e4d095", - "sha256:aab9f1e34d810feb00bf841993552b8fcc6ae71d473c505381627143d0018a6a", - "sha256:abb61afd84f23099ac6099d804cdba9bd3b902aaaded3ffff47e490b0a495520", - "sha256:adf9ee115ae8ff8b6da4b854b4152f253b390ba64407a22d75456fe07dcbda65", - "sha256:aedc6c672b351afe6dfe17ff83ee5e7eb6ed44718f879a9328a68bdb20b57e11", - "sha256:b7a00ecb1434f8183395fac5366a21ee73d14900082ca37cf74993cf46baa56c", - "sha256:ba32f4a91c1cb7314c429b03afbf87b1fff4fb1c8db32260e7310104bd77f0c7", - "sha256:cbd0f2cbd8689861209cd89141371d3a22a11613304d1f0736492590aa0ab332", - "sha256:e4bc372b953bf6cec65a8d48482ba574f6e051621d157cf224227dbb55486b1e", - "sha256:eccac3d9aadc68e994b6d228cb0c8919fc47a5350d85a1b4d3d81d1e98baf40c", - "sha256:efd550b3da28195746bb43bd1d815058181a7ca6d9d6aa89dd37f5eefe2cacb7", - "sha256:efef581c8ba4d990770875e1a2218e856849d32ada2680e53aebc5d154a17e20", - "sha256:f057897711a630a0b7a6a03f1acf379b6ba25d37dc5dc217a97191984ba7f2fc", - "sha256:f37d45fab14ffef9d33a0dc3bc59ce0c5313e2253323312d47739192da94f5fd", - "sha256:f44906f70205d456d503105023041f1e63aece7623b31c390a0103db4de17537" + "sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108", + "sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", - "version": "==5.2.0" + "markers": "python_version >= '3.6'", + "version": "==3.4.0" } }, "develop": { @@ -1289,11 +997,11 @@ }, "coveralls": { "hashes": [ - "sha256:2301a19500b06649d2ec4f2858f9c69638d7699a4c63027c5d53daba666147cc", - "sha256:b990ba1f7bc4288e63340be0433698c1efe8217f78c689d254c2540af3d38617" + "sha256:5399c0565ab822a70a477f7031f6c88a9dd196b3de2877b3facb43b51bd13434", + "sha256:f8384968c57dee4b7133ae701ecdad88e85e30597d496dcba0d7fbb470dca41f" ], "index": "pypi", - "version": "==2.2.0" + "version": "==3.0.0" }, "distlib": { "hashes": [ @@ -1335,11 +1043,11 @@ }, "faker": { "hashes": [ - "sha256:7b0c4bb678be21a68640007f254259c73d18f7996a3448267716423360519732", - "sha256:7e98483fc273ec5cfe1c9efa9b99adaa2de4c6b610fbc62d3767088e4974b0ce" + "sha256:47ac7d62d5bad8c16422a91f121430ab7656d40ca8fea9c84bcdbdf92e739b03", + "sha256:6bc44606d44f711e1d89ad9a5b42394cc6f7eedaffc765ddb5b2d22084c15733" ], "markers": "python_version >= '3.6'", - "version": "==5.3.0" + "version": "==5.5.0" }, "filelock": { "hashes": [ @@ -1366,6 +1074,22 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.2.0" }, + "importlib-metadata": { + "hashes": [ + "sha256:ace61d5fc652dc280e7b6b4ff732a9c2d40db2c0f92bc6cb74e07b73d53a1771", + "sha256:fa5daa4477a7414ae34e95942e4dd07f62adf589143c875c133c1e53c4eff38d" + ], + "markers": "python_version < '3.8'", + "version": "==3.4.0" + }, + "importlib-resources": { + "hashes": [ + "sha256:4743f090ed8946e713745ec0e660249ef9fb0b9843eacc5b5ff931d2fd5aa67f", + "sha256:ea17df80a0ff04b5dbd3d96dbeab1842acfd1c6c902eaeb8c8858abf2720161e" + ], + "markers": "python_version < '3.7'", + "version": "==5.0.0" + }, "iniconfig": { "hashes": [ "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3", @@ -1459,11 +1183,11 @@ }, "pygments": { "hashes": [ - "sha256:ccf3acacf3782cbed4a989426012f1c535c9a90d3a7fc3f16d231b9372d2b716", - "sha256:f275b6c0909e5dafd2d6269a656aa90fa58ebf4a74f8fcf9053195d226b24a08" + "sha256:bc9591213a8f0e0ca1a5e68a479b4887fdc3e75d0774e5c71c31920c427de435", + "sha256:df49d09b498e83c1a73128295860250b0b7edd4c723a32e9bc0d295c7c2ec337" ], "markers": "python_version >= '3.5'", - "version": "==2.7.3" + "version": "==2.7.4" }, "pyparsing": { "hashes": [ @@ -1570,19 +1294,19 @@ }, "sphinx": { "hashes": [ - "sha256:77dec5ac77ca46eee54f59cf477780f4fb23327b3339ef39c8471abb829c1285", - "sha256:b8aa4eb5502c53d3b5ca13a07abeedacd887f7770c198952fd5b9530d973e767" + "sha256:41cad293f954f7d37f803d97eb184158cfd90f51195131e94875bc07cd08b93c", + "sha256:c314c857e7cd47c856d2c5adff514ac2e6495f8b8e0f886a8a37e9305dfea0d8" ], "index": "pypi", - "version": "==3.4.2" + "version": "==3.4.3" }, "sphinx-rtd-theme": { "hashes": [ - "sha256:22c795ba2832a169ca301cd0a083f7a434e09c538c70beb42782c073651b707d", - "sha256:373413d0f82425aaa28fb288009bf0d0964711d347763af2f1b65cafcb028c82" + "sha256:eda689eda0c7301a80cf122dad28b1861e5605cbf455558f3775e1e8200e83a5", + "sha256:fa6bebd5ab9a73da8e102509a86f3fcc36dec04a0b52ea80e5a033b2aba00113" ], "index": "pypi", - "version": "==0.5.0" + "version": "==0.5.1" }, "sphinxcontrib-applehelp": { "hashes": [ @@ -1656,11 +1380,20 @@ }, "tox": { "hashes": [ - "sha256:42ce19ce5dc2f6d6b1fdc5666c476e1f1e2897359b47e0aa3a5b774f335d57c2", - "sha256:4321052bfe28f9d85082341ca8e233e3ea901fdd14dab8a5d3fbd810269fbaf6" + "sha256:5efda30ad73e662c3844ac51ce1381bf28f61063773e06996aa8b6277133a7c0", + "sha256:8cccede64802e78aa6c69f81051b25f0706639d1cbbb34d9366ce00c70ee054f" ], "index": "pypi", - "version": "==3.20.1" + "version": "==3.21.0" + }, + "typing-extensions": { + "hashes": [ + "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918", + "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c", + "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f" + ], + "markers": "python_version < '3.8'", + "version": "==3.7.4.3" }, "urllib3": { "hashes": [ @@ -1672,11 +1405,19 @@ }, "virtualenv": { "hashes": [ - "sha256:54b05fc737ea9c9ee9f8340f579e5da5b09fb64fd010ab5757eb90268616907c", - "sha256:b7a8ec323ee02fb2312f098b6b4c9de99559b462775bc8fe3627a73706603c1b" + "sha256:205a7577275dd0d9223c730dd498e21a8910600085c3dee97412b041fc4b853b", + "sha256:7992b8de87e544a4ab55afc2240bf8388c4e3b5765d03784dad384bfdf9097ee" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==20.2.2" + "version": "==20.3.0" + }, + "zipp": { + "hashes": [ + "sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108", + "sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb" + ], + "markers": "python_version >= '3.6'", + "version": "==3.4.0" } } } diff --git a/README.md b/README.md index 5c5fa4a76..89f55b2d9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.com/jonaswinkler/paperless-ng.svg?branch=master)](https://travis-ci.com/jonaswinkler/paperless-ng) +![ci](https://github.com/jonaswinkler/paperless-ng/workflows/ci/badge.svg) [![Documentation Status](https://readthedocs.org/projects/paperless-ng/badge/?version=latest)](https://paperless-ng.readthedocs.io/en/latest/?badge=latest) [![Gitter](https://badges.gitter.im/paperless-ng/community.svg)](https://gitter.im/paperless-ng/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker Hub Pulls](https://img.shields.io/docker/pulls/jonaswinkler/paperless-ng.svg)](https://hub.docker.com/r/jonaswinkler/paperless-ng) @@ -10,8 +10,6 @@ Paperless-ng is a fork of the original project, adding a new interface and many other changes under the hood. For a detailed list of changes, have a look at the changelog in the documentation. -This project is still in development and some things may not work as expected. - # How it Works Paperless does not control your scanner, it only helps you deal with what your scanner produces. @@ -48,7 +46,7 @@ Here's what you get: * Paperless learns from your documents and will be able to automatically assign tags, correspondents and types to documents once you've stored a few documents in paperless. * A task processor that processes documents in parallel and also tells you when something goes wrong. On modern multi core systems, consumption is blazing fast. -If you want to see some screenshots of paperless-ng in action, [some are available in the documentation](https://paperless-ng.readthedocs.io/en/latest/screenshots.html). +If you want to see some screenshots of paperless-ng in action, [some are available in the documentation](https://paperless-ng.readthedocs.io/en/latest/screenshots.html). However, some parts of the UI have changed since I took these. For a complete list of changes from paperless, check out the [changelog](https://paperless-ng.readthedocs.io/en/latest/changelog.html) @@ -56,22 +54,7 @@ For a complete list of changes from paperless, check out the [changelog](https:/ - Make the front end nice (except mobile). - Fix whatever bugs I and you find. - -## Roadmap for versions beyond 1.0 - -These are things that I want to add to paperless eventually. They are sorted by priority. - -- **More search.** The search backend is incredibly versatile and customizable. Searching is the most important feature of this project and thus, I want to implement things like: - - Group and limit search results by correspondent, show “more from this” links in the results. -- **Nested tags**. Organize tags in a hierarchical structure. This will combine the benefits of folders and tags in one coherent system. -- **Localization.** I won't translate paperless into any other languages except English and German, however, I'll add the necessary means so that anyone can translate paperless into their favorite language. -- **An interactive consumer** that shows its progress for documents it processes on the web page. - - With live updates and websockets. This already works on a dev branch, but requires a lot of new dependencies, which I'm not particularly happy about. - - Notifications when a document was added with buttons to open the new document right away. -- **Arbitrary tag colors**. Allow the selection of any color with a color picker. -- **More file types**. Possibly allow more file types to be processed by paperless, such as office .odt, .doc and .docx documents. - -Apart from that, paperless is pretty much feature complete. +- Make the documentation nice. ## On the chopping block. @@ -88,7 +71,7 @@ These features will probably never make it into paperless, since paperless is me # Getting started -The recommended way to deploy paperless is docker-compose. Don't clone the repository, grab the latest release to get started instead. The dockerfiles archive contains just the docker files which will pull the image from docker hub. The source archive contains everything you need to build the docker image yourself (i.e. if you want to run on Raspberry Pi). +The recommended way to deploy paperless is docker-compose. The files in the /docker/hub directory are configured to pull the image from Docker Hub. Read the [documentation](https://paperless-ng.readthedocs.io/en/latest/setup.html#installation) on how to get started. @@ -102,6 +85,12 @@ Read the section about [migration](https://paperless-ng.readthedocs.io/en/latest The documentation for Paperless-ng is available on [ReadTheDocs](https://paperless-ng.readthedocs.io/). +# Translation + +Paperless is currently available in English, German, Dutch and French. Translation is coordinated at transifex: https://www.transifex.com/paperless/paperless-ng + +If you want to see paperless in your own language, request that language at transifex and you can start translating after I approve the language. + # Suggestions? Questions? Something not working? Please open an issue and start a discussion about it! diff --git a/ansible/README.md b/ansible/README.md new file mode 100644 index 000000000..6cd9e9f9b --- /dev/null +++ b/ansible/README.md @@ -0,0 +1,114 @@ +Ansible Role: paperless-ng +========================== + +Installs and configures paperless-ng EDMS on Debian/Ubuntu systems. + +Requirements +------------ + +No special system requirements. Ansible 2.7 or newer is required. + +Note that this role requires root access, so either run it in a playbook with a global `become: yes`, or invoke the role in your playbook like: + + - hosts: all + roles: + - role: ansible + become: yes + +Role Variables +-------------- + +Most configuration variables from paperless-ng itself are available and accept their respective arguments. +Every `PAPERLESS_*` configuration varaible is lowercased and instead prefixed with `paperlessng_*` in `defaults/main.yml`. + +For a full listing including explainations and allowed values, see the current [documentation](https://paperless-ng.readthedocs.io/en/ng-0.9.14/configuration.html). + +Additional variables available in this role are listed below, along with default values: + + paperlessng_version: 0.9.14 + +The [release](https://github.com/jonaswinkler/paperless-ng/releases) archive version of paperless-ng to install. + + paperlessng_redis_host: localhost + paperlessng_redis_port: 6379 + +Seperate configuration values that combine into `PAPERLESS_REDIS`. + + paperlessng_db_type: sqlite + +Database to use. Default is file-based SQLite. + + paperlessng_db_host: localhost + paperlessng_db_port: 5432 + paperlessng_db_name: paperlessng + paperlessng_db_user: paperlessng + paperlessng_db_pass: paperlessng + paperlessng_db_sslmode: prefer + +Database configuration (only applicable if `paperlessng_db_type == 'postgresql'`). + + paperlessng_directory: /opt/paperless-ng + +Root directory paperless-ng is installed into. + + paperlessng_virtualenv: "{{ paperlessng_directory }}/.venv" + +Directory used for the virtual environment for paperless-ng. + + paperlessng_ocr_languages: + - eng + +List of OCR languages to install and configure (`apt search tesseract-ocr-*`). + + paperlessng_use_jbig2enc: True + +Whether to install and use [jbig2enc](https://github.com/agl/jbig2enc) for OCRmyPDF. + + paperlessng_big2enc_lossy: False + +Whether to use jbig2enc's lossy compression mode. + + paperlessng_superuser_name: paperlessng + paperlessng_superuser_email: paperlessng@example.com + paperlessng_superuser_password: paperlessng + +Credentials of the initial superuser in paperless-ng. + + paperlessng_system_user: paperlessng + paperlessng_system_group: paperlessng + +System user and group to run the paperless-ng services as (will be created if required). + + paperlessng_listen_address: 127.0.0.1 + paperlessng_listen_port: 8000 + +Address and port for the paperless-ng service to listen on. + +Dependencies +------------ + +No ansible dependencies. + +Example Playbook +---------------- +`playbook.yml`: + + - hosts: all + become: yes + vars_files: + - vars/main.yml + roles: + - ansible + +`vars/main.yml`: + + paperlessng_media_root: /mnt/media/smbshare + + paperlessng_db_type: postgresql + paperlessng_db_pass: PLEASEPROVIDEASTRONGPASSWORDHERE + + paperless_secret_key: AGAINPLEASECHANGETHISNOW + + paperlessng_ocr_languages: + - eng + - deu diff --git a/ansible/defaults/main.yml b/ansible/defaults/main.yml new file mode 100644 index 000000000..83047307d --- /dev/null +++ b/ansible/defaults/main.yml @@ -0,0 +1,78 @@ +--- +paperlessng_version: 0.9.14 + +# Required services +paperlessng_redis_host: localhost +paperlessng_redis_port: 6379 +paperlessng_db_type: sqlite # or postgresql +# Below entries only apply for paperlessng_db_type=='postgresql' +paperlessng_db_host: localhost +paperlessng_db_port: 5432 +paperlessng_db_name: paperlessng +paperlessng_db_user: paperlessng +paperlessng_db_pass: paperlessng +paperlessng_db_sslmode: prefer + +# Paths and folders +paperlessng_directory: /opt/paperless-ng +paperlessng_consumption_dir: "{{ paperlessng_directory }}/consumption" +paperlessng_data_dir: "{{ paperlessng_directory }}/data" +paperlessng_media_root: "{{ paperlessng_directory }}/media" +paperlessng_static_dir: "{{ paperlessng_directory }}/static" +paperlessng_filename_format: +paperlessng_virtualenv: "{{ paperlessng_directory }}/.venv" + +# Hosting & Security +paperless_secret_key: PLEASECHANGETHISFORTHELOVEOFGOD +paperless_allowed_hosts: "*" +paperless_cors_allowed_hosts: http://localhost:8000 +paperless_force_script_name: +paperless_static_url: /static/ +paperless_auto_login_username: +paperless_cookie_prefix: "" +paperless_enable_http_remote_user: False + +# OCR settings +paperlessng_ocr_languages: + - eng +paperlessng_ocr_mode: skip +paperlessng_ocr_output_type: pdfa +paperlessng_ocr_pages: 0 +paperlessng_ocr_image_dpi: +# see https://ocrmypdf.readthedocs.io/en/latest/api.html#ocrmypdf.ocr +paperlessng_ocr_user_args: + #- "deskew": True # https://github.com/jonaswinkler/paperless-ng/issues/231 + - "optimize": 1 +paperlessng_use_jbig2enc: True +paperlessng_big2enc_lossy: False + +# Tika settings +paperlessng_tika_enabled: False +paperlessng_tika_endpoint: http://localhost:9998 +paperlessng_tika_gotenberg_endpoint: http://localhost:3000 + +# Software tweaks +paperlessng_time_zone: Europe/Berlin +paperlessng_consumer_polling: 0 +paperlessng_consumer_delete_duplicates: False +paperlessng_consumer_recursive: False +paperlessng_consumer_subdirs_as_tags: False +paperlessng_optimize_thumbnails: True +paperlessng_post_consume_script: +paperlessng_filename_date_order: +paperlessng_filename_parse_transforms: +paperlessng_thumbnail_font_name: /usr/share/fonts/liberation/LiberationSerif-Regular.ttf +paperlessng_ignore_dates: "" + +# Superuser settings +paperlessng_superuser_name: paperlessng +paperlessng_superuser_email: paperlessng@example.com +paperlessng_superuser_password: paperlessng + +# System user settings +paperlessng_system_user: paperlessng +paperlessng_system_group: paperlessng + +# Webserver settings +paperlessng_listen_address: 127.0.0.1 +paperlessng_listen_port: 8000 diff --git a/ansible/meta/main.yml b/ansible/meta/main.yml new file mode 100644 index 000000000..78a4c1a41 --- /dev/null +++ b/ansible/meta/main.yml @@ -0,0 +1,17 @@ +dependencies: [] + +galaxy_info: + author: C0nsultant + description: Bare-metal deployment of paperless-ng DMS + license: license (GPLv3) + min_ansible_version: 2.7 + + platforms: + - name: Debian + versions: + - buster + - name: Ubuntu + versions: + - focal + + galaxy_tags: [EDMS, django, python, web] diff --git a/ansible/molecule/fresh/converge.yml b/ansible/molecule/fresh/converge.yml new file mode 100644 index 000000000..99e25677b --- /dev/null +++ b/ansible/molecule/fresh/converge.yml @@ -0,0 +1,7 @@ +--- +- name: fresh installation + hosts: all + tasks: + - name: install paperless-ng with default parameters + include_role: + name: ansible diff --git a/ansible/molecule/fresh/molecule.yml b/ansible/molecule/fresh/molecule.yml new file mode 100644 index 000000000..27f37ba63 --- /dev/null +++ b/ansible/molecule/fresh/molecule.yml @@ -0,0 +1,35 @@ +--- +dependency: + name: galaxy +driver: + name: docker +platforms: + - name: ubuntu_focal + image: jrei/systemd-ubuntu:20.04 + privileged: true + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:ro + tmpfs: + - /tmp + - /run + - /run/lock + override_command: False + # ubuntu 18.04 bionic works except that + # the default redis configuration expects IPv6 which is not enabled in docker by default + # the default Python environment is configured for ASCII instead of UTF-8 + # ubuntu 16.04 xenial only has Python 3.5 which is EOL and breaks multiple dependencies + - name: debian_buster + image: jrei/systemd-debian:10 + privileged: true + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:ro + tmpfs: + - /tmp + - /run + - /run/lock + override_command: False + # debian 9 stretch only has Python 3.5 which is EOL and breaks multiple dependencies +provisioner: + name: ansible +verifier: + name: ansible diff --git a/ansible/molecule/fresh/verify.yml b/ansible/molecule/fresh/verify.yml new file mode 100644 index 000000000..c353783ab --- /dev/null +++ b/ansible/molecule/fresh/verify.yml @@ -0,0 +1,60 @@ +--- +- name: Verify + hosts: all + gather_facts: false + + vars_files: + - ../../defaults/main.yml + + tasks: + - name: check if webserver is up + uri: + url: http://localhost:8000 + status_code: [200, 302] + return_content: yes + register: landingpage + failed_when: "'Sign in' not in landingpage.content" + + - name: check if document posting works + uri: + url: http://localhost:8000/api/documents/post_document/ + method: POST + body_format: form-multipart + body: + document: + content: FOO + filename: document.txt + mime_type: text/plain + headers: + Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}' + return_content: yes + register: post_document + failed_when: "'OK' not in post_document.content" + + - name: verify uploaded document has been accepted + uri: + url: http://localhost:8000/api/logs/ + headers: + Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}' + return_content: yes + register: logs + failed_when: "'Consuming document.txt' not in logs.content" + + # assumes txt consumption finished by now, might have to sleep a bit + - name: verify uploaded document has been consumed + uri: + url: http://localhost:8000/api/logs/ + headers: + Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}' + return_content: yes + register: logs + failed_when: "'document consumption finished' not in logs.content" + + - name: verify uploaded document is avaiable + uri: + url: http://localhost:8000/api/documents/1/ + headers: + Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}' + return_content: yes + register: document + failed_when: "'Not found.' in document.content or 'FOO' not in document.content" diff --git a/ansible/molecule/update/converge.yml b/ansible/molecule/update/converge.yml new file mode 100644 index 000000000..b19a5981a --- /dev/null +++ b/ansible/molecule/update/converge.yml @@ -0,0 +1,11 @@ +--- +- name: update previous release to newest release + hosts: all + tasks: + - name: set current version as installation target + set_fact: + paperlessng_version: 0.9.14 + + - name: update to newest paperless-ng release + include_role: + name: ansible diff --git a/ansible/molecule/update/molecule.yml b/ansible/molecule/update/molecule.yml new file mode 100644 index 000000000..27f37ba63 --- /dev/null +++ b/ansible/molecule/update/molecule.yml @@ -0,0 +1,35 @@ +--- +dependency: + name: galaxy +driver: + name: docker +platforms: + - name: ubuntu_focal + image: jrei/systemd-ubuntu:20.04 + privileged: true + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:ro + tmpfs: + - /tmp + - /run + - /run/lock + override_command: False + # ubuntu 18.04 bionic works except that + # the default redis configuration expects IPv6 which is not enabled in docker by default + # the default Python environment is configured for ASCII instead of UTF-8 + # ubuntu 16.04 xenial only has Python 3.5 which is EOL and breaks multiple dependencies + - name: debian_buster + image: jrei/systemd-debian:10 + privileged: true + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:ro + tmpfs: + - /tmp + - /run + - /run/lock + override_command: False + # debian 9 stretch only has Python 3.5 which is EOL and breaks multiple dependencies +provisioner: + name: ansible +verifier: + name: ansible diff --git a/ansible/molecule/update/prepare.yml b/ansible/molecule/update/prepare.yml new file mode 100644 index 000000000..6f3734329 --- /dev/null +++ b/ansible/molecule/update/prepare.yml @@ -0,0 +1,10 @@ +- name: install previous release + hosts: all + tasks: + - name: set previous version as installation target + set_fact: + paperlessng_version: 0.9.13 + + - name: install previous paperless-ng release + include_role: + name: ansible diff --git a/ansible/molecule/update/verify.yml b/ansible/molecule/update/verify.yml new file mode 100644 index 000000000..c353783ab --- /dev/null +++ b/ansible/molecule/update/verify.yml @@ -0,0 +1,60 @@ +--- +- name: Verify + hosts: all + gather_facts: false + + vars_files: + - ../../defaults/main.yml + + tasks: + - name: check if webserver is up + uri: + url: http://localhost:8000 + status_code: [200, 302] + return_content: yes + register: landingpage + failed_when: "'Sign in' not in landingpage.content" + + - name: check if document posting works + uri: + url: http://localhost:8000/api/documents/post_document/ + method: POST + body_format: form-multipart + body: + document: + content: FOO + filename: document.txt + mime_type: text/plain + headers: + Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}' + return_content: yes + register: post_document + failed_when: "'OK' not in post_document.content" + + - name: verify uploaded document has been accepted + uri: + url: http://localhost:8000/api/logs/ + headers: + Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}' + return_content: yes + register: logs + failed_when: "'Consuming document.txt' not in logs.content" + + # assumes txt consumption finished by now, might have to sleep a bit + - name: verify uploaded document has been consumed + uri: + url: http://localhost:8000/api/logs/ + headers: + Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}' + return_content: yes + register: logs + failed_when: "'document consumption finished' not in logs.content" + + - name: verify uploaded document is avaiable + uri: + url: http://localhost:8000/api/documents/1/ + headers: + Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}' + return_content: yes + register: document + failed_when: "'Not found.' in document.content or 'FOO' not in document.content" diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml new file mode 100644 index 000000000..a353a18ec --- /dev/null +++ b/ansible/tasks/main.yml @@ -0,0 +1,454 @@ +--- +- name: verify operating system + fail: + msg: Sorry, only Debian and Ubuntu supported at the moment. + when: not(ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu') + +- name: install base dependencies + apt: + update_cache: yes + pkg: + # paperless-ng + - python3-pip + - python3-dev + - fonts-liberation + - imagemagick + - optipng + - gnupg + - libpoppler-cpp-dev + - libpq-dev + - libmagic-dev + - mime-support + # OCRmyPDF + - unpaper + - ghostscript + - icc-profiles-free + - qpdf + - liblept5 + - libxml2 + - pngquant + - zlib1g + - tesseract-ocr + # dev + - sudo + - build-essential + - python3-setuptools + - python3-wheel + - python3-virtualenv + +- name: install ocr languages + apt: + pkg: "{{ paperlessng_ocr_languages | map('regex_replace', '^(.*)$', 'tesseract-ocr-\\1') | list }}" + +- name: set up notesalexp repository key (for jbig2enc) + apt_key: + url: https://notesalexp.org/debian/alexp_key.asc + state: present + when: paperlessng_use_jbig2enc + +- name: set up notesalexp repository (for jbig2enc) + apt_repository: + repo: "deb https://notesalexp.org/debian/{{ ansible_distribution_release }}/ {{ ansible_distribution_release }} main" + state: present + when: paperlessng_use_jbig2enc + +- name: set up notesalexp repository pinning + copy: + content: | + Package: * + Pin: release o=notesalexp.org + Pin-Priority: 1 + + Package: jbig2enc + Pin: release o=notesalexp.org + Pin-Priority: 500 + dest: /etc/apt/preferences.d/notesalexp + when: paperlessng_use_jbig2enc + +- name: install jbig2enc + apt: + pkg: jbig2enc + update_cache: yes + when: paperlessng_use_jbig2enc + +- name: install redis + apt: + pkg: redis-server + when: paperlessng_redis_host == 'localhost' or paperlessng_redis_host == '127.0.0.1' + +- name: enable redis + systemd: + name: redis-server + enabled: yes + masked: no + state: started + when: paperlessng_redis_host == 'localhost' or paperlessng_redis_host == '127.0.0.1' + +- name: create paperless system group + group: + name: "{{ paperlessng_system_group }}" + +- name: create paperless system user + user: + name: "{{ paperlessng_system_user }}" + groups: + - "{{ paperlessng_system_group }}" + shell: /usr/sbin/nologin + # GNUPG_HOME required due to paperless db.py + create_home: yes + +- name: check for paperless-ng installation + command: + cmd: 'grep -Po "(?<=Paperless-ng )\d+\.\d+\.\d+" {{ paperlessng_directory }}/docs/changelog.html' + changed_when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string' + failed_when: false + ignore_errors: yes + register: paperlessng_current_version + +- name: register current state + set_fact: + fresh_installation: '{{ "No such file or directory" in paperlessng_current_version.stderr }}' + update_installation: '{{ "No such file or directory" not in paperlessng_current_version.stderr and paperlessng_current_version.stdout != paperlessng_version | string }}' + reconfigure_only: '{{ paperlessng_current_version.stdout == paperlessng_version | string }}' + +- name: backup current paperless-ng installation + copy: + src: "{{ paperlessng_directory }}" + remote_src: yes + dest: "{{ paperlessng_directory }}-{{ ansible_date_time.iso8601 }}/" + when: update_installation + +- name: remove current paperless sources + file: + path: "{{ paperlessng_directory }}/{{ item }}" + state: absent + with_items: + - docker + - docs + - scripts + - src + - static + when: update_installation + +- name: create temporary directory + tempfile: + state: directory + register: tempdir + when: not reconfigure_only + +- name: extract paperless-ng + unarchive: + src: "https://github.com/jonaswinkler/paperless-ng/releases/download/ng-{{ paperlessng_version }}/paperless-ng-{{ paperlessng_version }}.tar.xz" + remote_src: yes + dest: "{{ tempdir.path }}" + when: not reconfigure_only + +- name: change owner and permissions of paperless-ng + command: + cmd: "{{ item }}" + warn: false + with_items: + - "chown -R {{ paperlessng_system_user }}:{{ paperlessng_system_group }} {{ tempdir.path }}" + - "find {{ tempdir.path }} -type d -exec chmod 0750 {} ;" + - "find {{ tempdir.path }} -type f -exec chmod 0640 {} ;" + when: not reconfigure_only + +- name: move paperless-ng + command: + cmd: "cp -a {{ tempdir.path }}/paperless-ng/. {{ paperlessng_directory }}" + when: not reconfigure_only + +- name: remove temporary directory + file: + path: "{{ tempdir.path }}" + state: absent + when: not reconfigure_only + +- name: create paperless-ng directories and set permissions + file: + path: "{{ item }}" + state: directory + owner: "{{ paperlessng_system_user }}" + group: "{{ paperlessng_system_group }}" + mode: "750" + with_items: + - "{{ paperlessng_directory }}" + - "{{ paperlessng_consumption_dir }}" + - "{{ paperlessng_data_dir }}" + - "{{ paperlessng_media_root }}" + - "{{ paperlessng_static_dir }}" + +- name: rename initial config + command: + cmd: "mv {{ paperlessng_directory }}/paperless.conf {{ paperlessng_directory }}/paperless.conf.template" + removes: "{{ paperlessng_directory }}/paperless.conf" + +- name: configure paperless-ng + lineinfile: + path: "{{ paperlessng_directory }}/paperless.conf.template" + regexp: "^#?{{ item.regexp }}=" + line: "{{ item.line }}" + with_items: + # Required services + - regexp: PAPERLESS_REDIS + line: "PAPERLESS_REDIS=redis://{{ paperlessng_redis_host }}:{{ paperlessng_redis_port }}" + # Paths and folders + - regexp: PAPERLESS_CONSUMPTION_DIR + line: "PAPERLESS_CONSUMPTION_DIR={{ paperlessng_consumption_dir }}" + - regexp: PAPERLESS_DATA_DIR + line: "PAPERLESS_DATA_DIR={{ paperlessng_data_dir }}" + - regexp: PAPERLESS_MEDIA_ROOT + line: "PAPERLESS_MEDIA_ROOT={{ paperlessng_media_root }}" + - regexp: PAPERLESS_STATICDIR + line: "PAPERLESS_STATICDIR={{ paperlessng_static_dir }}" + - regexp: PAPERLESS_FILENAME_FORMAT + line: "PAPERLESS_FILENAME_FORMAT={{ paperlessng_filename_format }}" + # Hosting & Security + - regexp: PAPERLESS_SECRET_KEY + line: "PAPERLESS_SECRET_KEY={{ paperless_secret_key }}" + - regexp: PAPERLESS_ALLOWED_HOSTS + line: "PAPERLESS_ALLOWED_HOSTS={{ paperless_allowed_hosts }}" + - regexp: PAPERLESS_CORS_ALLOWED_HOSTS + line: "PAPERLESS_CORS_ALLOWED_HOSTS={{ paperless_cors_allowed_hosts }}" + - regexp: PAPERLESS_FORCE_SCRIPT_NAME + line: "PAPERLESS_FORCE_SCRIPT_NAME={{ paperless_force_script_name }}" + - regexp: PAPERLESS_STATIC_URL + line: "PAPERLESS_STATIC_URL={{ paperless_static_url }}" + - regexp: PAPERLESS_AUTO_LOGIN_USERNAME + line: "PAPERLESS_AUTO_LOGIN_USERNAME={{ paperless_auto_login_username }}" + - regexp: PAPERLESS_COOKIE_PREFIX + line: "PAPERLESS_COOKIE_PREFIX={{ paperless_cookie_prefix }}" + - regexp: PAPERLESS_ENABLE_HTTP_REMOTE_USER + line: "PAPERLESS_ENABLE_HTTP_REMOTE_USER={{ paperless_enable_http_remote_user }}" + # OCR settings + - regexp: PAPERLESS_OCR_LANGUAGE + line: "PAPERLESS_OCR_LANGUAGE={{ paperlessng_ocr_languages | join('+') }}" + - regexp: PAPERLESS_OCR_MODE + line: "PAPERLESS_OCR_MODE={{ paperlessng_ocr_mode }}" + - regexp: PAPERLESS_OCR_OUTPUT_TYPE + line: "PAPERLESS_OCR_OUTPUT_TYPE={{ paperlessng_ocr_output_type }}" + - regexp: PAPERLESS_OCR_PAGES + line: "PAPERLESS_OCR_PAGES={{ paperlessng_ocr_pages }}" + - regexp: PAPERLESS_OCR_IMAGE_DPI + line: "PAPERLESS_OCR_IMAGE_DPI={{ paperlessng_ocr_image_dpi }}" + - regexp: PAPERLESS_OCR_USER_ARGS + line: "PAPERLESS_OCR_USER_ARGS={{ paperlessng_ocr_user_args | combine({'jbig2_lossy': true} if paperlessng_big2enc_lossy else {}) | to_json }}" + # Tika settings + - regexp: PAPERLESS_TIKA_ENABLED + line: "PAPERLESS_TIKA_ENABLED={{ paperlessng_tika_enabled }}" + - regexp: PAPERLESS_TIKA_ENDPOINT + line: "PAPERLESS_TIKA_ENDPOINT={{ paperlessng_tika_endpoint }}" + - regexp: PAPERLESS_TIKA_GOTENBERG_ENDPOINT + line: "PAPERLESS_TIKA_GOTENBERG_ENDPOINT={{ paperlessng_tika_endpoint }}" + # Software tweaks + - regexp: PAPERLESS_TIME_ZONE + line: "PAPERLESS_TIME_ZONE={{ paperlessng_time_zone }}" + - regexp: PAPERLESS_CONSUMER_POLLING + line: "PAPERLESS_CONSUMER_POLLING={{ paperlessng_consumer_polling }}" + - regexp: PAPERLESS_CONSUMER_DELETE_DUPLICATES + line: "PAPERLESS_CONSUMER_DELETE_DUPLICATES={{ paperlessng_consumer_delete_duplicates }}" + - regexp: PAPERLESS_CONSUMER_RECURSIVE + line: "PAPERLESS_CONSUMER_RECURSIVE={{ paperlessng_consumer_recursive }}" + - regexp: PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS + line: "PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS={{ paperlessng_consumer_subdirs_as_tags }}" + - regexp: PAPERLESS_OPTIMIZE_THUMBNAILS + line: "PAPERLESS_OPTIMIZE_THUMBNAILS={{ paperlessng_optimize_thumbnails }}" + - regexp: PAPERLESS_POST_CONSUME_SCRIPT + line: "PAPERLESS_POST_CONSUME_SCRIPT={{ paperlessng_post_consume_script }}" + - regexp: PAPERLESS_FILENAME_DATE_ORDER + line: "PAPERLESS_FILENAME_DATE_ORDER={{ paperlessng_filename_date_order }}" + - regexp: PAPERLESS_THUMBNAIL_FONT_NAME + line: "PAPERLESS_THUMBNAIL_FONT_NAME={{ paperlessng_thumbnail_font_name }}" + - regexp: PAPERLESS_IGNORE_DATES + line: "PAPERLESS_IGNORE_DATES={{ paperlessng_ignore_dates }}" + no_log: yes + +- name: configure paperless-ng database [sqlite] + lineinfile: + path: "{{ paperlessng_directory }}/paperless.conf.template" + regexp: "^#?PAPERLESS_DBHOST=(.*)$" + line: '#PAPERLESS_DBHOST=\1' + backrefs: yes + when: paperlessng_db_type == 'sqlite' + +- name: configure paperless-ng database [postgresql] + lineinfile: + path: "{{ paperlessng_directory }}/paperless.conf.template" + regexp: "^#?{{ item.regexp }}=" + line: "{{ item.line }}" + with_items: + - regexp: PAPERLESS_DBHOST + line: "PAPERLESS_DBHOST={{ paperlessng_db_host }}" + - regexp: PAPERLESS_DBPORT + line: "PAPERLESS_DBPORT={{ paperlessng_db_port }}" + - regexp: PAPERLESS_DBNAME + line: "PAPERLESS_DBNAME={{ paperlessng_db_name }}" + - regexp: PAPERLESS_DBUSER + line: "PAPERLESS_DBUSER={{ paperlessng_db_user }}" + - regexp: PAPERLESS_DBPASS + line: "PAPERLESS_DBPASS={{ paperlessng_db_pass }}" + - regexp: PAPERLESS_DBSSLMODE + line: "PAPERLESS_DBSSLMODE={{ paperlessng_db_sslmode }}" + when: paperlessng_db_type == 'postgresql' + no_log: yes + +- name: deploy paperless-ng configuration + copy: + src: "{{ paperlessng_directory }}/paperless.conf.template" + remote_src: yes + dest: /etc/paperless.conf + owner: root + group: root + mode: "0644" + register: configuration + +- name: create paperlessng venv + become: yes + become_user: "{{ paperlessng_system_user }}" + command: + cmd: "python3 -m virtualenv {{ paperlessng_virtualenv }} -p /usr/bin/python3" + creates: "{{ paperlessng_virtualenv }}" + register: venv + +- name: install paperlessng requirements + become: yes + become_user: "{{ paperlessng_system_user }}" + pip: + requirements: "{{ paperlessng_directory }}/requirements.txt" + executable: "{{ paperlessng_virtualenv }}/bin/pip3" + extra_args: --upgrade + when: not reconfigure_only + +- name: migrate database schema + become: yes + become_user: "{{ paperlessng_system_user }}" + command: "{{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py migrate" + register: database_schema + changed_when: '"No migrations to apply." not in database_schema.stdout' + when: not reconfigure_only + +- name: configure paperless superuser + become: yes + become_user: "{{ paperlessng_system_user }}" + # "manage.py createsuperuser" only works on interactive TTYs + vars: + creation_script: | + from django.contrib.auth.models import User + from django.contrib.auth.hashers import get_hasher + + if User.objects.filter(username='{{ paperlessng_superuser_name }}').exists(): + user = User.objects.get(username='{{ paperlessng_superuser_name }}') + old = user.__dict__.copy() + + user.is_superuser = True + user.email = '{{ paperlessng_superuser_email }}' + user.set_password('{{ paperlessng_superuser_password }}') + user.save() + new = user.__dict__ + + algorithm, iterations, old_salt, old_hash = old['password'].split('$') + new_password_old_salt = get_hasher(algorithm).encode(password='{{ paperlessng_superuser_password }}', salt=old_salt, iterations=int(iterations)) + _, _, _, new_hash = new_password_old_salt.split('$') + if not (old_hash == new_hash and old['is_superuser'] == new['is_superuser'] and old['email'] == new['email']): + print('changed') + else: + User.objects.create_superuser('{{ paperlessng_superuser_name }}', '{{ paperlessng_superuser_email }}', '{{ paperlessng_superuser_password }}') + print('changed') + command: '{{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py shell -c "{{ creation_script }}"' + register: superuser + changed_when: superuser.stdout == 'changed' + no_log: yes + +- name: set ownership and permissions on paperlessng venv + file: + path: "{{ paperlessng_virtualenv }}" + state: directory + recurse: yes + owner: "{{ paperlessng_system_user }}" + group: "{{ paperlessng_system_group }}" + mode: g-w,o-rwx + when: venv.changed or not reconfigure_only + +- name: configure ghostscript for PDF + lineinfile: + path: /etc/ImageMagick-6/policy.xml + regexp: '(\s+)' + line: '\1' + backrefs: yes + +- name: configure systemd services + ini_file: + path: "{{ paperlessng_directory }}/scripts/{{ item[0] }}" + section: "Service" + option: "{{ item[1].option }}" + value: "{{ item[1].value }}" + with_nested: + - [ + paperless-consumer.service, + paperless-scheduler.service, + paperless-webserver.service, + ] + - [ + # https://www.freedesktop.org/software/systemd/man/systemd.exec.html + { option: "User", value: "{{ paperlessng_system_user }}" }, + { option: "Group", value: "{{ paperlessng_system_group }}" }, + { option: "WorkingDirectory", value: "{{ paperlessng_directory }}/src", }, + { option: "ProtectSystem", value: "full" }, + { option: "NoNewPrivileges", value: "true" }, + { option: "PrivateUsers", value: "true" }, + { option: "PrivateDevices", value: "true" }, + ] + +- name: configure paperless-consumer service + ini_file: + path: "{{ paperlessng_directory }}/scripts/paperless-consumer.service" + section: "Service" + option: "ExecStart" + value: "{{ paperlessng_virtualenv }}/bin/python3 manage.py document_consumer" + +- name: configure paperless-scheduler service + ini_file: + path: "{{ paperlessng_directory }}/scripts/paperless-scheduler.service" + section: "Service" + option: "ExecStart" + value: "{{ paperlessng_virtualenv }}/bin/python3 manage.py qcluster" + +- name: configure paperless-webserver service + ini_file: + path: "{{ paperlessng_directory }}/scripts/paperless-webserver.service" + section: "Service" + option: "ExecStart" + value: "{{ paperlessng_virtualenv }}/bin/gunicorn paperless.wsgi -w 2 -b {{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}" + +- name: copy systemd services + copy: + src: "{{ paperlessng_directory }}/scripts/{{ item }}" + remote_src: yes + dest: "/etc/systemd/system/{{ item }}" + with_items: + - paperless-consumer.service + - paperless-scheduler.service + - paperless-webserver.service + register: paperless_services + +- name: reload systemd daemon + systemd: + name: "{{ item }}" + state: restarted + daemon_reload: yes + with_items: + - paperless-consumer + - paperless-scheduler + - paperless-webserver + when: paperless_services.changed or configuration.changed + +- name: enable paperlessng services + systemd: + name: "{{ item }}" + enabled: yes + masked: no + state: started + with_items: + - paperless-consumer + - paperless-scheduler + - paperless-webserver diff --git a/compile-frontend.sh b/compile-frontend.sh new file mode 100755 index 000000000..98b88d033 --- /dev/null +++ b/compile-frontend.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +set -e + +cd src-ui +npm install +./node_modules/.bin/ng build --prod diff --git a/crowdin.yml b/crowdin.yml new file mode 100644 index 000000000..f5a7765dd --- /dev/null +++ b/crowdin.yml @@ -0,0 +1,5 @@ +files: + - source: /src/locale/en-us/LC_MESSAGES/django.po + translation: /src/locale/%two_letters_code%/LC_MESSAGES/django.po + - source: /src-ui/messages.xlf + translation: /src-ui/src/locale/messages.%two_letters_code%.xlf diff --git a/docker/compose/.env b/docker/compose/.env new file mode 100644 index 000000000..511a1386d --- /dev/null +++ b/docker/compose/.env @@ -0,0 +1 @@ +COMPOSE_PROJECT_NAME=paperless \ No newline at end of file diff --git a/docker/docker-compose.env b/docker/compose/docker-compose.env similarity index 95% rename from docker/docker-compose.env rename to docker/compose/docker-compose.env index 4271bce6e..e9e8ecb06 100644 --- a/docker/docker-compose.env +++ b/docker/compose/docker-compose.env @@ -7,7 +7,7 @@ # Additional languages to install for text recognition, separated by a # whitespace. Note that this is # different from PAPERLESS_OCR_LANGUAGE (default=eng), which defines the -# default language used when guessing the language from the OCR output. +# language used for OCR. # The container installs English, German, Italian, Spanish and French by # default. # See https://packages.debian.org/search?keywords=tesseract-ocr-&searchon=names&suite=buster diff --git a/docker/compose/docker-compose.postgres-tika.yml b/docker/compose/docker-compose.postgres-tika.yml new file mode 100644 index 000000000..93fff4afc --- /dev/null +++ b/docker/compose/docker-compose.postgres-tika.yml @@ -0,0 +1,90 @@ +# docker-compose file for running paperless from the Docker Hub. +# This file contains everything paperless needs to run. +# Paperless supports amd64, arm and arm64 hardware. +# +# All compose files of paperless configure paperless in the following way: +# +# - Paperless is (re)started on system boot, if it was running before shutdown. +# - Docker volumes for storing data are managed by Docker. +# - Folders for importing and exporting files are created in the same directory +# as this file and mounted to the correct folders inside the container. +# - Paperless listens on port 8000. +# +# In addition to that, this docker-compose file adds the following optional +# configurations: +# +# - Instead of SQLite (default), PostgreSQL is used as the database server. +# - Apache Tika and Gotenberg servers are started with paperless and paperless +# is configured to use these services. These provide support for consuming +# Office documents (Word, Excel, Power Point and their LibreOffice counter- +# parts. +# +# To install and update paperless with this file, do the following: +# +# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env' +# and '.env' into a folder. +# - Run 'docker-compose pull'. +# - Run 'docker-compose run --rm webserver createsuperuser' to create a user. +# - Run 'docker-compose up -d'. +# +# For more extensive installation and update instructions, refer to the +# documentation. + +version: "3.4" +services: + broker: + image: redis:6.0 + restart: unless-stopped + + db: + image: postgres:13 + restart: unless-stopped + volumes: + - pgdata:/var/lib/postgresql/data + environment: + POSTGRES_DB: paperless + POSTGRES_USER: paperless + POSTGRES_PASSWORD: paperless + + webserver: + image: jonaswinkler/paperless-ng:latest + restart: unless-stopped + depends_on: + - db + - broker + - gotenberg + - tika + ports: + - 8000:8000 + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:8000"] + interval: 30s + timeout: 10s + retries: 5 + volumes: + - data:/usr/src/paperless/data + - media:/usr/src/paperless/media + - ./export:/usr/src/paperless/export + - ./consume:/usr/src/paperless/consume + env_file: docker-compose.env + environment: + PAPERLESS_REDIS: redis://broker:6379 + PAPERLESS_DBHOST: db + PAPERLESS_TIKA_ENABLED: 1 + PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000 + PAPERLESS_TIKA_ENDPOINT: http://tika:9998 + + gotenberg: + image: thecodingmachine/gotenberg + restart: unless-stopped + environment: + DISABLE_GOOGLE_CHROME: 1 + + tika: + image: apache/tika + restart: unless-stopped + +volumes: + data: + media: + pgdata: diff --git a/docker/compose/docker-compose.postgres.yml b/docker/compose/docker-compose.postgres.yml new file mode 100644 index 000000000..da33b4c25 --- /dev/null +++ b/docker/compose/docker-compose.postgres.yml @@ -0,0 +1,72 @@ +# docker-compose file for running paperless from the Docker Hub. +# This file contains everything paperless needs to run. +# Paperless supports amd64, arm and arm64 hardware. +# +# All compose files of paperless configure paperless in the following way: +# +# - Paperless is (re)started on system boot, if it was running before shutdown. +# - Docker volumes for storing data are managed by Docker. +# - Folders for importing and exporting files are created in the same directory +# as this file and mounted to the correct folders inside the container. +# - Paperless listens on port 8000. +# +# In addition to that, this docker-compose file adds the following optional +# configurations: +# +# - Instead of SQLite (default), PostgreSQL is used as the database server. +# +# To install and update paperless with this file, do the following: +# +# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env' +# and '.env' into a folder. +# - Run 'docker-compose pull'. +# - Run 'docker-compose run --rm webserver createsuperuser' to create a user. +# - Run 'docker-compose up -d'. +# +# For more extensive installation and update instructions, refer to the +# documentation. + +version: "3.4" +services: + broker: + image: redis:6.0 + restart: unless-stopped + + db: + image: postgres:13 + restart: unless-stopped + volumes: + - pgdata:/var/lib/postgresql/data + environment: + POSTGRES_DB: paperless + POSTGRES_USER: paperless + POSTGRES_PASSWORD: paperless + + webserver: + image: jonaswinkler/paperless-ng:latest + restart: unless-stopped + depends_on: + - db + - broker + ports: + - 8000:8000 + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:8000"] + interval: 30s + timeout: 10s + retries: 5 + volumes: + - data:/usr/src/paperless/data + - media:/usr/src/paperless/media + - ./export:/usr/src/paperless/export + - ./consume:/usr/src/paperless/consume + env_file: docker-compose.env + environment: + PAPERLESS_REDIS: redis://broker:6379 + PAPERLESS_DBHOST: db + + +volumes: + data: + media: + pgdata: diff --git a/docker/compose/docker-compose.sqlite-tika.yml b/docker/compose/docker-compose.sqlite-tika.yml new file mode 100644 index 000000000..5dfff0830 --- /dev/null +++ b/docker/compose/docker-compose.sqlite-tika.yml @@ -0,0 +1,78 @@ +# docker-compose file for running paperless from the Docker Hub. +# This file contains everything paperless needs to run. +# Paperless supports amd64, arm and arm64 hardware. +# +# All compose files of paperless configure paperless in the following way: +# +# - Paperless is (re)started on system boot, if it was running before shutdown. +# - Docker volumes for storing data are managed by Docker. +# - Folders for importing and exporting files are created in the same directory +# as this file and mounted to the correct folders inside the container. +# - Paperless listens on port 8000. +# +# SQLite is used as the database. The SQLite file is stored in the data volume. +# +# In addition to that, this docker-compose file adds the following optional +# configurations: +# +# - Apache Tika and Gotenberg servers are started with paperless and paperless +# is configured to use these services. These provide support for consuming +# Office documents (Word, Excel, Power Point and their LibreOffice counter- +# parts. +# +# To install and update paperless with this file, do the following: +# +# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env' +# and '.env' into a folder. +# - Run 'docker-compose pull'. +# - Run 'docker-compose run --rm webserver createsuperuser' to create a user. +# - Run 'docker-compose up -d'. +# +# For more extensive installation and update instructions, refer to the +# documentation. + +version: "3.4" +services: + broker: + image: redis:6.0 + restart: unless-stopped + + webserver: + image: jonaswinkler/paperless-ng:latest + restart: unless-stopped + depends_on: + - broker + - gotenberg + - tika + ports: + - 8000:8000 + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:8000"] + interval: 30s + timeout: 10s + retries: 5 + volumes: + - data:/usr/src/paperless/data + - media:/usr/src/paperless/media + - ./export:/usr/src/paperless/export + - ./consume:/usr/src/paperless/consume + env_file: docker-compose.env + environment: + PAPERLESS_REDIS: redis://broker:6379 + PAPERLESS_TIKA_ENABLED: 1 + PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000 + PAPERLESS_TIKA_ENDPOINT: http://tika:9998 + + gotenberg: + image: thecodingmachine/gotenberg + restart: unless-stopped + environment: + DISABLE_GOOGLE_CHROME: 1 + + tika: + image: apache/tika + restart: unless-stopped + +volumes: + data: + media: diff --git a/docker/compose/docker-compose.sqlite.yml b/docker/compose/docker-compose.sqlite.yml new file mode 100644 index 000000000..f49e1d1e9 --- /dev/null +++ b/docker/compose/docker-compose.sqlite.yml @@ -0,0 +1,56 @@ +# docker-compose file for running paperless from the Docker Hub. +# This file contains everything paperless needs to run. +# Paperless supports amd64, arm and arm64 hardware. +# +# All compose files of paperless configure paperless in the following way: +# +# - Paperless is (re)started on system boot, if it was running before shutdown. +# - Docker volumes for storing data are managed by Docker. +# - Folders for importing and exporting files are created in the same directory +# as this file and mounted to the correct folders inside the container. +# - Paperless listens on port 8000. +# +# SQLite is used as the database. The SQLite file is stored in the data volume. +# +# To install and update paperless with this file, do the following: +# +# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env' +# and '.env' into a folder. +# - Run 'docker-compose pull'. +# - Run 'docker-compose run --rm webserver createsuperuser' to create a user. +# - Run 'docker-compose up -d'. +# +# For more extensive installation and update instructions, refer to the +# documentation. + +version: "3.4" +services: + broker: + image: redis:6.0 + restart: unless-stopped + + webserver: + image: jonaswinkler/paperless-ng:latest + restart: unless-stopped + depends_on: + - broker + ports: + - 8000:8000 + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:8000"] + interval: 30s + timeout: 10s + retries: 5 + volumes: + - data:/usr/src/paperless/data + - media:/usr/src/paperless/media + - ./export:/usr/src/paperless/export + - ./consume:/usr/src/paperless/consume + env_file: docker-compose.env + environment: + PAPERLESS_REDIS: redis://broker:6379 + + +volumes: + data: + media: diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 13a0ba035..5919b14aa 100644 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -62,6 +62,7 @@ migrations() { # simultaneously. This also ensures that the db is ready when the command # of the current container starts. flock 200 + echo "Apply database migrations..." sudo -HEu paperless python3 manage.py migrate ) 200>/usr/src/paperless/data/migration_lock @@ -78,13 +79,19 @@ initialize() { fi done + echo "creating directory /tmp/paperless" + mkdir -p /tmp/paperless + chown -R paperless:paperless ../ + chown -R paperless:paperless /tmp/paperless migrations } install_languages() { + echo "Installing languages..." + local langs="$1" read -ra langs <<<"$langs" @@ -119,6 +126,8 @@ install_languages() { done } +echo "Paperless-ng docker container starting..." + # Install additional languages if specified if [[ ! -z "$PAPERLESS_OCR_LANGUAGES" ]]; then install_languages "$PAPERLESS_OCR_LANGUAGES" @@ -127,8 +136,10 @@ fi initialize if [[ "$1" != "/"* ]]; then + echo Executing management command "$@" exec sudo -HEu paperless python3 manage.py "$@" else + echo Executing "$@" exec "$@" fi diff --git a/docker/hub/docker-compose.postgres.yml b/docker/hub/docker-compose.postgres.yml deleted file mode 100644 index 0779cea22..000000000 --- a/docker/hub/docker-compose.postgres.yml +++ /dev/null @@ -1,44 +0,0 @@ -version: "3.4" -services: - broker: - image: redis:6.0 - restart: always - - db: - image: postgres:13 - restart: always - volumes: - - pgdata:/var/lib/postgresql/data - environment: - POSTGRES_DB: paperless - POSTGRES_USER: paperless - POSTGRES_PASSWORD: paperless - - webserver: - image: jonaswinkler/paperless-ng:0.9.11 - restart: always - depends_on: - - db - - broker - ports: - - 8000:8000 - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8000"] - interval: 30s - timeout: 10s - retries: 5 - volumes: - - data:/usr/src/paperless/data - - media:/usr/src/paperless/media - - ./export:/usr/src/paperless/export - - ./consume:/usr/src/paperless/consume - env_file: docker-compose.env - environment: - PAPERLESS_REDIS: redis://broker:6379 - PAPERLESS_DBHOST: db - - -volumes: - data: - media: - pgdata: diff --git a/docker/hub/docker-compose.sqlite.yml b/docker/hub/docker-compose.sqlite.yml deleted file mode 100644 index 3eed96cc3..000000000 --- a/docker/hub/docker-compose.sqlite.yml +++ /dev/null @@ -1,31 +0,0 @@ -version: "3.4" -services: - broker: - image: redis:6.0 - restart: always - - webserver: - image: jonaswinkler/paperless-ng:0.9.11 - restart: always - depends_on: - - broker - ports: - - 8000:8000 - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8000"] - interval: 30s - timeout: 10s - retries: 5 - volumes: - - data:/usr/src/paperless/data - - media:/usr/src/paperless/media - - ./export:/usr/src/paperless/export - - ./consume:/usr/src/paperless/consume - env_file: docker-compose.env - environment: - PAPERLESS_REDIS: redis://broker:6379 - - -volumes: - data: - media: diff --git a/docker/hub/docker-compose.tika.yml b/docker/hub/docker-compose.tika.yml deleted file mode 100644 index af8f575a0..000000000 --- a/docker/hub/docker-compose.tika.yml +++ /dev/null @@ -1,43 +0,0 @@ -version: "3.4" -services: - broker: - image: redis:6.0 - restart: always - - webserver: - image: jonaswinkler/paperless-ng:0.9.9 - restart: always - depends_on: - - broker - ports: - - 8000:8000 - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8000"] - interval: 30s - timeout: 10s - retries: 5 - volumes: - - data:/usr/src/paperless/data - - media:/usr/src/paperless/media - - ./export:/usr/src/paperless/export - - ./consume:/usr/src/paperless/consume - env_file: docker-compose.env - environment: - PAPERLESS_REDIS: redis://broker:6379 - PAPERLESS_TIKA_ENABLED: 1 - PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000 - PAPERLESS_TIKA_ENDPOINT: http://tika:9998 - - gotenberg: - image: thecodingmachine/gotenberg - restart: unless-stopped - environment: - DISABLE_GOOGLE_CHROME: 1 - - tika: - image: apache/tika - restart: unless-stopped - -volumes: - data: - media: diff --git a/docker/local/docker-compose.postgres.yml b/docker/local/docker-compose.postgres.yml deleted file mode 100644 index 59ae28939..000000000 --- a/docker/local/docker-compose.postgres.yml +++ /dev/null @@ -1,44 +0,0 @@ -version: "3.4" -services: - broker: - image: redis:6.0 - restart: always - - db: - image: postgres:13 - restart: always - volumes: - - pgdata:/var/lib/postgresql/data - environment: - POSTGRES_DB: paperless - POSTGRES_USER: paperless - POSTGRES_PASSWORD: paperless - - webserver: - build: . - restart: always - depends_on: - - db - - broker - ports: - - 8000:8000 - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8000"] - interval: 30s - timeout: 10s - retries: 5 - volumes: - - data:/usr/src/paperless/data - - media:/usr/src/paperless/media - - ./export:/usr/src/paperless/export - - ./consume:/usr/src/paperless/consume - env_file: docker-compose.env - environment: - PAPERLESS_REDIS: redis://broker:6379 - PAPERLESS_DBHOST: db - - -volumes: - data: - media: - pgdata: diff --git a/docker/local/docker-compose.sqlite.yml b/docker/local/docker-compose.sqlite.yml deleted file mode 100644 index 2d21fa3f1..000000000 --- a/docker/local/docker-compose.sqlite.yml +++ /dev/null @@ -1,31 +0,0 @@ -version: "3.4" -services: - broker: - image: redis:6.0 - restart: always - - webserver: - build: . - restart: always - depends_on: - - broker - ports: - - 8000:8000 - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8000"] - interval: 30s - timeout: 10s - retries: 5 - volumes: - - data:/usr/src/paperless/data - - media:/usr/src/paperless/media - - ./export:/usr/src/paperless/export - - ./consume:/usr/src/paperless/consume - env_file: docker-compose.env - environment: - PAPERLESS_REDIS: redis://broker:6379 - - -volumes: - data: - media: diff --git a/docker/local/docker-compose.tika.yml b/docker/local/docker-compose.tika.yml deleted file mode 100644 index 889713908..000000000 --- a/docker/local/docker-compose.tika.yml +++ /dev/null @@ -1,43 +0,0 @@ -version: "3.4" -services: - broker: - image: redis:6.0 - restart: always - - webserver: - build: . - restart: always - depends_on: - - broker - ports: - - 8000:8000 - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8000"] - interval: 30s - timeout: 10s - retries: 5 - volumes: - - data:/usr/src/paperless/data - - media:/usr/src/paperless/media - - ./export:/usr/src/paperless/export - - ./consume:/usr/src/paperless/consume - env_file: docker-compose.env - environment: - PAPERLESS_REDIS: redis://broker:6379 - PAPERLESS_TIKA_ENABLED: 1 - PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000 - PAPERLESS_TIKA_ENDPOINT: http://tika:9998 - - gotenberg: - image: thecodingmachine/gotenberg - restart: unless-stopped - environment: - DISABLE_GOOGLE_CHROME: 1 - - tika: - image: apache/tika - restart: unless-stopped - -volumes: - data: - media: diff --git a/docs/administration.rst b/docs/administration.rst index 727d9a9d5..14b986e82 100644 --- a/docs/administration.rst +++ b/docs/administration.rst @@ -20,6 +20,8 @@ Options available to any installation of paperless: metadata to a specific folder. You may import your documents into a fresh instance of paperless again or store your documents in another DMS with this export. +* The document exporter is also able to update an already existing export. + Therefore, incremental backups with ``rsync`` are entirely possible. Options available to docker installations: @@ -48,16 +50,16 @@ Options available to bare-metal and non-docker installations: Restoring ========= - - - .. _administration-updating: -Updating paperless +Updating Paperless ################## +Docker Route +============ + If a new release of paperless-ng is available, upgrading depends on how you -installed paperless-ng in the first place. The releases are available at +installed paperless-ng in the first place. The releases are available at the `release page `_. First of all, ensure that paperless is stopped. @@ -69,58 +71,54 @@ First of all, ensure that paperless is stopped. After that, :ref:`make a backup `. -A. If you used the dockerfiles archive, simply download the files of the new release, - adjust the settings in the files (i.e., the path to your consumption directory), - and replace your existing docker-compose files. Then start paperless as usual, - which will pull the new image, and update your database, if necessary: +A. If you pull the image from the docker hub, all you need to do is: .. code:: shell-session - $ cd /path/to/paperless + $ docker-compose pull $ docker-compose up - If you see everything working, you can start paperless-ng with "-d" to have it - run in the background. + The docker-compose files refer to the ``latest`` version, which is always the latest + stable release. - .. hint:: - - The released docker-compose files specify exact versions to be pulled from the hub. - This is to ensure that if the docker-compose files should change at some point - (i.e., services updates/configured differently), you wont run into trouble due to - docker pulling the ``latest`` image and running it in an older environment. - -B. If you built the image yourself, grab the new archive and replace your current - paperless folder with the new contents. - - After that, make the necessary adjustments to the docker-compose.yml (i.e., - adjust your consumption directory). - - Build and start the new image with: +B. If you built the image yourself, do the following: .. code:: shell-session - $ cd /path/to/paperless + $ git pull + $ ./compile-frontend.sh $ docker-compose build $ docker-compose up - If you see everything working, you can start paperless-ng with "-d" to have it - run in the background. +Running ``docker-compose up`` will also apply any new database migrations. +If you see everything working, press CTRL+C once to gracefully stop paperless. +Then you can start paperless-ng with ``-d`` to have it run in the background. -.. hint:: + .. note:: - You can usually keep your ``docker-compose.env`` file, since this file will - never include mandatory configuration options. However, it is worth checking - out the new version of this file, since it might have new recommendations - on what to configure. + In version 0.9.14, the update process was changed. In 0.9.13 and earlier, the + docker-compose files specified exact versions and pull won't automatically + update to newer versions. In order to enable updates as described above, either + get the new ``docker-compose.yml`` file from `here `_ + or edit the ``docker-compose.yml`` file, find the line that says + + .. code:: + image: jonaswinkler/paperless-ng:0.9.x + + and replace the version with ``latest``: -Updating paperless without docker -================================= + .. code:: + + image: jonaswinkler/paperless-ng:latest + +Bare Metal Route +================ After grabbing the new release and unpacking the contents, do the following: 1. Update dependencies. New paperless version may require additional - dependencies. The dependencies required are listed in the section about + dependencies. The dependencies required are listed in the section about :ref:`bare metal installations `. 2. Update python requirements. If you use Pipenv, this is done with the following steps. @@ -135,27 +133,52 @@ After grabbing the new release and unpacking the contents, do the following: This creates a new virtual environment (or uses your existing environment) and installs all dependencies into it. -3. Collect static files. + You can also use the included ``requirements.txt`` file instead and create the virtual + environment yourself. This file includes exactly the same dependencies. - .. code:: shell-session - - $ cd src - $ pipenv run python3 manage.py collectstatic --clear - -4. Migrate the database. +3. Migrate the database. .. code:: shell-session $ cd src $ pipenv run python3 manage.py migrate - -5. Update translation files. + + This might not actually do anything. Not every new paperless version comes with new + database migrations. + +Ansible Route +============= + +Most of the update process is automated when using the ansible role. + +1. Backup your defined role variables file outside the paperless source-tree: .. code:: shell-session - $ cd src - $ pipenv run python3 manage.py compilemessages - + $ cp ansible/vars.yml ~/vars.yml.old + +2. Pull the release tag you want to update to: + + .. code:: shell-session + + $ git fetch --all + $ git checkout ng-0.9.14 + +3. Update the role variable definitions ``ansible/vars.yml`` (where appropriate). + +4. Run the ansible playbook you created created during :ref:`installation ` again: + + .. note:: + + When ansible detects that an update run is in progress, it backs up the entire ``paperlessng_directory`` to ``paperlessng_directory-TIMESTAMP``. + Updates can be rolled back by simply moving the timestamped folder back to the original location. + If the update succeeds and you want to continue using the new release, please don't forget to delete the backup folder. + + .. code:: shell-session + + $ ansible-playbook playbook.yml + + Management utilities #################### @@ -189,8 +212,13 @@ backup or migration to another DMS. .. code:: - document_exporter target + document_exporter target [-c] [-f] [-d] + optional arguments: + -c, --compare-checksums + -f, --use-filename-format + -d, --delete + ``target`` is a folder to which the data gets written. This includes documents, thumbnails and a ``manifest.json`` file. The manifest contains all metadata from the database (correspondents, tags, etc). @@ -199,6 +227,24 @@ When you use the provided docker compose script, specify ``../export`` as the target. This path inside the container is automatically mounted on your host on the folder ``export``. +If the target directory already exists and contains files, paperless will assume +that the contents of the export directory are a previous export and will attempt +to update the previous export. Paperless will only export changed and added files. +Paperless determines whether a file has changed by inspecting the file attributes +"date/time modified" and "size". If that does not work out for you, specify +``--compare-checksums`` and paperless will attempt to compare file checksums instead. +This is slower. + +Paperless will not remove any existing files in the export directory. If you want +paperless to also remove files that do not belong to the current export such as files +from deleted documents, specify ``--delete``. Be careful when pointing paperless to +a directory that already contains other files. + +The filenames generated by this command follow the format +``[date created] [correspondent] [title].[extension]``. +If you want paperless to use ``PAPERLESS_FILENAME_FORMAT`` for exported filenames +instead, specify ``--use-filename-format``. + .. _utilities-importer: @@ -393,7 +439,7 @@ Documents can be stored in Paperless using GnuPG encryption. Furthermore, the entire text content of the documents is stored plain in the database, even if your documents are encrypted. Filenames are not encrypted as well. - + Also, the web server provides transparent access to your encrypted documents. Consider running paperless on an encrypted filesystem instead, which will then @@ -418,4 +464,4 @@ Basic usage to disable encryption of your document store: decrypt_documents [--passphrase SECR3TP4SSPHRA$E] -.. _Pipenv: https://pipenv.pypa.io/en/latest/ \ No newline at end of file +.. _Pipenv: https://pipenv.pypa.io/en/latest/ diff --git a/docs/changelog.rst b/docs/changelog.rst index 2b9d1b5bf..28bcc00e6 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -5,6 +5,83 @@ Changelog ********* +paperless-ng 1.0.0 +################## + +Nothing special about this release, but since there are relatively few bug reports coming in, I think that this is reasonably stable. + +* Document export + + * The document exporter has been rewritten to support updating an already existing export in place. + This enables incremental backups with ``rsync``. + * The document exporter supports naming exported files according to ``PAPERLESS_FILENAME_FORMAT``. + * The document exporter locks the media directory and the database during execution to ensure that + the resulting export is consistent. + * See the :ref:`updated documentation ` for more details. + +* Other changes and additions + + * Added a language selector to the settings. + * Added date format options to the settings. + * Range selection with shift clicking is now possible in the document list. + * Filtering correspondent, type and tag management pages by name. + * Focus "Name" field in dialogs by default. + + +paperless-ng 0.9.14 +################### + +Starting with this version, releases are getting built automatically. This release also comes with changes on how to install and +update paperless. + +* Paperless now uses GitHub Actions to make releases and build docker images. + + * Docker images are available for amd64, armhf, and aarch64. + * When you pull an image from Docker Hub, Docker will automatically select the correct image for you. + +* Changes to docker installations and updates + + * The ``-dockerfiles.tar.xz`` release archive is gone. Instead, simply grab the docker files from ``/docker/compose`` in the repository + if you wish to install paperless by pulling from the hub. + * The docker compose files in ``/docker/compose`` were changed to always use the ``latest`` version automatically. In order to do further + updates, simply do a ``docker-compose pull``. The documentation has been updated. + * The docker compose files were changed to restart paperless on system boot only if it was running before shutdown. + * Documentation of the docker-compose files about what they do. + +* Changes to bare metal installations and updates + + * The release archive is built exactly like before. However, the release now comes with already compiled translation messages and + collected static files. Therefore, the update steps ``compilemessages`` and ``collectstatic`` are now obsolete. + +* Other changes + + * A new configuration option ``PAPERLESS_IGNORE_DATES`` was added by `jayme-github`_. This can be used to instruct paperless to ignore + certain dates (such as your date of birth) when guessing the date from the document content. This was actually introduced in 0.9.12, + I just forgot to mention it in the changelog. + * The filter drop downs now display selected entries on top of all other entries. + * The PostgreSQL client now supports setting an explicit ``sslmode`` to force encryption of the connection to PostgreSQL. + * The docker images now come with ``jbig2enc``, which is a lossless image encoder for PDF documents and decreases the size of certain + PDF/A documents. + * When using any of the manual matching algorithms, paperless now logs messages about when and why these matching algorithms matched. + * The default settings for parallelization in paperless were adjusted to always leave one CPU core free. + * Added an option to the frontend to choose which method to use for displaying PDF documents. + +* Fixes + + * An issue with the tika parser not picking up files from the consumption directory was fixed. + * A couple changes to the dark mode and fixes to several other layout issues. + * An issue with the drop downs for correspondents, tags and types not properly supporting filtering with special characters was fixed. + * Fixed an issue with filenames of downloaded files: Dates where off by one day due to timezone issues. + * Searching will continue to work even when the index returns non-existing documents. This resulted in "Document does not exist" errors + before. Instead, a warning is logged, indicating the issue. + * An issue with the consumer crashing when invalid regular expression were used was fixed. + +paperless-ng 0.9.13 +################### + +* Fixed an issue with Paperless not starting due to the new Tika integration when ``USERMAP_UID`` and ``USERMAP_GID`` was used + in the ``docker-compose.env`` file. + paperless-ng 0.9.12 ################### @@ -17,6 +94,7 @@ paperless-ng 0.9.12 * See the :ref:`configuration` on how to enable this feature. This feature requires two additional services (one for parsing Office documents and metadata extraction and another for converting Office documents to PDF), and is therefore not enabled on default installations. + * As with all other documents, paperless converts Office documents to PDF and stores both the original as well as the archived PDF. * Dark mode @@ -32,6 +110,12 @@ paperless-ng 0.9.12 indicators and clearer error messages about what's wrong. * Paperless disables buttons with network actions (such as save and delete) when a network action is active. This indicates that something is happening and prevents double clicking. + * When using "Save & next", the title field is focussed automatically to better support keyboard editing. + * E-Mail: Added filter rule parameters to allow inline attachments (watch out for mails with inlined images!) and attachment filename filters + with wildcards. + * Support for remote user authentication thanks to `Michael Shamoon`_. This is useful for hiding Paperless behind single sign on applications + such as `authelia `_. + * "Clear filters" has been renamed to "Reset filters" and now correctly restores the default filters on saved views. Thanks to `Michael Shamoon`_ * Fixes @@ -55,7 +139,7 @@ paperless-ng 0.9.10 * There are some configuration options in the settings to alter the behavior. * Other changes and additions - + * Thanks to `zjean`_, paperless now publishes a webmanifest, which is useful for adding the application to home screens on mobile devices. * The Paperless-ng logo now navigates to the dashboard. * Filter for documents that don't have any correspondents, types or tags assigned. @@ -75,7 +159,7 @@ paperless-ng 0.9.10 The bulk delete operations did not update the search index. Therefore, documents that you deleted remained in the index and caused the search to return messages about missing documents when searching. Further bulk operations will properly update the index. - + However, this change is not retroactive: If you used the delete method of the bulk editor, you need to reindex your search index by :ref:`running the management command document_index with the argument reindex `. @@ -130,12 +214,12 @@ paperless-ng 0.9.7 * Thanks to the hard work of `Michael Shamoon`_, paperless now comes with a much more streamlined UI for filtering documents. - + * `Michael Shamoon`_ replaced the document preview with another component. This should fix compatibility with Safari browsers. * Added buttons to the management pages to quickly show all documents with one specific tag, correspondent, or title. - - * Paperless now stores your saved views on the server and associates them with your user account. + + * Paperless now stores your saved views on the server and associates them with your user account. This means that you can access your views on multiple devices and have separate views for different users. You will have to recreate your views. @@ -153,7 +237,7 @@ paperless-ng 0.9.7 This option enables you to be logged in into multiple instances by specifying different cookie names for each instance. * Fixes - + * Sometimes paperless would assign dates in the future to newly consumed documents. * The filename format fields ``{created_month}`` and ``{created_day}`` now use a leading zero for single digit values. * The filename format field ``{tags}`` can no longer be used without arguments. diff --git a/docs/configuration.rst b/docs/configuration.rst index 454377283..5edc003f6 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -53,6 +53,12 @@ PAPERLESS_DBPASS= Defaults to "paperless". +PAPERLESS_DBSSLMODE= + SSL mode to use when connecting to PostgreSQL. + + See `the official documentation about sslmode `_. + + Default is ``prefer``. Paths and folders ################# @@ -162,6 +168,12 @@ PAPERLESS_COOKIE_PREFIX= Defaults to ``""``, which does not alter the cookie names. +PAPERLESS_ENABLE_HTTP_REMOTE_USER= + Allows authentication via HTTP_REMOTE_USER which is used by some SSO + applications. + + Defaults to `false` which disables this feature. + .. _configuration-ocr: OCR settings @@ -210,20 +222,20 @@ PAPERLESS_OCR_MODE= into images and puts the OCRed text on top. This works for all documents, however, the resulting document may be significantly larger and text won't appear as sharp when zoomed in. - + The default is ``skip``, which only performs OCR when necessary and always creates archived documents. PAPERLESS_OCR_OUTPUT_TYPE= Specify the the type of PDF documents that paperless should produce. - + * ``pdf``: Modify the PDF document as little as possible. * ``pdfa``: Convert PDF documents into PDF/A-2b documents, which is a subset of the entire PDF specification and meant for storing documents long term. * ``pdfa-1``, ``pdfa-2``, ``pdfa-3`` to specify the exact version of PDF/A you wish to use. - + If not specified, ``pdfa`` is used. Remember that paperless also keeps the original input file as well as the archived version. @@ -255,7 +267,7 @@ PAPERLESS_OCR_IMAGE_DPI= present in an image. -PAPERLESS_OCR_USER_ARG= +PAPERLESS_OCR_USER_ARGS= OCRmyPDF offers many more options. Use this parameter to specify any additional arguments you wish to pass to OCRmyPDF. Since Paperless uses the API of OCRmyPDF, you have to specify these in a format that can be @@ -275,22 +287,19 @@ PAPERLESS_OCR_USER_ARG= .. code:: json - {"deskew": true, "optimize": 3, "unpaper_args": "--pre-rotate 90"} - + {"deskew": true, "optimize": 3, "unpaper_args": "--pre-rotate 90"} + .. _configuration-tika: Tika settings ############# -Paperless can make use of `Tika `_ and +Paperless can make use of `Tika `_ and `Gotenberg `_ for parsing and converting "Office" documents (such as ".doc", ".xlsx" and ".odt"). If you wish to use this, you must provide a Tika server and a Gotenberg server, configure their endpoints, and enable the feature. -If you run paperless on docker, you can add those services to the docker-compose -file (see the examples provided). - PAPERLESS_TIKA_ENABLED= Enable (or disable) the Tika parser. @@ -306,7 +315,41 @@ PAPERLESS_TIKA_GOTENBERG_ENDPOINT= Defaults to "http://localhost:3000". - +If you run paperless on docker, you can add those services to the docker-compose +file (see the provided ``docker-compose.tika.yml`` file for reference). The changes +requires are as follows: + +.. code:: yaml + + services: + # ... + + webserver: + # ... + + environment: + # ... + + PAPERLESS_TIKA_ENABLED: 1 + PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000 + PAPERLESS_TIKA_ENDPOINT: http://tika:9998 + + # ... + + gotenberg: + image: thecodingmachine/gotenberg + restart: unless-stopped + environment: + DISABLE_GOOGLE_CHROME: 1 + + tika: + image: apache/tika + restart: unless-stopped + +Add the configuration variables to the environment of the webserver (alternatively +put the configuration in the ``docker-compose.env`` file) and add the additional +services below the webserver service. Watch out for indentation. + Software tweaks ############### @@ -333,8 +376,26 @@ PAPERLESS_THREADS_PER_WORKER= use a higher thread per worker count. The default is a balance between the two, according to your CPU core count, - with a slight favor towards threads per worker, and using as much cores as - possible. + with a slight favor towards threads per worker, and leaving at least one core + free for other tasks: + + +----------------+---------+---------+ + | CPU core count | Workers | Threads | + +----------------+---------+---------+ + | 1 | 1 | 1 | + +----------------+---------+---------+ + | 2 | 1 | 1 | + +----------------+---------+---------+ + | 4 | 1 | 3 | + +----------------+---------+---------+ + | 6 | 2 | 2 | + +----------------+---------+---------+ + | 8 | 2 | 3 | + +----------------+---------+---------+ + | 12 | 3 | 3 | + +----------------+---------+---------+ + | 16 | 3 | 5 | + +----------------+---------+---------+ If you only specify PAPERLESS_TASK_WORKERS, paperless will adjust PAPERLESS_THREADS_PER_WORKER automatically. @@ -380,6 +441,9 @@ PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS= E.g. /foo/bar/file.pdf will add the tags "foo" and "bar" to the consumed file. Paperless will create any tags that don't exist yet. + This is useful for sorting documents with certain tags such as ``car`` or + ``todo`` prior to consumption. These folders won't be deleted. + PAPERLESS_CONSUMER_RECURSIVE must be enabled for this to work. Defaults to false. @@ -441,6 +505,19 @@ PAPERLESS_THUMBNAIL_FONT_NAME= Defaults to ``/usr/share/fonts/liberation/LiberationSerif-Regular.ttf``. +PAPERLESS_IGNORE_DATES= + Paperless parses a documents creation date from filename and file content. + You may specify a comma separated list of dates that should be ignored during + this process. This is useful for special dates (like date of birth) that appear + in documents regularly but are very unlikely to be the documents creation date. + + You may specify dates in a multitude of formats supported by dateparser (see + https://dateparser.readthedocs.io/en/latest/#popular-formats) but as the dates + need to be comma separated, the options are limited. + Example: "2020-12-02,22.04.1999" + + Defaults to an empty string to not ignore any dates. + Binaries ######## diff --git a/docs/extending.rst b/docs/extending.rst index 28da1f56b..b2ddf3d85 100644 --- a/docs/extending.rst +++ b/docs/extending.rst @@ -25,8 +25,9 @@ This section describes the steps you need to take to start development on paperl * Python 3.6. * All dependencies listed in the :ref:`Bare metal route ` - * redis. You can either install redis or use the included scritps/start-redis.sh - to use docker to fire up a redis instance. + * redis. You can either install redis or use the included scritps/start-services.sh + to use docker to fire up a redis instance (and some other services such as tika, + gotenberg and a postgresql server). Back end development ==================== @@ -38,7 +39,7 @@ Install the python dependencies by performing ``pipenv install --dev`` in the sr This will also create a virtual environment, which you can enter with ``pipenv shell`` or execute one-shot commands in with ``pipenv run``. -In ``src/paperless.conf``, enable debug mode. +Copy ``paperless.conf.example`` to ``paperless.conf`` and enable debug mode. Configure the IDE to use the src/ folder as the base source folder. Configure the following launch configurations in your IDE: @@ -102,18 +103,11 @@ In order to build the front end and serve it as part of django, execute .. code:: shell-session - $ ng build --prod --output-path ../src/documents/static/frontend/ + $ ng build --prod This will build the front end and put it in a location from which the Django server will serve it as static content. This way, you can verify that authentication is working. -Making a release -================ - -Execute the ``make-release.sh `` script. - -This will test and assemble everything and also build and tag a docker image. - Extending Paperless =================== diff --git a/docs/faq.rst b/docs/faq.rst index d9efddd0f..e41f9aace 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -52,6 +52,8 @@ out of that folder to use them elsewhere. Here are a couple notes about that. * PDF documents, PNG images, JPEG images, TIFF images and GIF images are processed with OCR and converted into PDF documents. * Plain text documents are supported as well and are added verbatim to paperless. +* With the optional Tika integration enabled (see :ref:`Configuration `), Paperless also supports various + Office documents (.docx, .doc, odt, .ppt, .pptx, .odp, .xls, .xlsx, .ods). Paperless determines the type of a file by inspecting its content. The file extensions do not matter. @@ -73,10 +75,8 @@ in your browser and paperless has to do much less work to serve the data. **Q:** *How do I install paperless-ng on Raspberry Pi?* -**A:** There is no docker image for ARM available. If you know how to build -that automatically, I'm all ears. For now, you have to grab the latest release -archive from the project page and build the image yourself. The release comes -with the front end already compiled, so you don't have to do this on the Pi. +**A:** Docker images are available for arm and arm64 hardware, so just follow +the docker-compose instructions, or go the bare metal route. **Q:** *How do I run this on unRaid?* diff --git a/docs/requirements.txt b/docs/requirements.txt new file mode 100644 index 000000000..e69de29bb diff --git a/docs/scanners.rst b/docs/scanners.rst index 5551fe55d..ad7566c71 100644 --- a/docs/scanners.rst +++ b/docs/scanners.rst @@ -10,6 +10,9 @@ scanner you use, but sometimes finding a scanner that will write to an FTP, NFS, or SMB server can be difficult. This page is here to help you find one that works right for you based on recommendations from other Paperless users. +Physical scanners +================= + +---------+----------------+-----+-----+-----+----------------+ | Brand | Model | Supports | Recommended By | +---------+----------------+-----+-----+-----+----------------+ @@ -45,3 +48,25 @@ that works right for you based on recommendations from other Paperless users. .. _REOLDEV: https://github.com/REOLDEV .. _Skylinar: https://github.com/Skylinar .. _jonaswinkler: https://github.com/jonaswinkler + +Mobile phone software +===================== + +You can use your phone to "scan" documents. The regular camera app will work, but may have too low contrast for OCR to work well. Apps specifically for scanning are recommended. + ++-------------------+----------------+-----+-----+-----+-------+--------+----------------+ +| Name | OS | Supports | Recommended By | ++-------------------+----------------+-----+-----+-----+-------+--------+----------------+ +| | | FTP | NFS | SMB | Email | WebDav | | ++===================+================+=====+=====+=====+=======+========+================+ +| `Office Lens`_ | Android | ? | ? | ? | ? | ? | `jonaswinkler`_| ++-------------------+----------------+-----+-----+-----+-------+--------+----------------+ +| `Genius Scan`_ | Android | yes | no | yes | yes | yes | `hannahswain`_ | ++-------------------+----------------+-----+-----+-----+-------+--------+----------------+ + +On Android, you can use these applications in combination with one of the :ref:`Paperless-ng compatible apps ` to "Share" the documents produced by these scanner apps with paperless. + +.. _Office Lens: https://play.google.com/store/apps/details?id=com.microsoft.office.officelens +.. _Genius Scan: https://play.google.com/store/apps/details?id=com.thegrizzlylabs.geniusscan.free + +.. _hannahswain: https://github.com/hannahswain diff --git a/docs/setup.rst b/docs/setup.rst index ddd246b16..a3a0bd1e8 100644 --- a/docs/setup.rst +++ b/docs/setup.rst @@ -3,35 +3,6 @@ Setup ***** -Download -######## - -Go to the project page on GitHub and download the -`latest release `_. -There are multiple options available. - -* Download the dockerfiles archive if you want to pull paperless from - Docker Hub. - -* Download the dist archive and extract it if you want to build the docker image - yourself or want to install paperless without docker. - -.. hint:: - - In contrast to paperless, the recommended way to get and update paperless-ng - is not to pull the entire git repository. Paperless-ng includes artifacts - that need to be compiled, and that's already done for you in the release. - -.. admonition:: Want to try out paperless-ng before migrating? - - The release contains a file ``.env`` which sets the docker-compose project - name to "paperless", which is the same as before and instructs docker-compose - to reuse and upgrade your paperless volumes. - - Just rename the project name in that file to anything else and docker-compose - will create fresh volumes for you! - - Overview of Paperless-ng ######################## @@ -110,22 +81,41 @@ Installation You can go multiple routes with setting up and running Paperless: -* The `docker route`_ -* The `bare metal route`_ +* :ref:`Pull the image from Docker Hub ` +* :ref:`Build the Docker image yourself ` +* :ref:`Install Paperless directly on your system manually (bare metal) ` +* :ref:`Use ansible to install Paperless on your system automatically (bare metal) ` -The `docker route`_ is quick & easy. This is the recommended route. This configures all the stuff +The Docker routes are quick & easy. These are the recommended routes. This configures all the stuff from above automatically so that it just works and uses sensible defaults for all configuration options. -The `bare metal route`_ is more complicated to setup but makes it easier +The bare metal route is more complicated to setup but makes it easier should you want to contribute some code back. You need to configure and run the above mentioned components yourself. -.. _setup-docker_route: +The ansible route cobines benefits from both options: +the setup process is fully automated, reproducible and idempotent, +it includes the same sensible defaults, +and it simultaneously provides the flexibility of a bare metal installation. -Docker Route -============ +.. _setup-docker_hub: -1. Install `Docker`_ and `docker-compose`_. [#compose]_ +Install Paperless from Docker Hub +================================= + +1. Go to the `/docker/compose directory on the project page `_ + and download one of the ``docker-compose.*.yml`` files, depending on which database backend you + want to use. Rename this file to `docker-compose.yml`. + If you want to enable optional support for Office documents, download a file with ``-tika`` in its name. + Download the ``docker-compose.env`` file and the ``.env`` file as well and store them + in the same directory. + + .. hint:: + + For new installations, it is recommended to use PostgreSQL as the database + backend. + +2. Install `Docker`_ and `docker-compose`_. .. caution:: @@ -142,15 +132,7 @@ Docker Route .. _Docker installation guide: https://docs.docker.com/engine/installation/ .. _docker-compose installation guide: https://docs.docker.com/compose/install/ -2. Copy either ``docker-compose.sqlite.yml`` or ``docker-compose.postgres.yml`` to - ``docker-compose.yml``, depending on which database backend you want to use. - - .. hint:: - - For new installations, it is recommended to use PostgreSQL as the database - backend. - -2. Modify ``docker-compose.yml`` to your preferences. You may want to change the path +3. Modify ``docker-compose.yml`` to your preferences. You may want to change the path to the consumption directory in this file. Find the line that specifies where to mount the consumption directory: @@ -167,7 +149,7 @@ Docker Route Don't change the part after the colon or paperless wont find your documents. -3. Modify ``docker-compose.env``, following the comments in the file. The +4. Modify ``docker-compose.env``, following the comments in the file. The most important change is to set ``USERMAP_UID`` and ``USERMAP_GID`` to the uid and gid of your user on the host system. This ensures that both the docker container and you on the host machine have write access @@ -177,9 +159,9 @@ Docker Route .. note:: - You can use any settings from the file ``paperless.conf`` in this file. + You can use any settings from the file ``paperless.conf.example`` in this file. Have a look at :ref:`configuration` to see whats available. - + .. caution:: Certain file systems such as NFS network shares don't support file system @@ -188,11 +170,10 @@ Docker Route with the default configuration. You will need to use ``PAPERLESS_CONSUMER_POLLING``, which will disable inotify. See :ref:`here `. -4. Run ``docker-compose up -d``. This will create and start the necessary - containers. This will also build the image of paperless if you grabbed the - source archive. +5. Run ``docker-compose up -d``. This will create and start the necessary + containers. -5. To be able to login, you will need a super user. To create it, execute the +6. To be able to login, you will need a super user. To create it, execute the following command: .. code-block:: shell-session @@ -202,7 +183,7 @@ Docker Route This will prompt you to set a username, an optional e-mail address and finally a password. -6. The default ``docker-compose.yml`` exports the webserver on your local port +7. The default ``docker-compose.yml`` exports the webserver on your local port 8000. If you haven't adapted this, you should now be able to visit your Paperless instance at ``http://127.0.0.1:8000``. You can login with the user and password you just created. @@ -210,11 +191,49 @@ Docker Route .. _Docker: https://www.docker.com/ .. _docker-compose: https://docs.docker.com/compose/install/ -.. [#compose] You of course don't have to use docker-compose, but it - simplifies deployment immensely. If you know your way around Docker, feel - free to tinker around without using compose! +.. _setup-docker_build: -.. _`setup-bare_metal`: +Build the docker image yourself +=============================== + +1. Clone the entire repository of paperless: + + .. code:: shell-session + + git clone https://github.com/jonaswinkler/paperless-ng + + The master branch always reflects the latest stable version. + +2. Copy one of the ``docker/compose/docker-compose.*.yml`` to ``docker-compose.yml`` in the root folder, + depending on which database backend you want to use. Copy + ``docker-compose.env`` into the project root as well. + +3. In the ``docker-compose.yml`` file, find the line that instructs docker-compose to pull the paperless image from Docker Hub: + + .. code:: yaml + + webserver: + image: jonaswinkler/paperless-ng:latest + + and replace it with a line that instructs docker-compose to build the image from the current working directory instead: + + .. code:: yaml + + webserver: + build: . + +4. Run the ``compile-frontend.sh`` script. This requires ``node`` and ``npm >= v15``. + +5. Follow steps 2 to 7 of :ref:`setup-docker_hub`. When asked to run + ``docker-compose up -d`` to start the containers, do + + .. code:: shell-session + + $ docker-compose build + + before that to build the image. + +.. _setup-bare_metal: Bare Metal Route ================ @@ -234,8 +253,9 @@ writing. Windows is not and will never be supported. * ``optipng`` for optimizing thumbnails * ``gnupg`` for handling encrypted documents * ``libpoppler-cpp-dev`` for PDF to text conversion - * ``libmagic-dev`` for mime type detection * ``libpq-dev`` for PostgreSQL + * ``libmagic-dev`` for mime type detection + * ``mime-support`` for mime type detection These dependencies are required for OCRmyPDF, which is used for text recognition. @@ -250,6 +270,11 @@ writing. Windows is not and will never be supported. * ``tesseract-ocr`` >= 4.0.0 for OCR * ``tesseract-ocr`` language packs (``tesseract-ocr-eng``, ``tesseract-ocr-deu``, etc) + On Raspberry Pi, these libraries are required as well: + + * ``libatlas-base-dev`` + * ``libxslt1-dev`` + You will also need ``build-essential``, ``python3-setuptools`` and ``python3-wheel`` for installing some of the python dependencies. @@ -258,8 +283,9 @@ writing. Windows is not and will never be supported. 3. Optional. Install ``postgresql`` and configure a database, user and password for paperless. If you do not wish to use PostgreSQL, SQLite is avialable as well. -4. Get the release archive. If you pull the git repo as it is, you also have to compile the front end by yourself. - Extract the frontend to a place from where you wish to execute it, such as ``/opt/paperless``. +4. Get the release archive from ``_. + If you clone the git repo as it is, you also have to compile the front end by yourself. + Extract the archive to a place from where you wish to execute it, such as ``/opt/paperless``. 5. Configure paperless. See :ref:`configuration` for details. Edit the included ``paperless.conf`` and adjust the settings to your needs. Required settings for getting paperless running are: @@ -272,7 +298,7 @@ writing. Windows is not and will never be supported. paperless stores its data. If you like, you can point both to the same directory. * ``PAPERLESS_SECRET_KEY`` should be a random sequence of characters. It's used for authentication. Failure to do so allows third parties to forge authentication credentials. - + Many more adjustments can be made to paperless, especially the OCR part. The following options are recommended for everyone: @@ -281,7 +307,7 @@ writing. Windows is not and will never be supported. 6. Setup permissions. Create a system users under which you wish to run paperless. Ensure that these directories exist and that the user has write permissions to the following directories - + * ``/opt/paperless/media`` * ``/opt/paperless/data`` * ``/opt/paperless/consume`` @@ -295,14 +321,8 @@ writing. Windows is not and will never be supported. .. code:: bash - # This collects static files from paperless and django. - python3 manage.py collectstatic --clear --no-input - # This creates the database schema. python3 manage.py migrate - - # This creates the translation files for paperless. - python3 manage.py compilemessages # This creates your first paperless user python3 manage.py createsuperuser @@ -313,7 +333,7 @@ writing. Windows is not and will never be supported. # This collects static files from paperless and django. python3 manage.py runserver - + and pointing your browser to http://localhost:8000/. .. warning:: @@ -366,13 +386,133 @@ writing. Windows is not and will never be supported. .. code:: - + to .. code:: +13. Optional: Install the `jbig2enc `_ + encoder. This will reduce the size of generated PDF documents. You'll most likely need + to compile this by yourself, because this software has been patented until around 2017 and + binary packages are not available for most distributions. + +.. _setup-ansible: + +Install Paperless using ansible +=============================== + .. note:: + + This role currently only supports Debian 10 Buster and Ubuntu 20.04 Focal or later as target hosts. + +1. Install ansible 2.7+ on the management node. + This may be the target host paperless-ng is being installed on or any remote host which can access the target host. + For further details, check the ansible `inventory `_ documentation. + + On Debian and Ubuntu, the official repositories should provide a suitable version: + + .. code:: bash + + apt install ansible + ansible --version + + Alternatively, you can install the most recent ansible release using PyPI: + + .. code:: bash + + python3 -m pip install ansible + ansible --version + + Make sure your taget hosts are accessible: + + .. code:: sh + + ansible -m ping YourAnsibleTargetHostGoesHere + +2. Clone the repository of paperless-ng: + + .. code:: sh + + git clone https://github.com/jonaswinkler/paperless-ng + + Checkout the latest release tag: + + .. code:: sh + + cd paperless-ng + git checkout ng-0.9.14 + +3. Create an ansible ``playbook.yml`` in the paperless-ng root directory: + + .. code:: yaml + + - hosts: YourAnsibleTargetHostGoesHere + become: yes + vars_files: + - ansible/vars.yml + roles: + - ansible + + Optional: If you also want to use PostgreSQL on the target system, install and add (for example) the `geerlingguy.postgresql `_ role: + + .. code:: sh + + ansible-galaxy install geerlingguy.postgresql + + .. code:: yaml + + - hosts: YourAnsibleTargetHostGoesHere + become: yes + vars_files: + - ansible/vars.yml + roles: + - geerlingguy.postgresql + - ansible + + Optional: If you also want to use a reverse proxy on the target system, install and add (for example) the `geerlingguy.nginx `_ role: + + .. code:: sh + + ansible-galaxy install geerlingguy.nginx + + .. code:: yaml + + - hosts: YourAnsibleTargetHostGoesHere + become: yes + vars_files: + - ansible/vars.yml + roles: + - geerlingguy.postgresql + - ansible + - geerlingguy.nginx + +4. Create ``ansible/vars.yml`` to configure your ansible deployment: + + .. code:: yaml + + paperless_secret_key: PleaseGenerateAStrongKeyForThis + + paperlessng_superuser_name: YourUserName + paperlessng_superuser_email: name@domain.tld + paperlessng_superuser_password: YourDesiredPasswordUsedForFirstLogin + + paperlessng_ocr_languages: + - eng + - deu + + For all of the available options, please check ``ansible/README.md`` and :ref:`configuration`. + + Optional configurations for the above-mentioned PostgreSQL and nginx roles would also go here. + +5. Run the ansible playbook from the management node: + + .. code:: sh + + ansible-playbook playbook.yml + + When this step completes successfully, paperless-ng will be available on the target host at ``http://127.0.0.1:8000`` (or the address you configured). + Migration to paperless-ng ######################### @@ -406,32 +546,27 @@ Migration to paperless-ng is then performed in a few simple steps: paperless. 3. Download the latest release of paperless-ng. You can either go with the - docker-compose files or use the archive to build the image yourself. + docker-compose files from `here `_ + or clone the repository to build the image yourself (see :ref:`above `). You can either replace your current paperless folder or put paperless-ng in a different location. .. caution:: - The release include a ``.env`` file. This will set the + Paperless includes a ``.env`` file. This will set the project name for docker compose to ``paperless`` so that paperless-ng will automatically reuse your existing paperless volumes. When you start it, it will migrate your existing data. After that, your old paperless installation will be incompatible with the migrated volumes. -4. Copy the ``docker-compose.sqlite.yml`` file to ``docker-compose.yml``. +4. Download the ``docker-compose.sqlite.yml`` file to ``docker-compose.yml``. If you want to switch to PostgreSQL, do that after you migrated your existing SQLite database. -5. Adjust ``docker-compose.yml`` and - ``docker-compose.env`` to your needs. - See `docker route`_ for details on which edits are advised. +5. Adjust ``docker-compose.yml`` and ``docker-compose.env`` to your needs. + See :ref:`setup-docker_hub` for details on which edits are advised. -6. Since ``docker-compose`` would just use the the old paperless image, we need to - manually build a new image: - - .. code:: shell-session - - $ docker-compose build +6. :ref:`Update paperless. ` 7. In order to find your existing documents with the new search feature, you need to invoke a one-time operation that will create the search index: @@ -439,7 +574,7 @@ Migration to paperless-ng is then performed in a few simple steps: .. code:: shell-session $ docker-compose run --rm webserver document_index reindex - + This will migrate your database and create the search index. After that, paperless will take care of maintaining the index by itself. @@ -452,7 +587,7 @@ Migration to paperless-ng is then performed in a few simple steps: This will run paperless in the background and automatically start it on system boot. 9. Paperless installed a permanent redirect to ``admin/`` in your browser. This - redirect is still in place and prevents access to the new UI. Clear + redirect is still in place and prevents access to the new UI. Clear your browsing cache in order to fix this. 10. Optionally, follow the instructions below to migrate your existing data to PostgreSQL. @@ -500,9 +635,9 @@ management commands as below. $ cd /path/to/paperless $ docker-compose run --rm webserver /bin/bash - + This will launch the container and initialize the PostgreSQL database. - + b) Without docker, open a shell in your virtual environment, switch to the ``src`` directory and create the database schema: @@ -512,7 +647,7 @@ management commands as below. $ pipenv shell $ cd src $ python3 manage.py migrate - + This will not copy any data yet. 4. Dump your data from SQLite: @@ -520,7 +655,7 @@ management commands as below. .. code:: shell-session $ python3 manage.py dumpdata --database=sqlite --exclude=contenttypes --exclude=auth.Permission > data.json - + 5. Load your data into PostgreSQL: .. code:: shell-session @@ -571,7 +706,7 @@ as well. Considerations for less powerful devices ######################################## -Paperless runs on Raspberry Pi. However, some things are rather slow on the Pi and +Paperless runs on Raspberry Pi. However, some things are rather slow on the Pi and configuring some options in paperless can help improve performance immensely: * Stick with SQLite to save some resources. @@ -593,17 +728,15 @@ configuring some options in paperless can help improve performance immensely: For details, refer to :ref:`configuration`. .. note:: - + Updating the :ref:`automatic matching algorithm ` takes quite a bit of time. However, the update mechanism checks if your - data has changed before doing the heavy lifting. If you experience the + data has changed before doing the heavy lifting. If you experience the algorithm taking too much cpu time, consider changing the schedule in the admin interface to daily. You can also manually invoke the task by changing the date and time of the next run to today/now. - The actual matching of the algorithm is fast and works on Raspberry Pi as + The actual matching of the algorithm is fast and works on Raspberry Pi as well as on any other device. - - .. _redis: https://redis.io/ diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst index 8786657db..b8343710f 100644 --- a/docs/troubleshooting.rst +++ b/docs/troubleshooting.rst @@ -75,6 +75,6 @@ You might encounter errors such as: This happens when paperless does not have permission to delete files inside the consumption directory. Ensure that ``USERMAP_UID`` and ``USERMAP_GID`` are set to the user id and group id you use on the host operating system, if these are -different from ``1000``. See :ref:`setup-docker_route`. +different from ``1000``. See :ref:`setup-docker_hub`. Also ensure that you are able to read and write to the consumption directory on the host. diff --git a/docs/usage_overview.rst b/docs/usage_overview.rst index 7a4fd7740..2c7093b99 100644 --- a/docs/usage_overview.rst +++ b/docs/usage_overview.rst @@ -110,6 +110,8 @@ The dashboard has a file drop field to upload documents to paperless. Simply dra onto this field or select a file with the file dialog. Multiple files are supported. +.. _usage-mobile_upload: + Mobile upload ============= @@ -118,7 +120,7 @@ to share any documents with paperless. This can be combined with any of the mobi scanning apps out there, such as Office Lens. Furthermore, there is the `Paperless App `_ as well, -which no only has document upload, but also document editing and browsing. +which not only has document upload, but also document browsing and download features. .. _usage-email: diff --git a/paperless.conf.example b/paperless.conf.example index d732bb5cb..652a741b0 100644 --- a/paperless.conf.example +++ b/paperless.conf.example @@ -13,6 +13,7 @@ #PAPERLESS_DBNAME=paperless #PAPERLESS_DBUSER=paperless #PAPERLESS_DBPASS=paperless +#PAPERLESS_DBSSLMODE=prefer # Paths and folders @@ -26,11 +27,12 @@ #PAPERLESS_SECRET_KEY=change-me #PAPERLESS_ALLOWED_HOSTS=example.com,www.example.com -#PAPERLESS_CORS_ALLOWED_HOSTS=localhost:8080,example.com,localhost:8000 +#PAPERLESS_CORS_ALLOWED_HOSTS=http://example.com,http://localhost:8000 #PAPERLESS_FORCE_SCRIPT_NAME= #PAPERLESS_STATIC_URL=/static/ #PAPERLESS_AUTO_LOGIN_USERNAME= #PAPERLESS_COOKIE_PREFIX= +#PAPERLESS_ENABLE_HTTP_REMOTE_USER=false # OCR settings @@ -50,11 +52,14 @@ #PAPERLESS_TIME_ZONE=UTC #PAPERLESS_CONSUMER_POLLING=10 #PAPERLESS_CONSUMER_DELETE_DUPLICATES=false +#PAPERLESS_CONSUMER_RECURSIVE=false +#PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS=false #PAPERLESS_OPTIMIZE_THUMBNAILS=true #PAPERLESS_POST_CONSUME_SCRIPT=/path/to/an/arbitrary/script.sh #PAPERLESS_FILENAME_DATE_ORDER=YMD #PAPERLESS_FILENAME_PARSE_TRANSFORMS=[] #PAPERLESS_THUMBNAIL_FONT_NAME= +#PAPERLESS_IGNORE_DATES= # Tika settings diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000..3b7a158c1 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,74 @@ +# +# These requirements were autogenerated by pipenv +# To regenerate from the project's Pipfile, run: +# +# pipenv lock --requirements +# + +-i https://pypi.python.org/simple +--extra-index-url https://www.piwheels.org/simple +arrow==0.17.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' +asgiref==3.3.1; python_version >= '3.5' +blessed==1.17.12 +certifi==2020.12.5 +cffi==1.14.4 +chardet==4.0.0; python_version >= '3.1' +coloredlogs==15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' +cryptography==3.3.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' +dateparser==0.7.6 +django-cors-headers==3.6.0 +django-extensions==3.1.0 +django-filter==2.4.0 +django-picklefield==3.0.1; python_version >= '3' +django-q==1.3.4 +django==3.1.5 +djangorestframework==3.12.2 +filelock==3.0.12 +fuzzywuzzy==0.18.0 +gunicorn==20.0.4 +humanfriendly==9.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' +idna==2.10; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' +imap-tools==0.34.0 +img2pdf==0.4.0 +importlib-metadata==3.4.0; python_version < '3.8' +inotify-simple==1.3.5; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' +inotifyrecursive==0.3.5 +joblib==1.0.0; python_version >= '3.6' +langdetect==1.0.8 +lxml==4.6.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' +numpy==1.19.5; python_version >= '3.6' +ocrmypdf==11.4.5 +pathvalidate==2.3.2 +pdfminer.six==20201018; python_version >= '3.4' +pdftotext==2.1.5 +pikepdf==2.2.5 +pillow==8.1.0 +pluggy==0.13.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' +psycopg2-binary==2.8.6 +pycparser==2.20; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' +python-dateutil==2.8.1 +python-dotenv==0.15.0 +python-gnupg==0.4.6 +python-levenshtein==0.12.0 +python-magic==0.4.18 +pytz==2020.5 +redis==3.5.3 +regex==2020.11.13 +reportlab==3.5.59 +requests==2.25.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' +scikit-learn==0.24.0 +scipy==1.5.4; python_version >= '3.6' +six==1.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' +sortedcontainers==2.3.0 +sqlparse==0.4.1; python_version >= '3.5' +threadpoolctl==2.1.0; python_version >= '3.5' +tika==1.24 +tqdm==4.56.0 +typing-extensions==3.7.4.3; python_version < '3.8' +tzlocal==2.1 +urllib3==1.26.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4' +watchdog==1.0.2 +wcwidth==0.2.5 +whitenoise==5.2.0 +whoosh==2.7.4 +zipp==3.4.0; python_version >= '3.6' diff --git a/scripts/make-release.sh b/scripts/make-release.sh deleted file mode 100755 index f5c9028fa..000000000 --- a/scripts/make-release.sh +++ /dev/null @@ -1,125 +0,0 @@ -#!/bin/bash - -# Release checklist -# - wait for travis build. -# adjust src/paperless/version.py -# changelog in the documentation -# adjust versions in docker/hub/* -# adjust version in src-ui/src/environments/prod -# If docker-compose was modified: all compose files are the same. - -# Steps: -# run release script "dev", push -# if it works: new tag, merge into master -# on master: make release "lastest", push -# on master: make release "version-tag", push -# publish release files - -set -e - - -VERSION=$1 - -if [ -z "$VERSION" ] -then - echo "Need a version string." - exit 1 -fi - -# source root directory of paperless -PAPERLESS_ROOT=$(git rev-parse --show-toplevel) - -# output directory -PAPERLESS_DIST="$PAPERLESS_ROOT/dist" -PAPERLESS_DIST_APP="$PAPERLESS_DIST/paperless-ng" -PAPERLESS_DIST_DOCKERFILES="$PAPERLESS_DIST/paperless-ng-dockerfiles" - -if [ -d "$PAPERLESS_DIST" ] -then - echo "Removing $PAPERLESS_DIST" - rm "$PAPERLESS_DIST" -r -fi - -mkdir "$PAPERLESS_DIST" -mkdir "$PAPERLESS_DIST_APP" -mkdir "$PAPERLESS_DIST_APP/docker" -mkdir "$PAPERLESS_DIST_APP/scripts" -mkdir "$PAPERLESS_DIST_DOCKERFILES" - -# setup dependencies. - -cd "$PAPERLESS_ROOT" - -pipenv clean -pipenv install --dev -pipenv lock --keep-outdated -r > "$PAPERLESS_DIST_APP/requirements.txt" - -# test if the application works. - -cd "$PAPERLESS_ROOT/src" -pipenv run pytest --cov -pipenv run pycodestyle - -# make the documentation. - -cd "$PAPERLESS_ROOT/docs" -make clean html - -# copy stuff into place - -# the application itself - -cp "$PAPERLESS_ROOT/.env" \ - "$PAPERLESS_ROOT/.dockerignore" \ - "$PAPERLESS_ROOT/CONTRIBUTING.md" \ - "$PAPERLESS_ROOT/LICENSE" \ - "$PAPERLESS_ROOT/Pipfile" \ - "$PAPERLESS_ROOT/Pipfile.lock" \ - "$PAPERLESS_ROOT/README.md" "$PAPERLESS_DIST_APP" - -cp "$PAPERLESS_ROOT/paperless.conf.example" "$PAPERLESS_DIST_APP/paperless.conf" - -# copy python source, templates and static files. -cd "$PAPERLESS_ROOT" -find src -wholename '*/templates/*' -o -wholename '*/static/*' -o -name '*.py' | cpio -pdm "$PAPERLESS_DIST_APP" - -# build the front end. - -cd "$PAPERLESS_ROOT/src-ui" -ng build --prod --output-hashing none --sourceMap=false --output-path "$PAPERLESS_DIST_APP/src/documents/static/frontend" - -# documentation -cp "$PAPERLESS_ROOT/docs/_build/html/" "$PAPERLESS_DIST_APP/docs" -r - -# docker files for building the image yourself -cp "$PAPERLESS_ROOT/docker/local/"* "$PAPERLESS_DIST_APP" -cp "$PAPERLESS_ROOT/docker/docker-compose.env" "$PAPERLESS_DIST_APP" - -# docker files for pulling from docker hub -cp "$PAPERLESS_ROOT/docker/hub/"* "$PAPERLESS_DIST_DOCKERFILES" -cp "$PAPERLESS_ROOT/.env" "$PAPERLESS_DIST_DOCKERFILES" -cp "$PAPERLESS_ROOT/docker/docker-compose.env" "$PAPERLESS_DIST_DOCKERFILES" - -# auxiliary files required for the docker image -cp "$PAPERLESS_ROOT/docker/docker-entrypoint.sh" "$PAPERLESS_DIST_APP/docker/" -cp "$PAPERLESS_ROOT/docker/gunicorn.conf.py" "$PAPERLESS_DIST_APP/docker/" -cp "$PAPERLESS_ROOT/docker/imagemagick-policy.xml" "$PAPERLESS_DIST_APP/docker/" -cp "$PAPERLESS_ROOT/docker/supervisord.conf" "$PAPERLESS_DIST_APP/docker/" - -# auxiliary files for bare metal installs -cp "$PAPERLESS_ROOT/scripts/paperless-webserver.service" "$PAPERLESS_DIST_APP/scripts/" -cp "$PAPERLESS_ROOT/scripts/paperless-consumer.service" "$PAPERLESS_DIST_APP/scripts/" -cp "$PAPERLESS_ROOT/scripts/paperless-scheduler.service" "$PAPERLESS_DIST_APP/scripts/" - -# try to make the docker build. - -cd "$PAPERLESS_DIST_APP" - -docker build . -t "jonaswinkler/paperless-ng:$VERSION" - -# works. package the app! - -cd "$PAPERLESS_DIST" - -tar -cJf "paperless-ng-$VERSION.tar.xz" paperless-ng/ -tar -cJf "paperless-ng-$VERSION-dockerfiles.tar.xz" paperless-ng-dockerfiles/ diff --git a/scripts/push-release.sh b/scripts/push-release.sh deleted file mode 100755 index cfa63f5cf..000000000 --- a/scripts/push-release.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -set -e - - -VERSION=$1 - -if [ -z "$VERSION" ] -then - echo "Need a version string." - exit 1 -fi - -# source root directory of paperless -PAPERLESS_ROOT=$(git rev-parse --show-toplevel) - -# output directory -PAPERLESS_DIST="$PAPERLESS_ROOT/dist" -PAPERLESS_DIST_APP="$PAPERLESS_DIST/paperless-ng" - -cd "$PAPERLESS_DIST_APP" - -docker push "jonaswinkler/paperless-ng:$VERSION" diff --git a/src-ui/angular.json b/src-ui/angular.json index 414cd4f64..829a482af 100644 --- a/src-ui/angular.json +++ b/src-ui/angular.json @@ -58,6 +58,7 @@ "with": "src/environments/environment.prod.ts" } ], + "outputPath": "../src/documents/static/frontend/", "optimization": true, "outputHashing": "none", "sourceMap": false, diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 4a84cfd64..6175cf700 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -6,21 +6,21 @@ Documents src/app/components/document-list/document-list.component.ts - 38 + 43 View "" saved successfully. src/app/components/document-list/document-list.component.ts - 84 + 94 View "" created successfully. src/app/components/document-list/document-list.component.ts - 103 + 115 @@ -34,28 +34,28 @@ Select none src/app/components/document-list/document-list.component.html - 11 + 10 Select page src/app/components/document-list/document-list.component.html - 12 + 11 Select all src/app/components/document-list/document-list.component.html - 13 + 12 - - Sort by + + Sort src/app/components/document-list/document-list.component.html - 41 + 39 @@ -83,84 +83,98 @@ {VAR_PLURAL, plural, =1 {Selected of one document} other {Selected of documents}} src/app/components/document-list/document-list.component.html - 86 + 85 {VAR_PLURAL, plural, =1 {One document} other { documents}} src/app/components/document-list/document-list.component.html - 87 + 86 + + + + (filtered) + + src/app/components/document-list/document-list.component.html + 86 ASN src/app/components/document-list/document-list.component.html - 100 + 105 Correspondent src/app/components/document-list/document-list.component.html - 101 + 111 Title src/app/components/document-list/document-list.component.html - 102 + 117 Document type src/app/components/document-list/document-list.component.html - 103 + 123 Created src/app/components/document-list/document-list.component.html - 104 + 129 Added src/app/components/document-list/document-list.component.html - 105 + 135 Confirm delete src/app/components/document-detail/document-detail.component.ts - 161 + 192 Do you really want to delete document ""? src/app/components/document-detail/document-detail.component.ts - 162 + 193 The files for this document will be deleted permanently. This operation cannot be undone. src/app/components/document-detail/document-detail.component.ts - 163 + 194 Delete document src/app/components/document-detail/document-detail.component.ts - 165 + 196 + + + + Error deleting document: + + src/app/components/document-detail/document-detail.component.ts + 203 @@ -202,28 +216,28 @@ Content src/app/components/document-detail/document-detail.component.html - 76 + 72 Metadata src/app/components/document-detail/document-detail.component.html - 85 + 81 Discard src/app/components/document-detail/document-detail.component.html - 134 + 130 Save src/app/components/document-detail/document-detail.component.html - 136 + 132 @@ -251,98 +265,91 @@ Archive serial number src/app/components/document-detail/document-detail.component.html - 61 + 60 Date created src/app/components/document-detail/document-detail.component.html - 65 - - - - Tags - - src/app/components/document-detail/document-detail.component.html - 70 + 61 Date modified src/app/components/document-detail/document-detail.component.html - 91 + 87 Date added src/app/components/document-detail/document-detail.component.html - 95 + 91 Media filename src/app/components/document-detail/document-detail.component.html - 99 + 95 Original MD5 checksum src/app/components/document-detail/document-detail.component.html - 103 + 99 Original file size src/app/components/document-detail/document-detail.component.html - 107 + 103 Original mime type src/app/components/document-detail/document-detail.component.html - 111 + 107 Archive MD5 checksum src/app/components/document-detail/document-detail.component.html - 115 + 111 Archive file size src/app/components/document-detail/document-detail.component.html - 119 + 115 Original document metadata src/app/components/document-detail/document-detail.component.html - 125 + 121 Archived document metadata src/app/components/document-detail/document-detail.component.html - 126 + 122 Save & next src/app/components/document-detail/document-detail.component.html - 135 + 131 @@ -370,7 +377,14 @@ Do you really want to delete the tag ""? src/app/components/manage/tag-list/tag-list.component.ts - 28 + 30 + + + + Tags + + src/app/components/manage/tag-list/tag-list.component.html + 1 @@ -380,60 +394,67 @@ 2 + + Filter by: + + src/app/components/manage/tag-list/tag-list.component.html + 8 + + Name src/app/components/manage/tag-list/tag-list.component.html - 13 + 9 Color src/app/components/manage/tag-list/tag-list.component.html - 14 + 20 Matching src/app/components/manage/tag-list/tag-list.component.html - 15 + 21 Document count src/app/components/manage/tag-list/tag-list.component.html - 16 + 22 Actions src/app/components/manage/tag-list/tag-list.component.html - 17 + 23 Documents src/app/components/manage/tag-list/tag-list.component.html - 32 + 38 Edit src/app/components/manage/tag-list/tag-list.component.html - 37 + 43 Do you really want to delete the document type ""? src/app/components/manage/document-type-list/document-type-list.component.ts - 24 + 26 @@ -461,21 +482,35 @@ Saved view "" deleted. src/app/components/manage/settings/settings.component.ts - 54 + 63 Settings saved successfully. src/app/components/manage/settings/settings.component.ts - 74 + 79 + + + + Use system language + + src/app/components/manage/settings/settings.component.ts + 83 + + + + Use date format of display language + + src/app/components/manage/settings/settings.component.ts + 87 Error while storing settings on server: src/app/components/manage/settings/settings.component.ts - 86 + 103 @@ -496,7 +531,7 @@ Saved views src/app/components/manage/settings/settings.component.html - 56 + 114 @@ -506,81 +541,158 @@ 13 + + Display language + + src/app/components/manage/settings/settings.component.html + 17 + + + + You need to reload the page after applying a new language. + + src/app/components/manage/settings/settings.component.html + 25 + + + + Date display + + src/app/components/manage/settings/settings.component.html + 32 + + + + Date format + + src/app/components/manage/settings/settings.component.html + 45 + + + + Short: + + src/app/components/manage/settings/settings.component.html + 51 + + + + Medium: + + src/app/components/manage/settings/settings.component.html + 55 + + + + Long: + + src/app/components/manage/settings/settings.component.html + 59 + + Items per page src/app/components/manage/settings/settings.component.html - 17 + 67 + + + + Document editor + + src/app/components/manage/settings/settings.component.html + 83 + + + + Use PDF viewer provided by the browser + + src/app/components/manage/settings/settings.component.html + 87 + + + + This is usually faster for displaying large PDF documents, but it might not work on some browsers. + + src/app/components/manage/settings/settings.component.html + 87 Dark mode src/app/components/manage/settings/settings.component.html - 33 + 94 Use system settings src/app/components/manage/settings/settings.component.html - 36 + 97 + + + + Enable dark mode + + src/app/components/manage/settings/settings.component.html + 98 Bulk editing src/app/components/manage/settings/settings.component.html - 44 + 102 Show confirmation dialogs src/app/components/manage/settings/settings.component.html - 48 + 106 Deleting documents will always ask for confirmation. src/app/components/manage/settings/settings.component.html - 48 + 106 Apply on close src/app/components/manage/settings/settings.component.html - 49 + 107 Appears on src/app/components/manage/settings/settings.component.html - 68 + 126 Show on dashboard src/app/components/manage/settings/settings.component.html - 71 + 129 Show in sidebar src/app/components/manage/settings/settings.component.html - 75 + 133 No saved views defined. src/app/components/manage/settings/settings.component.html - 85 + 143 @@ -594,7 +706,7 @@ Do you really want to delete the correspondent ""? src/app/components/manage/correspondent-list/correspondent-list.component.ts - 24 + 26 @@ -608,7 +720,7 @@ Last correspondence src/app/components/manage/correspondent-list/correspondent-list.component.html - 15 + 22 @@ -625,6 +737,13 @@ 29 + + Cancel + + src/app/components/common/confirm-dialog/confirm-dialog.component.html + 12 + + Create new correspondent @@ -639,53 +758,25 @@ 25 - - Could not save correspondent: - - src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts - 29 - - Matching algorithm src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 11 + 10 Matching pattern src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 12 - - - - Auto matching does not require you to fill in this field. - - src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 12 + 11 Case insensitive src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 13 - - - - Auto matching ignores this option. - - src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 13 - - - - Cancel - - src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 16 + 12 @@ -702,13 +793,6 @@ 25 - - Could not save tag: - - src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts - 29 - - Inbox tag @@ -737,13 +821,6 @@ 25 - - Could not save document type: - - src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts - 29 - - Search results @@ -819,28 +896,28 @@ Admin src/app/components/app-frame/app-frame.component.html - 147 + 154 Misc src/app/components/app-frame/app-frame.component.html - 153 + 160 Documentation src/app/components/app-frame/app-frame.component.html - 160 + 167 GitHub src/app/components/app-frame/app-frame.component.html - 167 + 174 @@ -906,13 +983,6 @@ 46 - - Filter by: - - src/app/components/document-list/filter-editor/filter-editor.component.html - 4 - - Filter tags @@ -924,28 +994,28 @@ Filter correspondents src/app/components/document-list/filter-editor/filter-editor.component.html - 19 + 20 Filter document types src/app/components/document-list/filter-editor/filter-editor.component.html - 25 + 27 - - Clear all filters + + Reset filters src/app/components/document-list/filter-editor/filter-editor.component.html - 47 + 50 Not assigned src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts - 161 + 166 Filter drop down element to filter for documents with no correspondent/type/tag assigned @@ -953,7 +1023,7 @@ Apply src/app/components/common/filterable-dropdown/filterable-dropdown.component.html - 28 + 26 @@ -1012,11 +1082,11 @@ 50 - - Created: + + Created: src/app/components/document-list/document-card-large/document-card-large.component.html - 65 + 67 @@ -1037,7 +1107,7 @@ Score: src/app/components/document-list/document-card-large/document-card-large.component.html - 61 + 62 @@ -1047,11 +1117,18 @@ 40 + + Error executing bulk operation: + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 73 + + "" and "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 103 + 114 This is for messages like 'modify "tag1" and "tag2"' @@ -1059,14 +1136,14 @@ "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 105 + 116 , src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 105 + 116 this is used to separate enumerations and should probably be a comma and a whitespace in most languages @@ -1074,7 +1151,7 @@ and "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 106 + 117 this is for messages like 'modify "tag1", "tag2" and "tag3"' @@ -1082,133 +1159,133 @@ Confirm tags assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 115 + 126 This operation will add the tag "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 118 + 129 This operation will add the tags to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 120 + 131 This operation will remove the tag "" from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 123 + 134 This operation will remove the tags from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 125 + 136 This operation will add the tags and remove the tags on selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 127 + 138 Confirm correspondent assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 157 + 158 This operation will assign the correspondent "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 159 + 160 This operation will remove the correspondent from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 161 + 162 Confirm document type assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 190 + 181 This operation will assign the document type "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 192 + 183 This operation will remove the document type from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 194 + 185 Delete confirm src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 219 + 200 This operation will permanently delete selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 220 + 201 This operation cannot be undone. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 221 + 202 Delete document(s) src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 223 + 204 Select: src/app/components/document-list/bulk-editor/bulk-editor.component.html - 11 + 10 All src/app/components/document-list/bulk-editor/bulk-editor.component.html - 21 + 20 Edit: src/app/components/document-list/bulk-editor/bulk-editor.component.html - 28 + 27 @@ -1386,6 +1463,34 @@ 12 + + English (US) + + src/app/services/settings.service.ts + 74 + + + + German + + src/app/services/settings.service.ts + 75 + + + + Dutch + + src/app/services/settings.service.ts + 76 + + + + French + + src/app/services/settings.service.ts + 77 + + Error @@ -1400,15 +1505,15 @@ 35 - - Correspondent + + ASN src/app/services/rest/document.service.ts 16 - - Document type + + Correspondent src/app/services/rest/document.service.ts 17 @@ -1421,8 +1526,8 @@ 18 - - ASN + + Document type src/app/services/rest/document.service.ts 19 @@ -1544,49 +1649,56 @@ Create new item src/app/components/common/edit-dialog/edit-dialog.component.ts - 38 + 50 Edit item src/app/components/common/edit-dialog/edit-dialog.component.ts - 42 + 54 Could not save element: src/app/components/common/edit-dialog/edit-dialog.component.ts - 46 + 58 Automatic src/app/components/manage/generic-list/generic-list.component.ts - 31 + 39 Do you really want to delete this element? src/app/components/manage/generic-list/generic-list.component.ts - 88 + 97 Associated documents will not be deleted. src/app/components/manage/generic-list/generic-list.component.ts - 95 + 104 Delete src/app/components/manage/generic-list/generic-list.component.ts - 97 + 106 + + + + Error while deleting element: + + src/app/components/manage/generic-list/generic-list.component.ts + 114 diff --git a/src-ui/package-lock.json b/src-ui/package-lock.json index 10215a32d..c3827f80c 100644 --- a/src-ui/package-lock.json +++ b/src-ui/package-lock.json @@ -331,6 +331,12 @@ "ms": "^2.1.1" } }, + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "dev": true + }, "uuid": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz", @@ -2178,6 +2184,14 @@ "pacote": "9.5.12", "semver": "7.3.2", "semver-intersect": "1.4.0" + }, + "dependencies": { + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "dev": true + } } }, "@types/glob": { diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index 130c474a1..ae5cc70b9 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -13,7 +13,7 @@ import { DocumentTypeListComponent } from './components/manage/document-type-lis import { LogsComponent } from './components/manage/logs/logs.component'; import { SettingsComponent } from './components/manage/settings/settings.component'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { DatePipe } from '@angular/common'; +import { DatePipe, registerLocaleData } from '@angular/common'; import { NotFoundComponent } from './components/not-found/not-found.component'; import { CorrespondentListComponent } from './components/manage/correspondent-list/correspondent-list.component'; import { ConfirmDialogComponent } from './components/common/confirm-dialog/confirm-dialog.component'; @@ -58,8 +58,18 @@ import { MetadataCollapseComponent } from './components/document-detail/metadata import { SelectDialogComponent } from './components/common/select-dialog/select-dialog.component'; import { NgSelectModule } from '@ng-select/ng-select'; import { NumberComponent } from './components/common/input/number/number.component'; +import { SafePipe } from './pipes/safe.pipe'; +import { CustomDatePipe } from './pipes/custom-date.pipe'; import { ConsumerStatusWidgetComponent } from './components/dashboard/widgets/consumer-status-widget/consumer-status-widget.component'; +import localeFr from '@angular/common/locales/fr'; +import localeNl from '@angular/common/locales/nl'; +import localeDe from '@angular/common/locales/de'; + +registerLocaleData(localeFr) +registerLocaleData(localeNl) +registerLocaleData(localeDe) + @NgModule({ declarations: [ AppComponent, @@ -108,6 +118,8 @@ import { ConsumerStatusWidgetComponent } from './components/dashboard/widgets/co MetadataCollapseComponent, SelectDialogComponent, NumberComponent, + SafePipe, + CustomDatePipe, ConsumerStatusWidgetComponent ], imports: [ diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html index 42273ca3a..c4258ceae 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.html +++ b/src-ui/src/app/components/app-frame/app-frame.component.html @@ -140,6 +140,13 @@  Logs +
  • + + + +  Settings + +
  • diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss index 6809875eb..e4b21add7 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.scss +++ b/src-ui/src/app/components/app-frame/app-frame.component.scss @@ -113,7 +113,7 @@ background-color: rgba(0, 0, 0, 0.15); padding-left: 1.8rem; border-color: rgba(255, 255, 255, 0.2); - transition: flex 0.3s ease; + transition: all .3s ease, padding-left 0s ease, background-color 0s ease; // Safari requires all max-width: 600px; min-width: 300px; // 1/2 max diff --git a/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html index 565829f21..8a8a297d9 100644 --- a/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html +++ b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html @@ -9,7 +9,7 @@

    {{message}}

    - + diff --git a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts index ff4660ca3..3faf18dbb 100644 --- a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts +++ b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts @@ -27,6 +27,8 @@ export abstract class EditDialogComponent implements OnI networkActive = false + closeEnabled = false + error = null abstract getForm(): FormGroup @@ -37,6 +39,11 @@ export abstract class EditDialogComponent implements OnI if (this.object != null) { this.objectForm.patchValue(this.object) } + + // wait to enable close button so it doesnt steal focus from input since its the first clickable element in the DOM + setTimeout(() => { + this.closeEnabled = true + }); } getCreateTitle() { @@ -86,7 +93,6 @@ export abstract class EditDialogComponent implements OnI serverResponse.subscribe(result => { this.activeModal.close() this.success.emit(result) - this.networkActive = false }, error => { this.error = error.error this.networkActive = false diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html index a0e833c98..fc74eb4e9 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html @@ -1,11 +1,9 @@ -
    +
    - +
    diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts index b51923c27..3481b1227 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts @@ -19,8 +19,13 @@ export class FilterableDropdownSelectionModel { items: MatchingModel[] = [] get itemsSorted(): MatchingModel[] { + // TODO: this is getting called very often return this.items.sort((a,b) => { - if (this.getNonTemporary(a.id) == ToggleableItemState.NotSelected && this.getNonTemporary(b.id) != ToggleableItemState.NotSelected) { + if (a.id == null && b.id != null) { + return -1 + } else if (a.id != null && b.id == null) { + return 1 + } else if (this.getNonTemporary(a.id) == ToggleableItemState.NotSelected && this.getNonTemporary(b.id) != ToggleableItemState.NotSelected) { return 1 } else if (this.getNonTemporary(a.id) != ToggleableItemState.NotSelected && this.getNonTemporary(b.id) == ToggleableItemState.NotSelected) { return -1 diff --git a/src-ui/src/app/components/common/input/abstract-input.ts b/src-ui/src/app/components/common/input/abstract-input.ts index f6039d2ec..5821b6682 100644 --- a/src-ui/src/app/components/common/input/abstract-input.ts +++ b/src-ui/src/app/components/common/input/abstract-input.ts @@ -1,10 +1,13 @@ -import { Directive, Input, OnInit } from '@angular/core'; +import { Directive, ElementRef, Input, OnInit, ViewChild } from '@angular/core'; import { ControlValueAccessor } from '@angular/forms'; import { v4 as uuidv4 } from 'uuid'; @Directive() export class AbstractInputComponent implements OnInit, ControlValueAccessor { + @ViewChild("inputField") + inputField: ElementRef + constructor() { } onChange = (newValue: T) => {}; @@ -24,6 +27,12 @@ export class AbstractInputComponent implements OnInit, ControlValueAccessor { this.disabled = isDisabled; } + focus() { + if (this.inputField && this.inputField.nativeElement) { + this.inputField.nativeElement.focus() + } + } + @Input() title: string diff --git a/src-ui/src/app/components/common/input/number/number.component.ts b/src-ui/src/app/components/common/input/number/number.component.ts index cdc52344d..2d28a7801 100644 --- a/src-ui/src/app/components/common/input/number/number.component.ts +++ b/src-ui/src/app/components/common/input/number/number.component.ts @@ -29,7 +29,7 @@ export class NumberComponent extends AbstractInputComponent { if (results.count > 0) { this.value = results.results[0].archive_serial_number + 1 } else { - this.value + 1 + this.value = 1 } this.onChange(this.value) } diff --git a/src-ui/src/app/components/common/input/select/select.component.html b/src-ui/src/app/components/common/input/select/select.component.html index 780dc5686..aa500d0d1 100644 --- a/src-ui/src/app/components/common/input/select/select.component.html +++ b/src-ui/src/app/components/common/input/select/select.component.html @@ -6,9 +6,11 @@ [style.color]="textColor" [style.background]="backgroundColor" [clearable]="allowNull" + [items]="items" + bindLabel="name" + bindValue="id" (change)="onChange(value)" (blur)="onTouched()"> - {{i.name}}
    diff --git a/src-ui/src/app/components/common/input/tags/tags.component.html b/src-ui/src/app/components/common/input/tags/tags.component.html index 01b3fe755..c9a0c96d6 100644 --- a/src-ui/src/app/components/common/input/tags/tags.component.html +++ b/src-ui/src/app/components/common/input/tags/tags.component.html @@ -1,5 +1,5 @@
    - +
    - + {{hint}}
    {{error}} diff --git a/src-ui/src/app/components/common/page-header/page-header.component.html b/src-ui/src/app/components/common/page-header/page-header.component.html index fccce9b98..1174ee044 100644 --- a/src-ui/src/app/components/common/page-header/page-header.component.html +++ b/src-ui/src/app/components/common/page-header/page-header.component.html @@ -1,9 +1,9 @@ -
    +

    {{title}}

    {{subTitle}}

    -
    +
    diff --git a/src-ui/src/app/components/dashboard/dashboard.component.html b/src-ui/src/app/components/dashboard/dashboard.component.html index 19b057717..40fee100f 100644 --- a/src-ui/src/app/components/dashboard/dashboard.component.html +++ b/src-ui/src/app/components/dashboard/dashboard.component.html @@ -1,5 +1,5 @@ -
    +
    Page
    @@ -9,7 +9,7 @@
    -
    • @@ -85,11 +85,11 @@ Date modified - {{document.modified | date:'medium'}} + {{document.modified | customDate}} Date added - {{document.added | date:'medium'}} + {{document.added | customDate}} Media filename @@ -134,8 +134,17 @@
    -
    - -
    + +
    + +
    + + + +     + + + +
    diff --git a/src-ui/src/app/components/document-detail/document-detail.component.scss b/src-ui/src/app/components/document-detail/document-detail.component.scss index 998653bab..346c9f4b0 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.scss +++ b/src-ui/src/app/components/document-detail/document-detail.component.scss @@ -1,6 +1,9 @@ -.pdf-viewer-container { +.preview-sticky { height: calc(100vh - 160px); top: 70px; position: sticky; +} + +.pdf-viewer-container { background-color: gray; } 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 4dbb6ab16..aa2308eac 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 @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, ViewChild } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; @@ -17,6 +17,8 @@ import { CorrespondentEditDialogComponent } from '../manage/correspondent-list/c import { DocumentTypeEditDialogComponent } from '../manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component'; import { PDFDocumentProxy } from 'ng2-pdf-viewer'; import { ToastService } from 'src/app/services/toast.service'; +import { TextComponent } from '../common/input/text/text.component'; +import { SettingsService, SETTINGS_KEYS } from 'src/app/services/settings.service'; @Component({ selector: 'app-document-detail', @@ -25,6 +27,9 @@ import { ToastService } from 'src/app/services/toast.service'; }) export class DocumentDetailComponent implements OnInit { + @ViewChild("inputTitle") + titleInput: TextComponent + expandOriginalMetadata = false expandArchivedMetadata = false @@ -66,7 +71,12 @@ export class DocumentDetailComponent implements OnInit { private openDocumentService: OpenDocumentsService, private documentListViewService: DocumentListViewService, private documentTitlePipe: DocumentTitlePipe, - private toastService: ToastService) { } + private toastService: ToastService, + private settings: SettingsService) { } + + get useNativePdfViewer(): boolean { + return this.settings.get(SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER) + } getContentType() { return this.metadata?.has_archive_version ? 'application/pdf' : this.metadata?.original_mime_type @@ -157,6 +167,7 @@ export class DocumentDetailComponent implements OnInit { if (nextDocId) { this.openDocumentService.closeDocument(this.document) this.router.navigate(['documents', nextDocId]) + this.titleInput.focus() } }, error => { this.networkActive = false diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html index b9912ec1d..053126445 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -6,8 +6,7 @@  Cancel -
    -
    +
    -
    -
    -
    @@ -14,7 +13,7 @@
    -
    -
    -
    - -
    +
    + +
    +
    + + +
    +
    + [class.active]="list.sortField == f.field">{{f.name}} +
    - -
    -
    +
    + +
    + + +
    +     -
    - -
    - - -
    -     - - - -
    + +
    -
    - +
    @@ -92,7 +90,7 @@
    - +
    @@ -104,55 +102,43 @@ [currentSortField]="list.sortField" [currentSortReverse]="list.sortReverse" (sort)="onSort($event)" - i18n> - ASN - + i18n>ASN - Correspondent - + i18n>Correspondent - Title - + i18n>Title - Document type - + i18n>Document type - Created - + i18n>Created - Added - + i18n>Added - +
    - +
    @@ -161,28 +147,28 @@ - {{(d.correspondent$ | async)?.name}} + {{(d.correspondent$ | async)?.name}} {{d.title | documentTitle}} - + - {{(d.document_type$ | async)?.name}} + {{(d.document_type$ | async)?.name}} - {{d.created | date}} + {{d.created | customDate}} - {{d.added | date}} + {{d.added | customDate}}
    - +
    diff --git a/src-ui/src/app/components/document-list/document-list.component.scss b/src-ui/src/app/components/document-list/document-list.component.scss index d7c08abec..28f765e29 100644 --- a/src-ui/src/app/components/document-list/document-list.component.scss +++ b/src-ui/src/app/components/document-list/document-list.component.scss @@ -1,5 +1,9 @@ @import "/src/theme"; +tr { + user-select: none; +} + .table-row-selected { background-color: $primaryFaded; } @@ -25,3 +29,8 @@ $paperless-card-breakpoints: ( } } } + +.dropdown-menu-right { + right: 0 !important; + left: auto !important; +} diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index db9fbb52e..509c0a735 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -33,6 +33,8 @@ export class DocumentListComponent implements OnInit { displayMode = 'smallCards' // largeCards, smallCards, details + filterRulesModified: boolean = false + get isFiltered() { return this.list.filterRules?.length > 0 } @@ -69,13 +71,14 @@ export class DocumentListComponent implements OnInit { this.router.navigate(["404"]) return } - this.list.savedView = view this.list.reload() + this.rulesChanged() }) } else { this.list.savedView = null this.list.reload() + this.rulesChanged() } }) } @@ -83,6 +86,7 @@ export class DocumentListComponent implements OnInit { loadViewConfig(view: PaperlessSavedView) { this.list.load(view) this.list.reload() + this.rulesChanged() } saveViewConfig() { @@ -105,6 +109,7 @@ export class DocumentListComponent implements OnInit { sort_reverse: this.list.sortReverse, sort_field: this.list.sortField } + this.savedViewService.create(savedView).subscribe(() => { modal.close() this.toastService.showInfo($localize`View "${savedView.name}" created successfully.`) @@ -115,6 +120,51 @@ export class DocumentListComponent implements OnInit { }) } + resetFilters(): void { + this.filterRulesModified = false + if (this.list.savedViewId) { + this.savedViewService.getCached(this.list.savedViewId).subscribe(viewUntouched => { + this.list.filterRules = viewUntouched.filter_rules + this.list.reload() + }) + } else { + this.list.filterRules = [] + this.list.reload() + } + } + + rulesChanged() { + let modified = false + if (this.list.savedView == null) { + modified = this.list.filterRules.length > 0 // documents list is modified if it has any filters + } else { + // compare savedView current filters vs original + this.savedViewService.getCached(this.list.savedViewId).subscribe(view => { + let filterRulesInitial = view.filter_rules + + if (this.list.filterRules.length !== filterRulesInitial.length) modified = true + else { + modified = this.list.filterRules.some(rule => { + return (filterRulesInitial.find(fri => fri.rule_type == rule.rule_type && fri.value == rule.value) == undefined) + }) + + if (!modified) { + // only check other direction if we havent already determined is modified + modified = filterRulesInitial.some(rule => { + this.list.filterRules.find(fr => fr.rule_type == rule.rule_type && fr.value == rule.value) == undefined + }) + } + } + }) + } + this.filterRulesModified = modified + } + + toggleSelected(document: PaperlessDocument, event: MouseEvent): void { + if (!event.shiftKey) this.list.toggleSelected(document) + else this.list.selectRangeTo(document) + } + clickTag(tagID: number) { this.list.selectNone() setTimeout(() => { diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html index efbf6ce7e..033596f53 100644 --- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html @@ -1,33 +1,36 @@
    -
    - - +
    + +
    - - - -
    -
    diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts index e6565beac..a9111bc9f 100644 --- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts @@ -40,7 +40,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy { case FILTER_HAS_TAG: return $localize`Tag: ${this.tags.find(t => t.id == +rule.value)?.name}` - + case FILTER_HAS_ANY_TAG: if (rule.value == "false") { return $localize`Without any tag` @@ -127,7 +127,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy { } else { this.tagSelectionModel.getSelectedItems().filter(tag => tag.id).forEach(tag => { filterRules.push({rule_type: FILTER_HAS_TAG, value: tag.id?.toString()}) - }) + }) } this.correspondentSelectionModel.getSelectedItems().forEach(correspondent => { filterRules.push({rule_type: FILTER_CORRESPONDENT, value: correspondent.id?.toString()}) @@ -153,16 +153,16 @@ export class FilterEditorComponent implements OnInit, OnDestroy { @Output() filterRulesChange = new EventEmitter() + @Output() + reset = new EventEmitter() + + @Input() + rulesModified: boolean = false + updateRules() { this.filterRulesChange.next(this.filterRules) } - hasFilters() { - return this._titleFilter || - this.dateAddedAfter || this.dateAddedBefore || this.dateCreatedAfter || this.dateCreatedBefore || - this.tagSelectionModel.selectionSize() || this.correspondentSelectionModel.selectionSize() || this.documentTypeSelectionModel.selectionSize() - } - get titleFilter() { return this._titleFilter } @@ -194,16 +194,8 @@ export class FilterEditorComponent implements OnInit, OnDestroy { this.titleFilterDebounce.complete() } - clearSelected() { - this._titleFilter = "" - this.tagSelectionModel.clear(false) - this.documentTypeSelectionModel.clear(false) - this.correspondentSelectionModel.clear(false) - this.dateAddedBefore = null - this.dateAddedAfter = null - this.dateCreatedBefore = null - this.dateCreatedAfter = null - this.updateRules() + resetSelected() { + this.reset.next() } toggleTag(tagId: number) { @@ -218,4 +210,15 @@ export class FilterEditorComponent implements OnInit, OnDestroy { this.documentTypeSelectionModel.toggle(documentTypeId) } + onTagsDropdownOpen() { + this.tagSelectionModel.apply() + } + + onCorrespondentDropdownOpen() { + this.correspondentSelectionModel.apply() + } + + onDocumentTypeDropdownOpen() { + this.documentTypeSelectionModel.apply() + } } diff --git a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html index f2063df7e..7f1d39859 100644 --- a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html +++ b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html @@ -1,7 +1,7 @@
    -
    diff --git a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts index e930ffaed..4f70941dd 100644 --- a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts +++ b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts @@ -20,6 +20,8 @@ export class SaveViewConfigDialogComponent implements OnInit { @Input() buttonsEnabled = true + closeEnabled = false + _defaultName = "" get defaultName() { @@ -31,7 +33,7 @@ export class SaveViewConfigDialogComponent implements OnInit { this._defaultName = value this.saveViewConfigForm.patchValue({name: value}) } - + saveViewConfigForm = new FormGroup({ name: new FormControl(''), showInSideBar: new FormControl(false), @@ -39,6 +41,10 @@ export class SaveViewConfigDialogComponent implements OnInit { }) ngOnInit(): void { + // wait to enable close button so it doesnt steal focus from input since its the first clickable element in the DOM + setTimeout(() => { + this.closeEnabled = true + }); } save() { diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html index 3544aeed0..bbc2c8453 100644 --- a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html +++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html @@ -1,12 +1,11 @@
    -
    - diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html index c04a0bcfe..4cbafb817 100644 --- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html +++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.html @@ -2,11 +2,18 @@ -
    - +
    +
    +
    + + +
    +
    + +
    - +
    @@ -21,7 +28,7 @@ - +
    Name{{ correspondent.name }} {{ getMatching(correspondent) }} {{ correspondent.document_count }}{{ correspondent.last_correspondence | date }}{{ correspondent.last_correspondence | customDate }}
    diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html index 0282ae863..613cc4fd4 100644 --- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html +++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.html @@ -2,12 +2,18 @@ -
    - +
    +
    +
    + + +
    +
    + +
    - +
    diff --git a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts index e1d5226f3..7c5dbc8e3 100644 --- a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts +++ b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts @@ -1,17 +1,19 @@ -import { Directive, OnInit, QueryList, ViewChildren } from '@angular/core'; +import { Directive, OnDestroy, OnInit, QueryList, ViewChildren } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { Subject, Subscription } from 'rxjs'; +import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; import { MatchingModel, MATCHING_ALGORITHMS, MATCH_AUTO } from 'src/app/data/matching-model'; import { ObjectWithId } from 'src/app/data/object-with-id'; import { SortableDirective, SortEvent } from 'src/app/directives/sortable.directive'; -import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service'; +import { AbstractNameFilterService } from 'src/app/services/rest/abstract-name-filter-service'; import { ToastService } from 'src/app/services/toast.service'; import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component'; @Directive() -export abstract class GenericListComponent implements OnInit { +export abstract class GenericListComponent implements OnInit, OnDestroy { constructor( - private service: AbstractPaperlessService, + private service: AbstractNameFilterService, private modalService: NgbModal, private editDialogComponent: any, private toastService: ToastService) { @@ -28,6 +30,10 @@ export abstract class GenericListComponent implements On public sortField: string public sortReverse: boolean + private nameFilterDebounce: Subject + private subscription: Subscription + private _nameFilter: string + getMatching(o: MatchingModel) { if (o.matching_algorithm == MATCH_AUTO) { return $localize`Automatic` @@ -44,12 +50,27 @@ export abstract class GenericListComponent implements On this.reloadData() } + ngOnInit(): void { this.reloadData() + + this.nameFilterDebounce = new Subject() + + this.subscription = this.nameFilterDebounce.pipe( + debounceTime(400), + distinctUntilChanged() + ).subscribe(title => { + this._nameFilter = title + this.reloadData() + }) + } + + ngOnDestroy() { + this.subscription.unsubscribe() } reloadData() { - this.service.list(this.page, null, this.sortField, this.sortReverse).subscribe(c => { + this.service.listFiltered(this.page, null, this.sortField, this.sortReverse, this._nameFilter).subscribe(c => { this.data = c.results this.collectionSize = c.count }); @@ -95,4 +116,12 @@ export abstract class GenericListComponent implements On } ) } + + get nameFilter() { + return this._nameFilter + } + + set nameFilter(nameFilter: string) { + this.nameFilterDebounce.next(nameFilter) + } } diff --git a/src-ui/src/app/components/manage/logs/logs.component.html b/src-ui/src/app/components/manage/logs/logs.component.html index 8c2cbae34..be14faf1d 100644 --- a/src-ui/src/app/components/manage/logs/logs.component.html +++ b/src-ui/src/app/components/manage/logs/logs.component.html @@ -5,8 +5,8 @@  Filter - - + +
    + diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts index 559ffe00f..47f714c21 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.ts +++ b/src-ui/src/app/components/manage/settings/settings.component.ts @@ -1,9 +1,9 @@ -import { Component, OnInit, Renderer2 } from '@angular/core'; +import { Component, Inject, LOCALE_ID, OnInit, Renderer2 } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { PaperlessSavedView } from 'src/app/data/paperless-saved-view'; import { DocumentListViewService } from 'src/app/services/document-list-view.service'; import { SavedViewService } from 'src/app/services/rest/saved-view.service'; -import { SettingsService, SETTINGS_KEYS } from 'src/app/services/settings.service'; +import { LanguageOption, SettingsService, SETTINGS_KEYS } from 'src/app/services/settings.service'; import { ToastService } from 'src/app/services/toast.service'; @Component({ @@ -21,16 +21,25 @@ export class SettingsComponent implements OnInit { 'documentListItemPerPage': new FormControl(this.settings.get(SETTINGS_KEYS.DOCUMENT_LIST_SIZE)), 'darkModeUseSystem': new FormControl(this.settings.get(SETTINGS_KEYS.DARK_MODE_USE_SYSTEM)), 'darkModeEnabled': new FormControl(this.settings.get(SETTINGS_KEYS.DARK_MODE_ENABLED)), - 'savedViews': this.savedViewGroup + 'useNativePdfViewer': new FormControl(this.settings.get(SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER)), + 'savedViews': this.savedViewGroup, + 'displayLanguage': new FormControl(this.settings.getLanguage()), + 'dateLocale': new FormControl(this.settings.get(SETTINGS_KEYS.DATE_LOCALE)), + 'dateFormat': new FormControl(this.settings.get(SETTINGS_KEYS.DATE_FORMAT)), }) savedViews: PaperlessSavedView[] + get computedDateLocale(): string { + return this.settingsForm.value.dateLocale || this.settingsForm.value.displayLanguage + } + constructor( public savedViewService: SavedViewService, private documentListViewService: DocumentListViewService, private toastService: ToastService, - private settings: SettingsService + private settings: SettingsService, + @Inject(LOCALE_ID) public currentLocale: string ) { } ngOnInit() { @@ -55,25 +64,33 @@ export class SettingsComponent implements OnInit { }) } - toggleDarkModeSetting() { - if (this.settingsForm.value.darkModeUseSystem) { - (this.settingsForm.controls.darkModeEnabled as FormControl).disable() - } else { - (this.settingsForm.controls.darkModeEnabled as FormControl).enable() - } - } - private saveLocalSettings() { this.settings.set(SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE, this.settingsForm.value.bulkEditApplyOnClose) this.settings.set(SETTINGS_KEYS.BULK_EDIT_CONFIRMATION_DIALOGS, this.settingsForm.value.bulkEditConfirmationDialogs) this.settings.set(SETTINGS_KEYS.DOCUMENT_LIST_SIZE, this.settingsForm.value.documentListItemPerPage) this.settings.set(SETTINGS_KEYS.DARK_MODE_USE_SYSTEM, this.settingsForm.value.darkModeUseSystem) this.settings.set(SETTINGS_KEYS.DARK_MODE_ENABLED, (this.settingsForm.value.darkModeEnabled == true).toString()) + this.settings.set(SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER, this.settingsForm.value.useNativePdfViewer) + this.settings.set(SETTINGS_KEYS.DATE_LOCALE, this.settingsForm.value.dateLocale) + this.settings.set(SETTINGS_KEYS.DATE_FORMAT, this.settingsForm.value.dateFormat) + this.settings.setLanguage(this.settingsForm.value.displayLanguage) this.documentListViewService.updatePageSize() this.settings.updateDarkModeSettings() this.toastService.showInfo($localize`Settings saved successfully.`) } + get displayLanguageOptions(): LanguageOption[] { + return [{code: "", name: $localize`Use system language`}].concat(this.settings.getLanguageOptions()) + } + + get dateLocaleOptions(): LanguageOption[] { + return [{code: "", name: $localize`Use date format of display language`}].concat(this.settings.getLanguageOptions()) + } + + get today() { + return new Date() + } + saveSettings() { let x = [] for (let id in this.savedViewGroup.value) { diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html index ad40659fb..fd4c3b7f0 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html +++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html @@ -1,12 +1,12 @@
    -
    - +
    diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.html b/src-ui/src/app/components/manage/tag-list/tag-list.component.html index 4af22b3cd..036beccbc 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-list.component.html +++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.html @@ -2,9 +2,15 @@ -
    - +
    +
    +
    + + +
    +
    + +
    Name
    diff --git a/src-ui/src/app/components/search/search.component.html b/src-ui/src/app/components/search/search.component.html index 547c8a475..ae0ec8e3e 100644 --- a/src-ui/src/app/components/search/search.component.html +++ b/src-ui/src/app/components/search/search.component.html @@ -16,11 +16,13 @@

    {resultCount, plural, =0 {No results} =1 {One result} other {{{resultCount}} results}}

    - + + + + -
    diff --git a/src-ui/src/app/data/filter-rule-type.ts b/src-ui/src/app/data/filter-rule-type.ts index 577e304d2..4669b548e 100644 --- a/src-ui/src/app/data/filter-rule-type.ts +++ b/src-ui/src/app/data/filter-rule-type.ts @@ -22,37 +22,36 @@ export const FILTER_ASN_ISNULL = 18 export const FILTER_RULE_TYPES: FilterRuleType[] = [ - {id: FILTER_TITLE, name: "Title contains", filtervar: "title__icontains", datatype: "string", multi: false, default: ""}, - {id: FILTER_CONTENT, name: "Content contains", filtervar: "content__icontains", datatype: "string", multi: false, default: ""}, + {id: FILTER_TITLE, filtervar: "title__icontains", datatype: "string", multi: false, default: ""}, + {id: FILTER_CONTENT, filtervar: "content__icontains", datatype: "string", multi: false, default: ""}, - {id: FILTER_ASN, name: "ASN is", filtervar: "archive_serial_number", datatype: "number", multi: false}, + {id: FILTER_ASN, filtervar: "archive_serial_number", datatype: "number", multi: false}, - {id: FILTER_CORRESPONDENT, name: "Correspondent is", filtervar: "correspondent__id", isnull_filtervar: "correspondent__isnull", datatype: "correspondent", multi: false}, - {id: FILTER_DOCUMENT_TYPE, name: "Document type is", filtervar: "document_type__id", isnull_filtervar: "document_type__isnull", datatype: "document_type", multi: false}, + {id: FILTER_CORRESPONDENT, filtervar: "correspondent__id", isnull_filtervar: "correspondent__isnull", datatype: "correspondent", multi: false}, + {id: FILTER_DOCUMENT_TYPE, filtervar: "document_type__id", isnull_filtervar: "document_type__isnull", datatype: "document_type", multi: false}, - {id: FILTER_IS_IN_INBOX, name: "Is in Inbox", filtervar: "is_in_inbox", datatype: "boolean", multi: false, default: true}, - {id: FILTER_HAS_TAG, name: "Has tag", filtervar: "tags__id__all", datatype: "tag", multi: true}, - {id: FILTER_DOES_NOT_HAVE_TAG, name: "Does not have tag", filtervar: "tags__id__none", datatype: "tag", multi: true}, - {id: FILTER_HAS_ANY_TAG, name: "Has any tag", filtervar: "is_tagged", datatype: "boolean", multi: false, default: true}, + {id: FILTER_IS_IN_INBOX, filtervar: "is_in_inbox", datatype: "boolean", multi: false, default: true}, + {id: FILTER_HAS_TAG, filtervar: "tags__id__all", datatype: "tag", multi: true}, + {id: FILTER_DOES_NOT_HAVE_TAG, filtervar: "tags__id__none", datatype: "tag", multi: true}, + {id: FILTER_HAS_ANY_TAG, filtervar: "is_tagged", datatype: "boolean", multi: false, default: true}, - {id: FILTER_CREATED_BEFORE, name: "Created before", filtervar: "created__date__lt", datatype: "date", multi: false}, - {id: FILTER_CREATED_AFTER, name: "Created after", filtervar: "created__date__gt", datatype: "date", multi: false}, + {id: FILTER_CREATED_BEFORE, filtervar: "created__date__lt", datatype: "date", multi: false}, + {id: FILTER_CREATED_AFTER, filtervar: "created__date__gt", datatype: "date", multi: false}, - {id: FILTER_CREATED_YEAR, name: "Year created is", filtervar: "created__year", datatype: "number", multi: false}, - {id: FILTER_CREATED_MONTH, name: "Month created is", filtervar: "created__month", datatype: "number", multi: false}, - {id: FILTER_CREATED_DAY, name: "Day created is", filtervar: "created__day", datatype: "number", multi: false}, + {id: FILTER_CREATED_YEAR, filtervar: "created__year", datatype: "number", multi: false}, + {id: FILTER_CREATED_MONTH, filtervar: "created__month", datatype: "number", multi: false}, + {id: FILTER_CREATED_DAY, filtervar: "created__day", datatype: "number", multi: false}, - {id: FILTER_ADDED_BEFORE, name: "Added before", filtervar: "added__date__lt", datatype: "date", multi: false}, - {id: FILTER_ADDED_AFTER, name: "Added after", filtervar: "added__date__gt", datatype: "date", multi: false}, + {id: FILTER_ADDED_BEFORE, filtervar: "added__date__lt", datatype: "date", multi: false}, + {id: FILTER_ADDED_AFTER, filtervar: "added__date__gt", datatype: "date", multi: false}, - {id: FILTER_MODIFIED_BEFORE, name: "Modified before", filtervar: "modified__date__lt", datatype: "date", multi: false}, - {id: FILTER_MODIFIED_AFTER, name: "Modified after", filtervar: "modified__date__gt", datatype: "date", multi: false}, - {id: FILTER_ASN_ISNULL, name: "ASN is null", filtervar: "archive_serial_number__isnull", datatype: "boolean", multi: false} + {id: FILTER_MODIFIED_BEFORE, filtervar: "modified__date__lt", datatype: "date", multi: false}, + {id: FILTER_MODIFIED_AFTER, filtervar: "modified__date__gt", datatype: "date", multi: false}, + {id: FILTER_ASN_ISNULL, filtervar: "archive_serial_number__isnull", datatype: "boolean", multi: false} ] export interface FilterRuleType { id: number - name: string filtervar: string isnull_filtervar?: string datatype: string //number, string, boolean, date diff --git a/src-ui/src/app/pipes/custom-date.pipe.spec.ts b/src-ui/src/app/pipes/custom-date.pipe.spec.ts new file mode 100644 index 000000000..822966baf --- /dev/null +++ b/src-ui/src/app/pipes/custom-date.pipe.spec.ts @@ -0,0 +1,8 @@ +import { CustomDatePipe } from './custom-date.pipe'; + +describe('CustomDatePipe', () => { + it('create an instance', () => { + const pipe = new CustomDatePipe(); + expect(pipe).toBeTruthy(); + }); +}); diff --git a/src-ui/src/app/pipes/custom-date.pipe.ts b/src-ui/src/app/pipes/custom-date.pipe.ts new file mode 100644 index 000000000..19989fbdd --- /dev/null +++ b/src-ui/src/app/pipes/custom-date.pipe.ts @@ -0,0 +1,19 @@ +import { DatePipe } from '@angular/common'; +import { Inject, LOCALE_ID, Pipe, PipeTransform } from '@angular/core'; +import { SettingsService, SETTINGS_KEYS } from '../services/settings.service'; + +@Pipe({ + name: 'customDate' +}) +export class CustomDatePipe extends DatePipe implements PipeTransform { + + constructor(@Inject(LOCALE_ID) locale: string, private settings: SettingsService) { + super(settings.get(SETTINGS_KEYS.DATE_LOCALE) || locale) + + } + + transform(value: any, format?: string, timezone?: string, locale?: string): string | null { + return super.transform(value, format || this.settings.get(SETTINGS_KEYS.DATE_FORMAT), timezone, locale) + } + +} diff --git a/src-ui/src/app/pipes/safe.pipe.spec.ts b/src-ui/src/app/pipes/safe.pipe.spec.ts new file mode 100644 index 000000000..49ee0ad14 --- /dev/null +++ b/src-ui/src/app/pipes/safe.pipe.spec.ts @@ -0,0 +1,8 @@ +import { SafePipe } from './safe.pipe'; + +describe('SafePipe', () => { + it('create an instance', () => { + const pipe = new SafePipe(); + expect(pipe).toBeTruthy(); + }); +}); diff --git a/src-ui/src/app/pipes/safe.pipe.ts b/src-ui/src/app/pipes/safe.pipe.ts new file mode 100644 index 000000000..6614964a9 --- /dev/null +++ b/src-ui/src/app/pipes/safe.pipe.ts @@ -0,0 +1,19 @@ +import { Pipe, PipeTransform } from '@angular/core'; +import { DomSanitizer } from '@angular/platform-browser'; + +@Pipe({ + name: 'safe' +}) +export class SafePipe implements PipeTransform { + + constructor(private sanitizer: DomSanitizer) { } + + transform(url) { + if (url == null) { + return this.sanitizer.bypassSecurityTrustResourceUrl("") + } else { + return this.sanitizer.bypassSecurityTrustResourceUrl(url); + } + } + +} \ No newline at end of file diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts index 1bbcca38e..4eb0c276c 100644 --- a/src-ui/src/app/services/document-list-view.service.ts +++ b/src-ui/src/app/services/document-list-view.service.ts @@ -27,6 +27,8 @@ export class DocumentListViewService { currentPage = 1 currentPageSize: number = this.settings.get(SETTINGS_KEYS.DOCUMENT_LIST_SIZE) collectionSize: number + rangeSelectionAnchorIndex: number + lastRangeSelectionToIndex: number /** * This is the current config for the document list. The service will always remember the last settings used for the document list. @@ -108,6 +110,7 @@ export class DocumentListViewService { if (onFinish) { onFinish() } + this.rangeSelectionAnchorIndex = this.lastRangeSelectionToIndex = null this.isReloading = false }, error => { @@ -218,6 +221,7 @@ export class DocumentListViewService { selectNone() { this.selected.clear() + this.rangeSelectionAnchorIndex = this.lastRangeSelectionToIndex = null } reduceSelectionToFilter() { @@ -249,14 +253,39 @@ export class DocumentListViewService { return this.selected.has(d.id) } - setSelected(d: PaperlessDocument, value: boolean) { - if (value) { - this.selected.add(d.id) - } else if (!value) { - this.selected.delete(d.id) + toggleSelected(d: PaperlessDocument): void { + if (this.selected.has(d.id)) this.selected.delete(d.id) + else this.selected.add(d.id) + this.rangeSelectionAnchorIndex = this.documentIndexInCurrentView(d.id) + this.lastRangeSelectionToIndex = null + } + + selectRangeTo(d: PaperlessDocument) { + if (this.rangeSelectionAnchorIndex !== null) { + const documentToIndex = this.documentIndexInCurrentView(d.id) + const fromIndex = Math.min(this.rangeSelectionAnchorIndex, documentToIndex) + const toIndex = Math.max(this.rangeSelectionAnchorIndex, documentToIndex) + + if (this.lastRangeSelectionToIndex !== null) { + // revert the old selection + this.documents.slice(Math.min(this.rangeSelectionAnchorIndex, this.lastRangeSelectionToIndex), Math.max(this.rangeSelectionAnchorIndex, this.lastRangeSelectionToIndex) + 1).forEach(d => { + this.selected.delete(d.id) + }) + } + + this.documents.slice(fromIndex, toIndex + 1).forEach(d => { + this.selected.add(d.id) + }) + this.lastRangeSelectionToIndex = documentToIndex + } else { // e.g. shift key but was first click + this.toggleSelected(d) } } + documentIndexInCurrentView(documentID: number): number { + return this.documents.map(d => d.id).indexOf(documentID) + } + constructor(private documentService: DocumentService, private settings: SettingsService, private router: Router) { let documentListViewConfigJson = sessionStorage.getItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG) if (documentListViewConfigJson) { diff --git a/src-ui/src/app/services/rest/abstract-name-filter-service.ts b/src-ui/src/app/services/rest/abstract-name-filter-service.ts new file mode 100644 index 000000000..d605fef49 --- /dev/null +++ b/src-ui/src/app/services/rest/abstract-name-filter-service.ts @@ -0,0 +1,14 @@ +import { ObjectWithId } from 'src/app/data/object-with-id' +import { AbstractPaperlessService } from './abstract-paperless-service' + +export abstract class AbstractNameFilterService extends AbstractPaperlessService { + + listFiltered(page?: number, pageSize?: number, sortField?: string, sortReverse?: boolean, nameFilter?: string) { + let params = {} + if (nameFilter) { + params = {'name__icontains': nameFilter} + } + return this.list(page, pageSize, sortField, sortReverse, params) + } + +} diff --git a/src-ui/src/app/services/rest/correspondent.service.ts b/src-ui/src/app/services/rest/correspondent.service.ts index a609b7dd8..7eac24971 100644 --- a/src-ui/src/app/services/rest/correspondent.service.ts +++ b/src-ui/src/app/services/rest/correspondent.service.ts @@ -1,12 +1,12 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent'; -import { AbstractPaperlessService } from './abstract-paperless-service'; +import { AbstractNameFilterService } from './abstract-name-filter-service'; @Injectable({ providedIn: 'root' }) -export class CorrespondentService extends AbstractPaperlessService { +export class CorrespondentService extends AbstractNameFilterService { constructor(http: HttpClient) { super(http, 'correspondents') diff --git a/src-ui/src/app/services/rest/document-type.service.ts b/src-ui/src/app/services/rest/document-type.service.ts index a3ba0d858..4f5b7d0ce 100644 --- a/src-ui/src/app/services/rest/document-type.service.ts +++ b/src-ui/src/app/services/rest/document-type.service.ts @@ -1,12 +1,12 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; -import { AbstractPaperlessService } from './abstract-paperless-service'; +import { AbstractNameFilterService } from './abstract-name-filter-service'; @Injectable({ providedIn: 'root' }) -export class DocumentTypeService extends AbstractPaperlessService { +export class DocumentTypeService extends AbstractNameFilterService { constructor(http: HttpClient) { super(http, 'document_types') diff --git a/src-ui/src/app/services/rest/search.service.ts b/src-ui/src/app/services/rest/search.service.ts index 3799f3dc7..e750100fa 100644 --- a/src-ui/src/app/services/rest/search.service.ts +++ b/src-ui/src/app/services/rest/search.service.ts @@ -28,7 +28,11 @@ export class SearchService { } return this.http.get(`${environment.apiBaseUrl}search/`, {params: httpParams}).pipe( map(result => { - result.results.forEach(hit => this.documentService.addObservablesToDocument(hit.document)) + result.results.forEach(hit => { + if (hit.document) { + this.documentService.addObservablesToDocument(hit.document) + } + }) return result }) ) diff --git a/src-ui/src/app/services/rest/tag.service.ts b/src-ui/src/app/services/rest/tag.service.ts index b4151dbb9..7bc55b0c9 100644 --- a/src-ui/src/app/services/rest/tag.service.ts +++ b/src-ui/src/app/services/rest/tag.service.ts @@ -1,12 +1,12 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { PaperlessTag } from 'src/app/data/paperless-tag'; -import { AbstractPaperlessService } from './abstract-paperless-service'; +import { AbstractNameFilterService } from './abstract-name-filter-service'; @Injectable({ providedIn: 'root' }) -export class TagService extends AbstractPaperlessService { +export class TagService extends AbstractNameFilterService { constructor(http: HttpClient) { super(http, 'tags') diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts index a8f85972d..041fb51ca 100644 --- a/src-ui/src/app/services/settings.service.ts +++ b/src-ui/src/app/services/settings.service.ts @@ -1,5 +1,7 @@ import { DOCUMENT } from '@angular/common'; import { Inject, Injectable, Renderer2, RendererFactory2 } from '@angular/core'; +import { Meta } from '@angular/platform-browser'; +import { CookieService } from 'ngx-cookie-service'; export interface PaperlessSettings { key: string @@ -7,12 +9,21 @@ export interface PaperlessSettings { default: any } +export interface LanguageOption { + code: string, + name: string, + englishName?: string +} + export const SETTINGS_KEYS = { BULK_EDIT_CONFIRMATION_DIALOGS: 'general-settings:bulk-edit:confirmation-dialogs', BULK_EDIT_APPLY_ON_CLOSE: 'general-settings:bulk-edit:apply-on-close', DOCUMENT_LIST_SIZE: 'general-settings:documentListSize', DARK_MODE_USE_SYSTEM: 'general-settings:dark-mode:use-system', - DARK_MODE_ENABLED: 'general-settings:dark-mode:enabled' + DARK_MODE_ENABLED: 'general-settings:dark-mode:enabled', + USE_NATIVE_PDF_VIEWER: 'general-settings:document-details:native-pdf-viewer', + DATE_LOCALE: 'general-settings:date-display:date-locale', + DATE_FORMAT: 'general-settings:date-display:date-format' } const SETTINGS: PaperlessSettings[] = [ @@ -20,7 +31,10 @@ const SETTINGS: PaperlessSettings[] = [ {key: SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE, type: "boolean", default: false}, {key: SETTINGS_KEYS.DOCUMENT_LIST_SIZE, type: "number", default: 50}, {key: SETTINGS_KEYS.DARK_MODE_USE_SYSTEM, type: "boolean", default: true}, - {key: SETTINGS_KEYS.DARK_MODE_ENABLED, type: "boolean", default: false} + {key: SETTINGS_KEYS.DARK_MODE_ENABLED, type: "boolean", default: false}, + {key: SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER, type: "boolean", default: false}, + {key: SETTINGS_KEYS.DATE_LOCALE, type: "string", default: ""}, + {key: SETTINGS_KEYS.DATE_FORMAT, type: "string", default: "mediumDate"} ] @Injectable({ @@ -32,7 +46,9 @@ export class SettingsService { constructor( private rendererFactory: RendererFactory2, - @Inject(DOCUMENT) private document + @Inject(DOCUMENT) private document, + private cookieService: CookieService, + private meta: Meta ) { this.renderer = rendererFactory.createRenderer(null, null); @@ -53,6 +69,35 @@ export class SettingsService { } + getLanguageOptions(): LanguageOption[] { + return [ + {code: "en-US", name: $localize`English (US)`, englishName: "English (US)"}, + {code: "de", name: $localize`German`, englishName: "German"}, + {code: "nl", name: $localize`Dutch`, englishName: "Dutch"}, + {code: "fr", name: $localize`French`, englishName: "French"} + ] + } + + private getLanguageCookieName() { + let prefix = "" + if (this.meta.getTag('name=cookie_prefix')) { + prefix = this.meta.getTag('name=cookie_prefix').content + } + return `${prefix || ''}django_language` + } + + getLanguage(): string { + return this.cookieService.get(this.getLanguageCookieName()) + } + + setLanguage(language: string) { + if (language) { + this.cookieService.set(this.getLanguageCookieName(), language) + } else { + this.cookieService.delete(this.getLanguageCookieName()) + } + } + get(key: string): any { let setting = SETTINGS.find(s => s.key == key) diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts index 1ac69bc39..fbd65d573 100644 --- a/src-ui/src/environments/environment.prod.ts +++ b/src-ui/src/environments/environment.prod.ts @@ -2,5 +2,5 @@ export const environment = { production: true, apiBaseUrl: "/api/", appTitle: "Paperless-ng", - version: "0.9.11" + version: "1.0.0" }; diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf index 98a3b057c..a898e4630 100644 --- a/src-ui/src/locale/messages.de.xlf +++ b/src-ui/src/locale/messages.de.xlf @@ -6,7 +6,7 @@ Dokumente src/app/components/document-list/document-list.component.ts - 38 + 43 @@ -14,7 +14,7 @@ Ansicht "" erfolgreich gespeichert. src/app/components/document-list/document-list.component.ts - 84 + 94 @@ -22,7 +22,7 @@ Ansicht "" erfolgreich erstellt. src/app/components/document-list/document-list.component.ts - 103 + 115 @@ -38,7 +38,7 @@ Nichts auswählen src/app/components/document-list/document-list.component.html - 11 + 10 @@ -46,7 +46,7 @@ Seite auswählen src/app/components/document-list/document-list.component.html - 12 + 11 @@ -54,15 +54,15 @@ Alles auswählen src/app/components/document-list/document-list.component.html - 13 + 12 - - Sort by + + Sort Sortieren src/app/components/document-list/document-list.component.html - 41 + 39 @@ -94,7 +94,7 @@ {VAR_PLURAL, plural, =1 { von 1 Dokumente ausgewählt} other { von Dokumente ausgewählt}} src/app/components/document-list/document-list.component.html - 86 + 85 @@ -102,7 +102,15 @@ {VAR_PLURAL, plural, =1 {Ein Dokument} other { Dokumente}} src/app/components/document-list/document-list.component.html - 87 + 86 + + + + (filtered) + (gefiltert) + + src/app/components/document-list/document-list.component.html + 86 @@ -110,7 +118,7 @@ ASN src/app/components/document-list/document-list.component.html - 100 + 105 @@ -118,7 +126,7 @@ Korrespondent src/app/components/document-list/document-list.component.html - 101 + 111 @@ -126,7 +134,7 @@ Titel src/app/components/document-list/document-list.component.html - 102 + 117 @@ -134,7 +142,7 @@ Dokumenttyp src/app/components/document-list/document-list.component.html - 103 + 123 @@ -142,7 +150,7 @@ Erstellt src/app/components/document-list/document-list.component.html - 104 + 129 @@ -150,7 +158,7 @@ Hinzugefügt src/app/components/document-list/document-list.component.html - 105 + 135 @@ -158,7 +166,7 @@ Löschen bestätigen src/app/components/document-detail/document-detail.component.ts - 161 + 192 @@ -166,7 +174,7 @@ Möchten Sie das Dokument "" wirklich löschen? src/app/components/document-detail/document-detail.component.ts - 162 + 193 @@ -174,7 +182,7 @@ Die Dateien dieses Dokuments werden permanent gelöscht. Diese Aktion kann nicht rückgängig gemacht werden. src/app/components/document-detail/document-detail.component.ts - 163 + 194 @@ -182,7 +190,15 @@ Dokument löschen src/app/components/document-detail/document-detail.component.ts - 165 + 196 + + + + Error deleting document: + Fehler beim Löschen des Dokuments: + + src/app/components/document-detail/document-detail.component.ts + 203 @@ -230,7 +246,7 @@ Inhalt src/app/components/document-detail/document-detail.component.html - 76 + 72 @@ -238,7 +254,7 @@ Metadaten src/app/components/document-detail/document-detail.component.html - 85 + 81 @@ -246,7 +262,7 @@ Verwerfen src/app/components/document-detail/document-detail.component.html - 134 + 130 @@ -254,7 +270,7 @@ Speichern src/app/components/document-detail/document-detail.component.html - 136 + 132 @@ -286,7 +302,7 @@ Archiv-Seriennummer src/app/components/document-detail/document-detail.component.html - 61 + 60 @@ -294,15 +310,7 @@ Erstellt am src/app/components/document-detail/document-detail.component.html - 65 - - - - Tags - Tags - - src/app/components/document-detail/document-detail.component.html - 70 + 61 @@ -310,7 +318,7 @@ Geändert am src/app/components/document-detail/document-detail.component.html - 91 + 87 @@ -318,7 +326,7 @@ Hinzugefügt am src/app/components/document-detail/document-detail.component.html - 95 + 91 @@ -326,7 +334,7 @@ Media-Dateiname src/app/components/document-detail/document-detail.component.html - 99 + 95 @@ -334,7 +342,7 @@ MD5-Prüfsumme Original src/app/components/document-detail/document-detail.component.html - 103 + 99 @@ -342,7 +350,7 @@ Dateigröße Original src/app/components/document-detail/document-detail.component.html - 107 + 103 @@ -350,7 +358,7 @@ MIME-Typ Original src/app/components/document-detail/document-detail.component.html - 111 + 107 @@ -358,7 +366,7 @@ MD5-Prüfsumme Archiv src/app/components/document-detail/document-detail.component.html - 115 + 111 @@ -366,7 +374,7 @@ Dateigröße Archiv src/app/components/document-detail/document-detail.component.html - 119 + 115 @@ -374,7 +382,7 @@ Original-Metadaten src/app/components/document-detail/document-detail.component.html - 125 + 121 @@ -382,7 +390,7 @@ Metadaten des archivierten Dokuments src/app/components/document-detail/document-detail.component.html - 126 + 122 @@ -390,7 +398,7 @@ Speichern & weiter src/app/components/document-detail/document-detail.component.html - 135 + 131 @@ -422,7 +430,15 @@ Möchten Sie das Tag "" wirklich löschen? src/app/components/manage/tag-list/tag-list.component.ts - 28 + 30 + + + + Tags + Tags + + src/app/components/manage/tag-list/tag-list.component.html + 1 @@ -433,12 +449,20 @@ 2 + + Filter by: + Filtern nach: + + src/app/components/manage/tag-list/tag-list.component.html + 8 + + Name Name src/app/components/manage/tag-list/tag-list.component.html - 13 + 9 @@ -446,7 +470,7 @@ Farbe src/app/components/manage/tag-list/tag-list.component.html - 14 + 20 @@ -454,7 +478,7 @@ Zuweisung src/app/components/manage/tag-list/tag-list.component.html - 15 + 21 @@ -462,7 +486,7 @@ Anzahl Dokumente src/app/components/manage/tag-list/tag-list.component.html - 16 + 22 @@ -470,7 +494,7 @@ Aktionen src/app/components/manage/tag-list/tag-list.component.html - 17 + 23 @@ -478,7 +502,7 @@ Dokumente src/app/components/manage/tag-list/tag-list.component.html - 32 + 38 @@ -486,7 +510,7 @@ Bearbeiten src/app/components/manage/tag-list/tag-list.component.html - 37 + 43 @@ -494,7 +518,7 @@ Möchten Sie den Dokumenttyp "" wirklich löschen? src/app/components/manage/document-type-list/document-type-list.component.ts - 24 + 26 @@ -526,7 +550,7 @@ Gespeicherte Ansicht "" gelöscht. src/app/components/manage/settings/settings.component.ts - 54 + 63 @@ -534,7 +558,23 @@ Einstellungen erfolgreich gespeichert. src/app/components/manage/settings/settings.component.ts - 74 + 79 + + + + Use system language + Benutze Systemsprache + + src/app/components/manage/settings/settings.component.ts + 83 + + + + Use date format of display language + Benutze Datumsformat der Anzeigesprache + + src/app/components/manage/settings/settings.component.ts + 87 @@ -542,7 +582,7 @@ Fehler beim Speichern der Einstellungen auf dem Server: src/app/components/manage/settings/settings.component.ts - 86 + 103 @@ -566,7 +606,7 @@ Gespeicherte Ansichten src/app/components/manage/settings/settings.component.html - 56 + 114 @@ -577,12 +617,92 @@ 13 + + Display language + Anzeigesprache + + src/app/components/manage/settings/settings.component.html + 17 + + + + You need to reload the page after applying a new language. + Nachdem Sie eine neue Sprache ausgewählt haben, müssen Sie die Seite neu laden. + + src/app/components/manage/settings/settings.component.html + 25 + + + + Date display + Datumsanzeige + + src/app/components/manage/settings/settings.component.html + 32 + + + + Date format + Datumsformat + + src/app/components/manage/settings/settings.component.html + 45 + + + + Short: + Kurz: + + src/app/components/manage/settings/settings.component.html + 51 + + + + Medium: + Mittel: + + src/app/components/manage/settings/settings.component.html + 55 + + + + Long: + Lang: + + src/app/components/manage/settings/settings.component.html + 59 + + Items per page Dokumente pro Seite src/app/components/manage/settings/settings.component.html - 17 + 67 + + + + Document editor + Dokumenteditor + + src/app/components/manage/settings/settings.component.html + 83 + + + + Use PDF viewer provided by the browser + Benutze PDF-Betrachter des Web Browsers + + src/app/components/manage/settings/settings.component.html + 87 + + + + This is usually faster for displaying large PDF documents, but it might not work on some browsers. + Der integrierte PDF-Betrachter des Web-Browsers ist in der Regel schneller bei der Anzeige besonders großer Dokumente, funktioniert aber nicht in allen Browsern. + + src/app/components/manage/settings/settings.component.html + 87 @@ -590,7 +710,7 @@ Dunkler Modus src/app/components/manage/settings/settings.component.html - 33 + 94 @@ -598,7 +718,15 @@ Benutze Systemeinstellungen src/app/components/manage/settings/settings.component.html - 36 + 97 + + + + Enable dark mode + Dunklen Modus aktivieren + + src/app/components/manage/settings/settings.component.html + 98 @@ -606,7 +734,7 @@ Massenbearbeitung src/app/components/manage/settings/settings.component.html - 44 + 102 @@ -614,7 +742,7 @@ Bestätigungsdialoge anzeigen src/app/components/manage/settings/settings.component.html - 48 + 106 @@ -622,7 +750,7 @@ Beim Löschen von Dokumenten wird immer nach einer Bestätigung gefragt. src/app/components/manage/settings/settings.component.html - 48 + 106 @@ -630,7 +758,7 @@ Anwenden beim Schließen src/app/components/manage/settings/settings.component.html - 49 + 107 @@ -638,7 +766,7 @@ Erscheint auf src/app/components/manage/settings/settings.component.html - 68 + 126 @@ -646,7 +774,7 @@ Auf Startseite zeigen src/app/components/manage/settings/settings.component.html - 71 + 129 @@ -654,7 +782,7 @@ In Seitenleiste zeigen src/app/components/manage/settings/settings.component.html - 75 + 133 @@ -662,7 +790,7 @@ Keine gespeicherten Ansichten vorhanden. src/app/components/manage/settings/settings.component.html - 85 + 143 @@ -678,7 +806,7 @@ Möchten Sie den Korrespondenten "" wirklich löschen? src/app/components/manage/correspondent-list/correspondent-list.component.ts - 24 + 26 @@ -694,7 +822,7 @@ Letzter Kontakt src/app/components/manage/correspondent-list/correspondent-list.component.html - 15 + 22 @@ -713,6 +841,14 @@ 29 + + Cancel + Abbrechen + + src/app/components/common/confirm-dialog/confirm-dialog.component.html + 12 + + Create new correspondent Neuen Korrespondenten erstellen @@ -729,20 +865,12 @@ 25 - - Could not save correspondent: - Konnte Korrespondent nicht speichern: - - src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts - 29 - - Matching algorithm Zuweisungsalgorithmus src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 11 + 10 @@ -750,15 +878,7 @@ Zuweisungsmuster src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 12 - - - - Auto matching does not require you to fill in this field. - Für Automatische Zuweisung muss dieses Feld nicht ausgefüllt werden. - - src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 12 + 11 @@ -766,23 +886,7 @@ Groß-/Kleinschreibung irrelevant src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 13 - - - - Auto matching ignores this option. - Automatische Zuweisung beachtet diese Einstellung nicht. - - src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 13 - - - - Cancel - Abbrechen - - src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 16 + 12 @@ -801,14 +905,6 @@ 25 - - Could not save tag: - Konnte Tag nicht speichern: - - src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts - 29 - - Inbox tag Posteingangs-Tag @@ -841,14 +937,6 @@ 25 - - Could not save document type: - Konnte Dokumenttyp nicht speichern: - - src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts - 29 - - Search results Suchergebnisse @@ -935,7 +1023,7 @@ Administration src/app/components/app-frame/app-frame.component.html - 147 + 154 @@ -943,7 +1031,7 @@ Weiteres src/app/components/app-frame/app-frame.component.html - 153 + 160 @@ -951,7 +1039,7 @@ Dokumentation src/app/components/app-frame/app-frame.component.html - 160 + 167 @@ -959,7 +1047,7 @@ GitHub src/app/components/app-frame/app-frame.component.html - 167 + 174 @@ -1034,14 +1122,6 @@ 46 - - Filter by: - Filtern nach: - - src/app/components/document-list/filter-editor/filter-editor.component.html - 4 - - Filter tags Tags filtern @@ -1055,7 +1135,7 @@ Korrespondenten filtern src/app/components/document-list/filter-editor/filter-editor.component.html - 19 + 20 @@ -1063,15 +1143,15 @@ Dokumenttypen filtern src/app/components/document-list/filter-editor/filter-editor.component.html - 25 + 27 - - Clear all filters + + Reset filters Filter zurücksetzen src/app/components/document-list/filter-editor/filter-editor.component.html - 47 + 50 @@ -1079,7 +1159,7 @@ Nicht zugewiesen src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts - 161 + 166 Filter drop down element to filter for documents with no correspondent/type/tag assigned @@ -1088,7 +1168,7 @@ Anwenden src/app/components/common/filterable-dropdown/filterable-dropdown.component.html - 28 + 26 @@ -1155,12 +1235,12 @@ 50 - - Created: - Erstellt: + + Created: + Erstellt: src/app/components/document-list/document-card-large/document-card-large.component.html - 65 + 67 @@ -1184,7 +1264,7 @@ Relevanz: src/app/components/document-list/document-card-large/document-card-large.component.html - 61 + 62 @@ -1195,12 +1275,20 @@ 40 + + Error executing bulk operation: + Fehler beim Ausführung der Massenverarbeitung: + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 73 + + "" and "" "" und "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 103 + 114 This is for messages like 'modify "tag1" and "tag2"' @@ -1209,7 +1297,7 @@ "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 105 + 116 @@ -1217,7 +1305,7 @@ , src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 105 + 116 this is used to separate enumerations and should probably be a comma and a whitespace in most languages @@ -1226,7 +1314,7 @@ und "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 106 + 117 this is for messages like 'modify "tag1", "tag2" and "tag3"' @@ -1235,7 +1323,7 @@ Tag-Zuweisung bestätigen src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 115 + 126 @@ -1243,7 +1331,7 @@ Diese Aktion wird ausgewählten Dokumenten das Tag "" hinzufügen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 118 + 129 @@ -1251,7 +1339,7 @@ Diese Aktion wird ausgewählten Dokumenten die Tags hinzufügen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 120 + 131 @@ -1259,7 +1347,7 @@ Diese Aktion wird das Tag "" von ausgewählten Dokumenten entfernen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 123 + 134 @@ -1267,7 +1355,7 @@ Diese Aktion wird die Tags von ausgewählten Dokumenten entfernen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 125 + 136 @@ -1275,7 +1363,7 @@ Diese Aktion wird die Tags den ausgewählten Dokumenten hinzufügen und die Tags entfernen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 127 + 138 @@ -1283,7 +1371,7 @@ Korrespondent-Zuweisung bestätigen src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 157 + 158 @@ -1291,7 +1379,7 @@ Diese Aktion wird ausgewählten Dokumenten den Korrespondent "" zuweisen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 159 + 160 @@ -1299,7 +1387,7 @@ Diese Aktion wird bei ausgewählten Dokumenten den Korrespondent entfernen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 161 + 162 @@ -1307,7 +1395,7 @@ Dokumenttyp-Zuweisung bestätigen src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 190 + 181 @@ -1315,7 +1403,7 @@ Diese Aktion wird ausgewählten Dokumenten den Dokumenttyp "" zuweisen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 192 + 183 @@ -1323,7 +1411,7 @@ Diese Aktion wird bei ausgewählten Dokumenten den Dokumenttyp entfernen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 194 + 185 @@ -1331,7 +1419,7 @@ Löschen bestätigen src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 219 + 200 @@ -1339,7 +1427,7 @@ Diese Aktion wird ausgewählte Dokumente unwiderruflich löschen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 220 + 201 @@ -1347,7 +1435,7 @@ Diese Aktion kann nicht rückgängig gemacht werden. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 221 + 202 @@ -1355,7 +1443,7 @@ Dokument(e) löschen src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 223 + 204 @@ -1363,7 +1451,7 @@ Auswählen: src/app/components/document-list/bulk-editor/bulk-editor.component.html - 11 + 10 @@ -1371,7 +1459,7 @@ Alle src/app/components/document-list/bulk-editor/bulk-editor.component.html - 21 + 20 @@ -1379,7 +1467,7 @@ Bearbeiten: src/app/components/document-list/bulk-editor/bulk-editor.component.html - 28 + 27 @@ -1582,6 +1670,38 @@ 12 + + English (US) + Englisch (US) + + src/app/services/settings.service.ts + 74 + + + + German + Deutsch + + src/app/services/settings.service.ts + 75 + + + + Dutch + Niederländisch + + src/app/services/settings.service.ts + 76 + + + + French + Französisch + + src/app/services/settings.service.ts + 77 + + Error Fehler @@ -1598,17 +1718,17 @@ 35 - - Correspondent - Korrespondent + + ASN + ASN src/app/services/rest/document.service.ts 16 - - Document type - Dokumenttyp + + Correspondent + Korrespondent src/app/services/rest/document.service.ts 17 @@ -1622,9 +1742,9 @@ 18 - - ASN - ASN + + Document type + Dokumenttyp src/app/services/rest/document.service.ts 19 @@ -1763,7 +1883,7 @@ Neues Element erstellen src/app/components/common/edit-dialog/edit-dialog.component.ts - 38 + 50 @@ -1771,7 +1891,7 @@ Element bearbeiten src/app/components/common/edit-dialog/edit-dialog.component.ts - 42 + 54 @@ -1779,7 +1899,7 @@ Konnte Element nicht speichern: src/app/components/common/edit-dialog/edit-dialog.component.ts - 46 + 58 @@ -1787,7 +1907,7 @@ Automatisch src/app/components/manage/generic-list/generic-list.component.ts - 31 + 39 @@ -1795,7 +1915,7 @@ Möchten Sie dieses Element wirklich löschen? src/app/components/manage/generic-list/generic-list.component.ts - 88 + 97 @@ -1803,7 +1923,7 @@ Assoziierte Dokumente werden nicht gelöscht. src/app/components/manage/generic-list/generic-list.component.ts - 95 + 104 @@ -1811,7 +1931,15 @@ Löschen src/app/components/manage/generic-list/generic-list.component.ts - 97 + 106 + + + + Error while deleting element: + Fehler beim Löschen des Elements: + + src/app/components/manage/generic-list/generic-list.component.ts + 114 @@ -1888,7 +2016,7 @@ Fuzzy: Document contains a word similar to this word - Ungenau: Dokument enthält ein zum folgdendem Wort ähnliches Wort + Ungenau: Dokument enthält ein zum folgendem Wort ähnliches Wort src/app/data/matching-model.ts 16 diff --git a/src-ui/src/locale/messages.fr.xlf b/src-ui/src/locale/messages.fr.xlf index 994db6c1d..4f09eab72 100644 --- a/src-ui/src/locale/messages.fr.xlf +++ b/src-ui/src/locale/messages.fr.xlf @@ -6,23 +6,23 @@ Documents src/app/components/document-list/document-list.component.ts - 38 + 43 View "" saved successfully. - Vue &quot;&quot; enregistrée avec succès. + Vue "" enregistrée avec succès. src/app/components/document-list/document-list.component.ts - 84 + 94 View "" created successfully. - Vue &quot;&quot; créée avec succès. + Vue "" créée avec succès. src/app/components/document-list/document-list.component.ts - 103 + 115 @@ -38,7 +38,7 @@ Sélectionner aucun src/app/components/document-list/document-list.component.html - 11 + 10 @@ -46,7 +46,7 @@ Sélectionner la page src/app/components/document-list/document-list.component.html - 12 + 11 @@ -54,15 +54,15 @@ Sélectionner tout src/app/components/document-list/document-list.component.html - 13 + 12 - - Sort by - Trier par + + Sort + Trier src/app/components/document-list/document-list.component.html - 41 + 39 @@ -83,7 +83,7 @@ Save "" - Enregistrer &quot;&quot; + Enregistrer "" src/app/components/document-list/document-list.component.html 71 @@ -91,10 +91,10 @@ {VAR_PLURAL, plural, =1 {Selected of one document} other {Selected of documents}} - {VAR_PLURAL, plural, =1 { document sélectionné sur 1} other { document(s) sélectionné(s) sur }} + {VAR_PLURAL, plural, =1 { document sélectionné sur 1} other { documents sélectionnés sur }} src/app/components/document-list/document-list.component.html - 86 + 85 @@ -102,7 +102,15 @@ {VAR_PLURAL, plural, =1 {Un document} other { documents}} src/app/components/document-list/document-list.component.html - 87 + 86 + + + + (filtered) + (filtré) + + src/app/components/document-list/document-list.component.html + 86 @@ -110,7 +118,7 @@ NSA src/app/components/document-list/document-list.component.html - 100 + 105 @@ -118,7 +126,7 @@ Correspondant src/app/components/document-list/document-list.component.html - 101 + 111 @@ -126,7 +134,7 @@ Titre src/app/components/document-list/document-list.component.html - 102 + 117 @@ -134,7 +142,7 @@ Type de document src/app/components/document-list/document-list.component.html - 103 + 123 @@ -142,7 +150,7 @@ Date de création src/app/components/document-list/document-list.component.html - 104 + 129 @@ -150,7 +158,7 @@ Date d'ajout src/app/components/document-list/document-list.component.html - 105 + 135 @@ -158,15 +166,15 @@ Confirmer la suppression src/app/components/document-detail/document-detail.component.ts - 161 + 192 Do you really want to delete document ""? - Voulez-vous vraiment supprimer le document &quot;&quot; ? + Voulez-vous vraiment supprimer le document "" ? src/app/components/document-detail/document-detail.component.ts - 162 + 193 @@ -174,7 +182,7 @@ Les fichiers liés à ce document seront supprimés définitivement. Cette action est irréversible. src/app/components/document-detail/document-detail.component.ts - 163 + 194 @@ -182,7 +190,15 @@ Supprimer le document src/app/components/document-detail/document-detail.component.ts - 165 + 196 + + + + Error deleting document: + Une erreur s'est produite lors de la suppression du document : + + src/app/components/document-detail/document-detail.component.ts + 203 @@ -230,7 +246,7 @@ Contenu src/app/components/document-detail/document-detail.component.html - 76 + 72 @@ -238,7 +254,7 @@ Métadonnées src/app/components/document-detail/document-detail.component.html - 85 + 81 @@ -246,7 +262,7 @@ Abandonner src/app/components/document-detail/document-detail.component.html - 134 + 130 @@ -254,7 +270,7 @@ Enregistrer src/app/components/document-detail/document-detail.component.html - 136 + 132 @@ -286,7 +302,7 @@ Numéro de série de l'archive src/app/components/document-detail/document-detail.component.html - 61 + 60 @@ -294,15 +310,7 @@ Date de création src/app/components/document-detail/document-detail.component.html - 65 - - - - Tags - Étiquettes - - src/app/components/document-detail/document-detail.component.html - 70 + 61 @@ -310,7 +318,7 @@ Modifié le src/app/components/document-detail/document-detail.component.html - 91 + 87 @@ -318,7 +326,7 @@ Date d'ajout src/app/components/document-detail/document-detail.component.html - 95 + 91 @@ -326,7 +334,7 @@ Nom de fichier du média src/app/components/document-detail/document-detail.component.html - 99 + 95 @@ -334,7 +342,7 @@ Somme de contrôle MD5 de l'original src/app/components/document-detail/document-detail.component.html - 103 + 99 @@ -342,7 +350,7 @@ Taille de fichier de l'original src/app/components/document-detail/document-detail.component.html - 107 + 103 @@ -350,7 +358,7 @@ Type mime de l'original src/app/components/document-detail/document-detail.component.html - 111 + 107 @@ -358,7 +366,7 @@ Somme de contrôle MD5 de l'archive src/app/components/document-detail/document-detail.component.html - 115 + 111 @@ -366,7 +374,7 @@ Taille de fichier de l'archive src/app/components/document-detail/document-detail.component.html - 119 + 115 @@ -374,7 +382,7 @@ Métadonnées du document original src/app/components/document-detail/document-detail.component.html - 125 + 121 @@ -382,7 +390,7 @@ Métadonnées du document archivé src/app/components/document-detail/document-detail.component.html - 126 + 122 @@ -390,7 +398,7 @@ Enregistrer & suivant src/app/components/document-detail/document-detail.component.html - 135 + 131 @@ -419,10 +427,18 @@ Do you really want to delete the tag ""? - Voulez-vous vraiment supprimer l'étiquette &quot;&quot; ? + Voulez-vous vraiment supprimer l'étiquette "" ? src/app/components/manage/tag-list/tag-list.component.ts - 28 + 30 + + + + Tags + Étiquettes + + src/app/components/manage/tag-list/tag-list.component.html + 1 @@ -433,12 +449,20 @@ 2 + + Filter by: + Filtrer par : + + src/app/components/manage/tag-list/tag-list.component.html + 8 + + Name Nom src/app/components/manage/tag-list/tag-list.component.html - 13 + 9 @@ -446,7 +470,7 @@ Couleur src/app/components/manage/tag-list/tag-list.component.html - 14 + 20 @@ -454,7 +478,7 @@ Rapprochement src/app/components/manage/tag-list/tag-list.component.html - 15 + 21 @@ -462,7 +486,7 @@ Nombre de documents src/app/components/manage/tag-list/tag-list.component.html - 16 + 22 @@ -470,7 +494,7 @@ Actions src/app/components/manage/tag-list/tag-list.component.html - 17 + 23 @@ -478,7 +502,7 @@ Documents src/app/components/manage/tag-list/tag-list.component.html - 32 + 38 @@ -486,15 +510,15 @@ Éditer src/app/components/manage/tag-list/tag-list.component.html - 37 + 43 Do you really want to delete the document type ""? - Voulez-vous vraiment supprimer le type de document &quot;&quot; ? + Voulez-vous vraiment supprimer le type de document "" ? src/app/components/manage/document-type-list/document-type-list.component.ts - 24 + 26 @@ -523,10 +547,10 @@ Saved view "" deleted. - Vue &quot;&quot; supprimée. + Vue "" supprimée. src/app/components/manage/settings/settings.component.ts - 54 + 63 @@ -534,7 +558,23 @@ Paramètres enregistrés avec succès. src/app/components/manage/settings/settings.component.ts - 74 + 79 + + + + Use system language + Utiliser la langue du système + + src/app/components/manage/settings/settings.component.ts + 83 + + + + Use date format of display language + Utiliser le format de date de la langue d'affichage + + src/app/components/manage/settings/settings.component.ts + 87 @@ -542,7 +582,7 @@ Une erreur s'est produite lors de l'enregistrement des paramètres sur le serveur : src/app/components/manage/settings/settings.component.ts - 86 + 103 @@ -566,23 +606,103 @@ Vues enregistrées src/app/components/manage/settings/settings.component.html - 56 + 114 Appearance - Apparition + Affichage src/app/components/manage/settings/settings.component.html 13 + + Display language + Langue d'affichage + + src/app/components/manage/settings/settings.component.html + 17 + + + + You need to reload the page after applying a new language. + Vous devez recharger la page après avoir sélectionné une nouvelle langue. + + src/app/components/manage/settings/settings.component.html + 25 + + + + Date display + Affichage de la date + + src/app/components/manage/settings/settings.component.html + 32 + + + + Date format + Format de date + + src/app/components/manage/settings/settings.component.html + 45 + + + + Short: + Court : + + src/app/components/manage/settings/settings.component.html + 51 + + + + Medium: + Moyen : + + src/app/components/manage/settings/settings.component.html + 55 + + + + Long: + Long : + + src/app/components/manage/settings/settings.component.html + 59 + + Items per page Éléments par page src/app/components/manage/settings/settings.component.html - 17 + 67 + + + + Document editor + Visionneuse de documents + + src/app/components/manage/settings/settings.component.html + 83 + + + + Use PDF viewer provided by the browser + Utiliser la visionneuse PDF fournie par le navigateur + + src/app/components/manage/settings/settings.component.html + 87 + + + + This is usually faster for displaying large PDF documents, but it might not work on some browsers. + Cette option est généralement plus rapide pour l'affichage de grands documents PDF, mais elle peut ne pas fonctionner sur certains navigateurs. + + src/app/components/manage/settings/settings.component.html + 87 @@ -590,7 +710,7 @@ Mode sombre src/app/components/manage/settings/settings.component.html - 33 + 94 @@ -598,7 +718,15 @@ Utiliser les paramètres du système src/app/components/manage/settings/settings.component.html - 36 + 97 + + + + Enable dark mode + Activer le mode sombre + + src/app/components/manage/settings/settings.component.html + 98 @@ -606,7 +734,7 @@ Edition en masse src/app/components/manage/settings/settings.component.html - 44 + 102 @@ -614,7 +742,7 @@ Afficher les messages de confirmation src/app/components/manage/settings/settings.component.html - 48 + 106 @@ -622,7 +750,7 @@ La suppression de documents requiert toujours une confirmation. src/app/components/manage/settings/settings.component.html - 48 + 106 @@ -630,7 +758,7 @@ Appliquer lors de la fermeture src/app/components/manage/settings/settings.component.html - 49 + 107 @@ -638,7 +766,7 @@ Apparaît sur src/app/components/manage/settings/settings.component.html - 68 + 126 @@ -646,7 +774,7 @@ Montrer sur le tableau de bord src/app/components/manage/settings/settings.component.html - 71 + 129 @@ -654,7 +782,7 @@ Montrer dans la barre latérale src/app/components/manage/settings/settings.component.html - 75 + 133 @@ -662,7 +790,7 @@ Aucune vue sauvegardée n'est définie. src/app/components/manage/settings/settings.component.html - 85 + 143 @@ -675,10 +803,10 @@ Do you really want to delete the correspondent ""? - Voulez-vous vraiment supprimer le correspondant &quot;&quot; ? + Voulez-vous vraiment supprimer le correspondant "" ? src/app/components/manage/correspondent-list/correspondent-list.component.ts - 24 + 26 @@ -694,7 +822,7 @@ Dernière correspondance src/app/components/manage/correspondent-list/correspondent-list.component.html - 15 + 22 @@ -713,6 +841,14 @@ 29 + + Cancel + Annuler + + src/app/components/common/confirm-dialog/confirm-dialog.component.html + 12 + + Create new correspondent Créer un nouveau correspondant @@ -729,20 +865,12 @@ 25 - - Could not save correspondent: - Impossible d'enregistrer le correspondant : - - src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts - 29 - - Matching algorithm Algorithme de rapprochement src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 11 + 10 @@ -750,15 +878,7 @@ Modèle de rapprochement src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 12 - - - - Auto matching does not require you to fill in this field. - Le rapprochement automatique ne nécessite pas que vous remplissiez ce champ. - - src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 12 + 11 @@ -766,23 +886,7 @@ Insensible à la casse src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 13 - - - - Auto matching ignores this option. - Le rapprochement automatique ne tient pas compte de cette option. - - src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 13 - - - - Cancel - Annuler - - src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 16 + 12 @@ -801,14 +905,6 @@ 25 - - Could not save tag: - Impossible d'enregistrer l'étiquette : - - src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts - 29 - - Inbox tag Étiquette de boîte de réception @@ -841,14 +937,6 @@ 25 - - Could not save document type: - Impossible d'enregistrer le type de document : - - src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts - 29 - - Search results Résultats de la recherche @@ -883,7 +971,7 @@ Did you mean ""? - Vouliez-vous dire &quot;&quot; ? + Vouliez-vous dire "" ? src/app/components/search/search.component.html 13 @@ -935,7 +1023,7 @@ Administration src/app/components/app-frame/app-frame.component.html - 147 + 154 @@ -943,7 +1031,7 @@ Divers src/app/components/app-frame/app-frame.component.html - 153 + 160 @@ -951,7 +1039,7 @@ Documentation src/app/components/app-frame/app-frame.component.html - 160 + 167 @@ -959,7 +1047,7 @@ GitHub src/app/components/app-frame/app-frame.component.html - 167 + 174 @@ -1034,14 +1122,6 @@ 46 - - Filter by: - Filtrer par : - - src/app/components/document-list/filter-editor/filter-editor.component.html - 4 - - Filter tags Filtrer les étiquettes @@ -1055,7 +1135,7 @@ Filtrer les correspondants src/app/components/document-list/filter-editor/filter-editor.component.html - 19 + 20 @@ -1063,15 +1143,15 @@ Filtrer les types de documents src/app/components/document-list/filter-editor/filter-editor.component.html - 25 + 27 - - Clear all filters - Réinitialiser tous les filtres + + Reset filters + Réinitialiser les filtres src/app/components/document-list/filter-editor/filter-editor.component.html - 47 + 50 @@ -1079,7 +1159,7 @@ Non affecté src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts - 161 + 166 Filter drop down element to filter for documents with no correspondent/type/tag assigned @@ -1088,7 +1168,7 @@ Appliquer src/app/components/common/filterable-dropdown/filterable-dropdown.component.html - 28 + 26 @@ -1155,12 +1235,12 @@ 50 - - Created: - Créé le : + + Created: + Créé le : src/app/components/document-list/document-card-large/document-card-large.component.html - 65 + 67 @@ -1184,7 +1264,7 @@ Score : src/app/components/document-list/document-card-large/document-card-large.component.html - 61 + 62 @@ -1195,21 +1275,29 @@ 40 - - "" and "" - &quot;&quot; et &quot;&quot; + + Error executing bulk operation: + Une erreur s'est produite lors de l'exécution de l'opération de masse : src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 103 + 73 + + + + "" and "" + "" et "" + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 114 This is for messages like 'modify "tag1" and "tag2"' "" - &quot;&quot; + "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 105 + 116 @@ -1217,16 +1305,16 @@ , src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 105 + 116 this is used to separate enumerations and should probably be a comma and a whitespace in most languages and "" - et &quot;&quot; + et "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 106 + 117 this is for messages like 'modify "tag1", "tag2" and "tag3"' @@ -1235,15 +1323,15 @@ Confirmer l'affectation des étiquettes src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 115 + 126 This operation will add the tag "" to selected document(s). - Cette action affectera l'étiquette &quot;&quot; au(x) document(s) sélectionné(s). + Cette action affectera l'étiquette "" au(x) document(s) sélectionné(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 118 + 129 @@ -1251,15 +1339,15 @@ Cette action affectera les étiquettes au(x) document(s) sélectionné(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 120 + 131 This operation will remove the tag "" from selected document(s). - Cette action supprimera l'étiquette &quot;&quot; de(s) document(s) sélectionné(s). + Cette action supprimera l'étiquette "" de(s) document(s) sélectionné(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 123 + 134 @@ -1267,7 +1355,7 @@ Cette action supprimera les étiquettes de(s) document(s) sélectionné(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 125 + 136 @@ -1275,7 +1363,7 @@ Cette action affectera les étiquettes et supprimera les étiquettes de(s) document(s) sélectionné(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 127 + 138 @@ -1283,15 +1371,15 @@ Confirmer l'affectation du correspondant src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 157 + 158 This operation will assign the correspondent "" to selected document(s). - Cette action affectera le correspondant &quot;&quot; au(x) document(s) sélectionné(s). + Cette action affectera le correspondant "" au(x) document(s) sélectionné(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 159 + 160 @@ -1299,7 +1387,7 @@ Cette action supprimera le correspondant de(s) document(s) sélectionné(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 161 + 162 @@ -1307,15 +1395,15 @@ Confirmer l'affectation du type de document src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 190 + 181 This operation will assign the document type "" to selected document(s). - Cette action affectera le type de document &quot;&quot; au(x) document(s) sélectionné(s). + Cette action affectera le type de document "" au(x) document(s) sélectionné(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 192 + 183 @@ -1323,7 +1411,7 @@ Cette action supprimera le type de document de(s) document(s) sélectionné(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 194 + 185 @@ -1331,7 +1419,7 @@ Confirmer la suppression src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 219 + 200 @@ -1339,7 +1427,7 @@ Cette action supprimera définitivement document(s) sélectionné(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 220 + 201 @@ -1347,7 +1435,7 @@ Cette action est irréversible. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 221 + 202 @@ -1355,7 +1443,7 @@ Supprimer le(s) document(s) src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 223 + 204 @@ -1363,7 +1451,7 @@ Sélectionner : src/app/components/document-list/bulk-editor/bulk-editor.component.html - 11 + 10 @@ -1371,7 +1459,7 @@ Tout src/app/components/document-list/bulk-editor/bulk-editor.component.html - 21 + 20 @@ -1379,7 +1467,7 @@ Éditer : src/app/components/document-list/bulk-editor/bulk-editor.component.html - 28 + 27 @@ -1582,6 +1670,38 @@ 12 + + English (US) + Anglais (US) + + src/app/services/settings.service.ts + 74 + + + + German + Allemand + + src/app/services/settings.service.ts + 75 + + + + Dutch + Néerlandais + + src/app/services/settings.service.ts + 76 + + + + French + Français + + src/app/services/settings.service.ts + 77 + + Error Erreur @@ -1598,17 +1718,17 @@ 35 - - Correspondent - Correspondant + + ASN + NSA src/app/services/rest/document.service.ts 16 - - Document type - Type de document + + Correspondent + Correspondant src/app/services/rest/document.service.ts 17 @@ -1622,9 +1742,9 @@ 18 - - ASN - NSA + + Document type + Type de document src/app/services/rest/document.service.ts 19 @@ -1763,7 +1883,7 @@ Créer un nouvel élément src/app/components/common/edit-dialog/edit-dialog.component.ts - 38 + 50 @@ -1771,7 +1891,7 @@ Éditer l'élément src/app/components/common/edit-dialog/edit-dialog.component.ts - 42 + 54 @@ -1779,7 +1899,7 @@ Impossible d'enregistrer l'élément : src/app/components/common/edit-dialog/edit-dialog.component.ts - 46 + 58 @@ -1787,7 +1907,7 @@ Automatique src/app/components/manage/generic-list/generic-list.component.ts - 31 + 39 @@ -1795,7 +1915,7 @@ Voulez-vous vraiment supprimer cet élément ? src/app/components/manage/generic-list/generic-list.component.ts - 88 + 97 @@ -1803,7 +1923,7 @@ Les documents associés ne seront pas supprimés. src/app/components/manage/generic-list/generic-list.component.ts - 95 + 104 @@ -1811,7 +1931,15 @@ Supprimer src/app/components/manage/generic-list/generic-list.component.ts - 97 + 106 + + + + Error while deleting element: + Une erreur s'est produite lors de la suppression de l'élément : + + src/app/components/manage/generic-list/generic-list.component.ts + 114 @@ -1824,7 +1952,7 @@ Any: Document contains any of these words (space separated) - Un des mots : le document contient l'un de ces mots (séparés par des espaces) + Un des mots : contient l'un de ces mots (séparés par des espaces) src/app/data/matching-model.ts 12 @@ -1840,7 +1968,7 @@ All: Document contains all of these words (space separated) - Tous les mots : le document contient tous ces mots (séparés par des espaces) + Tous les mots : contient tous ces mots (séparés par des espaces) src/app/data/matching-model.ts 13 @@ -1856,7 +1984,7 @@ Exact: Document contains this string - Concordance exacte : le document contient cette chaîne de caractères + Concordance exacte : contient cette chaîne de caractères src/app/data/matching-model.ts 14 @@ -1872,7 +2000,7 @@ Regular expression: Document matches this regular expression - Expression régulière : le document correspond à cette expression régulière + Expression régulière : correspond à cette expression régulière src/app/data/matching-model.ts 15 @@ -1888,7 +2016,7 @@ Fuzzy: Document contains a word similar to this word - Mot approximatif : le document contient un mot similaire à ce mot + Mot approximatif : contient un mot similaire à ce mot src/app/data/matching-model.ts 16 diff --git a/src-ui/src/locale/messages.nl_NL.xlf b/src-ui/src/locale/messages.nl_NL.xlf index 6301f95e6..3753bc92c 100644 --- a/src-ui/src/locale/messages.nl_NL.xlf +++ b/src-ui/src/locale/messages.nl_NL.xlf @@ -6,23 +6,23 @@ Documenten src/app/components/document-list/document-list.component.ts - 38 + 43 View "" saved successfully. - View &quot;&quot; met succes opgeslagen. + View "" met succes opgeslagen. src/app/components/document-list/document-list.component.ts - 84 + 94 View "" created successfully. - View &quot;&quot; met succes gemaakt. + View "" met succes gemaakt. src/app/components/document-list/document-list.component.ts - 103 + 115 @@ -38,7 +38,7 @@ Niets selecteren src/app/components/document-list/document-list.component.html - 11 + 10 @@ -46,7 +46,7 @@ Selecteer pagina src/app/components/document-list/document-list.component.html - 12 + 11 @@ -54,15 +54,15 @@ Alles selecteren src/app/components/document-list/document-list.component.html - 13 + 12 - - Sort by - Sorteer op + + Sort + Sorteren src/app/components/document-list/document-list.component.html - 41 + 39 @@ -83,7 +83,7 @@ Save "" - Opslaan &quot;&quot; + Opslaan "" src/app/components/document-list/document-list.component.html 71 @@ -94,7 +94,7 @@ {VAR_PLURAL, plural, =1 { van één document geselecteerd} other { van documenten geselecteerd}} src/app/components/document-list/document-list.component.html - 86 + 85 @@ -102,7 +102,15 @@ {VAR_PLURAL, plural, =1 {Eén document} other { documenten}} src/app/components/document-list/document-list.component.html - 87 + 86 + + + + (filtered) + (gefilterd) + + src/app/components/document-list/document-list.component.html + 86 @@ -110,7 +118,7 @@ ASN src/app/components/document-list/document-list.component.html - 100 + 105 @@ -118,7 +126,7 @@ Correspondent src/app/components/document-list/document-list.component.html - 101 + 111 @@ -126,7 +134,7 @@ Titel src/app/components/document-list/document-list.component.html - 102 + 117 @@ -134,7 +142,7 @@ Documenttype src/app/components/document-list/document-list.component.html - 103 + 123 @@ -142,7 +150,7 @@ Aangemaakt src/app/components/document-list/document-list.component.html - 104 + 129 @@ -150,7 +158,7 @@ Toegevoegd src/app/components/document-list/document-list.component.html - 105 + 135 @@ -158,15 +166,15 @@ Bevestig het verwijderen src/app/components/document-detail/document-detail.component.ts - 161 + 192 Do you really want to delete document ""? - Wilt u het document echt verwijderen &quot;&quot;? + Wilt u het document echt verwijderen ""? src/app/components/document-detail/document-detail.component.ts - 162 + 193 @@ -174,7 +182,7 @@ De bestanden voor dit document worden definitief verwijderd. Deze bewerking kan niet ongedaan worden gemaakt. src/app/components/document-detail/document-detail.component.ts - 163 + 194 @@ -182,7 +190,15 @@ Verwijder document src/app/components/document-detail/document-detail.component.ts - 165 + 196 + + + + Error deleting document: + Fout bij het verwijderen van het document: + + src/app/components/document-detail/document-detail.component.ts + 203 @@ -230,7 +246,7 @@ Inhoud src/app/components/document-detail/document-detail.component.html - 76 + 72 @@ -238,7 +254,7 @@ Metadata src/app/components/document-detail/document-detail.component.html - 85 + 81 @@ -246,7 +262,7 @@ Negeren src/app/components/document-detail/document-detail.component.html - 134 + 130 @@ -254,7 +270,7 @@ Opslaan src/app/components/document-detail/document-detail.component.html - 136 + 132 @@ -286,7 +302,7 @@ Archief serienummer src/app/components/document-detail/document-detail.component.html - 61 + 60 @@ -294,15 +310,7 @@ Aanmaakdatum src/app/components/document-detail/document-detail.component.html - 65 - - - - Tags - Tags - - src/app/components/document-detail/document-detail.component.html - 70 + 61 @@ -310,7 +318,7 @@ Wijzigingsdatum src/app/components/document-detail/document-detail.component.html - 91 + 87 @@ -318,7 +326,7 @@ Datum toegevoegd src/app/components/document-detail/document-detail.component.html - 95 + 91 @@ -326,7 +334,7 @@ Media bestandsnaam src/app/components/document-detail/document-detail.component.html - 99 + 95 @@ -334,7 +342,7 @@ Originele MD5 checksum src/app/components/document-detail/document-detail.component.html - 103 + 99 @@ -342,7 +350,7 @@ Originele bestandsgrootte src/app/components/document-detail/document-detail.component.html - 107 + 103 @@ -350,7 +358,7 @@ Oorspronkelijke mime-type src/app/components/document-detail/document-detail.component.html - 111 + 107 @@ -358,7 +366,7 @@ Archief MD5 checksum src/app/components/document-detail/document-detail.component.html - 115 + 111 @@ -366,7 +374,7 @@ Archief bestandsgrootte src/app/components/document-detail/document-detail.component.html - 119 + 115 @@ -374,7 +382,7 @@ Originele document metadata src/app/components/document-detail/document-detail.component.html - 125 + 121 @@ -382,7 +390,7 @@ Gearchiveerde document metadata src/app/components/document-detail/document-detail.component.html - 126 + 122 @@ -390,7 +398,7 @@ Opslaan & volgende src/app/components/document-detail/document-detail.component.html - 135 + 131 @@ -419,10 +427,18 @@ Do you really want to delete the tag ""? - Wil je de tag echt verwijderen &quot;&quot;? + Wil je het etiket echt verwijderen ""? src/app/components/manage/tag-list/tag-list.component.ts - 28 + 30 + + + + Tags + Etiketten + + src/app/components/manage/tag-list/tag-list.component.html + 1 @@ -433,12 +449,20 @@ 2 + + Filter by: + Filter op: + + src/app/components/manage/tag-list/tag-list.component.html + 8 + + Name Naam src/app/components/manage/tag-list/tag-list.component.html - 13 + 9 @@ -446,7 +470,7 @@ Kleur src/app/components/manage/tag-list/tag-list.component.html - 14 + 20 @@ -454,7 +478,7 @@ Overeenkomend src/app/components/manage/tag-list/tag-list.component.html - 15 + 21 @@ -462,7 +486,7 @@ Aantal documenten src/app/components/manage/tag-list/tag-list.component.html - 16 + 22 @@ -470,7 +494,7 @@ Acties src/app/components/manage/tag-list/tag-list.component.html - 17 + 23 @@ -478,7 +502,7 @@ Documenten src/app/components/manage/tag-list/tag-list.component.html - 32 + 38 @@ -486,15 +510,15 @@ Bewerk src/app/components/manage/tag-list/tag-list.component.html - 37 + 43 Do you really want to delete the document type ""? - Wilt u het documenttype echt verwijderen &quot;&quot;? + Wilt u het documenttype echt verwijderen ""? src/app/components/manage/document-type-list/document-type-list.component.ts - 24 + 26 @@ -523,10 +547,10 @@ Saved view "" deleted. - Opgeslagen view &quot;&quot; verwijderd. + Opgeslagen view "" verwijderd. src/app/components/manage/settings/settings.component.ts - 54 + 63 @@ -534,7 +558,23 @@ Instellingen succesvol opgeslagen. src/app/components/manage/settings/settings.component.ts - 74 + 79 + + + + Use system language + Gebruik de systeemtaal + + src/app/components/manage/settings/settings.component.ts + 83 + + + + Use date format of display language + Datumopmaak van weergavetaal gebruiken + + src/app/components/manage/settings/settings.component.ts + 87 @@ -542,7 +582,7 @@ Fout bij het opslaan van de instellingen: src/app/components/manage/settings/settings.component.ts - 86 + 103 @@ -566,7 +606,7 @@ Opgeslagen views src/app/components/manage/settings/settings.component.html - 56 + 114 @@ -577,12 +617,92 @@ 13 + + Display language + Taal + + src/app/components/manage/settings/settings.component.html + 17 + + + + You need to reload the page after applying a new language. + De pagina moet herladen worden nadat een andere taal werd gekozen. + + src/app/components/manage/settings/settings.component.html + 25 + + + + Date display + Datumweergave + + src/app/components/manage/settings/settings.component.html + 32 + + + + Date format + Datumopmaak + + src/app/components/manage/settings/settings.component.html + 45 + + + + Short: + Kort: + + src/app/components/manage/settings/settings.component.html + 51 + + + + Medium: + Medium: + + src/app/components/manage/settings/settings.component.html + 55 + + + + Long: + Lang: + + src/app/components/manage/settings/settings.component.html + 59 + + Items per page Resultaten per pagina src/app/components/manage/settings/settings.component.html - 17 + 67 + + + + Document editor + Documentbewerker + + src/app/components/manage/settings/settings.component.html + 83 + + + + Use PDF viewer provided by the browser + Gebruik de PDF lezer ingebouwd in uw browser + + src/app/components/manage/settings/settings.component.html + 87 + + + + This is usually faster for displaying large PDF documents, but it might not work on some browsers. + Dit is gewoonlijk sneller om grote PDF's te tonen, maar werkt niet bij elke browser. + + src/app/components/manage/settings/settings.component.html + 87 @@ -590,7 +710,7 @@ Nachtmodus src/app/components/manage/settings/settings.component.html - 33 + 94 @@ -598,7 +718,15 @@ Gebruik systeeminstellingen src/app/components/manage/settings/settings.component.html - 36 + 97 + + + + Enable dark mode + Gebruik nachtmodus + + src/app/components/manage/settings/settings.component.html + 98 @@ -606,7 +734,7 @@ Massabewerking src/app/components/manage/settings/settings.component.html - 44 + 102 @@ -614,7 +742,7 @@ Toon dialoogvenster ter bevestiging src/app/components/manage/settings/settings.component.html - 48 + 106 @@ -622,7 +750,7 @@ Er zal altijd om bevestiging gevraagd worden voor het verwijderen van documenten. src/app/components/manage/settings/settings.component.html - 48 + 106 @@ -630,7 +758,7 @@ Toepassen bij het sluiten src/app/components/manage/settings/settings.component.html - 49 + 107 @@ -638,7 +766,7 @@ Komt voor bij src/app/components/manage/settings/settings.component.html - 68 + 126 @@ -646,7 +774,7 @@ Toon op het dashboard src/app/components/manage/settings/settings.component.html - 71 + 129 @@ -654,7 +782,7 @@ Toon in de zijbalk src/app/components/manage/settings/settings.component.html - 75 + 133 @@ -662,7 +790,7 @@ Geen opgeslagen views gedefinieerd. src/app/components/manage/settings/settings.component.html - 85 + 143 @@ -675,10 +803,10 @@ Do you really want to delete the correspondent ""? - Bent u zeker dat u correspondent &quot;&quot; wilt verwijderen? + Bent u zeker dat u correspondent "" wilt verwijderen? src/app/components/manage/correspondent-list/correspondent-list.component.ts - 24 + 26 @@ -694,7 +822,7 @@ Laatste correspondentie src/app/components/manage/correspondent-list/correspondent-list.component.html - 15 + 22 @@ -713,6 +841,14 @@ 29 + + Cancel + Annuleren + + src/app/components/common/confirm-dialog/confirm-dialog.component.html + 12 + + Create new correspondent Nieuwe correspondent maken @@ -729,20 +865,12 @@ 25 - - Could not save correspondent: - Kon de correspondent niet opslaan: - - src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts - 29 - - Matching algorithm Algoritme voor het bepalen van de overeenkomst src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 11 + 10 @@ -750,15 +878,7 @@ Patroon voor overeenkomst src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 12 - - - - Auto matching does not require you to fill in this field. - Dit veld hoeft niet ingevuld te worden indien automatisch overeenkomsten gezocht worden. - - src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 12 + 11 @@ -766,23 +886,7 @@ Niet hoofdlettergevoelig src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 13 - - - - Auto matching ignores this option. - Deze optie wordt genegeerd bij het automatisch zoeken naar overeenkomsten. - - src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 13 - - - - Cancel - Annuleren - - src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html - 16 + 12 @@ -801,14 +905,6 @@ 25 - - Could not save tag: - Kon het etiket niet opslaan: - - src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts - 29 - - Inbox tag "Postvak in"-etiket @@ -841,14 +937,6 @@ 25 - - Could not save document type: - Kon documenttype niet opslaan: - - src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts - 29 - - Search results Zoekresultaten @@ -883,7 +971,7 @@ Did you mean ""? - Bedoelde u &quot;&quot;? + Bedoelde u ""? src/app/components/search/search.component.html 13 @@ -935,7 +1023,7 @@ Beheer src/app/components/app-frame/app-frame.component.html - 147 + 154 @@ -943,7 +1031,7 @@ Andere src/app/components/app-frame/app-frame.component.html - 153 + 160 @@ -951,7 +1039,7 @@ Handleiding src/app/components/app-frame/app-frame.component.html - 160 + 167 @@ -959,7 +1047,7 @@ GitHub src/app/components/app-frame/app-frame.component.html - 167 + 174 @@ -1034,14 +1122,6 @@ 46 - - Filter by: - Filter op: - - src/app/components/document-list/filter-editor/filter-editor.component.html - 4 - - Filter tags Etiketten filteren @@ -1055,7 +1135,7 @@ Correspondenten filteren src/app/components/document-list/filter-editor/filter-editor.component.html - 19 + 20 @@ -1063,15 +1143,15 @@ Documenttypes filteren src/app/components/document-list/filter-editor/filter-editor.component.html - 25 + 27 - - Clear all filters - Alle filters wegdoen + + Reset filters + Filters terug zetten src/app/components/document-list/filter-editor/filter-editor.component.html - 47 + 50 @@ -1079,7 +1159,7 @@ Niet toegekend src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts - 161 + 166 Filter drop down element to filter for documents with no correspondent/type/tag assigned @@ -1088,7 +1168,7 @@ Toepassen src/app/components/common/filterable-dropdown/filterable-dropdown.component.html - 28 + 26 @@ -1155,12 +1235,12 @@ 50 - - Created: - Aangemaakt op: + + Created: + Aangemaakt op: src/app/components/document-list/document-card-large/document-card-large.component.html - 65 + 67 @@ -1184,7 +1264,7 @@ Score: src/app/components/document-list/document-card-large/document-card-large.component.html - 61 + 62 @@ -1195,21 +1275,29 @@ 40 - - "" and "" - &quot;&quot; en &quot;&quot; + + Error executing bulk operation: + Fout bij het uitvoeren van een massabewerking: src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 103 + 73 + + + + "" and "" + "" en "" + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 114 This is for messages like 'modify "tag1" and "tag2"' "" - &quot;&quot; + "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 105 + 116 @@ -1217,16 +1305,16 @@ , src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 105 + 116 this is used to separate enumerations and should probably be a comma and a whitespace in most languages and "" - en &quot;&quot; + en "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 106 + 117 this is for messages like 'modify "tag1", "tag2" and "tag3"' @@ -1235,15 +1323,15 @@ Bevestig toewijzen van etiketten src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 115 + 126 This operation will add the tag "" to selected document(s). - Het etiket &quot;&quot; zal aan geselecteerd(e) document(en) worden toegewezen. + Het etiket "" zal aan geselecteerd(e) document(en) worden toegewezen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 118 + 129 @@ -1251,15 +1339,15 @@ De etiketten zullen aan geselecteerd(e) document(en) worden toegewezen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 120 + 131 This operation will remove the tag "" from selected document(s). - Het etiket &quot;&quot; zal verwijderd worden van geselecteerd(e) document(en). + Het etiket "" zal verwijderd worden van geselecteerd(e) document(en). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 123 + 134 @@ -1267,7 +1355,7 @@ De etiketten zullen verwijderd worden van geselecteerd(e) document(en). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 125 + 136 @@ -1275,7 +1363,7 @@ De etiketten zullen toegevoegd worden aan, en de etiketten zullen verwijderd worden van geselecteerd(e) document(en). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 127 + 138 @@ -1283,15 +1371,15 @@ Bevestig toewijzen van correspondent src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 157 + 158 This operation will assign the correspondent "" to selected document(s). - De correspondent &quot;&quot; zal aan geselecteerd(e) document(en) worden toegewezen. + De correspondent "" zal aan geselecteerd(e) document(en) worden toegewezen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 159 + 160 @@ -1299,7 +1387,7 @@ De correspondent zal verwijderd worden van geselecteerd(e) document(en). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 161 + 162 @@ -1307,15 +1395,15 @@ Bevestig toewijzen van documenttype src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 190 + 181 This operation will assign the document type "" to selected document(s). - Het documenttype &quot;&quot; zal aan geselecteerd(e) document(en) worden toegewezen. + Het documenttype "" zal aan geselecteerd(e) document(en) worden toegewezen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 192 + 183 @@ -1323,7 +1411,7 @@ Het documenttype zal verwijderd worden van geselecteerd(e) document(en). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 194 + 185 @@ -1331,7 +1419,7 @@ Bevestig verwijderen src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 219 + 200 @@ -1339,7 +1427,7 @@ geselecteerd(e) document(en) zullen permanent worden verwijderd. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 220 + 201 @@ -1347,7 +1435,7 @@ Deze actie kan niet ongedaan worden gemaakt. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 221 + 202 @@ -1355,7 +1443,7 @@ Verwijder document(en) src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 223 + 204 @@ -1363,7 +1451,7 @@ Selecteer: src/app/components/document-list/bulk-editor/bulk-editor.component.html - 11 + 10 @@ -1371,7 +1459,7 @@ Alles src/app/components/document-list/bulk-editor/bulk-editor.component.html - 21 + 20 @@ -1379,7 +1467,7 @@ Bewerk: src/app/components/document-list/bulk-editor/bulk-editor.component.html - 28 + 27 @@ -1582,6 +1670,38 @@ 12 + + English (US) + Engels (US) + + src/app/services/settings.service.ts + 74 + + + + German + Duits + + src/app/services/settings.service.ts + 75 + + + + Dutch + Nederlands + + src/app/services/settings.service.ts + 76 + + + + French + Frans + + src/app/services/settings.service.ts + 77 + + Error Fout @@ -1598,17 +1718,17 @@ 35 - - Correspondent - Correspondent + + ASN + ASN src/app/services/rest/document.service.ts 16 - - Document type - Documenttype + + Correspondent + Correspondent src/app/services/rest/document.service.ts 17 @@ -1622,9 +1742,9 @@ 18 - - ASN - ASN + + Document type + Documenttype src/app/services/rest/document.service.ts 19 @@ -1763,7 +1883,7 @@ Maak nieuw item src/app/components/common/edit-dialog/edit-dialog.component.ts - 38 + 50 @@ -1771,7 +1891,7 @@ Item bewerken src/app/components/common/edit-dialog/edit-dialog.component.ts - 42 + 54 @@ -1779,7 +1899,7 @@ Kon het element niet opslaan: src/app/components/common/edit-dialog/edit-dialog.component.ts - 46 + 58 @@ -1787,7 +1907,7 @@ Automatisch src/app/components/manage/generic-list/generic-list.component.ts - 31 + 39 @@ -1795,7 +1915,7 @@ Wil je dit element echt verwijderen? src/app/components/manage/generic-list/generic-list.component.ts - 88 + 97 @@ -1803,7 +1923,7 @@ Geassocieerde documenten zullen niet verwijderd worden. src/app/components/manage/generic-list/generic-list.component.ts - 95 + 104 @@ -1811,7 +1931,15 @@ Verwijderen src/app/components/manage/generic-list/generic-list.component.ts - 97 + 106 + + + + Error while deleting element: + Fout bij het verwijderen van het element: + + src/app/components/manage/generic-list/generic-list.component.ts + 114 @@ -1880,7 +2008,7 @@ Fuzzy word - Vaag woord + Gelijkaardig woord src/app/data/matching-model.ts 16 @@ -1888,7 +2016,7 @@ Fuzzy: Document contains a word similar to this word - Vaag: Document bevat een woord dat lijkt op dit woord + Gelijkaardig: Document bevat een woord dat lijkt op dit woord src/app/data/matching-model.ts 16 diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss index 88c2b8014..9a698143d 100644 --- a/src-ui/src/theme_dark.scss +++ b/src-ui/src/theme_dark.scss @@ -84,7 +84,7 @@ $border-color-dark-mode: #47494f; } .dropdown-menu { - background-color: $bg-dark-mode; + background-color: $bg-light-dark-mode; .dropdown-divider { border-color: $border-color-dark-mode; @@ -174,6 +174,17 @@ $border-color-dark-mode: #47494f; color: $text-color-dark-mode; border-color: $border-color-dark-mode; + .des, + .asc { + background-color: transparent !important; + color: $text-color-dark-mode; + border-color: $border-color-dark-mode; + + &::after { + filter: invert(0.8); /* arrow is a black inline png bkgd image (!) so use filter */ + } + } + tr:hover { background-color: $bg-light-dark-mode; color: $text-color-dark-mode-accent; @@ -250,13 +261,18 @@ $border-color-dark-mode: #47494f; background-color: $bg-dark-mode !important; } - .form-control, + .form-control:not(.is-invalid):not(.btn), + input:not(.is-invalid), + textarea:not(.is-invalid) { + border-color: $border-color-dark-mode; /* we dont want to override controls that get highlighting for errors */ + } + + .form-control:not(.btn), input, select, textarea { background-color: $bg-dark-mode; color: $text-color-dark-mode; - border-color: $border-color-dark-mode; &::placeholder { color: $text-color-dark-mode; @@ -281,7 +297,8 @@ $border-color-dark-mode: #47494f; } } - .ng-dropdown-panel .ng-dropdown-panel-items .ng-option:hover { + .ng-dropdown-panel .ng-dropdown-panel-items .ng-option:hover, + .ng-dropdown-panel .ng-dropdown-panel-items .ng-option.ng-option-marked { background-color: $bg-light-dark-mode; } @@ -325,6 +342,16 @@ $border-color-dark-mode: #47494f; .progress { background-color: $border-color-dark-mode; } + + .alert-danger { + color: $text-color-dark-mode-accent; + background-color: darken($danger-dark-mode, 20%); + border-color: darken($danger-dark-mode, 20%); + } + + .bg-dark { + background-color: $bg-light-dark-mode !important; + } } body.color-scheme-dark { diff --git a/src/documents/consumer.py b/src/documents/consumer.py index 21a4da66b..71b1294f5 100755 --- a/src/documents/consumer.py +++ b/src/documents/consumer.py @@ -91,6 +91,11 @@ class Consumer(LoggingMixin): if not settings.PRE_CONSUME_SCRIPT: return + if not os.path.isfile(settings.PRE_CONSUME_SCRIPT): + raise ConsumerError( + f"Configured pre-consume script " + f"{settings.PRE_CONSUME_SCRIPT} does not exist.") + try: Popen((settings.PRE_CONSUME_SCRIPT, self.path)).wait() except Exception as e: @@ -102,6 +107,11 @@ class Consumer(LoggingMixin): if not settings.POST_CONSUME_SCRIPT: return + if not os.path.isfile(settings.POST_CONSUME_SCRIPT): + raise ConsumerError( + f"Configured post-consume script " + f"{settings.POST_CONSUME_SCRIPT} does not exist.") + try: Popen(( settings.POST_CONSUME_SCRIPT, diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py index a5274a5f4..dd798e8ab 100644 --- a/src/documents/file_handling.py +++ b/src/documents/file_handling.py @@ -91,7 +91,7 @@ def generate_unique_filename(doc, root): return new_filename -def generate_filename(doc, counter=0): +def generate_filename(doc, counter=0, append_gpg=True): path = "" try: @@ -151,7 +151,7 @@ def generate_filename(doc, counter=0): filename = f"{doc.pk:07}{counter_str}{doc.file_type}" # Append .gpg for encrypted files - if doc.storage_type == doc.STORAGE_TYPE_GPG: + if append_gpg and doc.storage_type == doc.STORAGE_TYPE_GPG: filename += ".gpg" return filename diff --git a/src/documents/management/commands/document_archiver.py b/src/documents/management/commands/document_archiver.py index 7b9a123d9..01bd819c5 100644 --- a/src/documents/management/commands/document_archiver.py +++ b/src/documents/management/commands/document_archiver.py @@ -11,6 +11,7 @@ from django import db from django.conf import settings from django.core.management.base import BaseCommand from django.db import transaction +from filelock import FileLock from whoosh.writing import AsyncWriter from documents.models import Document @@ -47,8 +48,10 @@ def handle_document(document_id): archive_checksum=checksum, content=parser.get_text() ) - create_source_path_directory(document.archive_path) - shutil.move(parser.get_archive_path(), document.archive_path) + with FileLock(settings.MEDIA_LOCK): + create_source_path_directory(document.archive_path) + shutil.move(parser.get_archive_path(), + document.archive_path) with AsyncWriter(index.open_index()) as writer: index.update_document(writer, document) diff --git a/src/documents/management/commands/document_consumer.py b/src/documents/management/commands/document_consumer.py index 8ac60aa6d..9ba1b1a87 100644 --- a/src/documents/management/commands/document_consumer.py +++ b/src/documents/management/commands/document_consumer.py @@ -5,7 +5,6 @@ from time import sleep from django.conf import settings from django.core.management.base import BaseCommand, CommandError -from django.utils.text import slugify from django_q.tasks import async_task from watchdog.events import FileSystemEventHandler from watchdog.observers.polling import PollingObserver @@ -46,7 +45,7 @@ def _consume(filepath): return if not is_file_ext_supported(os.path.splitext(filepath)[1]): - logger.debug( + logger.warning( f"Not consuming file {filepath}: Unknown file extension.") return diff --git a/src/documents/management/commands/document_exporter.py b/src/documents/management/commands/document_exporter.py index a7a17f124..37fcf2024 100644 --- a/src/documents/management/commands/document_exporter.py +++ b/src/documents/management/commands/document_exporter.py @@ -1,15 +1,21 @@ +import hashlib import json import os import shutil import time +import tqdm +from django.conf import settings from django.core import serializers from django.core.management.base import BaseCommand, CommandError +from django.db import transaction +from filelock import FileLock from documents.models import Document, Correspondent, Tag, DocumentType from documents.settings import EXPORTER_FILE_NAME, EXPORTER_THUMBNAIL_NAME, \ EXPORTER_ARCHIVE_NAME from paperless.db import GnuPG +from ...file_handling import generate_filename, delete_empty_directories from ...mixins import Renderable @@ -24,13 +30,47 @@ class Command(Renderable, BaseCommand): def add_arguments(self, parser): parser.add_argument("target") + parser.add_argument( + "-c", "--compare-checksums", + default=False, + action="store_true", + help="Compare file checksums when determining whether to export " + "a file or not. If not specified, file size and time " + "modified is used instead." + ) + + parser.add_argument( + "-f", "--use-filename-format", + default=False, + action="store_true", + help="Use PAPERLESS_FILENAME_FORMAT for storing files in the " + "export directory, if configured." + ) + + parser.add_argument( + "-d", "--delete", + default=False, + action="store_true", + help="After exporting, delete files in the export directory that " + "do not belong to the current export, such as files from " + "deleted documents." + ) + def __init__(self, *args, **kwargs): BaseCommand.__init__(self, *args, **kwargs) self.target = None + self.files_in_export_dir = [] + self.exported_files = [] + self.compare_checksums = False + self.use_filename_format = False + self.delete = False def handle(self, *args, **options): self.target = options["target"] + self.compare_checksums = options['compare_checksums'] + self.use_filename_format = options['use_filename_format'] + self.delete = options['delete'] if not os.path.exists(self.target): raise CommandError("That path doesn't exist") @@ -38,83 +78,148 @@ class Command(Renderable, BaseCommand): if not os.access(self.target, os.W_OK): raise CommandError("That path doesn't appear to be writable") - if os.listdir(self.target): - raise CommandError("That directory is not empty.") - - self.dump() + with FileLock(settings.MEDIA_LOCK): + self.dump() def dump(self): + # 1. Take a snapshot of what files exist in the current export folder + for root, dirs, files in os.walk(self.target): + self.files_in_export_dir.extend( + map(lambda f: os.path.abspath(os.path.join(root, f)), files) + ) - documents = Document.objects.all() - document_map = {d.pk: d for d in documents} - manifest = json.loads(serializers.serialize("json", documents)) + # 2. Create manifest, containing all correspondents, types, tags and + # documents + with transaction.atomic(): + manifest = json.loads( + serializers.serialize("json", Correspondent.objects.all())) - for index, document_dict in enumerate(manifest): + manifest += json.loads(serializers.serialize( + "json", Tag.objects.all())) - # Force output to unencrypted as that will be the current state. - # The importer will make the decision to encrypt or not. - manifest[index]["fields"]["storage_type"] = Document.STORAGE_TYPE_UNENCRYPTED # NOQA: E501 + manifest += json.loads(serializers.serialize( + "json", DocumentType.objects.all())) + + documents = Document.objects.order_by("id") + document_map = {d.pk: d for d in documents} + document_manifest = json.loads( + serializers.serialize("json", documents)) + manifest += document_manifest + + # 3. Export files from each document + for index, document_dict in tqdm.tqdm(enumerate(document_manifest), + total=len(document_manifest)): + # 3.1. store files unencrypted + document_dict["fields"]["storage_type"] = Document.STORAGE_TYPE_UNENCRYPTED # NOQA: E501 document = document_map[document_dict["pk"]] - print(f"Exporting: {document}") - + # 3.2. generate a unique filename filename_counter = 0 while True: - original_name = document.get_public_filename( - counter=filename_counter) - original_target = os.path.join(self.target, original_name) + if self.use_filename_format: + base_name = generate_filename( + document, counter=filename_counter, + append_gpg=False) + else: + base_name = document.get_public_filename( + counter=filename_counter) - if not os.path.exists(original_target): + if base_name not in self.exported_files: + self.exported_files.append(base_name) break else: filename_counter += 1 - thumbnail_name = original_name + "-thumbnail.png" - thumbnail_target = os.path.join(self.target, thumbnail_name) - + # 3.3. write filenames into manifest + original_name = base_name + original_target = os.path.join(self.target, original_name) document_dict[EXPORTER_FILE_NAME] = original_name + + thumbnail_name = base_name + "-thumbnail.png" + thumbnail_target = os.path.join(self.target, thumbnail_name) document_dict[EXPORTER_THUMBNAIL_NAME] = thumbnail_name if os.path.exists(document.archive_path): - archive_name = document.get_public_filename( - archive=True, counter=filename_counter, suffix="_archive") + archive_name = base_name + "-archive.pdf" archive_target = os.path.join(self.target, archive_name) document_dict[EXPORTER_ARCHIVE_NAME] = archive_name else: archive_target = None + # 3.4. write files to target folder t = int(time.mktime(document.created.timetuple())) if document.storage_type == Document.STORAGE_TYPE_GPG: + os.makedirs(os.path.dirname(original_target), exist_ok=True) with open(original_target, "wb") as f: f.write(GnuPG.decrypted(document.source_file)) os.utime(original_target, times=(t, t)) + os.makedirs(os.path.dirname(thumbnail_target), exist_ok=True) with open(thumbnail_target, "wb") as f: f.write(GnuPG.decrypted(document.thumbnail_file)) os.utime(thumbnail_target, times=(t, t)) if archive_target: + os.makedirs(os.path.dirname(archive_target), exist_ok=True) with open(archive_target, "wb") as f: f.write(GnuPG.decrypted(document.archive_path)) os.utime(archive_target, times=(t, t)) else: + self.check_and_copy(document.source_path, + document.checksum, + original_target) - shutil.copy(document.source_path, original_target) - shutil.copy(document.thumbnail_path, thumbnail_target) + self.check_and_copy(document.thumbnail_path, + None, + thumbnail_target) if archive_target: - shutil.copy(document.archive_path, archive_target) + self.check_and_copy(document.archive_path, + document.archive_checksum, + archive_target) - manifest += json.loads( - serializers.serialize("json", Correspondent.objects.all())) + # 4. write manifest to target forlder + manifest_path = os.path.abspath( + os.path.join(self.target, "manifest.json")) - manifest += json.loads(serializers.serialize( - "json", Tag.objects.all())) - - manifest += json.loads(serializers.serialize( - "json", DocumentType.objects.all())) - - with open(os.path.join(self.target, "manifest.json"), "w") as f: + with open(manifest_path, "w") as f: json.dump(manifest, f, indent=2) + + if self.delete: + # 5. Remove files which we did not explicitly export in this run + + if manifest_path in self.files_in_export_dir: + self.files_in_export_dir.remove(manifest_path) + + for f in self.files_in_export_dir: + os.remove(f) + + delete_empty_directories(os.path.abspath(os.path.dirname(f)), + os.path.abspath(self.target)) + + def check_and_copy(self, source, source_checksum, target): + if os.path.abspath(target) in self.files_in_export_dir: + self.files_in_export_dir.remove(os.path.abspath(target)) + + perform_copy = False + + if os.path.exists(target): + source_stat = os.stat(source) + target_stat = os.stat(target) + if self.compare_checksums and source_checksum: + with open(target, "rb") as f: + target_checksum = hashlib.md5(f.read()).hexdigest() + perform_copy = target_checksum != source_checksum + elif source_stat.st_mtime != target_stat.st_mtime: + perform_copy = True + elif source_stat.st_size != target_stat.st_size: + perform_copy = True + else: + # Copy if it does not exist + perform_copy = True + + if perform_copy: + os.makedirs(os.path.dirname(target), exist_ok=True) + shutil.copy2(source, target) diff --git a/src/documents/management/commands/document_importer.py b/src/documents/management/commands/document_importer.py index 6df14a82c..a2e19e3cc 100644 --- a/src/documents/management/commands/document_importer.py +++ b/src/documents/management/commands/document_importer.py @@ -148,10 +148,10 @@ class Command(Renderable, BaseCommand): create_source_path_directory(document.source_path) - shutil.copy(document_path, document.source_path) - shutil.copy(thumbnail_path, document.thumbnail_path) + shutil.copy2(document_path, document.source_path) + shutil.copy2(thumbnail_path, document.thumbnail_path) if archive_path: create_source_path_directory(document.archive_path) - shutil.copy(archive_path, document.archive_path) + shutil.copy2(archive_path, document.archive_path) document.save() diff --git a/src/documents/management/commands/document_thumbnails.py b/src/documents/management/commands/document_thumbnails.py index 01df14624..6f6451599 100644 --- a/src/documents/management/commands/document_thumbnails.py +++ b/src/documents/management/commands/document_thumbnails.py @@ -13,8 +13,14 @@ from ...parsers import get_parser_class_for_mime_type def _process_document(doc_in): document = Document.objects.get(id=doc_in) - parser = get_parser_class_for_mime_type(document.mime_type)( - logging_group=None) + parser_class = get_parser_class_for_mime_type(document.mime_type) + + if parser_class: + parser = parser_class(logging_group=None) + else: + print(f"{document} No parser for mime type {document.mime_type}") + return + try: thumb = parser.get_optimised_thumbnail( document.source_path, document.mime_type) diff --git a/src/documents/matching.py b/src/documents/matching.py index 212698ad3..fa9ce6af3 100644 --- a/src/documents/matching.py +++ b/src/documents/matching.py @@ -1,3 +1,4 @@ +import logging import re from fuzzywuzzy import fuzz @@ -5,49 +6,59 @@ from fuzzywuzzy import fuzz from documents.models import MatchingModel, Correspondent, DocumentType, Tag -def match_correspondents(document_content, classifier): +logger = logging.getLogger(__name__) + + +def log_reason(matching_model, document, reason): + class_name = type(matching_model).__name__ + logger.debug( + f"Assigning {class_name} {matching_model.name} to document " + f"{document} because {reason}") + + +def match_correspondents(document, classifier): if classifier: - pred_id = classifier.predict_correspondent(document_content) + pred_id = classifier.predict_correspondent(document.content) else: pred_id = None correspondents = Correspondent.objects.all() return list(filter( - lambda o: matches(o, document_content) or o.pk == pred_id, + lambda o: matches(o, document) or o.pk == pred_id, correspondents)) -def match_document_types(document_content, classifier): +def match_document_types(document, classifier): if classifier: - pred_id = classifier.predict_document_type(document_content) + pred_id = classifier.predict_document_type(document.content) else: pred_id = None document_types = DocumentType.objects.all() return list(filter( - lambda o: matches(o, document_content) or o.pk == pred_id, + lambda o: matches(o, document) or o.pk == pred_id, document_types)) -def match_tags(document_content, classifier): +def match_tags(document, classifier): if classifier: - predicted_tag_ids = classifier.predict_tags(document_content) + predicted_tag_ids = classifier.predict_tags(document.content) else: predicted_tag_ids = [] tags = Tag.objects.all() return list(filter( - lambda o: matches(o, document_content) or o.pk in predicted_tag_ids, + lambda o: matches(o, document) or o.pk in predicted_tag_ids, tags)) -def matches(matching_model, document_content): +def matches(matching_model, document): search_kwargs = {} - document_content = document_content.lower() + document_content = document.content.lower() # Check that match is not empty if matching_model.match.strip() == "": @@ -62,26 +73,54 @@ def matches(matching_model, document_content): rf"\b{word}\b", document_content, **search_kwargs) if not search_result: return False + log_reason( + matching_model, document, + f"it contains all of these words: {matching_model.match}" + ) return True elif matching_model.matching_algorithm == MatchingModel.MATCH_ANY: for word in _split_match(matching_model): if re.search(rf"\b{word}\b", document_content, **search_kwargs): + log_reason( + matching_model, document, + f"it contains this word: {word}" + ) return True return False elif matching_model.matching_algorithm == MatchingModel.MATCH_LITERAL: - return bool(re.search( + result = bool(re.search( rf"\b{matching_model.match}\b", document_content, **search_kwargs )) + if result: + log_reason( + matching_model, document, + f"it contains this string: \"{matching_model.match}\"" + ) + return result elif matching_model.matching_algorithm == MatchingModel.MATCH_REGEX: - return bool(re.search( - re.compile(matching_model.match, **search_kwargs), - document_content - )) + try: + match = re.search( + re.compile(matching_model.match, **search_kwargs), + document_content + ) + except re.error: + logger.error( + f"Error while processing regular expression " + f"{matching_model.match}" + ) + return False + if match: + log_reason( + matching_model, document, + f"the string {match.group()} matches the regular expression " + f"{matching_model.match}" + ) + return bool(match) elif matching_model.matching_algorithm == MatchingModel.MATCH_FUZZY: match = re.sub(r'[^\w\s]', '', matching_model.match) @@ -89,8 +128,16 @@ def matches(matching_model, document_content): if matching_model.is_insensitive: match = match.lower() text = text.lower() - - return fuzz.partial_ratio(match, text) >= 90 + if fuzz.partial_ratio(match, text) >= 90: + # TODO: make this better + log_reason( + matching_model, document, + f"parts of the document content somehow match the string " + f"{matching_model.match}" + ) + return True + else: + return False elif matching_model.matching_algorithm == MatchingModel.MATCH_AUTO: # this is done elsewhere. diff --git a/src/documents/models.py b/src/documents/models.py index 3f0e331d0..86878dd7e 100755 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -12,6 +12,7 @@ from django.conf import settings from django.contrib.auth.models import User from django.db import models from django.utils import timezone +from django.utils.timezone import is_aware from django.utils.translation import gettext_lazy as _ @@ -62,12 +63,6 @@ class MatchingModel(models.Model): def __str__(self): return self.name - def save(self, *args, **kwargs): - - self.match = self.match.lower() - - models.Model.save(self, *args, **kwargs) - class Correspondent(MatchingModel): @@ -233,7 +228,10 @@ class Document(models.Model): verbose_name_plural = _("documents") def __str__(self): - created = datetime.date.isoformat(self.created) + if is_aware(self.created): + created = timezone.localdate(self.created).isoformat() + else: + created = datetime.date.isoformat(self.created) if self.correspondent and self.title: return f"{created} {self.correspondent} {self.title}" else: diff --git a/src/documents/parsers.py b/src/documents/parsers.py index 75c69ce6c..f8fd117d9 100644 --- a/src/documents/parsers.py +++ b/src/documents/parsers.py @@ -210,6 +210,13 @@ def parse_date(filename, text): } ) + def __filter(date): + if date and date.year > 1900 and \ + date <= timezone.now() and \ + date.date() not in settings.IGNORE_DATES: + return date + return None + date = None # if filename date parsing is enabled, search there first: @@ -223,7 +230,8 @@ def parse_date(filename, text): # Skip all matches that do not parse to a proper date continue - if date and date.year > 1900 and date <= timezone.now(): + date = __filter(date) + if date is not None: return date # Iterate through all regex matches in text and try to parse the date @@ -236,10 +244,9 @@ def parse_date(filename, text): # Skip all matches that do not parse to a proper date continue - if date and date.year > 1900 and date <= timezone.now(): + date = __filter(date) + if date is not None: break - else: - date = None return date diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index 66f5f883f..70a44d3fd 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -382,13 +382,6 @@ class PostDocumentSerializer(serializers.Serializer): return document.name, document_data - def validate_title(self, title): - if title: - return title - else: - # do not return empty strings. - return None - def validate_correspondent(self, correspondent): if correspondent: return correspondent.id diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py index be101b3af..76c1e76ed 100755 --- a/src/documents/signals/handlers.py +++ b/src/documents/signals/handlers.py @@ -38,7 +38,7 @@ def set_correspondent(sender, if document.correspondent and not replace: return - potential_correspondents = matching.match_correspondents(document.content, + potential_correspondents = matching.match_correspondents(document, classifier) potential_count = len(potential_correspondents) @@ -81,7 +81,7 @@ def set_document_type(sender, if document.document_type and not replace: return - potential_document_type = matching.match_document_types(document.content, + potential_document_type = matching.match_document_types(document, classifier) potential_count = len(potential_document_type) @@ -130,7 +130,7 @@ def set_tags(sender, current_tags = set(document.tags.all()) - matched_tags = matching.match_tags(document.content, classifier) + matched_tags = matching.match_tags(document, classifier) relevant_tags = set(matched_tags) - current_tags diff --git a/src/documents/templates/index.html b/src/documents/templates/index.html index 21112b643..285e48d3f 100644 --- a/src/documents/templates/index.html +++ b/src/documents/templates/index.html @@ -1,6 +1,7 @@ {% load static %} +{% load i18n %} @@ -16,7 +17,7 @@ - Loading... + {% translate "Paperless-ng is loading..." %} diff --git a/src/documents/templates/registration/logged_out.html b/src/documents/templates/registration/logged_out.html index 4a3cb60bb..bf21b95f8 100644 --- a/src/documents/templates/registration/logged_out.html +++ b/src/documents/templates/registration/logged_out.html @@ -1,6 +1,7 @@ {% load static %} +{% load i18n %} @@ -9,7 +10,7 @@ - Paperless Sign In + {% translate "Paperless-ng signed out" %} @@ -36,9 +37,9 @@ diff --git a/src/documents/templates/registration/login.html b/src/documents/templates/registration/login.html index 25a707bed..ba46d3adf 100644 --- a/src/documents/templates/registration/login.html +++ b/src/documents/templates/registration/login.html @@ -1,6 +1,7 @@ {% load static %} +{% load i18n %} @@ -9,7 +10,7 @@ - Paperless Sign In + {% translate "Paperless-ng sign in" %} @@ -37,18 +38,20 @@ {% csrf_token %} - -

    Please sign in.

    + +

    {% translate "Please sign in." %}

    {% if form.errors %} {% endif %} - - - - - + {% translate "Username" as i18n_username %} + {% translate "Password" as i18n_password %} + + + + + diff --git a/src/documents/tests/samples/documents/originals/0000002.pdf b/src/documents/tests/samples/documents/originals/0000002.pdf new file mode 100644 index 000000000..5e75266ca Binary files /dev/null and b/src/documents/tests/samples/documents/originals/0000002.pdf differ diff --git a/src/documents/tests/samples/documents/originals/0000002.pdf.gpg b/src/documents/tests/samples/documents/originals/0000002.pdf.gpg deleted file mode 100644 index 0322a8039..000000000 Binary files a/src/documents/tests/samples/documents/originals/0000002.pdf.gpg and /dev/null differ diff --git a/src/documents/tests/samples/documents/originals/0000003.pdf b/src/documents/tests/samples/documents/originals/0000003.pdf new file mode 100644 index 000000000..afbeef5c8 Binary files /dev/null and b/src/documents/tests/samples/documents/originals/0000003.pdf differ diff --git a/src/documents/tests/samples/documents/originals/0000004.pdf.gpg b/src/documents/tests/samples/documents/originals/0000004.pdf.gpg new file mode 100644 index 000000000..754efcbf6 Binary files /dev/null and b/src/documents/tests/samples/documents/originals/0000004.pdf.gpg differ diff --git a/src/documents/tests/samples/documents/thumbnails/0000002.png b/src/documents/tests/samples/documents/thumbnails/0000002.png new file mode 100644 index 000000000..a3a768401 Binary files /dev/null and b/src/documents/tests/samples/documents/thumbnails/0000002.png differ diff --git a/src/documents/tests/samples/documents/thumbnails/0000003.png b/src/documents/tests/samples/documents/thumbnails/0000003.png new file mode 100644 index 000000000..a3a768401 Binary files /dev/null and b/src/documents/tests/samples/documents/thumbnails/0000003.png differ diff --git a/src/documents/tests/samples/documents/thumbnails/0000002.png.gpg b/src/documents/tests/samples/documents/thumbnails/0000004.png.gpg similarity index 100% rename from src/documents/tests/samples/documents/thumbnails/0000002.png.gpg rename to src/documents/tests/samples/documents/thumbnails/0000004.png.gpg diff --git a/src/documents/tests/test_admin.py b/src/documents/tests/test_admin.py index b280c43ea..6915f595d 100644 --- a/src/documents/tests/test_admin.py +++ b/src/documents/tests/test_admin.py @@ -5,12 +5,14 @@ from django.test import TestCase from django.utils import timezone from documents.admin import DocumentAdmin -from documents.models import Document, Tag +from documents.models import Document +from documents.tests.utils import DirectoriesMixin -class TestDocumentAdmin(TestCase): +class TestDocumentAdmin(DirectoriesMixin, TestCase): def setUp(self) -> None: + super(TestDocumentAdmin, self).setUp() self.doc_admin = DocumentAdmin(model=Document, admin_site=AdminSite()) @mock.patch("documents.admin.index.add_or_update_document") diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py index dbe8f881c..2b332a873 100644 --- a/src/documents/tests/test_api.py +++ b/src/documents/tests/test_api.py @@ -114,8 +114,6 @@ class TestDocumentApi(DirectoriesMixin, APITestCase): results = response.data['results'] self.assertEqual(len(results[0]), 0) - - def test_document_actions(self): _, filename = tempfile.mkstemp(dir=self.dirs.originals_dir) @@ -230,6 +228,12 @@ class TestDocumentApi(DirectoriesMixin, APITestCase): self.assertEqual(len(results), 2) self.assertCountEqual([results[0]['id'], results[1]['id']], [doc1.id, doc3.id]) + response = self.client.get("/api/documents/?tags__id__in={},{}".format(tag_2.id, tag_3.id)) + self.assertEqual(response.status_code, 200) + results = response.data['results'] + self.assertEqual(len(results), 2) + self.assertCountEqual([results[0]['id'], results[1]['id']], [doc2.id, doc3.id]) + response = self.client.get("/api/documents/?tags__id__all={},{}".format(tag_2.id, tag_3.id)) self.assertEqual(response.status_code, 200) results = response.data['results'] @@ -455,6 +459,23 @@ class TestDocumentApi(DirectoriesMixin, APITestCase): self.assertIsNone(kwargs['override_document_type_id']) self.assertIsNone(kwargs['override_tag_ids']) + @mock.patch("documents.views.async_task") + def test_upload_empty_metadata(self, m): + + with open(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), "rb") as f: + response = self.client.post("/api/documents/post_document/", {"document": f, "title": "", "correspondent": "", "document_type": ""}) + + self.assertEqual(response.status_code, 200) + + m.assert_called_once() + + args, kwargs = m.call_args + self.assertEqual(kwargs['override_filename'], "simple.pdf") + self.assertIsNone(kwargs['override_title']) + self.assertIsNone(kwargs['override_correspondent_id']) + self.assertIsNone(kwargs['override_document_type_id']) + self.assertIsNone(kwargs['override_tag_ids']) + @mock.patch("documents.views.async_task") def test_upload_invalid_form(self, m): @@ -908,6 +929,14 @@ class TestBulkEdit(DirectoriesMixin, APITestCase): doc2 = Document.objects.get(id=self.doc2.id) self.assertEqual(doc2.correspondent, self.c1) + def test_api_no_correspondent(self): + response = self.client.post("/api/documents/bulk_edit/", json.dumps({ + "documents": [self.doc2.id], + "method": "set_correspondent", + "parameters": {} + }), content_type='application/json') + self.assertEqual(response.status_code, 400) + def test_api_invalid_document_type(self): self.assertEqual(self.doc2.document_type, self.dt1) response = self.client.post("/api/documents/bulk_edit/", json.dumps({ @@ -920,6 +949,14 @@ class TestBulkEdit(DirectoriesMixin, APITestCase): doc2 = Document.objects.get(id=self.doc2.id) self.assertEqual(doc2.document_type, self.dt1) + def test_api_no_document_type(self): + response = self.client.post("/api/documents/bulk_edit/", json.dumps({ + "documents": [self.doc2.id], + "method": "set_document_type", + "parameters": {} + }), content_type='application/json') + self.assertEqual(response.status_code, 400) + def test_api_add_invalid_tag(self): self.assertEqual(list(self.doc2.tags.all()), [self.t1]) response = self.client.post("/api/documents/bulk_edit/", json.dumps({ @@ -931,6 +968,14 @@ class TestBulkEdit(DirectoriesMixin, APITestCase): self.assertEqual(list(self.doc2.tags.all()), [self.t1]) + def test_api_add_tag_no_tag(self): + response = self.client.post("/api/documents/bulk_edit/", json.dumps({ + "documents": [self.doc2.id], + "method": "add_tag", + "parameters": {} + }), content_type='application/json') + self.assertEqual(response.status_code, 400) + def test_api_delete_invalid_tag(self): self.assertEqual(list(self.doc2.tags.all()), [self.t1]) response = self.client.post("/api/documents/bulk_edit/", json.dumps({ @@ -942,6 +987,14 @@ class TestBulkEdit(DirectoriesMixin, APITestCase): self.assertEqual(list(self.doc2.tags.all()), [self.t1]) + def test_api_delete_tag_no_tag(self): + response = self.client.post("/api/documents/bulk_edit/", json.dumps({ + "documents": [self.doc2.id], + "method": "remove_tag", + "parameters": {} + }), content_type='application/json') + self.assertEqual(response.status_code, 400) + def test_api_modify_invalid_tags(self): self.assertEqual(list(self.doc2.tags.all()), [self.t1]) response = self.client.post("/api/documents/bulk_edit/", json.dumps({ @@ -951,6 +1004,21 @@ class TestBulkEdit(DirectoriesMixin, APITestCase): }), content_type='application/json') self.assertEqual(response.status_code, 400) + def test_api_modify_tags_no_tags(self): + response = self.client.post("/api/documents/bulk_edit/", json.dumps({ + "documents": [self.doc2.id], + "method": "modify_tags", + "parameters": {"remove_tags": [1123123]} + }), content_type='application/json') + self.assertEqual(response.status_code, 400) + + response = self.client.post("/api/documents/bulk_edit/", json.dumps({ + "documents": [self.doc2.id], + "method": "modify_tags", + "parameters": {'add_tags': [self.t2.id, 1657]} + }), content_type='application/json') + self.assertEqual(response.status_code, 400) + def test_api_selection_data_empty(self): response = self.client.post("/api/documents/selection_data/", json.dumps({ "documents": [] diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py index 5049c1dd2..a6861a541 100644 --- a/src/documents/tests/test_consumer.py +++ b/src/documents/tests/test_consumer.py @@ -468,6 +468,42 @@ class TestConsumer(DirectoriesMixin, TestCase): self.assertTrue(os.path.isfile(dst)) +class PreConsumeTestCase(TestCase): + + @mock.patch("documents.consumer.Popen") + @override_settings(PRE_CONSUME_SCRIPT=None) + def test_no_pre_consume_script(self, m): + c = Consumer() + c.path = "path-to-file" + c.run_pre_consume_script() + m.assert_not_called() + + @mock.patch("documents.consumer.Popen") + @override_settings(PRE_CONSUME_SCRIPT="does-not-exist") + def test_pre_consume_script_not_found(self, m): + c = Consumer() + c.path = "path-to-file" + self.assertRaises(ConsumerError, c.run_pre_consume_script) + + @mock.patch("documents.consumer.Popen") + def test_pre_consume_script(self, m): + with tempfile.NamedTemporaryFile() as script: + with override_settings(PRE_CONSUME_SCRIPT=script.name): + c = Consumer() + c.path = "path-to-file" + c.run_pre_consume_script() + + m.assert_called_once() + + args, kwargs = m.call_args + + command = args[0] + + self.assertEqual(command[0], script.name) + self.assertEqual(command[1], "path-to-file") + + + class PostConsumeTestCase(TestCase): @mock.patch("documents.consumer.Popen") @@ -483,36 +519,45 @@ class PostConsumeTestCase(TestCase): m.assert_not_called() - @mock.patch("documents.consumer.Popen") - @override_settings(POST_CONSUME_SCRIPT="script") - def test_post_consume_script_simple(self, m): + + @override_settings(POST_CONSUME_SCRIPT="does-not-exist") + def test_post_consume_script_not_found(self): doc = Document.objects.create(title="Test", mime_type="application/pdf") - Consumer().run_post_consume_script(doc) - - m.assert_called_once() + self.assertRaises(ConsumerError, Consumer().run_post_consume_script, doc) + + @mock.patch("documents.consumer.Popen") + def test_post_consume_script_simple(self, m): + with tempfile.NamedTemporaryFile() as script: + with override_settings(POST_CONSUME_SCRIPT=script.name): + doc = Document.objects.create(title="Test", mime_type="application/pdf") + + Consumer().run_post_consume_script(doc) + + m.assert_called_once() @mock.patch("documents.consumer.Popen") - @override_settings(POST_CONSUME_SCRIPT="script") def test_post_consume_script_with_correspondent(self, m): - c = Correspondent.objects.create(name="my_bank") - doc = Document.objects.create(title="Test", mime_type="application/pdf", correspondent=c) - tag1 = Tag.objects.create(name="a") - tag2 = Tag.objects.create(name="b") - doc.tags.add(tag1) - doc.tags.add(tag2) + with tempfile.NamedTemporaryFile() as script: + with override_settings(POST_CONSUME_SCRIPT=script.name): + c = Correspondent.objects.create(name="my_bank") + doc = Document.objects.create(title="Test", mime_type="application/pdf", correspondent=c) + tag1 = Tag.objects.create(name="a") + tag2 = Tag.objects.create(name="b") + doc.tags.add(tag1) + doc.tags.add(tag2) - Consumer().run_post_consume_script(doc) + Consumer().run_post_consume_script(doc) - m.assert_called_once() + m.assert_called_once() - args, kwargs = m.call_args + args, kwargs = m.call_args - command = args[0] + command = args[0] - self.assertEqual(command[0], "script") - self.assertEqual(command[1], str(doc.pk)) - self.assertEqual(command[5], f"/api/documents/{doc.pk}/download/") - self.assertEqual(command[6], f"/api/documents/{doc.pk}/thumb/") - self.assertEqual(command[7], "my_bank") - self.assertCountEqual(command[8].split(","), ["a", "b"]) + self.assertEqual(command[0], script.name) + self.assertEqual(command[1], str(doc.pk)) + self.assertEqual(command[5], f"/api/documents/{doc.pk}/download/") + self.assertEqual(command[6], f"/api/documents/{doc.pk}/thumb/") + self.assertEqual(command[7], "my_bank") + self.assertCountEqual(command[8].split(","), ["a", "b"]) diff --git a/src/documents/tests/test_date_parsing.py b/src/documents/tests/test_date_parsing.py index 357b0937e..9cbb19c2b 100644 --- a/src/documents/tests/test_date_parsing.py +++ b/src/documents/tests/test_date_parsing.py @@ -138,3 +138,18 @@ class TestDate(TestCase): @override_settings(FILENAME_DATE_ORDER="YMD") def test_filename_date_parse_invalid(self, *args): self.assertIsNone(parse_date("/tmp/20 408000l 2475 - test.pdf", "No date in here")) + + @override_settings(IGNORE_DATES=(datetime.date(2019, 11, 3), datetime.date(2020, 1, 17))) + def test_ignored_dates(self, *args): + text = ( + "lorem ipsum 110319, 20200117 and lorem 13.02.2018 lorem " + "ipsum" + ) + date = parse_date("", text) + self.assertEqual( + date, + datetime.datetime( + 2018, 2, 13, 0, 0, + tzinfo=tz.gettz(settings.TIME_ZONE) + ) + ) \ No newline at end of file diff --git a/src/documents/tests/test_document_model.py b/src/documents/tests/test_document_model.py index 74bd9a2a7..87261ecd9 100644 --- a/src/documents/tests/test_document_model.py +++ b/src/documents/tests/test_document_model.py @@ -1,10 +1,10 @@ import shutil import tempfile -from datetime import datetime from pathlib import Path from unittest import mock from django.test import TestCase, override_settings +from django.utils import timezone from ..models import Document, Correspondent @@ -47,20 +47,20 @@ class TestDocument(TestCase): def test_file_name(self): - doc = Document(mime_type="application/pdf", title="test", created=datetime(2020, 12, 25)) + doc = Document(mime_type="application/pdf", title="test", created=timezone.datetime(2020, 12, 25)) self.assertEqual(doc.get_public_filename(), "2020-12-25 test.pdf") def test_file_name_jpg(self): - doc = Document(mime_type="image/jpeg", title="test", created=datetime(2020, 12, 25)) + doc = Document(mime_type="image/jpeg", title="test", created=timezone.datetime(2020, 12, 25)) self.assertEqual(doc.get_public_filename(), "2020-12-25 test.jpg") def test_file_name_unknown(self): - doc = Document(mime_type="application/zip", title="test", created=datetime(2020, 12, 25)) + doc = Document(mime_type="application/zip", title="test", created=timezone.datetime(2020, 12, 25)) self.assertEqual(doc.get_public_filename(), "2020-12-25 test.zip") def test_file_name_invalid_type(self): - doc = Document(mime_type="image/jpegasd", title="test", created=datetime(2020, 12, 25)) + doc = Document(mime_type="image/jpegasd", title="test", created=timezone.datetime(2020, 12, 25)) self.assertEqual(doc.get_public_filename(), "2020-12-25 test") diff --git a/src/documents/tests/test_management.py b/src/documents/tests/test_management.py index 58aaf9342..a71baa8ba 100644 --- a/src/documents/tests/test_management.py +++ b/src/documents/tests/test_management.py @@ -70,18 +70,18 @@ class TestDecryptDocuments(TestCase): PASSPHRASE="test" ).enable() - doc = Document.objects.create(checksum="9c9691e51741c1f4f41a20896af31770", title="wow", filename="0000002.pdf.gpg", mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG) + doc = Document.objects.create(checksum="82186aaa94f0b98697d704b90fd1c072", title="wow", filename="0000004.pdf.gpg", mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG) - shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000002.pdf.gpg"), os.path.join(originals_dir, "0000002.pdf.gpg")) - shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", f"0000002.png.gpg"), os.path.join(thumb_dir, f"{doc.id:07}.png.gpg")) + shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000004.pdf.gpg"), os.path.join(originals_dir, "0000004.pdf.gpg")) + shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", f"0000004.png.gpg"), os.path.join(thumb_dir, f"{doc.id:07}.png.gpg")) call_command('decrypt_documents') doc.refresh_from_db() self.assertEqual(doc.storage_type, Document.STORAGE_TYPE_UNENCRYPTED) - self.assertEqual(doc.filename, "0000002.pdf") - self.assertTrue(os.path.isfile(os.path.join(originals_dir, "0000002.pdf"))) + self.assertEqual(doc.filename, "0000004.pdf") + self.assertTrue(os.path.isfile(os.path.join(originals_dir, "0000004.pdf"))) self.assertTrue(os.path.isfile(doc.source_path)) self.assertTrue(os.path.isfile(os.path.join(thumb_dir, f"{doc.id:07}.png"))) self.assertTrue(os.path.isfile(doc.thumbnail_path)) diff --git a/src/documents/tests/test_management_exporter.py b/src/documents/tests/test_management_exporter.py index d6ab7eadd..986e458b9 100644 --- a/src/documents/tests/test_management_exporter.py +++ b/src/documents/tests/test_management_exporter.py @@ -3,6 +3,8 @@ import json import os import shutil import tempfile +from pathlib import Path +from unittest import mock from django.core.management import call_command from django.test import TestCase, override_settings @@ -10,54 +12,87 @@ from django.test import TestCase, override_settings from documents.management.commands import document_exporter from documents.models import Document, Tag, DocumentType, Correspondent from documents.sanity_checker import check_sanity +from documents.settings import EXPORTER_FILE_NAME from documents.tests.utils import DirectoriesMixin, paperless_environment class TestExportImport(DirectoriesMixin, TestCase): + def setUp(self) -> None: + self.target = tempfile.mkdtemp() + self.addCleanup(shutil.rmtree, self.target) + + self.d1 = Document.objects.create(content="Content", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", title="wow1", filename="0000001.pdf", mime_type="application/pdf") + self.d2 = Document.objects.create(content="Content", checksum="9c9691e51741c1f4f41a20896af31770", title="wow2", filename="0000002.pdf", mime_type="application/pdf") + self.d3 = Document.objects.create(content="Content", checksum="d38d7ed02e988e072caf924e0f3fcb76", title="wow2", filename="0000003.pdf", mime_type="application/pdf") + self.d4 = Document.objects.create(content="Content", checksum="82186aaa94f0b98697d704b90fd1c072", title="wow_dec", filename="0000004.pdf.gpg", mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG) + + self.t1 = Tag.objects.create(name="t") + self.dt1 = DocumentType.objects.create(name="dt") + self.c1 = Correspondent.objects.create(name="c") + + self.d1.tags.add(self.t1) + self.d1.correspondent = self.c1 + self.d1.document_type = self.dt1 + self.d1.save() + super(TestExportImport, self).setUp() + + def _get_document_from_manifest(self, manifest, id): + f = list(filter(lambda d: d['model'] == "documents.document" and d['pk'] == id, manifest)) + if len(f) == 1: + return f[0] + else: + raise ValueError(f"document with id {id} does not exist in manifest") + @override_settings( PASSPHRASE="test" ) - def test_exporter(self): + def _do_export(self, use_filename_format=False, compare_checksums=False, delete=False): + args = ['document_exporter', self.target] + if use_filename_format: + args += ["--use-filename-format"] + if compare_checksums: + args += ["--compare-checksums"] + if delete: + args += ["--delete"] + + call_command(*args) + + with open(os.path.join(self.target, "manifest.json")) as f: + manifest = json.load(f) + + return manifest + + def test_exporter(self, use_filename_format=False): shutil.rmtree(os.path.join(self.dirs.media_dir, "documents")) shutil.copytree(os.path.join(os.path.dirname(__file__), "samples", "documents"), os.path.join(self.dirs.media_dir, "documents")) - file = os.path.join(self.dirs.originals_dir, "0000001.pdf") + manifest = self._do_export(use_filename_format=use_filename_format) - d1 = Document.objects.create(content="Content", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", title="wow", filename="0000001.pdf", mime_type="application/pdf") - d2 = Document.objects.create(content="Content", checksum="9c9691e51741c1f4f41a20896af31770", title="wow", filename="0000002.pdf.gpg", mime_type="application/pdf", storage_type=Document.STORAGE_TYPE_GPG) - t1 = Tag.objects.create(name="t") - dt1 = DocumentType.objects.create(name="dt") - c1 = Correspondent.objects.create(name="c") + self.assertEqual(len(manifest), 7) + self.assertEqual(len(list(filter(lambda e: e['model'] == 'documents.document', manifest))), 4) - d1.tags.add(t1) - d1.correspondents = c1 - d1.document_type = dt1 - d1.save() - d2.save() + self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json"))) - target = tempfile.mkdtemp() - self.addCleanup(shutil.rmtree, target) - - call_command('document_exporter', target) - - with open(os.path.join(target, "manifest.json")) as f: - manifest = json.load(f) - - self.assertEqual(len(manifest), 5) + self.assertEqual(self._get_document_from_manifest(manifest, self.d1.id)['fields']['title'], "wow1") + self.assertEqual(self._get_document_from_manifest(manifest, self.d2.id)['fields']['title'], "wow2") + self.assertEqual(self._get_document_from_manifest(manifest, self.d3.id)['fields']['title'], "wow2") + self.assertEqual(self._get_document_from_manifest(manifest, self.d4.id)['fields']['title'], "wow_dec") for element in manifest: if element['model'] == 'documents.document': - fname = os.path.join(target, element[document_exporter.EXPORTER_FILE_NAME]) + fname = os.path.join(self.target, element[document_exporter.EXPORTER_FILE_NAME]) self.assertTrue(os.path.exists(fname)) - self.assertTrue(os.path.exists(os.path.join(target, element[document_exporter.EXPORTER_THUMBNAIL_NAME]))) + self.assertTrue(os.path.exists(os.path.join(self.target, element[document_exporter.EXPORTER_THUMBNAIL_NAME]))) with open(fname, "rb") as f: checksum = hashlib.md5(f.read()).hexdigest() self.assertEqual(checksum, element['fields']['checksum']) + self.assertEqual(element['fields']['storage_type'], Document.STORAGE_TYPE_UNENCRYPTED) + if document_exporter.EXPORTER_ARCHIVE_NAME in element: - fname = os.path.join(target, element[document_exporter.EXPORTER_ARCHIVE_NAME]) + fname = os.path.join(self.target, element[document_exporter.EXPORTER_ARCHIVE_NAME]) self.assertTrue(os.path.exists(fname)) with open(fname, "rb") as f: @@ -65,24 +100,123 @@ class TestExportImport(DirectoriesMixin, TestCase): self.assertEqual(checksum, element['fields']['archive_checksum']) with paperless_environment() as dirs: - self.assertEqual(Document.objects.count(), 2) + self.assertEqual(Document.objects.count(), 4) Document.objects.all().delete() Correspondent.objects.all().delete() DocumentType.objects.all().delete() Tag.objects.all().delete() self.assertEqual(Document.objects.count(), 0) - call_command('document_importer', target) - self.assertEqual(Document.objects.count(), 2) + call_command('document_importer', self.target) + self.assertEqual(Document.objects.count(), 4) + self.assertEqual(Tag.objects.count(), 1) + self.assertEqual(Correspondent.objects.count(), 1) + self.assertEqual(DocumentType.objects.count(), 1) + self.assertEqual(Document.objects.get(id=self.d1.id).title, "wow1") + self.assertEqual(Document.objects.get(id=self.d2.id).title, "wow2") + self.assertEqual(Document.objects.get(id=self.d3.id).title, "wow2") + self.assertEqual(Document.objects.get(id=self.d4.id).title, "wow_dec") messages = check_sanity() # everything is alright after the test self.assertEqual(len(messages), 0, str([str(m) for m in messages])) - @override_settings( - PAPERLESS_FILENAME_FORMAT="{title}" - ) def test_exporter_with_filename_format(self): - self.test_exporter() + shutil.rmtree(os.path.join(self.dirs.media_dir, "documents")) + shutil.copytree(os.path.join(os.path.dirname(__file__), "samples", "documents"), os.path.join(self.dirs.media_dir, "documents")) + + with override_settings(PAPERLESS_FILENAME_FORMAT="{created_year}/{correspondent}/{title}"): + self.test_exporter(use_filename_format=True) + + def test_update_export_changed_time(self): + shutil.rmtree(os.path.join(self.dirs.media_dir, "documents")) + shutil.copytree(os.path.join(os.path.dirname(__file__), "samples", "documents"), os.path.join(self.dirs.media_dir, "documents")) + + self._do_export() + self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json"))) + + st_mtime_1 = os.stat(os.path.join(self.target, "manifest.json")).st_mtime + + with mock.patch("documents.management.commands.document_exporter.shutil.copy2") as m: + self._do_export() + m.assert_not_called() + + self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json"))) + st_mtime_2 = os.stat(os.path.join(self.target, "manifest.json")).st_mtime + + Path(self.d1.source_path).touch() + + with mock.patch("documents.management.commands.document_exporter.shutil.copy2") as m: + self._do_export() + self.assertEqual(m.call_count, 1) + + st_mtime_3 = os.stat(os.path.join(self.target, "manifest.json")).st_mtime + self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json"))) + + self.assertNotEqual(st_mtime_1, st_mtime_2) + self.assertNotEqual(st_mtime_2, st_mtime_3) + + def test_update_export_changed_checksum(self): + shutil.rmtree(os.path.join(self.dirs.media_dir, "documents")) + shutil.copytree(os.path.join(os.path.dirname(__file__), "samples", "documents"), os.path.join(self.dirs.media_dir, "documents")) + + self._do_export() + + self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json"))) + + with mock.patch("documents.management.commands.document_exporter.shutil.copy2") as m: + self._do_export() + m.assert_not_called() + + self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json"))) + + self.d2.checksum = "asdfasdgf3" + self.d2.save() + + with mock.patch("documents.management.commands.document_exporter.shutil.copy2") as m: + self._do_export(compare_checksums=True) + self.assertEqual(m.call_count, 1) + + self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json"))) + + def test_update_export_deleted_document(self): + shutil.rmtree(os.path.join(self.dirs.media_dir, "documents")) + shutil.copytree(os.path.join(os.path.dirname(__file__), "samples", "documents"), os.path.join(self.dirs.media_dir, "documents")) + + manifest = self._do_export() + + self.assertTrue(len(manifest), 7) + doc_from_manifest = self._get_document_from_manifest(manifest, self.d3.id) + self.assertTrue(os.path.isfile(os.path.join(self.target, doc_from_manifest[EXPORTER_FILE_NAME]))) + self.d3.delete() + + manifest = self._do_export() + self.assertRaises(ValueError, self._get_document_from_manifest, manifest, self.d3.id) + self.assertTrue(os.path.isfile(os.path.join(self.target, doc_from_manifest[EXPORTER_FILE_NAME]))) + + manifest = self._do_export(delete=True) + self.assertFalse(os.path.isfile(os.path.join(self.target, doc_from_manifest[EXPORTER_FILE_NAME]))) + + self.assertTrue(len(manifest), 6) + + @override_settings(PAPERLESS_FILENAME_FORMAT="{title}/{correspondent}") + def test_update_export_changed_location(self): + shutil.rmtree(os.path.join(self.dirs.media_dir, "documents")) + shutil.copytree(os.path.join(os.path.dirname(__file__), "samples", "documents"), os.path.join(self.dirs.media_dir, "documents")) + + m = self._do_export(use_filename_format=True) + self.assertTrue(os.path.isfile(os.path.join(self.target, "wow1", "c.pdf"))) + + self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json"))) + + self.d1.title = "new_title" + self.d1.save() + self._do_export(use_filename_format=True, delete=True) + self.assertFalse(os.path.isfile(os.path.join(self.target, "wow1", "c.pdf"))) + self.assertFalse(os.path.isdir(os.path.join(self.target, "wow1"))) + self.assertTrue(os.path.isfile(os.path.join(self.target, "new_title", "c.pdf"))) + self.assertTrue(os.path.exists(os.path.join(self.target, "manifest.json"))) + self.assertTrue(os.path.isfile(os.path.join(self.target, "wow2", "none.pdf"))) + self.assertTrue(os.path.isfile(os.path.join(self.target, "wow2", "none_01.pdf"))) def test_export_missing_files(self): diff --git a/src/documents/tests/test_management_thumbnails.py b/src/documents/tests/test_management_thumbnails.py new file mode 100644 index 000000000..7ecdf0489 --- /dev/null +++ b/src/documents/tests/test_management_thumbnails.py @@ -0,0 +1,52 @@ +import os +import shutil +from unittest import mock + +from django.core.management import call_command +from django.test import TestCase + +from documents.management.commands.document_thumbnails import _process_document +from documents.models import Document, Tag, Correspondent, DocumentType +from documents.tests.utils import DirectoriesMixin + + +class TestMakeThumbnails(DirectoriesMixin, TestCase): + + def make_models(self): + self.d1 = Document.objects.create(checksum="A", title="A", content="first document", mime_type="application/pdf", filename="test.pdf") + shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), self.d1.source_path) + + self.d2 = Document.objects.create(checksum="Ass", title="A", content="first document", mime_type="application/pdf", filename="test2.pdf") + shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), self.d2.source_path) + + def setUp(self) -> None: + super(TestMakeThumbnails, self).setUp() + self.make_models() + + def test_process_document(self): + self.assertFalse(os.path.isfile(self.d1.thumbnail_path)) + _process_document(self.d1.id) + self.assertTrue(os.path.isfile(self.d1.thumbnail_path)) + + @mock.patch("documents.management.commands.document_thumbnails.shutil.move") + def test_process_document_invalid_mime_type(self, m): + self.d1.mime_type = "asdasdasd" + self.d1.save() + + _process_document(self.d1.id) + + m.assert_not_called() + + def test_command(self): + self.assertFalse(os.path.isfile(self.d1.thumbnail_path)) + self.assertFalse(os.path.isfile(self.d2.thumbnail_path)) + call_command('document_thumbnails') + self.assertTrue(os.path.isfile(self.d1.thumbnail_path)) + self.assertTrue(os.path.isfile(self.d2.thumbnail_path)) + + def test_command_documentid(self): + self.assertFalse(os.path.isfile(self.d1.thumbnail_path)) + self.assertFalse(os.path.isfile(self.d2.thumbnail_path)) + call_command('document_thumbnails', '-d', f"{self.d1.id}") + self.assertTrue(os.path.isfile(self.d1.thumbnail_path)) + self.assertFalse(os.path.isfile(self.d2.thumbnail_path)) diff --git a/src/documents/tests/test_matchables.py b/src/documents/tests/test_matchables.py index 4e4a3e7dc..da0fa66ea 100644 --- a/src/documents/tests/test_matchables.py +++ b/src/documents/tests/test_matchables.py @@ -21,13 +21,15 @@ class TestMatching(TestCase): matching_algorithm=getattr(klass, algorithm) ) for string in true: + doc = Document(content=string) self.assertTrue( - matching.matches(instance, string), + matching.matches(instance, doc), '"%s" should match "%s" but it does not' % (text, string) ) for string in false: + doc = Document(content=string) self.assertFalse( - matching.matches(instance, string), + matching.matches(instance, doc), '"%s" should not match "%s" but it does' % (text, string) ) @@ -169,7 +171,7 @@ class TestMatching(TestCase): def test_match_regex(self): self._test_matching( - r"alpha\w+gamma", + "alpha\w+gamma", "MATCH_REGEX", ( "I have alpha_and_gamma in me", @@ -187,6 +189,16 @@ class TestMatching(TestCase): ) ) + def test_tach_invalid_regex(self): + self._test_matching( + "[[", + "MATCH_REGEX", + [], + [ + "Don't match this" + ] + ) + def test_match_fuzzy(self): self._test_matching( diff --git a/src/documents/tests/test_migrations.py b/src/documents/tests/test_migrations.py index 33ba41444..ee7180c63 100644 --- a/src/documents/tests/test_migrations.py +++ b/src/documents/tests/test_migrations.py @@ -98,7 +98,7 @@ class TestMigrateMimeType(DirectoriesMixin, TestMigrations): doc2 = Document.objects.create(checksum="B", file_type="pdf", storage_type=STORAGE_TYPE_GPG) self.doc2_id = doc2.id - shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000002.pdf.gpg"), source_path_before(doc2)) + shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000004.pdf.gpg"), source_path_before(doc2)) def testMimeTypesMigrated(self): Document = self.apps.get_model('documents', 'Document') diff --git a/src/documents/tests/test_parsers.py b/src/documents/tests/test_parsers.py index 805e4beac..392c0504f 100644 --- a/src/documents/tests/test_parsers.py +++ b/src/documents/tests/test_parsers.py @@ -120,3 +120,4 @@ class TestParserAvailability(TestCase): self.assertTrue(is_file_ext_supported('.pdf')) self.assertFalse(is_file_ext_supported('.hsdfh')) + self.assertFalse(is_file_ext_supported('')) diff --git a/src/documents/tests/test_settings.py b/src/documents/tests/test_settings.py new file mode 100644 index 000000000..21f29b4d9 --- /dev/null +++ b/src/documents/tests/test_settings.py @@ -0,0 +1,34 @@ +import logging +from unittest import mock + +from django.test import TestCase + +from paperless.settings import default_task_workers, default_threads_per_worker + + +class TestSettings(TestCase): + + @mock.patch("paperless.settings.multiprocessing.cpu_count") + def test_single_core(self, cpu_count): + cpu_count.return_value = 1 + + default_workers = default_task_workers() + + default_threads = default_threads_per_worker(default_workers) + + self.assertEqual(default_workers, 1) + self.assertEqual(default_threads, 1) + + def test_workers_threads(self): + for i in range(2, 64): + with mock.patch("paperless.settings.multiprocessing.cpu_count") as cpu_count: + cpu_count.return_value = i + + default_workers = default_task_workers() + + default_threads = default_threads_per_worker(default_workers) + + self.assertTrue(default_workers >= 1) + self.assertTrue(default_threads >= 1) + + self.assertTrue(default_workers * default_threads < i, f"{i}") diff --git a/src/documents/tests/test_views.py b/src/documents/tests/test_views.py new file mode 100644 index 000000000..ccc41666a --- /dev/null +++ b/src/documents/tests/test_views.py @@ -0,0 +1,30 @@ +from django.conf import settings +from django.contrib.auth.models import User +from django.test import TestCase + + +class TestViews(TestCase): + + def setUp(self) -> None: + self.user = User.objects.create_user("testuser") + + def test_login_redirect(self): + response = self.client.get('/') + self.assertEqual(response.status_code, 302) + self.assertEqual(response.url, "/accounts/login/?next=/") + + def test_index(self): + self.client.force_login(self.user) + for (language_given, language_actual) in [("", "en-US"), ("en-US", "en-US"), ("de", "de"), ("en", "en-US"), ("en-us", "en-US"), ("fr", "fr"), ("jp", "en-US")]: + if language_given: + self.client.cookies.load({settings.LANGUAGE_COOKIE_NAME: language_given}) + elif settings.LANGUAGE_COOKIE_NAME in self.client.cookies.keys(): + self.client.cookies.pop(settings.LANGUAGE_COOKIE_NAME) + + response = self.client.get('/', ) + self.assertEqual(response.status_code, 200) + self.assertEqual(response.context_data['webmanifest'], f"frontend/{language_actual}/manifest.webmanifest") + self.assertEqual(response.context_data['styles_css'], f"frontend/{language_actual}/styles.css") + self.assertEqual(response.context_data['runtime_js'], f"frontend/{language_actual}/runtime.js") + self.assertEqual(response.context_data['polyfills_js'], f"frontend/{language_actual}/polyfills.js") + self.assertEqual(response.context_data['main_js'], f"frontend/{language_actual}/main.js") diff --git a/src/documents/views.py b/src/documents/views.py index af4861ad4..f0c7f10d1 100755 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -1,3 +1,4 @@ +import logging import os import tempfile from datetime import datetime @@ -79,7 +80,7 @@ class IndexView(TemplateView): context['runtime_js'] = f"frontend/{self.get_language()}/runtime.js" context['polyfills_js'] = f"frontend/{self.get_language()}/polyfills.js" # NOQA: E501 context['main_js'] = f"frontend/{self.get_language()}/main.js" - context['manifest'] = f"frontend/{self.get_language()}/manifest.webmanifest" # NOQA: E501 + context['webmanifest'] = f"frontend/{self.get_language()}/manifest.webmanifest" # NOQA: E501 return context @@ -158,6 +159,9 @@ class DocumentViewSet(RetrieveModelMixin, "added", "archive_serial_number") + def get_queryset(self): + return Document.objects.distinct() + def get_serializer(self, *args, **kwargs): fields_param = self.request.query_params.get('fields', None) if fields_param: @@ -458,12 +462,21 @@ class SearchView(APIView): self.ix = index.open_index() def add_infos_to_hit(self, r): - doc = Document.objects.get(id=r['id']) + try: + doc = Document.objects.get(id=r['id']) + except Document.DoesNotExist: + logging.getLogger(__name__).warning( + f"Search index returned a non-existing document: " + f"id: {r['id']}, title: {r['title']}. " + f"Search index needs reindex." + ) + doc = None + return {'id': r['id'], - 'highlights': r.highlights("content", text=doc.content), + 'highlights': r.highlights("content", text=doc.content) if doc else None, # NOQA: E501 'score': r.score, 'rank': r.rank, - 'document': DocumentSerializer(doc).data, + 'document': DocumentSerializer(doc).data if doc else None, 'title': r['title'] } diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po index 76cc28bec..c9257e0f1 100644 --- a/src/locale/de/LC_MESSAGES/django.po +++ b/src/locale/de/LC_MESSAGES/django.po @@ -4,16 +4,16 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Jonas Winkler , 2021 +# Jonas Winkler, 2021 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-01-02 00:26+0000\n" +"POT-Creation-Date: 2021-01-10 21:41+0000\n" "PO-Revision-Date: 2020-12-30 19:27+0000\n" -"Last-Translator: Jonas Winkler , 2021\n" +"Last-Translator: Jonas Winkler, 2021\n" "Language-Team: German (https://www.transifex.com/paperless/teams/115905/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -50,7 +50,7 @@ msgid "Automatic" msgstr "Automatisch" #: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25 -#: paperless_mail/models.py:100 +#: paperless_mail/models.py:109 msgid "name" msgstr "Name" @@ -346,34 +346,84 @@ msgstr "Filterregel" msgid "filter rules" msgstr "Filterregeln" -#: paperless/settings.py:254 +#: documents/templates/index.html:20 +msgid "Paperless-ng is loading..." +msgstr "Paperless-ng wird geladen..." + +#: documents/templates/registration/logged_out.html:13 +msgid "Paperless-ng signed out" +msgstr "Paperless-ng abgemeldet" + +#: documents/templates/registration/logged_out.html:41 +msgid "You have been successfully logged out. Bye!" +msgstr "Sie wurden erfolgreich abgemeldet. Auf Wiedersehen!" + +#: documents/templates/registration/logged_out.html:42 +msgid "Sign in again" +msgstr "Erneut anmelden" + +#: documents/templates/registration/login.html:13 +msgid "Paperless-ng sign in" +msgstr "Paperless-ng Anmeldung" + +#: documents/templates/registration/login.html:42 +msgid "Please sign in." +msgstr "Bitte melden Sie sich an." + +#: documents/templates/registration/login.html:45 +msgid "Your username and password didn't match. Please try again." +msgstr "" +"Ihr Benutzername und Passwort stimmen nicht überein. Bitte versuchen Sie es " +"erneut." + +#: documents/templates/registration/login.html:48 +msgid "Username" +msgstr "Benutzername" + +#: documents/templates/registration/login.html:49 +msgid "Password" +msgstr "Passwort" + +#: documents/templates/registration/login.html:54 +msgid "Sign in" +msgstr "Anmelden" + +#: paperless/settings.py:268 msgid "English" msgstr "Englisch" -#: paperless/settings.py:255 +#: paperless/settings.py:269 msgid "German" msgstr "Deutsch" +#: paperless/settings.py:270 +msgid "Dutch" +msgstr "Niederländisch" + +#: paperless/settings.py:271 +msgid "French" +msgstr "Französisch" + #: paperless/urls.py:108 msgid "Paperless-ng administration" msgstr "Paperless-ng Administration" -#: paperless_mail/admin.py:24 +#: paperless_mail/admin.py:25 msgid "Filter" msgstr "Filter" -#: paperless_mail/admin.py:26 +#: paperless_mail/admin.py:27 msgid "" "Paperless will only process mails that match ALL of the filters given below." msgstr "" "Paperless wird nur E-Mails verarbeiten, für die alle der hier angegebenen " "Filter zutreffen." -#: paperless_mail/admin.py:34 +#: paperless_mail/admin.py:37 msgid "Actions" msgstr "Aktionen" -#: paperless_mail/admin.py:36 +#: paperless_mail/admin.py:39 msgid "" "The action applied to the mail. This action is only performed when documents" " were consumed from the mail. Mails without attachments will remain entirely" @@ -383,11 +433,11 @@ msgstr "" "auf E-Mails angewendet, aus denen Anhänge verarbeitet wurden. E-Mails ohne " "Anhänge werden vollständig ignoriert." -#: paperless_mail/admin.py:43 +#: paperless_mail/admin.py:46 msgid "Metadata" msgstr "Metadaten" -#: paperless_mail/admin.py:45 +#: paperless_mail/admin.py:48 msgid "" "Assign metadata to documents consumed from this rule automatically. If you " "do not assign tags, types or correspondents here, paperless will still " @@ -448,7 +498,7 @@ msgstr "Benutzername" #: paperless_mail/models.py:50 msgid "password" -msgstr "Password" +msgstr "Passwort" #: paperless_mail/models.py:60 msgid "mail rule" @@ -458,87 +508,120 @@ msgstr "E-Mail-Regel" msgid "mail rules" msgstr "E-Mail-Regeln" -#: paperless_mail/models.py:69 +#: paperless_mail/models.py:67 +msgid "Only process attachments." +msgstr "Nur Anhänge verarbeiten." + +#: paperless_mail/models.py:68 +msgid "Process all files, including 'inline' attachments." +msgstr "Alle Dateien verarbeiten, auch 'inline'-Anhänge." + +#: paperless_mail/models.py:78 msgid "Mark as read, don't process read mails" msgstr "Als gelesen markieren, gelesene E-Mails nicht verarbeiten" -#: paperless_mail/models.py:70 +#: paperless_mail/models.py:79 msgid "Flag the mail, don't process flagged mails" msgstr "Als wichtig markieren, markierte E-Mails nicht verarbeiten" -#: paperless_mail/models.py:71 +#: paperless_mail/models.py:80 msgid "Move to specified folder" msgstr "In angegebenen Ordner verschieben" -#: paperless_mail/models.py:72 +#: paperless_mail/models.py:81 msgid "Delete" msgstr "Löschen" -#: paperless_mail/models.py:79 +#: paperless_mail/models.py:88 msgid "Use subject as title" msgstr "Betreff als Titel verwenden" -#: paperless_mail/models.py:80 +#: paperless_mail/models.py:89 msgid "Use attachment filename as title" msgstr "Dateiname des Anhangs als Titel verwenden" -#: paperless_mail/models.py:90 +#: paperless_mail/models.py:99 msgid "Do not assign a correspondent" msgstr "Keinen Korrespondenten zuweisen" -#: paperless_mail/models.py:92 +#: paperless_mail/models.py:101 msgid "Use mail address" msgstr "E-Mail-Adresse benutzen" -#: paperless_mail/models.py:94 +#: paperless_mail/models.py:103 msgid "Use name (or mail address if not available)" msgstr "Absendername benutzen (oder E-Mail-Adressen, wenn nicht verfügbar)" -#: paperless_mail/models.py:96 +#: paperless_mail/models.py:105 msgid "Use correspondent selected below" msgstr "Nachfolgend ausgewählten Korrespondent verwenden" -#: paperless_mail/models.py:104 +#: paperless_mail/models.py:113 msgid "order" msgstr "Reihenfolge" -#: paperless_mail/models.py:111 +#: paperless_mail/models.py:120 msgid "account" msgstr "Konto" -#: paperless_mail/models.py:115 +#: paperless_mail/models.py:124 msgid "folder" msgstr "Ordner" -#: paperless_mail/models.py:119 +#: paperless_mail/models.py:128 msgid "filter from" msgstr "Absender filtern" -#: paperless_mail/models.py:122 +#: paperless_mail/models.py:131 msgid "filter subject" msgstr "Betreff filtern" -#: paperless_mail/models.py:125 +#: paperless_mail/models.py:134 msgid "filter body" msgstr "Nachrichteninhalt filtern" -#: paperless_mail/models.py:129 +#: paperless_mail/models.py:138 +msgid "filter attachment filename" +msgstr "Anhang-Dateiname filtern" + +#: paperless_mail/models.py:140 +msgid "" +"Only consume documents which entirely match this filename if specified. " +"Wildcards such as *.pdf or *invoice* are allowed. Case insensitive." +msgstr "" +"Wenn angegeben werden nur Dateien verarbeitet, die diesem Dateinamen exakt " +"entsprechen. Platzhalter wie *.pdf oder *rechnung* sind erlaubt. Groß- und " +"Kleinschreibung ist irrelevant." + +#: paperless_mail/models.py:146 msgid "maximum age" msgstr "Maximales Alter" -#: paperless_mail/models.py:131 +#: paperless_mail/models.py:148 msgid "Specified in days." msgstr "Angegeben in Tagen." -#: paperless_mail/models.py:134 +#: paperless_mail/models.py:151 +msgid "attachment type" +msgstr "Dateianhangstyp" + +#: paperless_mail/models.py:154 +msgid "" +"Inline attachments include embedded images, so it's best to combine this " +"option with a filename filter." +msgstr "" +"'Inline'-Anhänge schließen eingebettete Bilder mit ein, daher sollte diese " +"Einstellung mit einem Dateinamenfilter kombiniert werden." + +#: paperless_mail/models.py:159 msgid "action" msgstr "Aktion" -#: paperless_mail/models.py:140 +#: paperless_mail/models.py:165 msgid "action parameter" msgstr "Parameter für Aktion" -#: paperless_mail/models.py:142 +#: paperless_mail/models.py:167 msgid "" "Additional parameter for the action selected above, i.e., the target folder " "of the move to folder action." @@ -546,22 +629,22 @@ msgstr "" "Zusätzlicher Parameter für die oben ausgewählte Aktion, zum Beispiel der " "Zielordner für die Aktion \"In angegebenen Ordner verschieben\"" -#: paperless_mail/models.py:148 +#: paperless_mail/models.py:173 msgid "assign title from" msgstr "Titel zuweisen von" -#: paperless_mail/models.py:158 +#: paperless_mail/models.py:183 msgid "assign this tag" msgstr "Dieses Tag zuweisen" -#: paperless_mail/models.py:166 +#: paperless_mail/models.py:191 msgid "assign this document type" msgstr "Diesen Dokumenttyp zuweisen" -#: paperless_mail/models.py:170 +#: paperless_mail/models.py:195 msgid "assign correspondent from" msgstr "Korrespondent zuweisen von" -#: paperless_mail/models.py:180 +#: paperless_mail/models.py:205 msgid "assign this correspondent" msgstr "Diesen Korrespondent zuweisen" diff --git a/src/locale/en-us/LC_MESSAGES/django.po b/src/locale/en-us/LC_MESSAGES/django.po index 9af185626..414caba52 100644 --- a/src/locale/en-us/LC_MESSAGES/django.po +++ b/src/locale/en-us/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-01-02 00:26+0000\n" +"POT-Creation-Date: 2021-01-10 21:41+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -46,7 +46,7 @@ msgid "Automatic" msgstr "" #: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25 -#: paperless_mail/models.py:100 +#: paperless_mail/models.py:109 msgid "name" msgstr "" @@ -338,43 +338,91 @@ msgstr "" msgid "filter rules" msgstr "" -#: paperless/settings.py:254 +#: documents/templates/index.html:20 +msgid "Paperless-ng is loading..." +msgstr "" + +#: documents/templates/registration/logged_out.html:13 +msgid "Paperless-ng signed out" +msgstr "" + +#: documents/templates/registration/logged_out.html:41 +msgid "You have been successfully logged out. Bye!" +msgstr "" + +#: documents/templates/registration/logged_out.html:42 +msgid "Sign in again" +msgstr "" + +#: documents/templates/registration/login.html:13 +msgid "Paperless-ng sign in" +msgstr "" + +#: documents/templates/registration/login.html:42 +msgid "Please sign in." +msgstr "" + +#: documents/templates/registration/login.html:45 +msgid "Your username and password didn't match. Please try again." +msgstr "" + +#: documents/templates/registration/login.html:48 +msgid "Username" +msgstr "" + +#: documents/templates/registration/login.html:49 +msgid "Password" +msgstr "" + +#: documents/templates/registration/login.html:54 +msgid "Sign in" +msgstr "" + +#: paperless/settings.py:268 msgid "English" msgstr "" -#: paperless/settings.py:255 +#: paperless/settings.py:269 msgid "German" msgstr "" +#: paperless/settings.py:270 +msgid "Dutch" +msgstr "" + +#: paperless/settings.py:271 +msgid "French" +msgstr "" + #: paperless/urls.py:108 msgid "Paperless-ng administration" msgstr "" -#: paperless_mail/admin.py:24 +#: paperless_mail/admin.py:25 msgid "Filter" msgstr "" -#: paperless_mail/admin.py:26 +#: paperless_mail/admin.py:27 msgid "" "Paperless will only process mails that match ALL of the filters given below." msgstr "" -#: paperless_mail/admin.py:34 +#: paperless_mail/admin.py:37 msgid "Actions" msgstr "" -#: paperless_mail/admin.py:36 +#: paperless_mail/admin.py:39 msgid "" "The action applied to the mail. This action is only performed when documents " "were consumed from the mail. Mails without attachments will remain entirely " "untouched." msgstr "" -#: paperless_mail/admin.py:43 +#: paperless_mail/admin.py:46 msgid "Metadata" msgstr "" -#: paperless_mail/admin.py:45 +#: paperless_mail/admin.py:48 msgid "" "Assign metadata to documents consumed from this rule automatically. If you " "do not assign tags, types or correspondents here, paperless will still " @@ -439,108 +487,136 @@ msgstr "" msgid "mail rules" msgstr "" -#: paperless_mail/models.py:69 +#: paperless_mail/models.py:67 +msgid "Only process attachments." +msgstr "" + +#: paperless_mail/models.py:68 +msgid "Process all files, including 'inline' attachments." +msgstr "" + +#: paperless_mail/models.py:78 msgid "Mark as read, don't process read mails" msgstr "" -#: paperless_mail/models.py:70 +#: paperless_mail/models.py:79 msgid "Flag the mail, don't process flagged mails" msgstr "" -#: paperless_mail/models.py:71 +#: paperless_mail/models.py:80 msgid "Move to specified folder" msgstr "" -#: paperless_mail/models.py:72 +#: paperless_mail/models.py:81 msgid "Delete" msgstr "" -#: paperless_mail/models.py:79 +#: paperless_mail/models.py:88 msgid "Use subject as title" msgstr "" -#: paperless_mail/models.py:80 +#: paperless_mail/models.py:89 msgid "Use attachment filename as title" msgstr "" -#: paperless_mail/models.py:90 +#: paperless_mail/models.py:99 msgid "Do not assign a correspondent" msgstr "" -#: paperless_mail/models.py:92 +#: paperless_mail/models.py:101 msgid "Use mail address" msgstr "" -#: paperless_mail/models.py:94 +#: paperless_mail/models.py:103 msgid "Use name (or mail address if not available)" msgstr "" -#: paperless_mail/models.py:96 +#: paperless_mail/models.py:105 msgid "Use correspondent selected below" msgstr "" -#: paperless_mail/models.py:104 +#: paperless_mail/models.py:113 msgid "order" msgstr "" -#: paperless_mail/models.py:111 +#: paperless_mail/models.py:120 msgid "account" msgstr "" -#: paperless_mail/models.py:115 +#: paperless_mail/models.py:124 msgid "folder" msgstr "" -#: paperless_mail/models.py:119 +#: paperless_mail/models.py:128 msgid "filter from" msgstr "" -#: paperless_mail/models.py:122 +#: paperless_mail/models.py:131 msgid "filter subject" msgstr "" -#: paperless_mail/models.py:125 +#: paperless_mail/models.py:134 msgid "filter body" msgstr "" -#: paperless_mail/models.py:129 -msgid "maximum age" -msgstr "" - -#: paperless_mail/models.py:131 -msgid "Specified in days." -msgstr "" - -#: paperless_mail/models.py:134 -msgid "action" +#: paperless_mail/models.py:138 +msgid "filter attachment filename" msgstr "" #: paperless_mail/models.py:140 +msgid "" +"Only consume documents which entirely match this filename if specified. " +"Wildcards such as *.pdf or *invoice* are allowed. Case insensitive." +msgstr "" + +#: paperless_mail/models.py:146 +msgid "maximum age" +msgstr "" + +#: paperless_mail/models.py:148 +msgid "Specified in days." +msgstr "" + +#: paperless_mail/models.py:151 +msgid "attachment type" +msgstr "" + +#: paperless_mail/models.py:154 +msgid "" +"Inline attachments include embedded images, so it's best to combine this " +"option with a filename filter." +msgstr "" + +#: paperless_mail/models.py:159 +msgid "action" +msgstr "" + +#: paperless_mail/models.py:165 msgid "action parameter" msgstr "" -#: paperless_mail/models.py:142 +#: paperless_mail/models.py:167 msgid "" "Additional parameter for the action selected above, i.e., the target folder " "of the move to folder action." msgstr "" -#: paperless_mail/models.py:148 +#: paperless_mail/models.py:173 msgid "assign title from" msgstr "" -#: paperless_mail/models.py:158 +#: paperless_mail/models.py:183 msgid "assign this tag" msgstr "" -#: paperless_mail/models.py:166 +#: paperless_mail/models.py:191 msgid "assign this document type" msgstr "" -#: paperless_mail/models.py:170 +#: paperless_mail/models.py:195 msgid "assign correspondent from" msgstr "" -#: paperless_mail/models.py:180 +#: paperless_mail/models.py:205 msgid "assign this correspondent" msgstr "" diff --git a/src/locale/fr/LC_MESSAGES/django.po b/src/locale/fr/LC_MESSAGES/django.po index 295b9fd86..7ab8aa45f 100644 --- a/src/locale/fr/LC_MESSAGES/django.po +++ b/src/locale/fr/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Jonas Winkler , 2020 +# Jonas Winkler, 2020 # Philmo67, 2021 # #, fuzzy @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-01-02 00:26+0000\n" +"POT-Creation-Date: 2021-01-10 21:41+0000\n" "PO-Revision-Date: 2020-12-30 19:27+0000\n" "Last-Translator: Philmo67, 2021\n" "Language-Team: French (https://www.transifex.com/paperless/teams/115905/fr/)\n" @@ -51,7 +51,7 @@ msgid "Automatic" msgstr "Automatique" #: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25 -#: paperless_mail/models.py:100 +#: paperless_mail/models.py:109 msgid "name" msgstr "nom" @@ -348,34 +348,84 @@ msgstr "règle de filtrage" msgid "filter rules" msgstr "règles de filtrage" -#: paperless/settings.py:254 +#: documents/templates/index.html:20 +msgid "Paperless-ng is loading..." +msgstr "Paperless-ng est en cours de chargement..." + +#: documents/templates/registration/logged_out.html:13 +msgid "Paperless-ng signed out" +msgstr "Déconnecté de Paperless-ng" + +#: documents/templates/registration/logged_out.html:41 +msgid "You have been successfully logged out. Bye!" +msgstr "Vous avez été déconnecté avec succès. Au revoir !" + +#: documents/templates/registration/logged_out.html:42 +msgid "Sign in again" +msgstr "Se reconnecter" + +#: documents/templates/registration/login.html:13 +msgid "Paperless-ng sign in" +msgstr "Connexion à Paperless-ng" + +#: documents/templates/registration/login.html:42 +msgid "Please sign in." +msgstr "Veuillez vous connecter." + +#: documents/templates/registration/login.html:45 +msgid "Your username and password didn't match. Please try again." +msgstr "" +"Votre nom d'utilisateur et votre mot de passe ne correspondent pas. Veuillez" +" réessayer." + +#: documents/templates/registration/login.html:48 +msgid "Username" +msgstr "Nom d'utilisateur" + +#: documents/templates/registration/login.html:49 +msgid "Password" +msgstr "Mot de passe" + +#: documents/templates/registration/login.html:54 +msgid "Sign in" +msgstr "S'identifier" + +#: paperless/settings.py:268 msgid "English" msgstr "Anglais" -#: paperless/settings.py:255 +#: paperless/settings.py:269 msgid "German" msgstr "Allemand" +#: paperless/settings.py:270 +msgid "Dutch" +msgstr "Néerlandais" + +#: paperless/settings.py:271 +msgid "French" +msgstr "Français" + #: paperless/urls.py:108 msgid "Paperless-ng administration" msgstr "Administration de Paperless-ng" -#: paperless_mail/admin.py:24 +#: paperless_mail/admin.py:25 msgid "Filter" msgstr "Filtrage" -#: paperless_mail/admin.py:26 +#: paperless_mail/admin.py:27 msgid "" "Paperless will only process mails that match ALL of the filters given below." msgstr "" "Paperless-ng ne traitera que les courriers qui correspondent à TOUS les " "filtres ci-dessous." -#: paperless_mail/admin.py:34 +#: paperless_mail/admin.py:37 msgid "Actions" msgstr "Actions" -#: paperless_mail/admin.py:36 +#: paperless_mail/admin.py:39 msgid "" "The action applied to the mail. This action is only performed when documents" " were consumed from the mail. Mails without attachments will remain entirely" @@ -385,20 +435,20 @@ msgstr "" "documents ont été traités depuis des courriels. Les courriels sans pièces " "jointes demeurent totalement inchangés." -#: paperless_mail/admin.py:43 +#: paperless_mail/admin.py:46 msgid "Metadata" msgstr "Métadonnées" -#: paperless_mail/admin.py:45 +#: paperless_mail/admin.py:48 msgid "" "Assign metadata to documents consumed from this rule automatically. If you " "do not assign tags, types or correspondents here, paperless will still " "process all matching rules that you have defined." msgstr "" "Affecter automatiquement des métadonnées aux documents traités à partir de " -"cette règle. Si vous n'affectez pas d'étiquettes, de types ou de " -"correspondants ici, Paperless-ng traitera quand même toutes les règles de " -"rapprochement que vous avez définies." +"cette règle. Si vous n'affectez pas d'étiquette, de type ou de correspondant" +" ici, Paperless-ng appliquera toutes les autres règles de rapprochement que " +"vous avez définies." #: paperless_mail/apps.py:9 msgid "Paperless mail" @@ -460,87 +510,120 @@ msgstr "règle de courriel" msgid "mail rules" msgstr "règles de courriel" -#: paperless_mail/models.py:69 +#: paperless_mail/models.py:67 +msgid "Only process attachments." +msgstr "Ne traiter que les pièces jointes." + +#: paperless_mail/models.py:68 +msgid "Process all files, including 'inline' attachments." +msgstr "Traiter tous les fichiers, y compris les pièces jointes \"en ligne\"." + +#: paperless_mail/models.py:78 msgid "Mark as read, don't process read mails" msgstr "Marquer comme lu, ne pas traiter les courriels lus" -#: paperless_mail/models.py:70 +#: paperless_mail/models.py:79 msgid "Flag the mail, don't process flagged mails" msgstr "Marquer le courriel, ne pas traiter les courriels marqués" -#: paperless_mail/models.py:71 +#: paperless_mail/models.py:80 msgid "Move to specified folder" msgstr "Déplacer vers le dossier spécifié" -#: paperless_mail/models.py:72 +#: paperless_mail/models.py:81 msgid "Delete" msgstr "Supprimer" -#: paperless_mail/models.py:79 +#: paperless_mail/models.py:88 msgid "Use subject as title" msgstr "Utiliser le sujet en tant que titre" -#: paperless_mail/models.py:80 +#: paperless_mail/models.py:89 msgid "Use attachment filename as title" msgstr "Utiliser le nom de la pièce jointe en tant que titre" -#: paperless_mail/models.py:90 +#: paperless_mail/models.py:99 msgid "Do not assign a correspondent" msgstr "Ne pas affecter de correspondant" -#: paperless_mail/models.py:92 +#: paperless_mail/models.py:101 msgid "Use mail address" msgstr "Utiliser l'adresse électronique" -#: paperless_mail/models.py:94 +#: paperless_mail/models.py:103 msgid "Use name (or mail address if not available)" msgstr "Utiliser le nom (ou l'adresse électronique s'il n'est pas disponible)" -#: paperless_mail/models.py:96 +#: paperless_mail/models.py:105 msgid "Use correspondent selected below" msgstr "Utiliser le correspondant sélectionné ci-dessous" -#: paperless_mail/models.py:104 +#: paperless_mail/models.py:113 msgid "order" msgstr "ordre" -#: paperless_mail/models.py:111 +#: paperless_mail/models.py:120 msgid "account" msgstr "compte" -#: paperless_mail/models.py:115 +#: paperless_mail/models.py:124 msgid "folder" msgstr "répertoire" -#: paperless_mail/models.py:119 +#: paperless_mail/models.py:128 msgid "filter from" msgstr "filtrer l'expéditeur" -#: paperless_mail/models.py:122 +#: paperless_mail/models.py:131 msgid "filter subject" msgstr "filtrer le sujet" -#: paperless_mail/models.py:125 +#: paperless_mail/models.py:134 msgid "filter body" msgstr "filtrer le corps du message" -#: paperless_mail/models.py:129 +#: paperless_mail/models.py:138 +msgid "filter attachment filename" +msgstr "filtrer le nom de fichier de la pièce jointe" + +#: paperless_mail/models.py:140 +msgid "" +"Only consume documents which entirely match this filename if specified. " +"Wildcards such as *.pdf or *invoice* are allowed. Case insensitive." +msgstr "" +"Ne traiter que les documents correspondant intégralement à ce nom de fichier" +" s'il est spécifié. Les jokers tels que *.pdf ou *facture* sont autorisés. " +"La casse n'est pas prise en compte." + +#: paperless_mail/models.py:146 msgid "maximum age" msgstr "âge maximum" -#: paperless_mail/models.py:131 +#: paperless_mail/models.py:148 msgid "Specified in days." msgstr "En jours." -#: paperless_mail/models.py:134 +#: paperless_mail/models.py:151 +msgid "attachment type" +msgstr "type de pièce jointe" + +#: paperless_mail/models.py:154 +msgid "" +"Inline attachments include embedded images, so it's best to combine this " +"option with a filename filter." +msgstr "" +"Les pièces jointes en ligne comprennent les images intégrées, il est donc " +"préférable de combiner cette option avec un filtre de nom de fichier." + +#: paperless_mail/models.py:159 msgid "action" msgstr "action" -#: paperless_mail/models.py:140 +#: paperless_mail/models.py:165 msgid "action parameter" msgstr "paramètre d'action" -#: paperless_mail/models.py:142 +#: paperless_mail/models.py:167 msgid "" "Additional parameter for the action selected above, i.e., the target folder " "of the move to folder action." @@ -548,22 +631,22 @@ msgstr "" "Paramètre supplémentaire pour l'action sélectionnée ci-dessus, par exemple " "le dossier cible de l'action de déplacement vers un dossier." -#: paperless_mail/models.py:148 +#: paperless_mail/models.py:173 msgid "assign title from" msgstr "affecter le titre depuis" -#: paperless_mail/models.py:158 +#: paperless_mail/models.py:183 msgid "assign this tag" msgstr "affecter cette étiquette" -#: paperless_mail/models.py:166 +#: paperless_mail/models.py:191 msgid "assign this document type" msgstr "affecter ce type de document" -#: paperless_mail/models.py:170 +#: paperless_mail/models.py:195 msgid "assign correspondent from" msgstr "affecter le correspondant depuis" -#: paperless_mail/models.py:180 +#: paperless_mail/models.py:205 msgid "assign this correspondent" msgstr "affecter ce correspondant" diff --git a/src/locale/nl_NL/LC_MESSAGES/django.po b/src/locale/nl_NL/LC_MESSAGES/django.po index 9778d46bc..36293e7b8 100644 --- a/src/locale/nl_NL/LC_MESSAGES/django.po +++ b/src/locale/nl_NL/LC_MESSAGES/django.po @@ -4,17 +4,17 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Ben Zweekhorst , 2021 -# J V , 2021 +# Ben , 2021 +# Jo Vandeginste , 2021 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-01-02 00:26+0000\n" +"POT-Creation-Date: 2021-01-10 21:41+0000\n" "PO-Revision-Date: 2020-12-30 19:27+0000\n" -"Last-Translator: J V , 2021\n" +"Last-Translator: Jo Vandeginste , 2021\n" "Language-Team: Dutch (Netherlands) (https://www.transifex.com/paperless/teams/115905/nl_NL/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,14 +44,14 @@ msgstr "Reguliere expressie" #: documents/models.py:36 msgid "Fuzzy word" -msgstr "Vaag woord" +msgstr "Gelijkaardig woord" #: documents/models.py:37 msgid "Automatic" msgstr "Automatisch" #: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25 -#: paperless_mail/models.py:100 +#: paperless_mail/models.py:109 msgid "name" msgstr "naam" @@ -93,11 +93,11 @@ msgstr "" #: documents/models.py:114 msgid "tag" -msgstr "tag" +msgstr "etiket" #: documents/models.py:115 documents/models.py:171 msgid "tags" -msgstr "tags" +msgstr "etiketten" #: documents/models.py:121 documents/models.py:153 msgid "document type" @@ -285,11 +285,11 @@ msgstr "zit in \"Postvak in\"" #: documents/models.py:380 msgid "has tag" -msgstr "heeft tag" +msgstr "heeft etiket" #: documents/models.py:381 msgid "has any tag" -msgstr "heeft elke tag" +msgstr "heeft één van de etiketten" #: documents/models.py:382 msgid "created before" @@ -329,7 +329,7 @@ msgstr "gewijzigd na" #: documents/models.py:391 msgid "does not have tag" -msgstr "heeft geen tag" +msgstr "heeft geen etiket" #: documents/models.py:402 msgid "rule type" @@ -347,33 +347,81 @@ msgstr "filterregel" msgid "filter rules" msgstr "filterregels" -#: paperless/settings.py:254 +#: documents/templates/index.html:20 +msgid "Paperless-ng is loading..." +msgstr "Paperless-ng is aan het laden..." + +#: documents/templates/registration/logged_out.html:13 +msgid "Paperless-ng signed out" +msgstr "Paperless-ng - afmelden" + +#: documents/templates/registration/logged_out.html:41 +msgid "You have been successfully logged out. Bye!" +msgstr "Je bent nu afgemeld. Tot later!" + +#: documents/templates/registration/logged_out.html:42 +msgid "Sign in again" +msgstr "Meld je opnieuw aan" + +#: documents/templates/registration/login.html:13 +msgid "Paperless-ng sign in" +msgstr "Paperless-ng - aanmelden" + +#: documents/templates/registration/login.html:42 +msgid "Please sign in." +msgstr "Gelieve aan te melden." + +#: documents/templates/registration/login.html:45 +msgid "Your username and password didn't match. Please try again." +msgstr "Je gebruikersnaam en wachtwoord komen niet overeen. Probeer opnieuw." + +#: documents/templates/registration/login.html:48 +msgid "Username" +msgstr "Gebruikersnaam" + +#: documents/templates/registration/login.html:49 +msgid "Password" +msgstr "Wachtwoord" + +#: documents/templates/registration/login.html:54 +msgid "Sign in" +msgstr "Aanmelden" + +#: paperless/settings.py:268 msgid "English" msgstr "Engels" -#: paperless/settings.py:255 +#: paperless/settings.py:269 msgid "German" msgstr "Duits" +#: paperless/settings.py:270 +msgid "Dutch" +msgstr "Nederlands" + +#: paperless/settings.py:271 +msgid "French" +msgstr "Frans" + #: paperless/urls.py:108 msgid "Paperless-ng administration" msgstr "Paperless-ng administratie" -#: paperless_mail/admin.py:24 +#: paperless_mail/admin.py:25 msgid "Filter" msgstr "Filter" -#: paperless_mail/admin.py:26 +#: paperless_mail/admin.py:27 msgid "" "Paperless will only process mails that match ALL of the filters given below." msgstr "" "Paperless verwerkt alleen e-mails die voldoen aan ALLE onderstaande filters." -#: paperless_mail/admin.py:34 +#: paperless_mail/admin.py:37 msgid "Actions" msgstr "Acties" -#: paperless_mail/admin.py:36 +#: paperless_mail/admin.py:39 msgid "" "The action applied to the mail. This action is only performed when documents" " were consumed from the mail. Mails without attachments will remain entirely" @@ -383,11 +431,11 @@ msgstr "" "wanneer documenten verwerkt werden uit de mail. Mails zonder bijlage blijven" " onaangeroerd." -#: paperless_mail/admin.py:43 +#: paperless_mail/admin.py:46 msgid "Metadata" msgstr "Metadata" -#: paperless_mail/admin.py:45 +#: paperless_mail/admin.py:48 msgid "" "Assign metadata to documents consumed from this rule automatically. If you " "do not assign tags, types or correspondents here, paperless will still " @@ -457,87 +505,120 @@ msgstr "email-regel" msgid "mail rules" msgstr "email-regels" -#: paperless_mail/models.py:69 +#: paperless_mail/models.py:67 +msgid "Only process attachments." +msgstr "Alleen bijlagen verwerken" + +#: paperless_mail/models.py:68 +msgid "Process all files, including 'inline' attachments." +msgstr "Verwerk alle bestanden, inclusief 'inline' bijlagen." + +#: paperless_mail/models.py:78 msgid "Mark as read, don't process read mails" msgstr "Markeer als gelezen, verwerk geen gelezen mails" -#: paperless_mail/models.py:70 +#: paperless_mail/models.py:79 msgid "Flag the mail, don't process flagged mails" msgstr "Markeer de mail, verwerk geen mails met markering" -#: paperless_mail/models.py:71 +#: paperless_mail/models.py:80 msgid "Move to specified folder" msgstr "Verplaats naar gegeven map" -#: paperless_mail/models.py:72 +#: paperless_mail/models.py:81 msgid "Delete" msgstr "Verwijder" -#: paperless_mail/models.py:79 +#: paperless_mail/models.py:88 msgid "Use subject as title" msgstr "Gebruik onderwerp als titel" -#: paperless_mail/models.py:80 +#: paperless_mail/models.py:89 msgid "Use attachment filename as title" msgstr "Gebruik naam van bijlage als titel" -#: paperless_mail/models.py:90 +#: paperless_mail/models.py:99 msgid "Do not assign a correspondent" msgstr "Wijs geen correspondent toe" -#: paperless_mail/models.py:92 +#: paperless_mail/models.py:101 msgid "Use mail address" msgstr "Gebruik het email-adres" -#: paperless_mail/models.py:94 +#: paperless_mail/models.py:103 msgid "Use name (or mail address if not available)" msgstr "Gebruik de naam, en anders het email-adres" -#: paperless_mail/models.py:96 +#: paperless_mail/models.py:105 msgid "Use correspondent selected below" msgstr "Gebruik de hieronder aangeduide correspondent" -#: paperless_mail/models.py:104 +#: paperless_mail/models.py:113 msgid "order" msgstr "volgorde" -#: paperless_mail/models.py:111 +#: paperless_mail/models.py:120 msgid "account" msgstr "account" -#: paperless_mail/models.py:115 +#: paperless_mail/models.py:124 msgid "folder" msgstr "map" -#: paperless_mail/models.py:119 +#: paperless_mail/models.py:128 msgid "filter from" msgstr "filter afzender" -#: paperless_mail/models.py:122 +#: paperless_mail/models.py:131 msgid "filter subject" msgstr "filter onderwerp" -#: paperless_mail/models.py:125 +#: paperless_mail/models.py:134 msgid "filter body" msgstr "filter inhoud" -#: paperless_mail/models.py:129 +#: paperless_mail/models.py:138 +msgid "filter attachment filename" +msgstr "Filter bestandsnaam van bijlage" + +#: paperless_mail/models.py:140 +msgid "" +"Only consume documents which entirely match this filename if specified. " +"Wildcards such as *.pdf or *invoice* are allowed. Case insensitive." +msgstr "" +"Alleen documenten verwerken die volledig overeenkomen, indien aangegeven. Je" +" kunt jokertekens gebruiken, zoals *.pdf of *factuur*. Dit is niet " +"hoofdlettergevoelig." + +#: paperless_mail/models.py:146 msgid "maximum age" msgstr "Maximale leeftijd" -#: paperless_mail/models.py:131 +#: paperless_mail/models.py:148 msgid "Specified in days." msgstr "Aangegeven in dagen" -#: paperless_mail/models.py:134 +#: paperless_mail/models.py:151 +msgid "attachment type" +msgstr "Type bijlage" + +#: paperless_mail/models.py:154 +msgid "" +"Inline attachments include embedded images, so it's best to combine this " +"option with a filename filter." +msgstr "" +"\"Inline\" bijlagen bevatten vaak ook afbeeldingen. In dit geval valt het " +"aan te raden om ook een filter voor de bestandsnaam op te geven." + +#: paperless_mail/models.py:159 msgid "action" msgstr "actie" -#: paperless_mail/models.py:140 +#: paperless_mail/models.py:165 msgid "action parameter" msgstr "actie parameters" -#: paperless_mail/models.py:142 +#: paperless_mail/models.py:167 msgid "" "Additional parameter for the action selected above, i.e., the target folder " "of the move to folder action." @@ -545,22 +626,22 @@ msgstr "" "Extra parameters voor de hierboven gekozen actie, met andere woorden: de " "bestemmingsmap voor de verplaats-actie." -#: paperless_mail/models.py:148 +#: paperless_mail/models.py:173 msgid "assign title from" msgstr "wijs titel toe van" -#: paperless_mail/models.py:158 +#: paperless_mail/models.py:183 msgid "assign this tag" msgstr "wijs dit etiket toe" -#: paperless_mail/models.py:166 +#: paperless_mail/models.py:191 msgid "assign this document type" msgstr "wijs dit documenttype toe" -#: paperless_mail/models.py:170 +#: paperless_mail/models.py:195 msgid "assign correspondent from" msgstr "wijs correspondent toe van" -#: paperless_mail/models.py:180 +#: paperless_mail/models.py:205 msgid "assign this correspondent" msgstr "wijs deze correspondent toe" diff --git a/src/paperless/auth.py b/src/paperless/auth.py index ece5d0eba..cd717e56b 100644 --- a/src/paperless/auth.py +++ b/src/paperless/auth.py @@ -2,6 +2,7 @@ from django.conf import settings from django.contrib.auth.models import User from django.utils.deprecation import MiddlewareMixin from rest_framework import authentication +from django.contrib.auth.middleware import RemoteUserMiddleware class AutoLoginMiddleware(MiddlewareMixin): @@ -26,3 +27,11 @@ class AngularApiAuthenticationOverride(authentication.BaseAuthentication): return (user, None) else: return None + + +class HttpRemoteUserMiddleware(RemoteUserMiddleware): + """ This class allows authentication via HTTP_REMOTE_USER which is set for + example by certain SSO applications. + """ + + header = 'HTTP_REMOTE_USER' diff --git a/src/paperless/settings.py b/src/paperless/settings.py index 9b0160c82..b36ab6cf1 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -4,6 +4,7 @@ import multiprocessing import os import re +import dateparser from dotenv import load_dotenv from django.utils.translation import gettext_lazy as _ @@ -89,7 +90,6 @@ INSTALLED_APPS = [ "documents.apps.DocumentsConfig", "paperless_tesseract.apps.PaperlessTesseractConfig", "paperless_text.apps.PaperlessTextConfig", - "paperless_tika.apps.PaperlessTikaConfig", "paperless_mail.apps.PaperlessMailConfig", "django.contrib.admin", @@ -177,6 +177,25 @@ if AUTO_LOGIN_USERNAME: # regular login in case the provided user does not exist. MIDDLEWARE.insert(_index+1, 'paperless.auth.AutoLoginMiddleware') +ENABLE_HTTP_REMOTE_USER = __get_boolean("PAPERLESS_ENABLE_HTTP_REMOTE_USER") + +if ENABLE_HTTP_REMOTE_USER: + MIDDLEWARE.append( + 'paperless.auth.HttpRemoteUserMiddleware' + ) + AUTHENTICATION_BACKENDS = [ + 'django.contrib.auth.backends.RemoteUserBackend', + 'django.contrib.auth.backends.ModelBackend' + ] + REST_FRAMEWORK['DEFAULT_AUTHENTICATION_CLASSES'].append( + 'rest_framework.authentication.RemoteUserAuthentication' + ) + +# X-Frame options for embedded PDF display: +if DEBUG: + X_FRAME_OPTIONS = 'ANY' +else: + X_FRAME_OPTIONS = 'SAMEORIGIN' # We allow CORS from localhost:8080 CORS_ALLOWED_ORIGINS = tuple(os.getenv("PAPERLESS_CORS_ALLOWED_HOSTS", "http://localhost:8000").split(",")) @@ -252,6 +271,7 @@ if os.getenv("PAPERLESS_DBHOST"): "NAME": os.getenv("PAPERLESS_DBNAME", "paperless"), "USER": os.getenv("PAPERLESS_DBUSER", "paperless"), "PASSWORD": os.getenv("PAPERLESS_DBPASS", "paperless"), + 'OPTIONS': {'sslmode': os.getenv("PAPERLESS_DBSSLMODE", "prefer")}, } if os.getenv("PAPERLESS_DBPORT"): DATABASES["default"]["PORT"] = os.getenv("PAPERLESS_DBPORT") @@ -306,7 +326,7 @@ LOGGING = { "class": "documents.loggers.PaperlessHandler", }, "console": { - "level": "INFO", + "level": "DEBUG" if DEBUG else "INFO", "class": "logging.StreamHandler", "formatter": "verbose", } @@ -343,10 +363,13 @@ LOGGING = { # Favors threads per worker on smaller systems and never exceeds cpu_count() # in total. + def default_task_workers(): + # always leave one core open + available_cores = max(multiprocessing.cpu_count() - 1, 1) try: return max( - math.floor(math.sqrt(multiprocessing.cpu_count())), + math.floor(math.sqrt(available_cores)), 1 ) except NotImplementedError: @@ -363,17 +386,19 @@ Q_CLUSTER = { } -def default_threads_per_worker(): +def default_threads_per_worker(task_workers): + # always leave one core open + available_cores = max(multiprocessing.cpu_count() - 1, 1) try: return max( - math.floor(multiprocessing.cpu_count() / TASK_WORKERS), + math.floor(available_cores / task_workers), 1 ) except NotImplementedError: return 1 -THREADS_PER_WORKER = os.getenv("PAPERLESS_THREADS_PER_WORKER", default_threads_per_worker()) +THREADS_PER_WORKER = os.getenv("PAPERLESS_THREADS_PER_WORKER", default_threads_per_worker(TASK_WORKERS)) ############################################################################### # Paperless Specific Settings # @@ -458,3 +483,13 @@ PAPERLESS_TIKA_ENDPOINT = os.getenv("PAPERLESS_TIKA_ENDPOINT", "http://localhost PAPERLESS_TIKA_GOTENBERG_ENDPOINT = os.getenv( "PAPERLESS_TIKA_GOTENBERG_ENDPOINT", "http://localhost:3000" ) + +if PAPERLESS_TIKA_ENABLED: + INSTALLED_APPS.append("paperless_tika.apps.PaperlessTikaConfig") + +# List dates that should be ignored when trying to parse date from document text +IGNORE_DATES = set() +for s in os.getenv("PAPERLESS_IGNORE_DATES", "").split(","): + d = dateparser.parse(s) + if d: + IGNORE_DATES.add(d.date()) diff --git a/src/paperless/version.py b/src/paperless/version.py index e1ba14cb4..8dcd08521 100644 --- a/src/paperless/version.py +++ b/src/paperless/version.py @@ -1 +1 @@ -__version__ = (0, 9, 11) +__version__ = (1, 0, 0) diff --git a/src/paperless_mail/admin.py b/src/paperless_mail/admin.py index 4c63c2b29..d6789ebe5 100644 --- a/src/paperless_mail/admin.py +++ b/src/paperless_mail/admin.py @@ -12,6 +12,7 @@ class MailAccountAdmin(admin.ModelAdmin): class MailRuleAdmin(admin.ModelAdmin): radio_fields = { + "attachment_type": admin.VERTICAL, "action": admin.VERTICAL, "assign_title_from": admin.VERTICAL, "assign_correspondent_from": admin.VERTICAL @@ -29,7 +30,9 @@ class MailRuleAdmin(admin.ModelAdmin): ('filter_from', 'filter_subject', 'filter_body', - 'maximum_age') + 'filter_attachment_filename', + 'maximum_age', + 'attachment_type') }), (_("Actions"), { 'description': diff --git a/src/paperless_mail/mail.py b/src/paperless_mail/mail.py index 537807400..e1916c1dd 100644 --- a/src/paperless_mail/mail.py +++ b/src/paperless_mail/mail.py @@ -1,6 +1,7 @@ import os import tempfile from datetime import timedelta, date +from fnmatch import fnmatch import magic import pathvalidate @@ -198,7 +199,7 @@ class MailAccountHandler(LoggingMixin): try: messages = M.fetch(criteria=AND(**criterias), - mark_seen=False) + mark_seen=False, charset='UTF-8') except Exception: raise MailError( f"Rule {rule}: Error while fetching folder {rule.folder}") @@ -263,7 +264,7 @@ class MailAccountHandler(LoggingMixin): for att in message.attachments: - if not att.content_disposition == "attachment": + if not att.content_disposition == "attachment" and rule.attachment_type == MailRule.ATTACHMENT_TYPE_ATTACHMENTS_ONLY: # NOQA: E501 self.log( 'debug', f"Rule {rule}: " @@ -271,6 +272,10 @@ class MailAccountHandler(LoggingMixin): f"with content disposition {att.content_disposition}") continue + if rule.filter_attachment_filename: + if not fnmatch(att.filename, rule.filter_attachment_filename): + continue + title = self.get_title(message, att, rule) # don't trust the content type of the attachment. Could be diff --git a/src/paperless_mail/migrations/0007_auto_20210106_0138.py b/src/paperless_mail/migrations/0007_auto_20210106_0138.py new file mode 100644 index 000000000..2da9eecc9 --- /dev/null +++ b/src/paperless_mail/migrations/0007_auto_20210106_0138.py @@ -0,0 +1,23 @@ +# Generated by Django 3.1.5 on 2021-01-06 01:38 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('paperless_mail', '0006_auto_20210101_2340'), + ] + + operations = [ + migrations.AddField( + model_name='mailrule', + name='attachment_type', + field=models.PositiveIntegerField(choices=[(1, 'Only process attachments.'), (2, "Process all files, including 'inline' attachments.")], default=1, help_text="Inline attachments include embedded images, so it's best to combine this option with a filename filter.", verbose_name='attachment type'), + ), + migrations.AddField( + model_name='mailrule', + name='filter_attachment_filename', + field=models.CharField(blank=True, help_text='Only consume documents which entirely match this filename if specified. Wildcards such as *.pdf or *invoice* are allowed. Case insensitive.', max_length=256, null=True, verbose_name='filter attachment filename'), + ), + ] diff --git a/src/paperless_mail/models.py b/src/paperless_mail/models.py index ddfb4d43c..7e56b47a7 100644 --- a/src/paperless_mail/models.py +++ b/src/paperless_mail/models.py @@ -60,6 +60,15 @@ class MailRule(models.Model): verbose_name = _("mail rule") verbose_name_plural = _("mail rules") + ATTACHMENT_TYPE_ATTACHMENTS_ONLY = 1 + ATTACHMENT_TYPE_EVERYTHING = 2 + + ATTACHMENT_TYPES = ( + (ATTACHMENT_TYPE_ATTACHMENTS_ONLY, _("Only process attachments.")), + (ATTACHMENT_TYPE_EVERYTHING, _("Process all files, including 'inline' " + "attachments.")) + ) + ACTION_DELETE = 1 ACTION_MOVE = 2 ACTION_MARK_READ = 3 @@ -125,11 +134,27 @@ class MailRule(models.Model): _("filter body"), max_length=256, null=True, blank=True) + filter_attachment_filename = models.CharField( + _("filter attachment filename"), + max_length=256, null=True, blank=True, + help_text=_("Only consume documents which entirely match this " + "filename if specified. Wildcards such as *.pdf or " + "*invoice* are allowed. Case insensitive.") + ) + maximum_age = models.PositiveIntegerField( _("maximum age"), default=30, help_text=_("Specified in days.")) + attachment_type = models.PositiveIntegerField( + _("attachment type"), + choices=ATTACHMENT_TYPES, + default=ATTACHMENT_TYPE_ATTACHMENTS_ONLY, + help_text=_("Inline attachments include embedded images, so it's best " + "to combine this option with a filename filter.") + ) + action = models.PositiveIntegerField( _("action"), choices=ACTIONS, diff --git a/src/paperless_mail/tests/test_mail.py b/src/paperless_mail/tests/test_mail.py index 9c0f52c53..bec0ff4b4 100644 --- a/src/paperless_mail/tests/test_mail.py +++ b/src/paperless_mail/tests/test_mail.py @@ -1,3 +1,4 @@ +import os import uuid from collections import namedtuple from typing import ContextManager @@ -9,6 +10,7 @@ from django.test import TestCase from imap_tools import MailMessageFlags, MailboxFolderSelectError from documents.models import Correspondent +from documents.tests.utils import DirectoriesMixin from paperless_mail import tasks from paperless_mail.mail import MailError, MailAccountHandler from paperless_mail.models import MailRule, MailAccount @@ -41,7 +43,7 @@ class BogusMailBox(ContextManager): folder = BogusFolderManager() - def fetch(self, criteria, mark_seen): + def fetch(self, criteria, mark_seen, charset=""): msg = self.messages criteria = str(criteria).strip('()').split(" ") @@ -130,7 +132,7 @@ def fake_magic_from_buffer(buffer, mime=False): @mock.patch('paperless_mail.mail.magic.from_buffer', fake_magic_from_buffer) -class TestMail(TestCase): +class TestMail(DirectoriesMixin, TestCase): def setUp(self): patcher = mock.patch('paperless_mail.mail.MailBox') @@ -146,6 +148,7 @@ class TestMail(TestCase): self.reset_bogus_mailbox() self.mail_account_handler = MailAccountHandler() + super(TestMail, self).setUp() def reset_bogus_mailbox(self): self.bogus_mailbox.messages = [] @@ -220,9 +223,13 @@ class TestMail(TestCase): args1, kwargs1 = self.async_task.call_args_list[0] args2, kwargs2 = self.async_task.call_args_list[1] + self.assertTrue(os.path.isfile(kwargs1['path']), kwargs1['path']) + self.assertEqual(kwargs1['override_title'], "file_0") self.assertEqual(kwargs1['override_filename'], "file_0.pdf") + self.assertTrue(os.path.isfile(kwargs2['path']), kwargs1['path']) + self.assertEqual(kwargs2['override_title'], "file_1") self.assertEqual(kwargs2['override_filename'], "file_1.pdf") @@ -253,6 +260,7 @@ class TestMail(TestCase): self.assertEqual(self.async_task.call_count, 1) args, kwargs = self.async_task.call_args + self.assertTrue(os.path.isfile(kwargs['path']), kwargs['path']) self.assertEqual(kwargs['override_filename'], "f1.pdf") def test_handle_disposition(self): @@ -273,6 +281,49 @@ class TestMail(TestCase): args, kwargs = self.async_task.call_args self.assertEqual(kwargs['override_filename'], "f2.pdf") + def test_handle_inline_files(self): + message = create_message() + message.attachments = [ + create_attachment(filename="f1.pdf", content_disposition='inline'), + create_attachment(filename="f2.pdf", content_disposition='attachment') + ] + + account = MailAccount() + rule = MailRule(assign_title_from=MailRule.TITLE_FROM_FILENAME, account=account, attachment_type=MailRule.ATTACHMENT_TYPE_EVERYTHING) + + result = self.mail_account_handler.handle_message(message, rule) + + self.assertEqual(result, 2) + self.assertEqual(self.async_task.call_count, 2) + + def test_filename_filter(self): + message = create_message() + message.attachments = [ + create_attachment(filename="f1.pdf"), + create_attachment(filename="f2.pdf"), + create_attachment(filename="f3.pdf"), + create_attachment(filename="f2.png"), + ] + + tests = [ + ("*.pdf", ["f1.pdf", "f2.pdf", "f3.pdf"]), + ("f1.pdf", ["f1.pdf"]), + ("f1", []), + ("*", ["f1.pdf", "f2.pdf", "f3.pdf", "f2.png"]), + ("*.png", ["f2.png"]), + ] + + for (pattern, matches) in tests: + self.async_task.reset_mock() + account = MailAccount() + rule = MailRule(assign_title_from=MailRule.TITLE_FROM_FILENAME, account=account, filter_attachment_filename=pattern) + + result = self.mail_account_handler.handle_message(message, rule) + + self.assertEqual(result, len(matches)) + filenames = [a[1]['override_filename'] for a in self.async_task.call_args_list] + self.assertCountEqual(filenames, matches) + def test_handle_mail_account_mark_read(self): account = MailAccount.objects.create(name="test", imap_server="", username="admin", password="secret")