diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5eaca123a..85db2d482 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,6 +2,7 @@ name: ci on: push: + tags: ng-* branches-ignore: - 'translations**' pull_request: @@ -19,7 +20,7 @@ jobs: name: Set up Python uses: actions/setup-python@v2 with: - python-version: 3.8 + python-version: 3.7 - name: Get pip cache dir id: pip-cache @@ -34,8 +35,6 @@ jobs: - 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 - @@ -50,6 +49,39 @@ jobs: name: documentation path: docs/_build/html/ + codestyle: + 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: 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: Install dependencies + run: | + pip install --upgrade pipenv + pipenv install --system --dev --ignore-pipfile + - + name: Codestyle + run: | + cd src/ + pycodestyle + tests: runs-on: ubuntu-20.04 strategy: @@ -77,10 +109,10 @@ jobs: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-pip${{ matrix.python-version }} - - name: Prepare tests + name: Install dependencies run: | sudo apt-get update -qq - sudo apt-get install -qq --no-install-recommends libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng + sudo apt-get install -qq --no-install-recommends unpaper tesseract-ocr imagemagick ghostscript optipng pip install --upgrade pipenv pipenv install --system --dev --ignore-pipfile - @@ -88,11 +120,6 @@ jobs: run: | cd src/ pytest - - - name: Codestyle - run: | - cd src/ - pycodestyle - name: Publish coverage results if: matrix.python-version == '3.8' @@ -113,6 +140,13 @@ jobs: uses: actions/setup-node@v2 with: node-version: '15' + - + name: Configure version on dev branches + if: startsWith(github.ref, 'refs/heads/feature-') || github.ref == 'refs/heads/dev' + run: | + git_hash=$(git rev-parse --short "$GITHUB_SHA") + git_branch=${GITHUB_REF#refs/heads/} + sed -i -E "s/version: \"(.*)\"/version: \"${git_branch} ${git_hash}\"/g" src-ui/src/environments/environment.prod.ts - name: Build frontend run: ./compile-frontend.sh @@ -124,7 +158,7 @@ jobs: path: src/documents/static/frontend/ build-release: - needs: [frontend, documentation, tests] + needs: [frontend, documentation, tests, codestyle] runs-on: ubuntu-20.04 steps: - @@ -139,7 +173,7 @@ jobs: name: Install dependencies run: | sudo apt-get update -qq - sudo apt-get install -qq --no-install-recommends libpoppler-cpp-dev gettext liblept5 + sudo apt-get install -qq --no-install-recommends gettext liblept5 pip3 install -r requirements.txt - name: Download frontend artifact @@ -234,7 +268,7 @@ jobs: build-docker-image: if: github.event_name == 'push' && (startsWith(github.ref, 'refs/heads/feature-') || github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/ng-')) runs-on: ubuntu-latest - needs: [frontend, tests] + needs: [frontend, tests, codestyle] steps: - name: Prepare diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a8fb1f8e9..0bbd6c8ea 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,11 +9,11 @@ If you want to implement something big: Please start a discussion about that in ## Python -Use python 3.6 for development. Paperless supports python 3.6, 3.7 and 3.8. +Paperless supports python 3.6, 3.7, 3.8 and 3.9. ## Branches -master always reflects the latest release. +master always reflects the latest release. Apart from changes to the documentation or readme, absolutely no functional changes on this branch in between releases. dev contains all changes that will be part of the next release. Use this branch to start making your changes. diff --git a/Dockerfile b/Dockerfile index 6247ef009..c94b7030f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,10 +10,6 @@ RUN ./configure && make FROM python:3.7-slim -WORKDIR /usr/src/paperless/ - -COPY requirements.txt ./ - # Binary dependencies RUN apt-get update \ && apt-get -y --no-install-recommends install \ @@ -49,59 +45,61 @@ RUN apt-get update \ tesseract-ocr-spa \ unpaper \ zlib1g \ - && 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 \ + && 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 - -COPY 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/ +WORKDIR /usr/src/paperless/src/ + +COPY requirements.txt ../ + +# Python dependencies +RUN apt-get update \ + && apt-get -y --no-install-recommends install \ + build-essential \ + 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/* + +# setup docker-specific things +COPY docker/ ./docker/ + +RUN cd docker \ + && cp imagemagick-policy.xml /etc/ImageMagick-6/policy.xml \ + && mkdir /var/log/supervisord /var/run/supervisord \ + && cp supervisord.conf /etc/supervisord.conf \ + && cp docker-entrypoint.sh /sbin/docker-entrypoint.sh \ + && chmod 755 /sbin/docker-entrypoint.sh \ + && chmod +x install_management_commands.sh \ + && ./install_management_commands.sh \ + && cd .. \ + && rm docker -rf + +COPY gunicorn.conf.py ../ # copy app -COPY src/ ./src/ +COPY src/ ./ # add users, setup scripts RUN addgroup --gid 1000 paperless \ && useradd --uid 1000 --gid paperless --home-dir /usr/src/paperless paperless \ - && chown -R paperless:paperless . \ - && chmod 755 /sbin/docker-entrypoint.sh - -WORKDIR /usr/src/paperless/src/ - -RUN sudo -HEu paperless python3 manage.py collectstatic --clear --no-input - -RUN sudo -HEu paperless python3 manage.py compilemessages + && chown -R paperless:paperless ../ \ + && sudo -HEu paperless python3 manage.py collectstatic --clear --no-input \ + && sudo -HEu paperless python3 manage.py compilemessages VOLUME ["/usr/src/paperless/data", "/usr/src/paperless/media", "/usr/src/paperless/consume", "/usr/src/paperless/export"] ENTRYPOINT ["/sbin/docker-entrypoint.sh"] diff --git a/Pipfile b/Pipfile index cbe5c5103..29a91ece3 100644 --- a/Pipfile +++ b/Pipfile @@ -17,19 +17,19 @@ django-filter = "~=2.4.0" django-q = "~=1.3.4" djangorestframework = "~=3.12.2" filelock = "*" -fuzzywuzzy = "*" +fuzzywuzzy = {extras = ["speedup"], version = "*"} gunicorn = "*" imap-tools = "*" langdetect = "*" -pdftotext = "*" +# numpy 1.20.0 drops python 3.6 support +numpy = "~=1.19.5" pathvalidate = "*" # 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" +pikepdf = "~=2.5.0" python-gnupg = "*" python-dotenv = "*" python-dateutil = "*" -python-Levenshtein = "*" python-magic = "*" psycopg2-binary = "*" redis = "*" @@ -38,10 +38,10 @@ scikit-learn="==0.24.0" # Prevent scipy updates because 1.6 is incompatible with python 3.6 scipy="~=1.5.4" whitenoise = "~=5.2.0" -watchdog = "*" +watchdog = "~=1.0.0" whoosh="~=2.7.4" inotifyrecursive = "~=0.3.4" -ocrmypdf = "~=11.4.5" +ocrmypdf = "~=11.6" tqdm = "*" tika = "*" # TODO: This will sadly also install daphne+dependencies, @@ -49,6 +49,12 @@ tika = "*" channels = "~=3.0" channels-redis = "*" uvicorn = {extras = ["standard"], version = "*"} +concurrent-log-handler = "*" +# uvloop 0.15+ incompatible with python 3.6 +uvloop = "~=0.14.0" +# TODO: keep an eye on piwheel builds and update this once available (https://www.piwheels.org/project/cryptography/) +cryptography = "~=3.3.2" +"pdfminer.six" = "*" [dev-packages] coveralls = "*" diff --git a/Pipfile.lock b/Pipfile.lock index ff9e96717..eefaeeecd 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "d80d2539a4528a8fd9e848875c2e2d5bcdb3e98154f45b612706094b84ecaaea" + "sha256": "71959eb287fc97969263be5e3a1b1f4f369b7a5ace85bd1947a25b9b92e17e8a" }, "pipfile-spec": 6, "requires": {}, @@ -60,11 +60,11 @@ }, "autobahn": { "hashes": [ - "sha256:410a93e0e29882c8b5d5ab05d220b07609b886ef5f23c0b8d39153254ffd6895", - "sha256:52ee4236ff9a1fcbbd9500439dcf3284284b37f8a6b31ecc8a36e00cf9f95049" + "sha256:41a3a3f89cde48643baf4e105d9491c566295f9abee951379e59121784044b8b", + "sha256:7e6b1bf95196b733978bab2d54a7ab8899c16ce11be369dc58422c07b7eea726" ], "markers": "python_version >= '3.6'", - "version": "==20.12.3" + "version": "==21.2.1" }, "automat": { "hashes": [ @@ -90,46 +90,47 @@ }, "cffi": { "hashes": [ - "sha256:00a1ba5e2e95684448de9b89888ccd02c98d512064b4cb987d48f4b40aa0421e", - "sha256:00e28066507bfc3fe865a31f325c8391a1ac2916219340f87dfad602c3e48e5d", - "sha256:045d792900a75e8b1e1b0ab6787dd733a8190ffcf80e8c8ceb2fb10a29ff238a", - "sha256:0638c3ae1a0edfb77c6765d487fee624d2b1ee1bdfeffc1f0b58c64d149e7eec", - "sha256:105abaf8a6075dc96c1fe5ae7aae073f4696f2905fde6aeada4c9d2926752362", - "sha256:155136b51fd733fa94e1c2ea5211dcd4c8879869008fc811648f16541bf99668", - "sha256:1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c", - "sha256:1d2c4994f515e5b485fd6d3a73d05526aa0fcf248eb135996b088d25dfa1865b", - "sha256:23f318bf74b170c6e9adb390e8bd282457f6de46c19d03b52f3fd042b5e19654", - "sha256:2c24d61263f511551f740d1a065eb0212db1dbbbbd241db758f5244281590c06", - "sha256:51a8b381b16ddd370178a65360ebe15fbc1c71cf6f584613a7ea08bfad946698", - "sha256:594234691ac0e9b770aee9fcdb8fa02c22e43e5c619456efd0d6c2bf276f3eb2", - "sha256:5cf4be6c304ad0b6602f5c4e90e2f59b47653ac1ed9c662ed379fe48a8f26b0c", - "sha256:64081b3f8f6f3c3de6191ec89d7dc6c86a8a43911f7ecb422c60e90c70be41c7", - "sha256:6bc25fc545a6b3d57b5f8618e59fc13d3a3a68431e8ca5fd4c13241cd70d0009", - "sha256:798caa2a2384b1cbe8a2a139d80734c9db54f9cc155c99d7cc92441a23871c03", - "sha256:7c6b1dece89874d9541fc974917b631406233ea0440d0bdfbb8e03bf39a49b3b", - "sha256:840793c68105fe031f34d6a086eaea153a0cd5c491cde82a74b420edd0a2b909", - "sha256:8d6603078baf4e11edc4168a514c5ce5b3ba6e3e9c374298cb88437957960a53", - "sha256:9cc46bc107224ff5b6d04369e7c595acb700c3613ad7bcf2e2012f62ece80c35", - "sha256:9f7a31251289b2ab6d4012f6e83e58bc3b96bd151f5b5262467f4bb6b34a7c26", - "sha256:9ffb888f19d54a4d4dfd4b3f29bc2c16aa4972f1c2ab9c4ab09b8ab8685b9c2b", - "sha256:a5ed8c05548b54b998b9498753fb9cadbfd92ee88e884641377d8a8b291bcc01", - "sha256:a7711edca4dcef1a75257b50a2fbfe92a65187c47dab5a0f1b9b332c5919a3fb", - "sha256:af5c59122a011049aad5dd87424b8e65a80e4a6477419c0c1015f73fb5ea0293", - "sha256:b18e0a9ef57d2b41f5c68beefa32317d286c3d6ac0484efd10d6e07491bb95dd", - "sha256:b4e248d1087abf9f4c10f3c398896c87ce82a9856494a7155823eb45a892395d", - "sha256:ba4e9e0ae13fc41c6b23299545e5ef73055213e466bd107953e4a013a5ddd7e3", - "sha256:be8661bcee1bc2fc4b033a6ab65bd1f87ce5008492601695d0b9a4e820c3bde5", - "sha256:c6332685306b6417a91b1ff9fae889b3ba65c2292d64bd9245c093b1b284809d", - "sha256:d5ff0621c88ce83a28a10d2ce719b2ee85635e85c515f12bac99a95306da4b2e", - "sha256:d9efd8b7a3ef378dd61a1e77367f1924375befc2eba06168b6ebfa903a5e59ca", - "sha256:df5169c4396adc04f9b0a05f13c074df878b6052430e03f50e68adf3a57aa28d", - "sha256:ebb253464a5d0482b191274f1c8bf00e33f7e0b9c66405fbffc61ed2c839c775", - "sha256:ec80dc47f54e6e9a78181ce05feb71a0353854cc26999db963695f950b5fb375", - "sha256:f032b34669220030f905152045dfa27741ce1a6db3324a5bc0b96b6c7420c87b", - "sha256:f60567825f791c6f8a592f3c6e3bd93dd2934e3f9dac189308426bd76b00ef3b", - "sha256:f803eaa94c2fcda012c047e62bc7a51b0bdabda1cad7a92a522694ea2d76e49f" + "sha256:005a36f41773e148deac64b08f233873a4d0c18b053d37da83f6af4d9087b813", + "sha256:0857f0ae312d855239a55c81ef453ee8fd24136eaba8e87a2eceba644c0d4c06", + "sha256:1071534bbbf8cbb31b498d5d9db0f274f2f7a865adca4ae429e147ba40f73dea", + "sha256:158d0d15119b4b7ff6b926536763dc0714313aa59e320ddf787502c70c4d4bee", + "sha256:1f436816fc868b098b0d63b8920de7d208c90a67212546d02f84fe78a9c26396", + "sha256:2894f2df484ff56d717bead0a5c2abb6b9d2bf26d6960c4604d5c48bbc30ee73", + "sha256:29314480e958fd8aab22e4a58b355b629c59bf5f2ac2492b61e3dc06d8c7a315", + "sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1", + "sha256:35f27e6eb43380fa080dccf676dece30bef72e4a67617ffda586641cd4508d49", + "sha256:3d3dd4c9e559eb172ecf00a2a7517e97d1e96de2a5e610bd9b68cea3925b4892", + "sha256:43e0b9d9e2c9e5d152946b9c5fe062c151614b262fda2e7b201204de0b99e482", + "sha256:48e1c69bbacfc3d932221851b39d49e81567a4d4aac3b21258d9c24578280058", + "sha256:51182f8927c5af975fece87b1b369f722c570fe169f9880764b1ee3bca8347b5", + "sha256:5560dbf8deedbffb638d8a2da31da91094db361cc07f8a501a339b2daae2cbcc", + "sha256:58e3f59d583d413809d60779492342801d6e82fefb89c86a38e040c16883be53", + "sha256:5de7970188bb46b7bf9858eb6890aad302577a5f6f75091fd7cdd3ef13ef3045", + "sha256:65fa59693c62cf06e45ddbb822165394a288edce9e276647f0046e1ec26920f3", + "sha256:69e395c24fc60aad6bb4fa7e583698ea6cc684648e1ffb7fe85e3c1ca131a7d5", + "sha256:6c97d7350133666fbb5cf4abdc1178c812cb205dc6f41d174a7b0f18fb93337e", + "sha256:6e4714cc64f474e4d6e37cfff31a814b509a35cb17de4fb1999907575684479c", + "sha256:72d8d3ef52c208ee1c7b2e341f7d71c6fd3157138abf1a95166e6165dd5d4369", + "sha256:8ae6299f6c68de06f136f1f9e69458eae58f1dacf10af5c17353eae03aa0d827", + "sha256:8b198cec6c72df5289c05b05b8b0969819783f9418e0409865dac47288d2a053", + "sha256:9338beed13d880320450d95c9e07ccf839faa3ea7b75d788f4ed46d845044a71", + "sha256:99cd03ae7988a93dd00bcd9d0b75e1f6c426063d6f03d2f90b89e29b25b82dfa", + "sha256:9cf8022fb8d07a97c178b02327b284521c7708d7c71a9c9c355c178ac4bbd3d4", + "sha256:9de2e279153a443c656f2defd67769e6d1e4163952b3c622dcea5b08a6405322", + "sha256:9e93e79c2551ff263400e1e4be085a1210e12073a31c2011dbbda14bda0c6132", + "sha256:9ff227395193126d82e60319a673a037d5de84633f11279e336f9c0f189ecc62", + "sha256:a465da611f6fa124963b91bf432d960a555563efe4ed1cc403ba5077b15370aa", + "sha256:ad17025d226ee5beec591b52800c11680fca3df50b8b29fe51d882576e039ee0", + "sha256:afb29c1ba2e5a3736f1c301d9d0abe3ec8b86957d04ddfa9d7a6a42b9367e396", + "sha256:b85eb46a81787c50650f2392b9b4ef23e1f126313b9e0e9013b35c15e4288e2e", + "sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991", + "sha256:cbde590d4faaa07c72bf979734738f328d239913ba3e043b1e98fe9a39f8b2b6", + "sha256:cd2868886d547469123fadc46eac7ea5253ea7fcb139f12e1dfc2bbd406427d1", + "sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406", + "sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d", + "sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c" ], - "version": "==1.14.4" + "version": "==1.14.5" }, "channels": { "hashes": [ @@ -172,6 +173,14 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==15.0" }, + "concurrent-log-handler": { + "hashes": [ + "sha256:00d5ca24d463a7013c3479b026f34b76da4b50df8d76194132b8d8403c014379", + "sha256:b12f79abed3f94121c25ce9c24cdb57d889282ec6ff61f5535ab2068dc37d409" + ], + "index": "pypi", + "version": "==0.9.19" + }, "constantly": { "hashes": [ "sha256:586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35", @@ -181,24 +190,24 @@ }, "cryptography": { "hashes": [ - "sha256:0003a52a123602e1acee177dc90dd201f9bb1e73f24a070db7d36c588e8f5c7d", - "sha256:0e85aaae861d0485eb5a79d33226dd6248d2a9f133b81532c8f5aae37de10ff7", - "sha256:594a1db4511bc4d960571536abe21b4e5c3003e8750ab8365fafce71c5d86901", - "sha256:69e836c9e5ff4373ce6d3ab311c1a2eed274793083858d3cd4c7d12ce20d5f9c", - "sha256:788a3c9942df5e4371c199d10383f44a105d67d401fb4304178020142f020244", - "sha256:7e177e4bea2de937a584b13645cab32f25e3d96fc0bc4a4cf99c27dc77682be6", - "sha256:83d9d2dfec70364a74f4e7c70ad04d3ca2e6a08b703606993407bf46b97868c5", - "sha256:84ef7a0c10c24a7773163f917f1cb6b4444597efd505a8aed0a22e8c4780f27e", - "sha256:982f661bffc7a24b6d4f8ebe3291f17cf3833a0941c6f4d9d55c790b9aa2cdb3", - "sha256:9e21301f7a1e7c03dbea73e8602905a4ebba641547a462b26dd03451e5769e7c", - "sha256:9f6b0492d111b43de5f70052e24c1f0951cb9e6022188ebcb1cc3a3d301469b0", - "sha256:a69bd3c68b98298f490e84519b954335154917eaab52cf582fa2c5c7efc6e812", - "sha256:b4890d5fb9b7a23e3bf8abf5a8a7da8e228f1e97dc96b30b95685df840b6914a", - "sha256:c366df0401d1ec4e548bebe8f91d55ebcc0ec3137900d214dd7aac8427ef3030", - "sha256:dc42f645f8f3a489c3dd416730a514e7a91a59510ddaadc09d04224c098d3302" + "sha256:0d7b69674b738068fa6ffade5c962ecd14969690585aaca0a1b1fc9058938a72", + "sha256:1bd0ccb0a1ed775cd7e2144fe46df9dc03eefd722bbcf587b3e0616ea4a81eff", + "sha256:3c284fc1e504e88e51c428db9c9274f2da9f73fdf5d7e13a36b8ecb039af6e6c", + "sha256:49570438e60f19243e7e0d504527dd5fe9b4b967b5a1ff21cc12b57602dd85d3", + "sha256:541dd758ad49b45920dda3b5b48c968f8b2533d8981bcdb43002798d8f7a89ed", + "sha256:5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed", + "sha256:7951a966613c4211b6612b0352f5bf29989955ee592c4a885d8c7d0f830d0433", + "sha256:922f9602d67c15ade470c11d616f2b2364950602e370c76f0c94c94ae672742e", + "sha256:a0f0b96c572fc9f25c3f4ddbf4688b9b38c69836713fb255f4a2715d93cbaf44", + "sha256:a777c096a49d80f9d2979695b835b0f9c9edab73b59e4ceb51f19724dda887ed", + "sha256:a9a4ac9648d39ce71c2f63fe7dc6db144b9fa567ddfc48b9fde1b54483d26042", + "sha256:aa4969f24d536ae2268c902b2c3d62ab464b5a66bcb247630d208a79a8098e9b", + "sha256:c7390f9b2119b2b43160abb34f63277a638504ef8df99f11cb52c1fda66a2e6f", + "sha256:ddd06e71c449a4fe10d0c60846280ee35d69ce49e3e413ce46d5f129e1468083", + "sha256:e18e6ab84dfb0ab997faf8cca25a86ff15dfea4027b986322026cc99e0a892da" ], - "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" + "index": "pypi", + "version": "==3.3.2" }, "daphne": { "hashes": [ @@ -218,11 +227,11 @@ }, "django": { "hashes": [ - "sha256:2d78425ba74c7a1a74b196058b261b9733a8570782f4e2828974777ccca7edf7", - "sha256:efa2ab96b33b20c2182db93147a0c3cd7769d418926f9e9f140a60dca7c64ca9" + "sha256:32ce792ee9b6a0cbbec340123e229ac9f765dff8c2a4ae9247a14b2ba3a365a7", + "sha256:baf099db36ad31f970775d0be5587cc58a6256a6771a44eb795b554d45f211b8" ], "index": "pypi", - "version": "==3.1.5" + "version": "==3.1.7" }, "django-cors-headers": { "hashes": [ @@ -234,11 +243,11 @@ }, "django-extensions": { "hashes": [ - "sha256:7cd002495ff0a0e5eb6cdd6be759600905b4e4079232ea27618fc46bdd853651", - "sha256:c7f88625a53f631745d4f2bef9ec4dcb999ed59476393bdbbe99db8596778846" + "sha256:674ad4c3b1587a884881824f40212d51829e662e52f85b012cd83d83fe1271d9", + "sha256:9507f8761ee760748938fd8af766d0608fb2738cf368adfa1b2451f61c15ae35" ], "index": "pypi", - "version": "==3.1.0" + "version": "==3.1.1" }, "django-filter": { "hashes": [ @@ -281,6 +290,9 @@ "version": "==3.0.12" }, "fuzzywuzzy": { + "extras": [ + "speedup" + ], "hashes": [ "sha256:45016e92264780e58972dca1b3d939ac864b78437422beecebb3095f8efd00e8", "sha256:928244b28db720d1e0ee7587acf660ea49d7e4c632569cad4f1cd7e68a5f0993" @@ -416,14 +428,6 @@ ], "version": "==0.4.0" }, - "importlib-metadata": { - "hashes": [ - "sha256:ace61d5fc652dc280e7b6b4ff732a9c2d40db2c0f92bc6cb74e07b73d53a1771", - "sha256:fa5daa4477a7414ae34e95942e4dd07f62adf589143c875c133c1e53c4eff38d" - ], - "markers": "python_version < '3.8'", - "version": "==3.4.0" - }, "incremental": { "hashes": [ "sha256:717e12246dddf231a349175f48d74d93e2897244939173b01974ab6661406b9f", @@ -449,11 +453,11 @@ }, "joblib": { "hashes": [ - "sha256:75ead23f13484a2a414874779d69ade40d4fa1abe62b222a23cd50d4bc822f6f", - "sha256:7ad866067ac1fdec27d51c8678ea760601b70e32ff1881d4dc8e1171f2b64b24" + "sha256:9c17567692206d2f3fb9ecf5e991084254fe631665c450b443761c4186a613f7", + "sha256:feeb1ec69c4d45129954f1b7034954241eedfd6ba39b5e9e4b6883be3332d5e5" ], "markers": "python_version >= '3.6'", - "version": "==1.0.0" + "version": "==1.0.1" }, "langdetect": { "hashes": [ @@ -582,16 +586,16 @@ "sha256:dbd18bcf4889b720ba13a27ec2f2aac1981bd41203b3a3b27ba7a33f88ae4827", "sha256:df609c82f18c5b9f6cb97271f03315ff0dbe481a2a02e56aeb1b1a985ce38e60" ], - "markers": "python_version >= '3.6'", + "index": "pypi", "version": "==1.19.5" }, "ocrmypdf": { "hashes": [ - "sha256:416a9c4321bfc844f250694b8c68ebb538f60609bbc8686bd9f84a13c5127d68", - "sha256:f45fc7e844e6026d6080a623a2936be120fc077d99aaa599df022acf35fb31e6" + "sha256:0f624456a50be0b0bc8c0b59704d159f637616c093a1cabe8bb383706561bcf7", + "sha256:b829ad640a6160423162012e094ee2f7cd074ec99efadd7f7486954ec9182985" ], "index": "pypi", - "version": "==11.4.5" + "version": "==11.6.2" }, "pathvalidate": { "hashes": [ @@ -606,42 +610,37 @@ "sha256:b9aac0ebeafb21c08bf65f2039f4b2c5f78a3449d0a41df711d72445649e952a", "sha256:d78877ba8d8bf957f3bb636c4f73f4f6f30f56c461993877ac22c39c20837509" ], - "markers": "python_version >= '3.4'", - "version": "==20201018" - }, - "pdftotext": { - "hashes": [ - "sha256:98aeb8b07a4127e1a30223bd933ef080bbd29aa88f801717ca6c5618380b8aa6" - ], "index": "pypi", - "version": "==2.1.5" + "version": "==20201018" }, "pikepdf": { "hashes": [ - "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" + "sha256:02815df9499d3a6dfac2e07e4d2fdbe25fcbefae208970e76bff90af4a402d49", + "sha256:06b0c3004cc9e9068ebc62bb59c3c3a54e7af13867f4a326690d79c69a1cf288", + "sha256:1a471c6ca288fbcd0e1b0e128ef12bb14c5e7db745786308ba292fc7cff30bb5", + "sha256:489ed0fd1281beb0343a34fe8b9d94407c440ed0419ab2e6f5ea297a41824a31", + "sha256:5106b27f7085ed449e057b9988f07c80a87292d2bf46c585a8635ac7a3ccf0d5", + "sha256:51acffba6f3d21674eea7a0432ce1adaf0743641d57844a5e3dc92b4a7e81c85", + "sha256:53d694d70dd072a47bd2dd71329dcef0f809dcd8084d1d11c31baf3b64cd345c", + "sha256:6a640fef52dc785abd354d6800a52ecc02656c98dbfc2ecde559323b001bd43f", + "sha256:7006ef95f847412605dea6e772019f637949eaeaf65363d5d6afd9aa96bf5623", + "sha256:81e13b62877dbc089095e7efa03c27834bdf6b49d404d064cb227b0e179ce049", + "sha256:8fc3e97b24dafbd4b1ac057c8f144c18467ce55d342a1a8c42688890ead58ef3", + "sha256:9158dc4d3ef4e2301fb1879d5825530fdb32143ced770d60fa8e5badeee70a35", + "sha256:961337a10b42bd656b59116ce1c574eafd515b45a513221df6ae1f11734bfb6c", + "sha256:994ccac972357a7b9b147217e1beea2f7688697944b862dbb2a3e64aa9a5ff14", + "sha256:a8e9abf7db0351357b55c3f935979e7dc14f3f259a25d15bcc86abce730955a7", + "sha256:b836eda7f70b9dd75ccdeaf4e78b38393118a66821a69a10054b1430f945d1fd", + "sha256:b859a225f6bd953472c50f4df612b4575df646e560189e3720310ad65b6805a0", + "sha256:cae106bd461cfad73c554c09f6db1d5f2c6a28f5b8cb0602b63046840f488226", + "sha256:cdc75b8fa5a650f4fc91214a315358fde7470e09b95a00981b73a7c4ac5ddb97", + "sha256:e2c28da4f37ad9a3efbedbbfc6f1084941bde43903d30dfdbb338d5ba94c9f50", + "sha256:e596bd8fdbf40bfb8dc8068cdbc7e5b72052188d1ad8ca84da9d6b77658a8b31", + "sha256:ee957b9c60b6def20cbdf656d35859ce211eec02dafa3abb9d5ca937d32a3c3b", + "sha256:f9428d4b1f70af4f4560be4dccbbc5ab5308c00c5b62ed2f1c44ce9e2591b3d2" ], "index": "pypi", - "version": "==2.2.5" + "version": "==2.5.2" }, "pillow": { "hashes": [ @@ -690,6 +689,14 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==0.13.1" }, + "portalocker": { + "hashes": [ + "sha256:afa66c85041d7bac1532acb74ff26cc2406472dcf7145c90c31ff8ca4f1cc146", + "sha256:e5f6ffb2f360e9aef615a7c284143d2a93bb640c62e8e45a703e6083fc5aa114" + ], + "markers": "python_version >= '3'", + "version": "==2.2.1" + }, "psycopg2-binary": { "hashes": [ "sha256:0deac2af1a587ae12836aa07970f5cb91964f05a7c6cdb69d8425ff4c15d4e2c", @@ -819,27 +826,26 @@ }, "python-levenshtein": { "hashes": [ - "sha256:108edd3c271f1afda8b21a8d9da81886414dfb6940a085fa7903c592e0f8f54b", - "sha256:1ff19b712c5974080b003fd26ef365cd93dfc1a5e690be621f79f3e63e00a7cc", - "sha256:554e273a88060d177e7b3c1e6ea9158dde11563bfae8f7f661f73f47e5ff0911" + "sha256:212db61934fcb819f5cb2fcb5ad5c0e2e43f3161f524eef4a135f7285dfb308a", + "sha256:d92fe5c3b10c8ad8f2d880499f5e96ed24dbc7cd0414a665c2e2505feaf4ec58", + "sha256:dc2395fbd148a1ab31090dd113c366695934b9e85fe5a4b2a032745efd0346f6" ], - "index": "pypi", - "version": "==0.12.1" + "version": "==0.12.2" }, "python-magic": { "hashes": [ - "sha256:356efa93c8899047d1eb7d3eb91e871ba2f5b1376edbaf4cc305e3c872207355", - "sha256:b757db2a5289ea3f1ced9e60f072965243ea43a2221430048fd8cacab17be0ce" + "sha256:8551e804c09a3398790bd9e392acb26554ae2609f29c72abb0b9dee9a5571eae", + "sha256:ca884349f2c92ce830e3f498c5b7c7051fe2942c3ee4332f65213b8ebff15a62" ], "index": "pypi", - "version": "==0.4.18" + "version": "==0.4.22" }, "pytz": { "hashes": [ - "sha256:16962c5fb8db4a8f63a26646d8886e9d769b6c511543557bc84e9569fb9a9cb4", - "sha256:180befebb1927b16f6b57101720075a984c019ac16b1b7575673bea42c6c3da5" + "sha256:83a4a90894bf38e243cf052c8b58f381bfe9a7a483f6a9cab140bc7f702ac4da", + "sha256:eb10ce3e7736052ed3623d49975ce333bcd712c7bb19a58b9e2089d4057d0798" ], - "version": "==2020.5" + "version": "==2021.1" }, "pyyaml": { "hashes": [ @@ -1091,11 +1097,11 @@ }, "tqdm": { "hashes": [ - "sha256:4621f6823bab46a9cc33d48105753ccbea671b68bab2c50a9f0be23d4065cb5a", - "sha256:fe3d08dd00a526850568d542ff9de9bbc2a09a791da3c334f3213d8d0bbbca65" + "sha256:65185676e9fdf20d154cffd1c5de8e39ef9696ff7e59fe0156b1b08e468736af", + "sha256:70657337ec104eb4f3fb229285358f23f045433f6aea26846cdd55f0fd68945c" ], "index": "pypi", - "version": "==4.56.0" + "version": "==4.57.0" }, "twisted": { "extras": [ @@ -1133,20 +1139,11 @@ }, "txaio": { "hashes": [ - "sha256:1488d31d564a116538cc1265ac3f7979fb6223bb5a9e9f1479436ee2c17d8549", - "sha256:a8676d6c68aea1f0e2548c4afdb8e6253873af3bc2659bb5bcd9f39dff7ff90f" + "sha256:7d6f89745680233f1c4db9ddb748df5e88d2a7a37962be174c0fd04c8dba1dc8", + "sha256:c16b55f9a67b2419cfdf8846576e2ec9ba94fe6978a83080c352a80db31c93fb" ], "markers": "python_version >= '3.6'", - "version": "==20.12.1" - }, - "typing-extensions": { - "hashes": [ - "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918", - "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c", - "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f" - ], - "markers": "python_version < '3.8'", - "version": "==3.7.4.3" + "version": "==21.2.1" }, "tzlocal": { "hashes": [ @@ -1168,11 +1165,11 @@ "standard" ], "hashes": [ - "sha256:1079c50a06f6338095b4f203e7861dbff318dde5f22f3a324fc6e94c7654164c", - "sha256:ef1e0bb5f7941c6fe324e06443ddac0331e1632a776175f87891c7bd02694355" + "sha256:3292251b3c7978e8e4a7868f4baf7f7f7bb7e40c759ecc125c37e99cdea34202", + "sha256:7587f7b08bd1efd2b9bad809a3d333e972f1d11af8a5e52a9371ee3a5de71524" ], "index": "pypi", - "version": "==0.13.3" + "version": "==0.13.4" }, "uvloop": { "hashes": [ @@ -1188,6 +1185,7 @@ "sha256:e7514d7a48c063226b7d06617cbb12a14278d4323a065a8d46a7962686ce2e95", "sha256:f07909cd9fc08c52d294b1570bba92186181ca01fe3dc9ffba68955273dd7362" ], + "index": "pypi", "version": "==0.14.0" }, "watchdog": { @@ -1215,11 +1213,10 @@ }, "watchgod": { "hashes": [ - "sha256:59700dab7445aa8e6067a5b94f37bae90fc367554549b1ed2e9d0f4f38a90d2a", - "sha256:5fb60afa9558b79736395db1cb60ad3ed59df5c2f507a3ff729220cf1251ffdc", - "sha256:e9cca0ab9c63f17fc85df9fd8bd18156ff00aff04ebe5976cee473f4968c6858" + "sha256:48140d62b0ebe9dd9cf8381337f06351e1f2e70b2203fa9c6eff4e572ca84f29", + "sha256:d6c1ea21df37847ac0537ca0d6c2f4cdf513562e95f77bb93abbcf05573407b7" ], - "version": "==0.6" + "version": "==0.7" }, "wcwidth": { "hashes": [ @@ -1273,14 +1270,6 @@ "index": "pypi", "version": "==2.7.4" }, - "zipp": { - "hashes": [ - "sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108", - "sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb" - ], - "markers": "python_version >= '3.6'", - "version": "==3.4.0" - }, "zope.interface": { "hashes": [ "sha256:05a97ba92c1c7c26f25c9f671aa1ef85ffead6cdad13770e5b689cf983adc7e1", @@ -1501,11 +1490,11 @@ }, "faker": { "hashes": [ - "sha256:0783729c61501d52efea2967aff6e6fcb8370f0f6b5a558f2a81233642ae529a", - "sha256:6b2995ffff6c2b02bc5daad96f8c24c021e5bd491d9d53d31bcbd66f348181d4" + "sha256:31a58ec5a8f4672f24da3b5ddea02c82a712de1de3179b432948e5c34d787aca", + "sha256:aadfe0efe11ecbbbc5b3b0b0fab050c2acbd2d8e5201769546d43d236bfff663" ], "markers": "python_version >= '3.6'", - "version": "==5.8.0" + "version": "==6.4.1" }, "filelock": { "hashes": [ @@ -1532,22 +1521,6 @@ "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:885b8eae589179f661c909d699a546cf10d83692553e34dca1bf5eb06f7f6217", - "sha256:bfdad047bce441405a49cf8eb48ddce5e56c696e185f59147a8b79e75e9e6380" - ], - "markers": "python_version < '3.7'", - "version": "==5.1.0" - }, "iniconfig": { "hashes": [ "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3", @@ -1558,12 +1531,11 @@ }, "jinja2": { "hashes": [ - "sha256:3f172970d5670703bd3812e8ca6459a9a7e069fa8e51b40195f83c81db191ec4", - "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0", - "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035" + "sha256:03e47ad063331dd6a3f04a43eddca8a966a26ba0c5b7207a9a9e4e08f1b29419", + "sha256:a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", - "version": "==2.11.2" + "version": "==2.11.3" }, "markupsafe": { "hashes": [ @@ -1573,8 +1545,12 @@ "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42", "sha256:19536834abffb3fa155017053c607cb835b2ecc6a3a2554a88043d991dffb736", + "sha256:195d7d2c4fbb0ee8139a6cf67194f3973a6b3042d742ebe0a9ed36d8b6f0c07f", + "sha256:22c178a091fc6630d0d045bdb5992d2dfe14e3259760e713c490da5323866c39", "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", + "sha256:2beec1e0de6924ea551859edb9e7679da6e4870d32cb766240ce17e0a0ba2014", + "sha256:3b8a6499709d29c2e2399569d96719a1b21dcd94410a586a18526b143ec8470f", "sha256:3d61f15e39611aacd91b7e71d903787da86d9e80896e683c0103fced9add7834", "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", @@ -1584,36 +1560,51 @@ "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15", "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1", + "sha256:6f1e273a344928347c1290119b493a1f0303c52f5a5eae5f16d74f48c15d4a85", + "sha256:6fffc775d90dcc9aed1b89219549b329a9250d918fd0b8fa8d93d154918422e1", "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e", "sha256:7952deddf24b85c88dab48f6ec366ac6e39d2761b5280f2f9594911e03fcd064", "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b", "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905", + "sha256:7fed13866cf14bba33e7176717346713881f56d9d2bcebab207f7a036f41b850", + "sha256:84dee80c15f1b560d55bcfe6d47b27d070b4681c699c572af2e3c7cc90a3b8e0", "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735", "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d", + "sha256:98bae9582248d6cf62321dcb52aaf5d9adf0bad3b40582925ef7c7f0ed85fceb", "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e", "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d", "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c", + "sha256:a6a744282b7718a2a62d2ed9d993cad6f5f585605ad352c11de459f4108df0a1", + "sha256:acf08ac40292838b3cbbb06cfe9b2cb9ec78fce8baca31ddb87aaac2e2dc3bc2", "sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21", "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2", "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5", + "sha256:b1dba4527182c95a0db8b6060cc98ac49b9e2f5e64320e2b56e47cb2831978c7", "sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b", + "sha256:b7d644ddb4dbd407d31ffb699f1d140bc35478da613b441c582aeb7c43838dd8", "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6", + "sha256:bf5aa3cbcfdf57fa2ee9cd1822c862ef23037f5c832ad09cfea57fa846dec193", "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f", + "sha256:caabedc8323f1e93231b52fc32bdcde6db817623d33e100708d9a68e1f53b26b", "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f", "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2", + "sha256:d53bc011414228441014aa71dbec320c66468c1030aae3a6e29778a3382d96e5", + "sha256:d73a845f227b0bfe8a7455ee623525ee656a9e2e749e4742706d80a6065d5e2c", + "sha256:d9be0ba6c527163cbed5e0857c451fcd092ce83947944d6c14bc95441203f032", "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7", - "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be" + "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be", + "sha256:feb7b34d6325451ef96bc0e36e1a6c0c1c64bc1fbec4b854f4529e51887b1621" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.1.1" }, "packaging": { "hashes": [ - "sha256:24e0da08660a87484d1602c30bb4902d74816b6985b93de36926f5bc95741858", - "sha256:78598185a7008a470d64526a8059de9aaa449238f280fc9eb6b13ba6c4109093" + "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5", + "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==20.8" + "version": "==20.9" }, "pluggy": { "hashes": [ @@ -1641,11 +1632,11 @@ }, "pygments": { "hashes": [ - "sha256:bc9591213a8f0e0ca1a5e68a479b4887fdc3e75d0774e5c71c31920c427de435", - "sha256:df49d09b498e83c1a73128295860250b0b7edd4c723a32e9bc0d295c7c2ec337" + "sha256:37a13ba168a02ac54cc5891a42b1caec333e59b66addb7fa633ea8a6d73445c0", + "sha256:b21b072d0ccdf29297a82a2363359d99623597b8a265b8081760e4d0f7153c88" ], "markers": "python_version >= '3.5'", - "version": "==2.7.4" + "version": "==2.8.0" }, "pyparsing": { "hashes": [ @@ -1706,11 +1697,11 @@ }, "pytest-xdist": { "hashes": [ - "sha256:1d8edbb1a45e8e1f8e44b1260583107fc23f8bc8da6d18cb331ff61d41258ecf", - "sha256:f127e11e84ad37cc1de1088cb2990f3c354630d428af3f71282de589c5bb779b" + "sha256:2447a1592ab41745955fb870ac7023026f20a5f0bfccf1b52a879bd193d46450", + "sha256:718887296892f92683f6a51f25a3ae584993b06f7076ce1e1fd482e59a8220a2" ], "index": "pypi", - "version": "==2.2.0" + "version": "==2.2.1" }, "python-dateutil": { "hashes": [ @@ -1722,10 +1713,10 @@ }, "pytz": { "hashes": [ - "sha256:16962c5fb8db4a8f63a26646d8886e9d769b6c511543557bc84e9569fb9a9cb4", - "sha256:180befebb1927b16f6b57101720075a984c019ac16b1b7575673bea42c6c3da5" + "sha256:83a4a90894bf38e243cf052c8b58f381bfe9a7a483f6a9cab140bc7f702ac4da", + "sha256:eb10ce3e7736052ed3623d49975ce333bcd712c7bb19a58b9e2089d4057d0798" ], - "version": "==2020.5" + "version": "==2021.1" }, "requests": { "hashes": [ @@ -1838,20 +1829,11 @@ }, "tox": { "hashes": [ - "sha256:76df3db6eee929bb62bdbacca5bb6bc840669d98e86a015b7a57b7df0a6eaf8b", - "sha256:854e6e4a71c614b488f81cb88df3b92edcb1a9ec43d4102e6289e9669bbf7f18" + "sha256:89afa9c59c04beb55eda789c7a65feb1a70fde117f85f1bd1c27c66758456e60", + "sha256:ed1e650cf6368bcbc4a071eeeba363c480920e0ed8a9ad1793c7caaa5ad33d49" ], "index": "pypi", - "version": "==3.21.3" - }, - "typing-extensions": { - "hashes": [ - "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918", - "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c", - "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f" - ], - "markers": "python_version < '3.8'", - "version": "==3.7.4.3" + "version": "==3.22.0" }, "urllib3": { "hashes": [ @@ -1863,19 +1845,11 @@ }, "virtualenv": { "hashes": [ - "sha256:219ee956e38b08e32d5639289aaa5bd190cfbe7dafcb8fa65407fca08e808f9c", - "sha256:227a8fed626f2f20a6cdb0870054989f82dd27b2560a911935ba905a2a5e0034" + "sha256:147b43894e51dd6bba882cf9c282447f780e2251cd35172403745fc381a0a80d", + "sha256:2be72df684b74df0ea47679a7df93fd0e04e72520022c57b479d8f881485dbe3" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==20.4.0" - }, - "zipp": { - "hashes": [ - "sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108", - "sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb" - ], - "markers": "python_version >= '3.6'", - "version": "==3.4.0" + "version": "==20.4.2" } } } diff --git a/README.md b/README.md index cb866e2ca..b21173ba5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ [![ci](https://github.com/jonaswinkler/paperless-ng/workflows/ci/badge.svg)](https://github.com/jonaswinkler/paperless-ng/actions) +![Ansible Role](https://github.com/jonaswinkler/paperless-ng/workflows/Ansible%20Role/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) @@ -6,15 +7,16 @@ # Paperless-ng -[Paperless](https://github.com/the-paperless-project/paperless) is an application by Daniel Quinn and contributors that indexes your scanned documents and allows you to easily search for documents and store metadata alongside your documents. +[Paperless (click me)](https://github.com/the-paperless-project/paperless) is an application by Daniel Quinn and contributors that indexes your scanned documents and allows you to easily search for documents and store metadata alongside your documents. -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 [change log](https://paperless-ng.readthedocs.io/en/latest/changelog.html) in the documentation. +Paperless-ng is a fork of the original project, adding a new interface and many other changes under the hood. These key points should help you decide whether Paperless-ng is something you would prefer over Paperless: -# Survey +* Interface: The new front end is the main interface for paperless-ng, the old interface still exists but most customizations (such as thumbnails for the document list) have been removed. +* Encryption: Paperless-ng does not support GnuPG anymore, since storing your data on encrypted file systems (that you optionally mount on demand) achieves about the same result. +* Resource usage: Paperless-ng does use a bit more resources than Paperless. Running the web server requires about 300MB of RAM or more, depending on the configuration. While adding documents, it requires about 300MB additional RAM, depending on the document. It still runs on Pi (many users do that), but it has been generally geared to better use the resources of more powerful systems. +* API changes: If you rely on the REST API of paperless, some of its functionality has been changed. -If you already used Paperless-ng for a bit, would like to give some anonymous feedback, and help me decide on what to focus on next: I've created a survey, [see here](https://github.com/jonaswinkler/paperless-ng/issues/402). Thank you! - -*See also [Feature Requests](#feature-requests)* +For a detailed list of changes, have a look at the [change log](https://paperless-ng.readthedocs.io/en/latest/changelog.html) in the documentation. # How it Works @@ -37,8 +39,8 @@ Here's what you get: * Performs OCR on your documents, adds selectable text to image only documents and adds tags, correspondents and document types to your documents. * Supports PDF documents, images, plain text files, and Office documents (Word, Excel, Powerpoint, and LibreOffice equivalents). * Office document support is optional and provided by Apache Tika (see [configuration](https://paperless-ng.readthedocs.io/en/latest/configuration.html#tika-settings)) -* Paperless stores your documents plain on disk. Filenames and folders are managed by paperless and can be configured freely. -* Single page application front end. Should be pretty snappy. Will be mobile friendly in the future. +* Paperless stores your documents plain on disk. Filenames and folders are managed by paperless and their format can be configured freely. +* Single page application front end. * Includes a dashboard that shows basic statistics and has document upload. * Filtering by tags, correspondents, types, and more. * Customizable views can be saved and displayed on the dashboard. @@ -49,14 +51,13 @@ Here's what you get: * Searching for similar documents ("More like this") * Email processing: Paperless adds documents from your email accounts. * Configure multiple accounts and filters for each account. - * When adding documents from mails, paperless can move these mails to a new folder, mark them as read, flag them or delete them. + * When adding documents from mail, paperless can move these mail to a new folder, mark them as read, flag them as important or delete them. * Machine learning powered document matching. * 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. +* Optimized for multi core systems: Paperless-ng consumes multiple documents in parallel. +* The integrated sanity checker makes sure that your document archive is in good health. -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) +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). # Getting started @@ -76,9 +77,9 @@ The documentation for Paperless-ng is available on [ReadTheDocs](https://paperle # Translation -Paperless is currently available in English, German, Dutch and French. Translation is coordinated at transifex: https://www.transifex.com/paperless/paperless-ng +Paperless is currently available in English, German, Dutch, French, and Portuguese. -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. +There's an active translation project at transifex! If you want to help out by translating paperless into your language, please head over to https://github.com/jonaswinkler/paperless-ng/issues/212 for details. # Feature Requests @@ -108,4 +109,4 @@ These projects also exist, but their status and compatibility with paperless-ng # Important Note -Document scanners are typically used to scan sensitive documents. Things like your social insurance number, tax records, invoices, etc. Everything is stored in the clear without encryption by default (it needs to be searchable, so if someone has ideas on how to do that on encrypted data, I'm all ears). This means that Paperless should never be run on an untrusted host. Instead, I recommend that if you do want to use it, run it locally on a server in your own home. +Document scanners are typically used to scan sensitive documents. Things like your social insurance number, tax records, invoices, etc. Everything is stored in the clear without encryption. This means that Paperless should never be run on an untrusted host. Instead, I recommend that if you do want to use it, run it locally on a server in your own home. diff --git a/ansible/README.md b/ansible/README.md index 6cd9e9f9b..0940cf072 100644 --- a/ansible/README.md +++ b/ansible/README.md @@ -107,7 +107,7 @@ Example Playbook paperlessng_db_type: postgresql paperlessng_db_pass: PLEASEPROVIDEASTRONGPASSWORDHERE - paperless_secret_key: AGAINPLEASECHANGETHISNOW + paperlessng_secret_key: AGAINPLEASECHANGETHISNOW paperlessng_ocr_languages: - eng diff --git a/ansible/defaults/main.yml b/ansible/defaults/main.yml index aaeffa507..f1cbb8f88 100644 --- a/ansible/defaults/main.yml +++ b/ansible/defaults/main.yml @@ -23,14 +23,14 @@ 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 +paperlessng_secret_key: PLEASECHANGETHISFORTHELOVEOFGOD +paperlessng_allowed_hosts: "*" +paperlessng_cors_allowed_hosts: http://localhost:8000 +paperlessng_force_script_name: +paperlessng_static_url: /static/ +paperlessng_auto_login_username: +paperlessng_cookie_prefix: "" +paperlessng_enable_http_remote_user: False # OCR settings paperlessng_ocr_languages: diff --git a/ansible/molecule/default/verify.yml b/ansible/molecule/default/verify.yml index 185840783..7646b223e 100644 --- a/ansible/molecule/default/verify.yml +++ b/ansible/molecule/default/verify.yml @@ -38,7 +38,7 @@ - name: verify uploaded document has been accepted uri: - url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/logs/" + url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/logs/paperless/" headers: Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}' return_content: yes @@ -51,7 +51,7 @@ - name: verify uploaded document has been consumed uri: - url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/logs/" + url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/logs/paperless/" headers: Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}' return_content: yes diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml index 6857a7c63..bfaf8df17 100644 --- a/ansible/tasks/main.yml +++ b/ansible/tasks/main.yml @@ -15,7 +15,6 @@ - imagemagick - optipng - gnupg - - libpoppler-cpp-dev - libpq-dev - libmagic-dev - mime-support @@ -286,21 +285,21 @@ line: "PAPERLESS_FILENAME_FORMAT={{ paperlessng_filename_format }}" # Hosting & Security - regexp: PAPERLESS_SECRET_KEY - line: "PAPERLESS_SECRET_KEY={{ paperless_secret_key }}" + line: "PAPERLESS_SECRET_KEY={{ paperlessng_secret_key }}" - regexp: PAPERLESS_ALLOWED_HOSTS - line: "PAPERLESS_ALLOWED_HOSTS={{ paperless_allowed_hosts }}" + line: "PAPERLESS_ALLOWED_HOSTS={{ paperlessng_allowed_hosts }}" - regexp: PAPERLESS_CORS_ALLOWED_HOSTS - line: "PAPERLESS_CORS_ALLOWED_HOSTS={{ paperless_cors_allowed_hosts }}" + line: "PAPERLESS_CORS_ALLOWED_HOSTS={{ paperlessng_cors_allowed_hosts }}" - regexp: PAPERLESS_FORCE_SCRIPT_NAME - line: "PAPERLESS_FORCE_SCRIPT_NAME={{ paperless_force_script_name }}" + line: "PAPERLESS_FORCE_SCRIPT_NAME={{ paperlessng_force_script_name }}" - regexp: PAPERLESS_STATIC_URL - line: "PAPERLESS_STATIC_URL={{ paperless_static_url }}" + line: "PAPERLESS_STATIC_URL={{ paperlessng_static_url }}" - regexp: PAPERLESS_AUTO_LOGIN_USERNAME - line: "PAPERLESS_AUTO_LOGIN_USERNAME={{ paperless_auto_login_username }}" + line: "PAPERLESS_AUTO_LOGIN_USERNAME={{ paperlessng_auto_login_username }}" - regexp: PAPERLESS_COOKIE_PREFIX - line: "PAPERLESS_COOKIE_PREFIX={{ paperless_cookie_prefix }}" + line: "PAPERLESS_COOKIE_PREFIX={{ paperlessng_cookie_prefix }}" - regexp: PAPERLESS_ENABLE_HTTP_REMOTE_USER - line: "PAPERLESS_ENABLE_HTTP_REMOTE_USER={{ paperless_enable_http_remote_user }}" + line: "PAPERLESS_ENABLE_HTTP_REMOTE_USER={{ paperlessng_enable_http_remote_user }}" # OCR settings - regexp: PAPERLESS_OCR_LANGUAGE line: "PAPERLESS_OCR_LANGUAGE={{ paperlessng_ocr_languages | join('+') }}" diff --git a/crowdin.yml b/crowdin.yml index f5a7765dd..0e6a46a31 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -1,5 +1,5 @@ files: - - source: /src/locale/en-us/LC_MESSAGES/django.po - translation: /src/locale/%two_letters_code%/LC_MESSAGES/django.po + - source: /src/locale/en_US/LC_MESSAGES/django.po + translation: /src/locale/%locale_with_underscore%/LC_MESSAGES/django.po - source: /src-ui/messages.xlf - translation: /src-ui/src/locale/messages.%two_letters_code%.xlf + translation: /src-ui/src/locale/messages.%locale_with_underscore%.xlf diff --git a/docker/install_management_commands.sh b/docker/install_management_commands.sh new file mode 100755 index 000000000..17fb8f277 --- /dev/null +++ b/docker/install_management_commands.sh @@ -0,0 +1,6 @@ +for command in document_archiver document_exporter document_importer mail_fetcher document_create_classifier document_index document_renamer document_retagger document_thumbnails document_sanity_checker; +do + echo "installing $command..." + sed "s/management_command/$command/g" management_script.sh > /usr/local/bin/$command + chmod +x /usr/local/bin/$command +done diff --git a/docker/management_script.sh b/docker/management_script.sh new file mode 100644 index 000000000..bffa26e98 --- /dev/null +++ b/docker/management_script.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +set -e + +cd /usr/src/paperless/src/ + +if [[ $(id -u) == 0 ]] ; +then + sudo -HEu paperless python3 manage.py management_command "$@" +elif [[ $(id -un) == "paperless" ]] ; +then + python3 manage.py management_command "$@" +else + echo "Unknown user." +fi diff --git a/docs/administration.rst b/docs/administration.rst index c54323e6e..c91f501bd 100644 --- a/docs/administration.rst +++ b/docs/administration.rst @@ -23,6 +23,12 @@ Options available to any installation of paperless: * The document exporter is also able to update an already existing export. Therefore, incremental backups with ``rsync`` are entirely possible. +.. caution:: + + You cannot import the export generated with one version of paperless in a + different version of paperless. The export contains an exact image of the + database, and migrations may change the database layout. + Options available to docker installations: * Backup the docker volumes. These usually reside within @@ -101,17 +107,17 @@ Then you can start paperless-ng with ``-d`` to have it run in the background. 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``: .. code:: image: jonaswinkler/paperless-ng:latest - + Bare Metal Route ================ @@ -171,26 +177,63 @@ Most of the update process is automated when using the ansible role. $ ansible-playbook playbook.yml +Downgrading Paperless +##################### + +Downgrades are possible. However, some updates also contain database migrations (these change the layout of the database and may move data). +In order to move back from a version that applied database migrations, you'll have to revert the database migration *before* downgrading, +and then downgrade paperless. + +This table lists the most recent database migrations for each versions: + ++---------+-------------------------+ +| Version | Latest migration number | ++---------+-------------------------+ +| 1.0.0 | 1011 | ++---------+-------------------------+ +| 1.1.0 | 1011 | ++---------+-------------------------+ +| 1.1.1 | 1012 | ++---------+-------------------------+ + +Execute the following management command to migrate your database: + +.. code:: shell-session + + $ python3 manage.py migrate documents + +.. note:: + + Some migrations cannot be undone. The command will issue errors if that happens. + +.. _utilities-management-commands: + Management utilities #################### Paperless comes with some management commands that perform various maintenance -tasks on your paperless instance. You can invoke these commands either by +tasks on your paperless instance. You can invoke these commands in the following way: + +With docker-compose, while paperless is running: .. code:: shell-session $ cd /path/to/paperless - $ docker-compose run --rm webserver + $ docker-compose exec webserver -or +With docker, while paperless is running: + +.. code:: shell-session + + $ docker exec -it + +Bare metal: .. code:: shell-session $ cd /path/to/paperless/src $ python3 manage.py -depending on whether you use docker or not. - All commands have built-in help, which can be accessed by executing them with the argument ``--help``. @@ -210,7 +253,7 @@ backup or migration to another DMS. -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). @@ -367,6 +410,34 @@ the naming scheme. The command takes no arguments and processes all your documents at once. +.. _utilities-sanity-checker: + +Sanity checker +============== + +Paperless has a built-in sanity checker that inspects your document collection for issues. + +The issues detected by the sanity checker are as follows: + +* Missing original files. +* Missing archive files. +* Inaccessible original files due to improper permissions. +* Inaccessible archive files due to improper permissions. +* Corrupted original documents by comparing their checksum against what is stored in the database. +* Corrupted archive documents by comparing their checksum against what is stored in the database. +* Missing thumbnails. +* Inaccessible thumbnails due to improper permissions. +* Documents without any content (warning). +* Orphaned files in the media directory (warning). These are files that are not referenced by any document im paperless. + + +.. code:: + + document_sanity_checker + +The command takes no arguments. Depending on the size of your document archive, this may take some time. + + Fetching e-mail =============== diff --git a/docs/advanced_usage.rst b/docs/advanced_usage.rst index 8f6b91b4c..c64df4317 100644 --- a/docs/advanced_usage.rst +++ b/docs/advanced_usage.rst @@ -217,6 +217,7 @@ will create a directory structure as follows: Paperless provides the following placeholders withing filenames: +* ``{asn}``: The archive serial number of the document, or "none". * ``{correspondent}``: The name of the correspondent, or "none". * ``{document_type}``: The name of the document type, or "none". * ``{tag_list}``: A comma separated list of all tags assigned to the document. diff --git a/docs/changelog.rst b/docs/changelog.rst index 1da8621bb..137fa2fd2 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -5,6 +5,106 @@ Changelog ********* +paperless-ng 1.2.1 +################## + +* `Rodrigo Avelino `_ translated Paperless into Portuguese (Brazil). + +* The date input fields now respect the currently selected date format. + +* Added a fancy icon when adding paperless to the home screen on iOS devices. Thanks to `Joel Nordell `_. + +* When using regular expression matching, the regular expression is now validated before saving the tag/correspondent/type. + +paperless-ng 1.2.0 +################## + +* Changes to the OCRmyPDF integration + + * Added support for deskewing and automatic rotation of incorrectly rotated pages. This is enabled by default, see :ref:`configuration-ocr`. + * Better support for encrypted files. + * Better support for various other PDF files: Paperless will now attempt to force OCR with safe options when OCR fails with the configured options. + * Added an explicit option to skip cleaning with ``unpaper``. + +* Download multiple selected documents as a zip archive. + +* The document list now remembers the current page. + +* Improved responsiveness when switching between saved views and the document list. + +* Increased the default wait time when observing files in the consumption folder + with polling from 1 to 5 seconds. This will decrease the likelihood of paperless + consuming partially written files. + +* Fixed a crash of the document archiver management command when trying to process documents with unknown mime types. + +* Paperless no longer depends on ``libpoppler-cpp-dev``. + +.. note:: + + Some packages that paperless depends on are slowly dropping Python 3.6 + support one after another, including the web server. Supporting Python + 3.6 means that I cannot update these packages anymore. + + At some point, paperless will drop Python 3.6 support. If using a bare + metal installation and you're still on Python 3.6, upgrade to 3.7 or newer. + + If using docker, this does not affect you. + +paperless-ng 1.1.4 +################## + +* Added English (GB) locale. + +* Added ISO-8601 date display option. + +paperless-ng 1.1.3 +################## + +* Added a docker-specific configuration option to adjust the number of + worker processes of the web server. See :ref:`configuration-docker`. + +* Some more memory usage optimizations. + +* Don't show inbox statistics if no inbox tag is defined. + +paperless-ng 1.1.2 +################## + +* Always show top left corner of thumbnails, even for extra wide documents. + +* Added a management command for executing the sanity checker directly. + See :ref:`utilities-sanity-checker`. + +* The weekly sanity check now reports messages in the log files. + +* Fixed an issue with the metadata tab not reporting anything in case of missing files. + +* Reverted a change from 1.1.0 that caused huge memory usage due to redis caching. + +* Some memory usage optimizations. + +paperless-ng 1.1.1 +################## + +This release contains new database migrations. + +* Fixed a bug in the sanity checker that would cause it to display "x not in list" errors instead of actual issues. + +* Fixed a bug with filename generation for archive filenames that would cause the archive files of two documents to overlap. + + * This happened when ``PAPERLESS_FILENAME_FORMAT`` is used and the filenames of two or more documents are the same, except for the file extension. + * Paperless will now store the archive filename in the database as well instead of deriving it from the original filename, and use the + same logic for detecting and avoiding filename clashes that's also used for original filenames. + * The migrations will repair any missing archive files. If you're using tika, ensure that tika is running while performing the migration. Docker-compose will take care of that. + +* Fixed a bug with thumbnail regeneration when TIKA integration was used. + +* Added ASN as a placeholder field to the filename format. + +* The docker image now comes with built-in shortcuts for most management commands. These are now the recommended way to execute management commands, since these + also ensure that they're always executed as the paperless user and you're less likely to run into permission issues. See :ref:`utilities-management-commands`. + paperless-ng 1.1.0 ################## @@ -17,7 +117,7 @@ paperless-ng 1.1.0 or added with one of the mobile apps. * Documents are successfully added to paperless. * Document consumption failed (with error messages) - + * Configuration options to enable/disable individual notifications. * Live updates to document lists and saved views when new documents are added. @@ -37,6 +137,8 @@ paperless-ng 1.1.0 Paperless will continue to work with WSGI, but you will not get any status notifications. + Apache ``mod_wsgi`` users, see :ref:`this note `. + * Paperless now offers suggestions for tags, correspondents and types on the document detail page. * Added an interactive easy install script that automatically downloads, configures and starts paperless with docker. @@ -56,6 +158,13 @@ paperless-ng 1.1.0 * Better info section in the side bar. + * Paperless no longer logs to the database. Instead, logs are written to rotating log files. This solves many "database is locked" + issues on Raspberry Pi, especially when SQLite is used. + + * By default, log files are written to ``PAPERLESS_DATA_DIR/log/``. Logging settings can be adjusted with + ``PAPERLESS_LOGGING_DIR``, ``PAPERLESS_LOGROTATE_MAX_SIZE`` and + ``PAPERLESS_LOGROTATE_MAX_BACKUPS``. + paperless-ng 1.0.0 ################## diff --git a/docs/conf.py b/docs/conf.py index b2442ddc9..71abe2079 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -28,7 +28,7 @@ master_doc = 'index' # General information about the project. project = u'Paperless-ng' -copyright = u'2015, Daniel Quinn' +copyright = u'2021, Daniel Quinn, Jonas Winkler' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/docs/configuration.rst b/docs/configuration.rst index 36b124350..e26180382 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -72,13 +72,13 @@ PAPERLESS_CONSUMPTION_DIR= container. Change the local consumption directory in the docker-compose.yml file instead. - Defaults to "../consume", relative to the "src" directory. + Defaults to "../consume/", relative to the "src" directory. PAPERLESS_DATA_DIR= This is where paperless stores all its data (search index, SQLite database, classification model, etc). - Defaults to "../data", relative to the "src" directory. + Defaults to "../data/", relative to the "src" directory. PAPERLESS_MEDIA_ROOT= This is where your documents and thumbnails are stored. @@ -86,7 +86,7 @@ PAPERLESS_MEDIA_ROOT= You can set this and PAPERLESS_DATA_DIR to the same folder to have paperless store all its data within the same volume. - Defaults to "../media", relative to the "src" directory. + Defaults to "../media/", relative to the "src" directory. PAPERLESS_STATICDIR= Override the default STATIC_ROOT here. This is where all static files @@ -94,7 +94,7 @@ PAPERLESS_STATICDIR= Unless you're doing something fancy, there is no need to override this. - Defaults to "../static", relative to the "src" directory. + Defaults to "../static/", relative to the "src" directory. PAPERLESS_FILENAME_FORMAT= Changes the filenames paperless uses to store documents in the media directory. @@ -102,6 +102,25 @@ PAPERLESS_FILENAME_FORMAT= Default is none, which disables this feature. +PAPERLESS_LOGGING_DIR= + This is where paperless will store log files. + + Defaults to "``PAPERLESS_DATA_DIR``/log/". + + +Logging +####### + +PAPERLESS_LOGROTATE_MAX_SIZE= + Maximum file size for log files before they are rotated, in bytes. + + Defaults to 1 MiB. + +PAPERLESS_LOGROTATE_MAX_BACKUPS= + Number of rotated log files to keep. + + Defaults to 20. + Hosting & Security ################## @@ -183,7 +202,6 @@ Paperless uses `OCRmyPDF `_ for performing OCR on documents and images. Paperless uses sensible defaults for most settings, but all of them can be configured to your needs. - PAPERLESS_OCR_LANGUAGE= Customize the language that paperless will attempt to use when parsing documents. @@ -226,6 +244,54 @@ PAPERLESS_OCR_MODE= The default is ``skip``, which only performs OCR when necessary and always creates archived documents. + Read more about this in the `OCRmyPDF documentation `_. + +PAPERLESS_OCR_CLEAN= + Tells paperless to use ``unpaper`` to clean any input document before + sending it to tesseract. This uses more resources, but generally results + in better OCR results. The following modes are available: + + * ``clean``: Apply unpaper. + * ``clean-final``: Apply unpaper, and use the cleaned images to build the + output file instead of the original images. + * ``none``: Do not apply unpaper. + + Defaults to ``clean``. + + .. note:: + + ``clean-final`` is incompatible with ocr mode ``redo``. When both + ``clean-final`` and the ocr mode ``redo`` is configured, ``clean`` + is used instead. + +PAPERLESS_OCR_DESKEW= + Tells paperless to correct skewing (slight rotation of input images mainly + due to improper scanning) + + Defaults to ``true``, which enables this feature. + + .. note:: + + Deskewing is incompatible with ocr mode ``redo``. Deskewing will get + disabled automatically if ``redo`` is used as the ocr mode. + +PAPERLESS_OCR_ROTATE_PAGES= + Tells paperless to correct page rotation (90°, 180° and 270° rotation). + + If you notice that paperless is not rotating incorrectly rotated + pages (or vice versa), try adjusting the threshold up or down (see below). + + Defaults to ``true``, which enables this feature. + + +PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD= + Adjust the threshold for automatic page rotation by ``PAPERLESS_OCR_ROTATE_PAGES``. + This is an arbitrary value reported by tesseract. "15" is a very conservative value, + whereas "2" is a very aggressive option and will often result in correctly rotated pages + being rotated as well. + + Defaults to "12". + PAPERLESS_OCR_OUTPUT_TYPE= Specify the the type of PDF documents that paperless should produce. @@ -252,7 +318,6 @@ PAPERLESS_OCR_PAGES= Defaults to 0, which disables this feature and always uses all pages. - PAPERLESS_OCR_IMAGE_DPI= Paperless will OCR any images you put into the system and convert them into PDF documents. This is useful if your scanner produces images. @@ -263,8 +328,8 @@ PAPERLESS_OCR_IMAGE_DPI= Set this to the DPI your scanner produces images at. - Default is none, which causes paperless to fail if no DPI information is - present in an image. + Default is none, which will automatically calculate image DPI so that + the produced PDF documents are A4 sized. PAPERLESS_OCR_USER_ARGS= @@ -273,7 +338,7 @@ PAPERLESS_OCR_USER_ARGS= the API of OCRmyPDF, you have to specify these in a format that can be passed to the API. See `the API reference of OCRmyPDF `_ for valid parameters. All command line options are supported, but they - use underscores instead of dashed. + use underscores instead of dashes. .. caution:: @@ -333,7 +398,7 @@ requires are as follows: PAPERLESS_TIKA_ENABLED: 1 PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000 PAPERLESS_TIKA_ENDPOINT: http://tika:9998 - + # ... gotenberg: @@ -536,3 +601,65 @@ PAPERLESS_GS_BINARY= PAPERLESS_OPTIPNG_BINARY= Defaults to "/usr/bin/optipng". + + +.. _configuration-docker: + +Docker-specific options +####################### + +These options don't have any effect in ``paperless.conf``. These options adjust +the behavior of the docker container. Configure these in `docker-compose.env`. + +PAPERLESS_WEBSERVER_WORKERS= + The number of worker processes the webserver should spawn. More worker processes + usually result in the front end to load data much quicker. However, each worker process + also loads the entire application into memory separately, so increasing this value + will increase RAM usage. + + Consider configuring this to 1 on low power devices with limited amount of RAM. + + Defaults to 2. + +USERMAP_UID= + The ID of the paperless user in the container. Set this to your actual user ID on the + host system, which you can get by executing + + .. code:: shell-session + + $ id -u + + Paperless will change ownership on its folders to this user, so you need to get this right + in order to be able to write to the consumption directory. + + Defaults to 1000. + +USERMAP_GID= + The ID of the paperless Group in the container. Set this to your actual group ID on the + host system, which you can get by executing + + .. code:: shell-session + + $ id -g + + Paperless will change ownership on its folders to this group, so you need to get this right + in order to be able to write to the consumption directory. + + Defaults to 1000. + +PAPERLESS_OCR_LANGUAGES= + Additional OCR languages to install. By default, paperless comes with + English, German, Italian, Spanish and French. If your language is not in this list, install + additional languages with this configuration option: + + .. code:: bash + + PAPERLESS_OCR_LANGUAGES=tur ces + + To actually use these languages, also set the default OCR language of paperless: + + .. code:: bash + + PAPERLESS_OCR_LANGUAGE=tur + + Defaults to none, which does not install any additional languages. diff --git a/docs/extending.rst b/docs/extending.rst index b2ddf3d85..860106258 100644 --- a/docs/extending.rst +++ b/docs/extending.rst @@ -109,6 +109,30 @@ This will build the front end and put it in a location from which the Django ser it as static content. This way, you can verify that authentication is working. +Building the documentation +========================== + +The documentation is built using sphinx. I've configured ReadTheDocs to automatically build +the documentation when changes are pushed. If you want to build the documentation locally, +this is how you do it: + +1. Install python dependencies. + + .. code:: shell-session + + $ cd /path/to/paperless + $ pipenv install --dev + +2. Build the documentation + + .. code:: shell-session + + $ cd /path/to/paperless/docs + $ pipenv run make clean html + +This will build the HTML documentation, and put the resulting files in the ``_build/html`` +directory. + Extending Paperless =================== diff --git a/docs/faq.rst b/docs/faq.rst index e41f9aace..0f4527d62 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -62,9 +62,9 @@ file extensions do not matter. **A:** The short answer is yes. I've tested it on a Raspberry Pi 3 B. The long answer is that certain parts of -Paperless will run very slow, such as the tesseract OCR. On Raspberry Pi, +Paperless will run very slow, such as the OCR. On Raspberry Pi, try to OCR documents before feeding them into paperless so that paperless can -reuse the text. The web interface should be a lot snappier, since it runs +reuse the text. The web interface is a lot snappier, since it runs in your browser and paperless has to do much less work to serve the data. .. note:: @@ -76,7 +76,14 @@ 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:** Docker images are available for arm and arm64 hardware, so just follow -the docker-compose instructions, or go the bare metal route. +the docker-compose instructions. Apart from more required disk space compared to +a bare metal installation, docker comes with close to zero overhead, even on +Raspberry Pi. + +If you decide to got with the bare metal route, be aware that some of the +python requirements do not have precompiled packages for ARM / ARM64. Installation +of these will require additional development libraries and compilation will take +a long time. **Q:** *How do I run this on unRaid?* @@ -95,12 +102,21 @@ occasionally build the image on and see if it works. **Q:** *How do I proxy this with NGINX?* -.. code:: +**A:** See :ref:`here `. - location / { - proxy_pass http://localhost:8000/ - } +.. _faq-mod_wsgi: -And that's about it. Paperless serves everything, including static files by itself -when running the docker image. If you want to do anything fancy, you have to -install paperless bare metal. +**Q:** *How do I get WebSocket support with Apache mod_wsgi*? + +**A:** ``mod_wsgi`` by itself does not support ASGI. Paperless will continue +to work with WSGI, but certain features such as status notifications about +document consumption won't be available. + +If you want to continue using ``mod_wsgi``, you will have to run an ASGI-enabled +web server as well that processes WebSocket connections, and configure Apache to +redirect WebSocket connections to this server. Multiple options for ASGI servers +exist: + +* ``gunicorn`` with ``uvicorn`` as the worker implementation (the default of paperless) +* ``daphne`` as a standalone server, which is the reference implementation for ASGI. +* ``uvicorn`` as a standalone server diff --git a/docs/index.rst b/docs/index.rst index a083fb3d1..4035d822e 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -70,8 +70,8 @@ Contents configuration api faq - extending troubleshooting + extending contributing scanners screenshots diff --git a/docs/setup.rst b/docs/setup.rst index eda03550e..69cb2bc97 100644 --- a/docs/setup.rst +++ b/docs/setup.rst @@ -81,6 +81,7 @@ Installation You can go multiple routes to setup and run Paperless: +* :ref:`Use the easy install docker script ` * :ref:`Pull the image from Docker Hub ` * :ref:`Build the Docker image yourself ` * :ref:`Install Paperless directly on your system manually (bare metal) ` @@ -101,6 +102,24 @@ it includes the same sensible defaults, and it simultaneously provides the flexi .. _CLI Basics: https://sehn.tech/post/devops-with-docker/ .. _idempotent: https://docs.ansible.com/ansible/latest/reference_appendices/glossary.html#Idempotency +.. _setup-docker_script: + +Install Paperless from Docker Hub using the installation script +=============================================================== + +Paperless provides an interactive installation script. This script will ask you +for a couple configuration options, download and create the necessary configuration files, pull the docker image, start paperless and create your user account. This script essentially +performs all the steps described in :ref:`setup-docker_hub` automatically. + +1. Make sure that docker and docker-compose are installed. +2. Download and run the installation script: + + .. code:: shell-session + + $ wget https://raw.githubusercontent.com/jonaswinkler/paperless-ng/master/install-paperless-ng.sh + $ chmod +x install-paperless-ng.sh + $ ./install-paperless-ng.sh + .. _setup-docker_hub: Install Paperless from Docker Hub @@ -157,7 +176,10 @@ Install Paperless from Docker Hub 5. 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 + to the uid and gid of your user on the host system. Use ``id -u`` and + ``id -g`` to get these. + + This ensures that both the docker container and you on the host machine have write access to the consumption directory. If your UID and GID on the host system is 1000 (the default for the first normal user on most systems), it will @@ -176,14 +198,10 @@ Install Paperless from Docker Hub with the default configuration. You will need to use ``PAPERLESS_CONSUMER_POLLING``, which will disable inotify. See :ref:`here `. -6. Now head over to: https://hub.docker.com/r/jonaswinkler/paperless-ng and choose your preferred - image and copy the link. To download this image do a `docker pull` followed by the link. Do this within the directory with the .yml files. - Depending on your network connection and CPU this will take a while. You have time to get a beverage. +6. Run ``docker-compose pull``, followed by ``docker-compose up -d``. + This will pull the image, create and start the necessary containers. -7. Run ``docker-compose up -d``. This will create and start the necessary - containers, but your are not done yet! - -8. To be able to login, you will need a super user. To create it, execute the +7. To be able to login, you will need a super user. To create it, execute the following command: .. code-block:: shell-session @@ -193,8 +211,8 @@ Install Paperless from Docker Hub This will prompt you to set a username, an optional e-mail address and finally a password (at least 8 characters). -9. 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 +8. The default ``docker-compose.yml`` exports the webserver on your local port + 8000. If you did not change this, you should now be able to visit your Paperless instance at ``http://127.0.0.1:8000`` or your servers IP-Address:8000. Use the login credentials you have created with the previous step. @@ -203,7 +221,7 @@ Install Paperless from Docker Hub .. _setup-docker_build: -Build the docker image yourself +Build the Docker image yourself =============================== 1. Clone the entire repository of paperless: @@ -234,14 +252,14 @@ Build the docker image yourself 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 +5. Follow steps 3 to 8 of :ref:`setup-docker_hub`. When asked to run + ``docker-compose pull`` to pull the image, do .. code:: shell-session $ docker-compose build - before that to build the image. + instead to build the image. .. _setup-bare_metal: @@ -262,7 +280,6 @@ writing. Windows is not and will never be supported. * ``imagemagick`` >= 6 for PDF conversion * ``optipng`` for optimizing thumbnails * ``gnupg`` for handling encrypted documents - * ``libpoppler-cpp-dev`` for PDF to text conversion * ``libpq-dev`` for PostgreSQL * ``libmagic-dev`` for mime type detection * ``mime-support`` for mime type detection @@ -291,7 +308,7 @@ writing. Windows is not and will never be supported. 2. Install ``redis`` >= 5.0 and configure it to start automatically. 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. + to use PostgreSQL, SQLite is available as well. 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. @@ -315,8 +332,14 @@ writing. Windows is not and will never be supported. * Set ``PAPERLESS_OCR_LANGUAGE`` to the language most of your documents are written in. * Set ``PAPERLESS_TIME_ZONE`` to your local time zone. -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 +6. Create a system user under which you wish to run paperless. + + .. code:: shell-session + + adduser paperless --system --home /opt/paperless --group + +7. Ensure that these directories exist + and that the paperless user has write permissions to the following directories: * ``/opt/paperless/media`` * ``/opt/paperless/data`` @@ -324,30 +347,32 @@ writing. Windows is not and will never be supported. Adjust as necessary if you configured different folders. -7. Install python requirements from the ``requirements.txt`` file. +8. Install python requirements from the ``requirements.txt`` file. It is up to you if you wish to use a virtual environment or not. .. code:: shell-session - pip3 install -r requirements.txt + sudo -Hu paperless pip3 install -r requirements.txt + This will install all python dependencies in the home directory of + the new paperless user. -8. Go to ``/opt/paperless/src``, and execute the following commands: +9. Go to ``/opt/paperless/src``, and execute the following commands: .. code:: bash # This creates the database schema. - python3 manage.py migrate + sudo -Hu paperless python3 manage.py migrate # This creates your first paperless user - python3 manage.py createsuperuser + sudo -Hu paperless python3 manage.py createsuperuser -9. Optional: Test that paperless is working by executing +10. Optional: Test that paperless is working by executing .. code:: bash # This collects static files from paperless and django. - python3 manage.py runserver + sudo -Hu paperless python3 manage.py runserver and pointing your browser to http://localhost:8000/. @@ -362,7 +387,7 @@ writing. Windows is not and will never be supported. This will not start the consumer. Paperless does this in a separate process. -10. Setup systemd services to run paperless automatically. You may +11. Setup systemd services to run paperless automatically. You may use the service definition files included in the ``scripts`` folder as a starting point. @@ -378,14 +403,7 @@ writing. Windows is not and will never be supported. These services rely on redis and optionally the database server, but don't need to be started in any particular order. The example files depend on redis being started. If you use a database server, you should - add additinal dependencies. - - .. hint:: - - You may optionally set up your preferred web server to serve - paperless as a wsgi application directly instead of running the - ``webserver`` service. The module containing the wsgi application - is named ``paperless.wsgi``. + add additional dependencies. .. caution:: @@ -394,10 +412,13 @@ writing. Windows is not and will never be supported. however, the documentation of GUnicorn states that you should use a proxy server in front of gunicorn instead. -11. Optional: Install a samba server and make the consumption folder + For instructions on how to use nginx for that, + :ref:`see the instructions below `. + +12. Optional: Install a samba server and make the consumption folder available as a network share. -12. Configure ImageMagick to allow processing of PDF documents. Most distributions have +13. Configure ImageMagick to allow processing of PDF documents. Most distributions have this disabled by default, since PDF documents can contain malware. If you don't do this, paperless will fall back to ghostscript for certain steps such as thumbnail generation. @@ -414,7 +435,7 @@ writing. Windows is not and will never be supported. -13. Optional: Install the `jbig2enc `_ +14. 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. @@ -423,9 +444,10 @@ writing. Windows is not and will never be supported. Install Paperless using ansible =============================== - .. note:: - This role currently only supports Debian 10 Buster and Ubuntu 20.04 Focal or later as target hosts. +.. 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. @@ -462,7 +484,7 @@ Install Paperless using ansible .. code:: sh cd paperless-ng - git checkout ng-0.9.14 + git checkout ng-1.0.0 3. Create an ansible ``playbook.yml`` in the paperless-ng root directory: @@ -512,7 +534,7 @@ Install Paperless using ansible .. code:: yaml - paperless_secret_key: PleaseGenerateAStrongKeyForThis + paperlessng_secret_key: PleaseGenerateAStrongKeyForThis paperlessng_superuser_name: YourUserName paperlessng_superuser_email: name@domain.tld @@ -570,7 +592,7 @@ 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 from `here `_ + 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. @@ -740,7 +762,8 @@ configuring some options in paperless can help improve performance immensely: * Stick with SQLite to save some resources. * Consider setting ``PAPERLESS_OCR_PAGES`` to 1, so that paperless will only OCR - the first page of your documents. + the first page of your documents. In most cases, this page contains enough + information to be able to find it. * ``PAPERLESS_TASK_WORKERS`` and ``PAPERLESS_THREADS_PER_WORKER`` are configured to use all cores. The Raspberry Pi models 3 and up have 4 cores, meaning that paperless will use 2 workers and 2 threads per worker. This may result in @@ -751,8 +774,13 @@ configuring some options in paperless can help improve performance immensely: your documents before feeding them into paperless. Some scanners are able to do this! You might want to even specify ``skip_noarchive`` to skip archive file generation for already ocr'ed documents entirely. +* If you want to perform OCR on the the device, consider using ``PAPERLESS_OCR_CLEAN=none``. + This will speed up OCR times and use less memory at the expense of slightly worse + OCR results. * Set ``PAPERLESS_OPTIMIZE_THUMBNAILS`` to 'false' if you want faster consumption times. Thumbnails will be about 20% larger. +* If using docker, consider setting ``PAPERLESS_WEBSERVER_WORKERS`` to + 1. This will save some memory. For details, refer to :ref:`configuration`. @@ -769,3 +797,46 @@ For details, refer to :ref:`configuration`. well as on any other device. .. _redis: https://redis.io/ + + +.. _setup-nginx: + +Using nginx as a reverse proxy +############################## + +If you want to expose paperless to the internet, you should hide it behind a +reverse proxy with SSL enabled. + +In addition to the usual configuration for SSL, +the following configuration is required for paperless to operate: + +.. code:: nginx + + http { + + # Adjust as required. This is the maximum size for file uploads. + # The default value 1M might be a little too small. + client_max_body_size 10M; + + server { + + location / { + + # Adjust host and port as required. + proxy_pass http://localhost:8000/; + + # These configuration options are required for WebSockets to work. + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Host $server_name; + } + } + } + +Also read `this `__, towards the end of the section. diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst index f55d57af5..d2a76e7b3 100644 --- a/docs/troubleshooting.rst +++ b/docs/troubleshooting.rst @@ -60,7 +60,8 @@ required so that the user running paperless inside docker has write permissions to these folders. This happens when pointing these directories to NFS shares, for example. -Ensure that `chown` is possible on these directories. +Ensure that ``chown`` is possible on these directories. + Classifier error: No training data available ############################################ @@ -73,6 +74,7 @@ This may have two reasons: with Inbox tags. Verify that there are documents in your archive without inbox tags. The algorithm will only learn from documents not in your inbox. + UserWarning in sklearn on every single document ############################################### @@ -91,6 +93,31 @@ in most cases. This warning will disappear automatically when paperless updates If you want to get rid of the warning or actually experience issues with automatic matching, delete the file ``classification_model.pickle`` in the data directory and let paperless recreate it. + +504 Server Error: Gateway Timeout when adding Office documents +############################################################## + +You may experience these errors when using the optional TIKA integration: + +.. code:: + + requests.exceptions.HTTPError: 504 Server Error: Gateway Timeout for url: http://gotenberg:3000/convert/office + +Gotenberg is a server that converts Office documents into PDF documents and has a default timeout of 10 seconds. +When conversion takes longer, Gotenberg raises this error. + +You can increase the timeout by configuring an environment variable for gotenberg (see also `here `__). +If using docker-compose, this is achieved by the following configuration change in the ``docker-compose.yml`` file: + +.. code:: yaml + + gotenberg: + image: thecodingmachine/gotenberg + restart: unless-stopped + environment: + DISABLE_GOOGLE_CHROME: 1 + DEFAULT_WAIT_TIMEOUT: 30 + Permission denied errors in the consumption directory ##################################################### @@ -106,6 +133,38 @@ 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. + +OSError: [Errno 19] No such device when consuming files +####################################################### + +If you experience errors such as: + +.. code:: shell-session + + File "/usr/local/lib/python3.7/site-packages/whoosh/codec/base.py", line 570, in open_compound_file + return CompoundStorage(dbfile, use_mmap=storage.supports_mmap) + File "/usr/local/lib/python3.7/site-packages/whoosh/filedb/compound.py", line 75, in __init__ + self._source = mmap.mmap(fileno, 0, access=mmap.ACCESS_READ) + OSError: [Errno 19] No such device + + During handling of the above exception, another exception occurred: + + Traceback (most recent call last): + File "/usr/local/lib/python3.7/site-packages/django_q/cluster.py", line 436, in worker + res = f(*task["args"], **task["kwargs"]) + File "/usr/src/paperless/src/documents/tasks.py", line 73, in consume_file + override_tag_ids=override_tag_ids) + File "/usr/src/paperless/src/documents/consumer.py", line 271, in try_consume_file + raise ConsumerError(e) + +Paperless uses a search index to provide better and faster full text searching. This search index is stored inside +the ``data`` folder. The search index uses memory-mapped files (mmap). The above error indicates that paperless +was unable to create and open these files. + +This happens when you're trying to store the data directory on certain file systems (mostly network shares) +that don't support memory-mapped files. + + Web-UI stuck at "Loading..." ############################ @@ -148,4 +207,4 @@ This might have multiple reasons. SENDFILE=0 - to your `docker-compose.env` file. \ No newline at end of file + to your `docker-compose.env` file. diff --git a/gunicorn.conf.py b/gunicorn.conf.py index 36bde9cf7..995b4fb9d 100644 --- a/gunicorn.conf.py +++ b/gunicorn.conf.py @@ -1,21 +1,9 @@ +import os + bind = '0.0.0.0:8000' -backlog = 2048 -workers = 3 +workers = int(os.getenv("PAPERLESS_WEBSERVER_WORKERS", 2)) worker_class = 'uvicorn.workers.UvicornWorker' -worker_connections = 1000 -timeout = 20 -keepalive = 2 -spew = False -daemon = False -pidfile = None -umask = 0 -user = None -group = None -tmp_upload_dir = None -loglevel = 'info' -errorlog = '-' -accesslog = '-' -proc_name = None +timeout = 120 def pre_fork(server, worker): pass diff --git a/install-paperless-ng.sh b/install-paperless-ng.sh index ad992fe8c..8fb44e222 100755 --- a/install-paperless-ng.sh +++ b/install-paperless-ng.sh @@ -15,7 +15,7 @@ ask() { fi array=$3 if [[ -z $3 || " ${array[@]} " =~ " ${result} " ]]; then - ask_result=$result + ask_result=$result return else echo "Invalid option: $result" @@ -23,6 +23,47 @@ ask() { done } +ask_docker_folder() { + while true ; do + + read -p "$1 [$2]: " result + + if [[ -z $result ]]; then + ask_result=$2 + return + fi + + if [[ $result == /* || $result == ./* ]]; then + ask_result=$result + return + else + echo "Invalid folder: $result" + fi + + + done +} + +if [[ $(id -u) == "0" ]] ; then + echo "Do not run this script as root." + exit 1 +fi + +if [[ -z $(which wget) ]] ; then + echo "wget executable not found. Is wget installed?" + exit 1 +fi + +if [[ -z $(which docker) ]] ; then + echo "docker executable not found. Is docker installed?" + exit 1 +fi + +if [[ -z $(which docker-compose) ]] ; then + echo "docker-compose executable not found. Is docker-compose installed?" + exit 1 +fi + echo "" echo "############################################" echo "### Paperless-ng docker installation ###" @@ -48,14 +89,13 @@ echo "The consume folder is where paperles will search for new documents." echo "Point this to a folder where your scanner is able to put your scanned" echo "documents." echo "" -echo "HINT: If paperless is unable to pick up any files from this directory after" -echo "installation, you might need to configure PAPERLESS_CONSUMER_POLLING." -echo "See the documentation for details." -echo "" -echo "CAUTION: You must specify an absolute path starting with /" +echo "CAUTION: You must specify an absolute path starting with / or a relative " +echo "path starting with ./ here. Examples:" +echo " /mnt/consume" +echo " ./consume" echo "" -ask "Consume folder" "$TARGET_FOLDER/consume" +ask_docker_folder "Consume folder" "$TARGET_FOLDER/consume" CONSUME_FOLDER=$ask_result echo "" @@ -64,9 +104,10 @@ echo "Leave empty and docker will manage this folder for you." echo "Docker usually stores managed folders in /var/lib/docker/volumes." echo "" echo "CAUTION: If specified, you must specify an absolute path starting with /" +echo "or a relative path starting with ./ here." echo "" -ask "Media folder" "" +ask_docker_folder "Media folder" "" MEDIA_FOLDER=$ask_result echo "" @@ -74,8 +115,11 @@ echo "The data folder is where paperless stores other data, such as your" echo "SQLite database (if used), the search index and other data." echo "As with the media folder, leave empty to have this managed by docker." echo "" +echo "CAUTION: If specified, you must specify an absolute path starting with /" +echo "or a relative path starting with ./ here." +echo "" -ask "Data folder" "" +ask_docker_folder "Data folder" "" DATA_FOLDER=$ask_result echo "" @@ -166,8 +210,36 @@ done ask "Email" "$USERNAME@localhost" EMAIL=$ask_result -echo "Done collecting data. Press any key to install." -read +echo "" +echo "Summary" +echo "=======" +echo "" + +echo "Target folder: $TARGET_FOLDER" +echo "Consume folder: $CONSUME_FOLDER" +if [[ -z $MEDIA_FOLDER ]] ; then + echo "Media folder: Managed by docker" +else + echo "Media folder: $MEDIA_FOLDER" +fi +if [[ -z $DATA_FOLDER ]] ; then + echo "Data folder: Managed by docker" +else + echo "Data folder: $DATA_FOLDER" +fi +echo "" +echo "Port: $PORT" +echo "Database: $DATABASE_BACKEND" +echo "Tika enabled: $TIKA_ENABLED" +echo "OCR language: $OCR_LANGUAGE" +echo "User id: $USERMAP_UID" +echo "Group id: $USERMAP_GID" +echo "" +echo "Paperless username: $USERNAME" +echo "Paperless email: $EMAIL" + +echo "" +read -p "Press any key to install." echo "" echo "Installing paperless..." @@ -209,7 +281,7 @@ sed -i "s/- 8000:8000/- $PORT:8000/g" docker-compose.yml sed -i "s#- \./consume:/usr/src/paperless/consume#- $CONSUME_FOLDER:/usr/src/paperless/consume#g" docker-compose.yml if [[ -n $MEDIA_FOLDER ]] ; then - sed -i "s#- data:/usr/src/paperless/media#- $MEDIA_FOLDER:/usr/src/paperless/media#g" docker-compose.yml + sed -i "s#- media:/usr/src/paperless/media#- $MEDIA_FOLDER:/usr/src/paperless/media#g" docker-compose.yml fi if [[ -n $DATA_FOLDER ]] ; then diff --git a/paperless.conf.example b/paperless.conf.example index 652a741b0..b1b63879d 100644 --- a/paperless.conf.example +++ b/paperless.conf.example @@ -41,6 +41,10 @@ #PAPERLESS_OCR_OUTPUT_TYPE=pdfa #PAPERLESS_OCR_PAGES=1 #PAPERLESS_OCR_IMAGE_DPI=300 +#PAPERLESS_OCR_CLEAN=clean +#PAPERLESS_OCR_DESKEW=true +#PAPERLESS_OCR_ROTATE_PAGES=true +#PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD=12.0 #PAPERLESS_OCR_USER_ARGS={} #PAPERLESS_CONVERT_MEMORY_LIMIT=0 #PAPERLESS_CONVERT_TMPDIR=/var/tmp/paperless diff --git a/requirements.txt b/requirements.txt index c3f32002b..2df1b29ae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,29 +12,30 @@ arrow==0.17.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, asgiref==3.3.1; python_version >= '3.5' async-timeout==3.0.1; python_full_version >= '3.5.3' attrs==20.3.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' -autobahn==20.12.3; python_version >= '3.6' +autobahn==21.2.1; python_version >= '3.6' automat==20.2.0 blessed==1.17.12 certifi==2020.12.5 -cffi==1.14.4 +cffi==1.14.5 channels-redis==3.2.0 channels==3.0.3 chardet==4.0.0; python_version >= '3.1' click==7.1.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' coloredlogs==15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' +concurrent-log-handler==0.9.19 constantly==15.1.0 -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' +cryptography==3.3.2 daphne==3.0.1; python_version >= '3.6' dateparser==0.7.6 django-cors-headers==3.7.0 -django-extensions==3.1.0 +django-extensions==3.1.1 django-filter==2.4.0 django-picklefield==3.0.1; python_version >= '3' django-q==1.3.4 -django==3.1.5 +django==3.1.7 djangorestframework==3.12.2 filelock==3.0.12 -fuzzywuzzy==0.18.0 +fuzzywuzzy[speedup]==0.18.0 gunicorn==20.0.4 h11==0.12.0; python_version >= '3.6' hiredis==1.1.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' @@ -44,22 +45,21 @@ hyperlink==21.0.0 idna==2.10; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' imap-tools==0.37.0 img2pdf==0.4.0 -importlib-metadata==3.4.0; python_version < '3.8' incremental==17.5.0 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' +joblib==1.0.1; 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' msgpack==1.0.2 -numpy==1.19.5; python_version >= '3.6' -ocrmypdf==11.4.5 +numpy==1.19.5 +ocrmypdf==11.6.2 pathvalidate==2.3.2 -pdfminer.six==20201018; python_version >= '3.4' -pdftotext==2.1.5 -pikepdf==2.2.5 +pdfminer.six==20201018 +pikepdf==2.5.2 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' +portalocker==2.2.1; python_version >= '3' psycopg2-binary==2.8.6 pyasn1-modules==0.2.8 pyasn1==0.4.8 @@ -69,9 +69,9 @@ pyopenssl==20.0.1; python_version >= '2.7' and python_version not in '3.0, 3.1, python-dateutil==2.8.1 python-dotenv==0.15.0 python-gnupg==0.4.6 -python-levenshtein==0.12.1 -python-magic==0.4.18 -pytz==2020.5 +python-levenshtein==0.12.2 +python-magic==0.4.22 +pytz==2021.1 pyyaml==5.4.1 redis==3.5.3 regex==2020.11.13 @@ -85,19 +85,17 @@ 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 +tqdm==4.57.0 twisted[tls]==20.3.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' -txaio==20.12.1; python_version >= '3.6' -typing-extensions==3.7.4.3; python_version < '3.8' +txaio==21.2.1; python_version >= '3.6' tzlocal==2.1 urllib3==1.26.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4' -uvicorn[standard]==0.13.3 +uvicorn[standard]==0.13.4 uvloop==0.14.0 watchdog==1.0.2 -watchgod==0.6 +watchgod==0.7 wcwidth==0.2.5 websockets==8.1 whitenoise==5.2.0 whoosh==2.7.4 -zipp==3.4.0; python_version >= '3.6' zope.interface==5.2.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' diff --git a/resources/logo.txt b/resources/logo.txt new file mode 100644 index 000000000..75a1d2c75 --- /dev/null +++ b/resources/logo.txt @@ -0,0 +1,16 @@ + 9w + {@@N + Q@@@@H + G@@@@@@@\ + SilN@@@@@@@ + *Q *@@@@@@@@S /= = = = = = = = = = = = = = = = = =\ + *@ B@@@@@@@@N || || + N R$ A@@@@@@@@@@ || PAPERLESS-NG || +x@@ $U B@@@@@@@@@R || || +N@@N^ @ N@@@@@@@@@* \= = = = = = = = = = = = = = = = = =/ +|@@@u @ E@@@@@@@@l + Q@@@ \ Px@@@@@@P + 1@@S` @@@o' + z$ ; + v + / diff --git a/src-ui/angular.json b/src-ui/angular.json index 829a482af..2877408d2 100644 --- a/src-ui/angular.json +++ b/src-ui/angular.json @@ -18,7 +18,9 @@ "locales": { "de": "src/locale/messages.de.xlf", "nl-NL": "src/locale/messages.nl_NL.xlf", - "fr": "src/locale/messages.fr.xlf" + "fr": "src/locale/messages.fr.xlf", + "en-GB": "src/locale/messages.en_GB.xlf", + "pt-BR": "src/locale/messages.pt_BR.xlf" } }, "architect": { @@ -35,6 +37,7 @@ "aot": true, "assets": [ "src/favicon.ico", + "src/apple-touch-icon.png", "src/assets", "src/manifest.webmanifest", { "glob": "pdf.worker.min.js", @@ -111,6 +114,7 @@ "karmaConfig": "karma.conf.js", "assets": [ "src/favicon.ico", + "src/apple-touch-icon.png", "src/assets", "src/manifest.webmanifest" ], diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 86198ca7f..d04d5a6f8 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -52,17 +52,17 @@ - View "" saved successfully. + View "" saved successfully. src/app/components/document-list/document-list.component.ts - 109 + 115 View "" created successfully. src/app/components/document-list/document-list.component.ts - 130 + 136 @@ -114,8 +114,8 @@ 72 - - Save "" + + Save "" src/app/components/document-list/document-list.component.html 71 @@ -188,35 +188,35 @@ Confirm delete src/app/components/document-detail/document-detail.component.ts - 199 + 203 Do you really want to delete document ""? src/app/components/document-detail/document-detail.component.ts - 200 + 204 The files for this document will be deleted permanently. This operation cannot be undone. src/app/components/document-detail/document-detail.component.ts - 201 + 205 Delete document src/app/components/document-detail/document-detail.component.ts - 203 + 207 Error deleting document: src/app/components/document-detail/document-detail.component.ts - 210 + 214 @@ -513,13 +513,6 @@ 1 - - Filter - - src/app/components/manage/logs/logs.component.html - 7 - - Saved view "" deleted. @@ -538,21 +531,21 @@ Use system language src/app/components/manage/settings/settings.component.ts - 91 + 92 Use date format of display language src/app/components/manage/settings/settings.component.ts - 95 + 98 Error while storing settings on server: src/app/components/manage/settings/settings.component.ts - 111 + 115 @@ -1081,6 +1074,13 @@ 46 + + Title: + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 50 + + Filter tags @@ -1219,21 +1219,21 @@ Error executing bulk operation: src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 73 + 74 "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 112 + 113 "" and "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 114 + 115 This is for messages like 'modify "tag1" and "tag2"' @@ -1241,7 +1241,7 @@ , src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 116 + 117 this is used to separate enumerations and should probably be a comma and a whitespace in most languages @@ -1249,7 +1249,7 @@ and "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 117 + 118 this is for messages like 'modify "tag1", "tag2" and "tag3"' @@ -1257,112 +1257,112 @@ Confirm tags assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 126 + 127 This operation will add the tag "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 129 + 130 This operation will add the tags to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 131 + 132 This operation will remove the tag "" from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 134 + 135 This operation will remove the tags from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 136 + 137 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 - 138 + 139 Confirm correspondent assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 158 + 159 This operation will assign the correspondent "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 160 + 161 This operation will remove the correspondent from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 162 + 163 Confirm document type assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 181 + 182 This operation will assign the document type "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 183 + 184 This operation will remove the document type from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 185 + 186 Delete confirm src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 200 + 201 This operation will permanently delete selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 201 + 202 This operation cannot be undone. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 202 + 203 Delete document(s) src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 204 + 205 @@ -1386,6 +1386,13 @@ 27 + + Download originals + + src/app/components/document-list/bulk-editor/bulk-editor.component.html + 68 + + Suggestions: @@ -1414,20 +1421,20 @@ 1 - - Documents in inbox: - - src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html - 3 - - - - Total documents: + + Total documents: src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html 4 + + Documents in inbox: + + src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html + 3 + + Processing: @@ -1470,6 +1477,13 @@ 126 + + HTTP error: + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 136 + + Upload new documents @@ -1584,6 +1598,13 @@ 21 + + Invalid date. + + src/app/components/common/input/date/date.component.html + 13 + + Yes @@ -1609,49 +1630,70 @@ English (US) src/app/services/settings.service.ts - 82 + 88 + + + + English (GB) + + src/app/services/settings.service.ts + 89 German src/app/services/settings.service.ts - 83 + 90 Dutch src/app/services/settings.service.ts - 84 + 91 French src/app/services/settings.service.ts - 85 + 92 + + + + Portuguese (Brazil) + + src/app/services/settings.service.ts + 93 + + + + ISO 8601 + + src/app/services/settings.service.ts + 98 Document already exists. src/app/services/consumer-status.service.ts - 14 + 15 File not found. src/app/services/consumer-status.service.ts - 15 + 16 Pre-consume script does not exist. src/app/services/consumer-status.service.ts - 16 + 17 Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation @@ -1659,7 +1701,7 @@ Error while executing pre-consume script. src/app/services/consumer-status.service.ts - 17 + 18 Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation @@ -1667,7 +1709,7 @@ Post-consume script does not exist. src/app/services/consumer-status.service.ts - 18 + 19 Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation @@ -1675,7 +1717,7 @@ Error while executing post-consume script. src/app/services/consumer-status.service.ts - 19 + 20 Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation @@ -1683,49 +1725,49 @@ Received new file. src/app/services/consumer-status.service.ts - 20 + 21 File type not supported. src/app/services/consumer-status.service.ts - 21 + 22 Processing document... src/app/services/consumer-status.service.ts - 22 + 23 Generating thumbnail... src/app/services/consumer-status.service.ts - 23 + 24 Retrieving date from document... src/app/services/consumer-status.service.ts - 24 + 25 Saving document... src/app/services/consumer-status.service.ts - 25 + 26 Finished. src/app/services/consumer-status.service.ts - 26 + 27 diff --git a/src-ui/package-lock.json b/src-ui/package-lock.json index c3827f80c..fd6d69538 100644 --- a/src-ui/package-lock.json +++ b/src-ui/package-lock.json @@ -2055,9 +2055,9 @@ } }, "@ng-bootstrap/ng-bootstrap": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-8.0.0.tgz", - "integrity": "sha512-v77Gfd8xHH+exq0WqIqVRlxbUEHdA/2+RUJenUP2IDTQN9E1rWl7O461/kosr+0XPuxPArHQJxhh/WsCYckcNg==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-8.0.4.tgz", + "integrity": "sha512-EdxTwOPOtlvfnwrglPniulmzdnXdXH3lTGaGAY1HrYRvdtGg6wicRvl+BvwVE/3Qik5NPkOWMVghUHpv3evIYg==", "requires": { "tslib": "^2.0.0" } @@ -5545,6 +5545,11 @@ "schema-utils": "^2.6.5" } }, + "file-saver": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", + "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" + }, "file-uri-to-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", diff --git a/src-ui/package.json b/src-ui/package.json index a7cef2581..896caab30 100644 --- a/src-ui/package.json +++ b/src-ui/package.json @@ -20,9 +20,10 @@ "@angular/platform-browser": "~10.1.5", "@angular/platform-browser-dynamic": "~10.1.5", "@angular/router": "~10.1.5", - "@ng-bootstrap/ng-bootstrap": "^8.0.0", + "@ng-bootstrap/ng-bootstrap": "^8.0.4", "@ng-select/ng-select": "^5.0.9", "bootstrap": "^4.5.0", + "file-saver": "^2.0.5", "ng-bootstrap": "^1.6.3", "ngx-cookie-service": "^10.1.1", "ngx-file-drop": "^10.0.0", diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index d63d34306..e9f52d62e 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -3,7 +3,7 @@ import { NgModule } from '@angular/core'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { NgbDateAdapter, NgbDateParserFormatter, NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; import { DocumentListComponent } from './components/document-list/document-list.component'; import { DocumentDetailComponent } from './components/document-detail/document-detail.component'; @@ -39,7 +39,6 @@ import { SelectComponent } from './components/common/input/select/select.compone import { CheckComponent } from './components/common/input/check/check.component'; import { SaveViewConfigDialogComponent } from './components/document-list/save-view-config-dialog/save-view-config-dialog.component'; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; -import { DateTimeComponent } from './components/common/input/date-time/date-time.component'; import { TagsComponent } from './components/common/input/tags/tags.component'; import { SortableDirective } from './directives/sortable.directive'; import { CookieService } from 'ngx-cookie-service'; @@ -59,14 +58,21 @@ 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 { DateComponent } from './components/common/input/date/date.component'; +import { ISODateTimeAdapter } from './utils/ngb-iso-date-time-adapter'; +import { LocalizedDateParserFormatter } from './utils/ngb-date-parser-formatter'; import localeFr from '@angular/common/locales/fr'; import localeNl from '@angular/common/locales/nl'; import localeDe from '@angular/common/locales/de'; +import localePt from '@angular/common/locales/pt-PT'; +import localeEnGb from '@angular/common/locales/en-GB'; registerLocaleData(localeFr) registerLocaleData(localeNl) registerLocaleData(localeDe) +registerLocaleData(localePt, "pt-BR") +registerLocaleData(localeEnGb) @NgModule({ declarations: [ @@ -101,7 +107,6 @@ registerLocaleData(localeDe) SelectComponent, CheckComponent, SaveViewConfigDialogComponent, - DateTimeComponent, TagsComponent, SortableDirective, SavedViewWidgetComponent, @@ -117,7 +122,8 @@ registerLocaleData(localeDe) SelectDialogComponent, NumberComponent, SafePipe, - CustomDatePipe + CustomDatePipe, + DateComponent ], imports: [ BrowserModule, @@ -138,7 +144,9 @@ registerLocaleData(localeDe) multi: true }, FilterPipe, - DocumentTitlePipe + DocumentTitlePipe, + {provide: NgbDateAdapter, useClass: ISODateTimeAdapter}, + {provide: NgbDateParserFormatter, useClass: LocalizedDateParserFormatter} ], bootstrap: [AppComponent] }) 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 70329d537..34a978fe5 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 @@ -163,13 +163,13 @@
  • -
    - +
    +  GitHub - + @@ -177,7 +177,7 @@
    • -
  • +
  • {{versionString}}
    diff --git a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html index b70a04103..ee8e6e6f4 100644 --- a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html +++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html @@ -20,8 +20,17 @@
    - + +
    + +
    +
    - + +
    + +
    + diff --git a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts index 27472bdc7..e21b28312 100644 --- a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts +++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts @@ -1,7 +1,10 @@ import { formatDate } from '@angular/common'; import { Component, EventEmitter, Input, Output, OnInit, OnDestroy } from '@angular/core'; +import { NgbDateAdapter } from '@ng-bootstrap/ng-bootstrap'; import { Subject, Subscription } from 'rxjs'; -import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; +import { debounceTime } from 'rxjs/operators'; +import { SettingsService } from 'src/app/services/settings.service'; +import { ISODateAdapter } from 'src/app/utils/ngb-iso-date-adapter'; export interface DateSelection { before?: string @@ -16,10 +19,17 @@ const LAST_YEAR = 3 @Component({ selector: 'app-date-dropdown', templateUrl: './date-dropdown.component.html', - styleUrls: ['./date-dropdown.component.scss'] + styleUrls: ['./date-dropdown.component.scss'], + providers: [ + {provide: NgbDateAdapter, useClass: ISODateAdapter}, + ] }) export class DateDropdownComponent implements OnInit, OnDestroy { + constructor(settings: SettingsService) { + this.datePlaceHolder = settings.getLocalizedDateInputFormat() + } + quickFilters = [ {id: LAST_7_DAYS, name: $localize`Last 7 days`}, {id: LAST_MONTH, name: $localize`Last month`}, @@ -27,6 +37,8 @@ export class DateDropdownComponent implements OnInit, OnDestroy { {id: LAST_YEAR, name: $localize`Last year`} ] + datePlaceHolder: string + @Input() dateBefore: string diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.html b/src-ui/src/app/components/common/input/date-time/date-time.component.html deleted file mode 100644 index 7c002db1b..000000000 --- a/src-ui/src/app/components/common/input/date-time/date-time.component.html +++ /dev/null @@ -1,13 +0,0 @@ -
    -
    - - -
    -
    - - -
    -
    - - - \ No newline at end of file diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.ts b/src-ui/src/app/components/common/input/date-time/date-time.component.ts deleted file mode 100644 index bce208ec8..000000000 --- a/src-ui/src/app/components/common/input/date-time/date-time.component.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { formatDate } from '@angular/common'; -import { Component, forwardRef, Input, OnInit } from '@angular/core'; -import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; - -@Component({ - providers: [{ - provide: NG_VALUE_ACCESSOR, - useExisting: forwardRef(() => DateTimeComponent), - multi: true - }], - selector: 'app-input-date-time', - templateUrl: './date-time.component.html', - styleUrls: ['./date-time.component.scss'] -}) -export class DateTimeComponent implements OnInit,ControlValueAccessor { - - constructor() { - } - - onChange = (newValue: any) => {}; - - onTouched = () => {}; - - writeValue(newValue: any): void { - this.dateValue = formatDate(newValue, 'yyyy-MM-dd', "en-US") - this.timeValue = formatDate(newValue, 'HH:mm:ss', 'en-US') - } - registerOnChange(fn: any): void { - this.onChange = fn; - } - registerOnTouched(fn: any): void { - this.onTouched = fn; - } - setDisabledState?(isDisabled: boolean): void { - this.disabled = isDisabled; - } - - @Input() - titleDate: string = "Date" - - @Input() - titleTime: string - - @Input() - disabled: boolean = false - - @Input() - hint: string - - timeValue - - dateValue - - ngOnInit(): void { - } - - dateOrTimeChanged() { - this.onChange(formatDate(this.dateValue + "T" + this.timeValue,"yyyy-MM-ddTHH:mm:ssZZZZZ", "en-us", "UTC")) - } - -} diff --git a/src-ui/src/app/components/common/input/date/date.component.html b/src-ui/src/app/components/common/input/date/date.component.html new file mode 100644 index 000000000..ca9ccc040 --- /dev/null +++ b/src-ui/src/app/components/common/input/date/date.component.html @@ -0,0 +1,15 @@ +
    + +
    + +
    + +
    +
    Invalid date.
    +
    +
    diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.scss b/src-ui/src/app/components/common/input/date/date.component.scss similarity index 100% rename from src-ui/src/app/components/common/input/date-time/date-time.component.scss rename to src-ui/src/app/components/common/input/date/date.component.scss diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.spec.ts b/src-ui/src/app/components/common/input/date/date.component.spec.ts similarity index 55% rename from src-ui/src/app/components/common/input/date-time/date-time.component.spec.ts rename to src-ui/src/app/components/common/input/date/date.component.spec.ts index 0657768bd..ea92c7b30 100644 --- a/src-ui/src/app/components/common/input/date-time/date-time.component.spec.ts +++ b/src-ui/src/app/components/common/input/date/date.component.spec.ts @@ -1,20 +1,20 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { DateTimeComponent } from './date-time.component'; +import { DateComponent } from './date.component'; -describe('DateTimeComponent', () => { - let component: DateTimeComponent; - let fixture: ComponentFixture; +describe('DateComponent', () => { + let component: DateComponent; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ DateTimeComponent ] + declarations: [ DateComponent ] }) .compileComponents(); }); beforeEach(() => { - fixture = TestBed.createComponent(DateTimeComponent); + fixture = TestBed.createComponent(DateComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src-ui/src/app/components/common/input/date/date.component.ts b/src-ui/src/app/components/common/input/date/date.component.ts new file mode 100644 index 000000000..b3b863581 --- /dev/null +++ b/src-ui/src/app/components/common/input/date/date.component.ts @@ -0,0 +1,32 @@ +import { Component, forwardRef, Input, OnInit, ViewChild } from '@angular/core'; +import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { NgbDateAdapter, NgbDateParserFormatter, NgbDatepickerContent } from '@ng-bootstrap/ng-bootstrap'; +import { SettingsService } from 'src/app/services/settings.service'; +import { v4 as uuidv4 } from 'uuid'; +import { AbstractInputComponent } from '../abstract-input'; + + +@Component({ + providers: [{ + provide: NG_VALUE_ACCESSOR, + useExisting: forwardRef(() => DateComponent), + multi: true + }], + selector: 'app-input-date', + templateUrl: './date.component.html', + styleUrls: ['./date.component.scss'] +}) +export class DateComponent extends AbstractInputComponent implements OnInit { + + constructor(private settings: SettingsService) { + super() + } + + ngOnInit(): void { + super.ngOnInit() + this.placeholder = this.settings.getLocalizedDateInputFormat() + } + + placeholder: string + +} diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts index 04e7e56bd..20bc26cdc 100644 --- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts +++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts @@ -12,7 +12,7 @@ import { DocumentService } from 'src/app/services/rest/document.service'; templateUrl: './saved-view-widget.component.html', styleUrls: ['./saved-view-widget.component.scss'] }) -export class SavedViewWidgetComponent implements OnInit { +export class SavedViewWidgetComponent implements OnInit, OnDestroy { constructor( private documentService: DocumentService, @@ -48,7 +48,7 @@ export class SavedViewWidgetComponent implements OnInit { if (this.savedView.show_in_sidebar) { this.router.navigate(['view', this.savedView.id]) } else { - this.list.load(this.savedView) + this.list.loadSavedView(this.savedView, true) this.router.navigate(["documents"]) } } diff --git a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html index 6ab996675..a29b50f78 100644 --- a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html +++ b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html @@ -1,6 +1,6 @@ -

    Documents in inbox: {{statistics.documents_inbox}}

    -

    Total documents: {{statistics.documents_total}}

    +

    Documents in inbox: {{statistics?.documents_inbox}}

    +

    Total documents: {{statistics?.documents_total}}

         diff --git a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts index c3f45d63c..5207d56ab 100644 --- a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts +++ b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts @@ -1,6 +1,7 @@ import { HttpClient } from '@angular/common/http'; -import { Component, OnInit } from '@angular/core'; -import { Observable } from 'rxjs'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Observable, Subscription } from 'rxjs'; +import { ConsumerStatusService } from 'src/app/services/consumer-status.service'; import { environment } from 'src/environments/environment'; export interface Statistics { @@ -14,20 +15,34 @@ export interface Statistics { templateUrl: './statistics-widget.component.html', styleUrls: ['./statistics-widget.component.scss'] }) -export class StatisticsWidgetComponent implements OnInit { +export class StatisticsWidgetComponent implements OnInit, OnDestroy { - constructor(private http: HttpClient) { } + constructor(private http: HttpClient, + private consumerStatusService: ConsumerStatusService) { } statistics: Statistics = {} - getStatistics(): Observable { + subscription: Subscription + + private getStatistics(): Observable { return this.http.get(`${environment.apiBaseUrl}statistics/`) } - ngOnInit(): void { + reload() { this.getStatistics().subscribe(statistics => { this.statistics = statistics }) } + ngOnInit(): void { + this.reload() + this.subscription = this.consumerStatusService.onDocumentConsumptionFinished().subscribe(status => { + this.reload() + }) + } + + ngOnDestroy(): void { + this.subscription.unsubscribe() + } + } diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html index eb1e1da73..c4f7fa21c 100644 --- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html +++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html @@ -1,6 +1,6 @@
    - + Dismiss completed  diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts index f604a3fc1..e74e2bc41 100644 --- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts +++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts @@ -92,8 +92,8 @@ export class UploadFileWidgetComponent implements OnInit { this.consumerStatusService.dismiss(status) } - dismissAll() { - this.consumerStatusService.dismissAll() + dismissCompleted() { + this.consumerStatusService.dismissCompleted() } ngOnInit(): void { @@ -133,7 +133,7 @@ export class UploadFileWidgetComponent implements OnInit { break; } default: { - this.consumerStatusService.fail(status, `${error.status} ${error.statusText}`) + this.consumerStatusService.fail(status, $localize`HTTP error: ${error.status} ${error.statusText}`) break; } } diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html index 9db571708..7ef4e8e91 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.html +++ b/src-ui/src/app/components/document-detail/document-detail.component.html @@ -48,7 +48,7 @@ - + { this.metadata = result + }, error => { + this.metadata = null }) this.documentsService.getSuggestions(doc.id).subscribe(result => { this.suggestions = result + }, error => { + this.suggestions = null }) this.title = this.documentTitlePipe.transform(doc.title) this.documentForm.patchValue(doc) @@ -179,8 +183,8 @@ export class DocumentDetailComponent implements OnInit { close() { this.openDocumentService.closeDocument(this.document) - if (this.documentListViewService.savedViewId) { - this.router.navigate(['view', this.documentListViewService.savedViewId]) + if (this.documentListViewService.activeSavedViewId) { + this.router.navigate(['view', this.documentListViewService.activeSavedViewId]) } else { this.router.navigate(['documents']) } 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 053126445..90cda1224 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 @@ -56,6 +56,20 @@
    +
    + +
    + +
    + +
    +
    +
    +
    - +
    - +
    @@ -86,7 +86,7 @@ {list.collectionSize, plural, =1 {One document} other {{{list.collectionSize || 0}} documents}} (filtered)

    + [rotate]="true" aria-label="Default pagination">
    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 0d1562c24..cf7afb845 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 @@ -1,4 +1,4 @@ -import { AfterViewInit, Component, OnDestroy, OnInit, QueryList, ViewChild, ViewChildren } from '@angular/core'; +import { Component, OnDestroy, OnInit, QueryList, ViewChild, ViewChildren } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { Subscription } from 'rxjs'; @@ -9,7 +9,7 @@ import { ConsumerStatusService } from 'src/app/services/consumer-status.service' import { DocumentListViewService } from 'src/app/services/document-list-view.service'; import { DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/document.service'; import { SavedViewService } from 'src/app/services/rest/saved-view.service'; -import { Toast, ToastService } from 'src/app/services/toast.service'; +import { ToastService } from 'src/app/services/toast.service'; import { FilterEditorComponent } from './filter-editor/filter-editor.component'; import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component'; @@ -46,7 +46,7 @@ export class DocumentListComponent implements OnInit, OnDestroy { } getTitle() { - return this.list.savedViewTitle || $localize`Documents` + return this.list.activeSavedViewTitle || $localize`Documents` } getSortFields() { @@ -73,19 +73,18 @@ export class DocumentListComponent implements OnInit, OnDestroy { this.list.reload() }) this.route.paramMap.subscribe(params => { - this.list.clear() if (params.has('id')) { this.savedViewService.getCached(+params.get('id')).subscribe(view => { if (!view) { this.router.navigate(["404"]) return } - this.list.savedView = view + this.list.activateSavedView(view) this.list.reload() this.rulesChanged() }) } else { - this.list.savedView = null + this.list.activateSavedView(null) this.list.reload() this.rulesChanged() } @@ -99,16 +98,23 @@ export class DocumentListComponent implements OnInit, OnDestroy { } loadViewConfig(view: PaperlessSavedView) { - this.list.load(view) + this.list.loadSavedView(view) this.list.reload() this.rulesChanged() } saveViewConfig() { - this.savedViewService.update(this.list.savedView).subscribe(result => { - this.toastService.showInfo($localize`View "${this.list.savedView.name}" saved successfully.`) - }) - + if (this.list.activeSavedViewId != null) { + let savedView: PaperlessSavedView = { + id: this.list.activeSavedViewId, + filter_rules: this.list.filterRules, + sort_field: this.list.sortField, + sort_reverse: this.list.sortReverse + } + this.savedViewService.patch(savedView).subscribe(result => { + this.toastService.showInfo($localize`View "${this.list.activeSavedViewTitle}" saved successfully.`) + }) + } } saveViewConfigAs() { @@ -116,7 +122,7 @@ export class DocumentListComponent implements OnInit, OnDestroy { modal.componentInstance.defaultName = this.filterEditor.generateFilterName() modal.componentInstance.saveClicked.subscribe(formValue => { modal.componentInstance.buttonsEnabled = false - let savedView = { + let savedView: PaperlessSavedView = { name: formValue.name, show_on_dashboard: formValue.showOnDashboard, show_in_sidebar: formValue.showInSideBar, @@ -137,8 +143,8 @@ export class DocumentListComponent implements OnInit, OnDestroy { resetFilters(): void { this.filterRulesModified = false - if (this.list.savedViewId) { - this.savedViewService.getCached(this.list.savedViewId).subscribe(viewUntouched => { + if (this.list.activeSavedViewId) { + this.savedViewService.getCached(this.list.activeSavedViewId).subscribe(viewUntouched => { this.list.filterRules = viewUntouched.filter_rules this.list.reload() }) @@ -150,11 +156,11 @@ export class DocumentListComponent implements OnInit, OnDestroy { rulesChanged() { let modified = false - if (this.list.savedView == null) { + if (this.list.activeSavedViewId == 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 => { + this.savedViewService.getCached(this.list.activeSavedViewId).subscribe(view => { let filterRulesInitial = view.filter_rules if (this.list.filterRules.length !== filterRulesInitial.length) modified = true 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 a9111bc9f..a6506efde 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 @@ -46,6 +46,8 @@ export class FilterEditorComponent implements OnInit, OnDestroy { return $localize`Without any tag` } + case FILTER_TITLE: + return $localize`Title: ${rule.value}` } } @@ -117,7 +119,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy { }) } - get filterRules() { + get filterRules(): FilterRule[] { let filterRules: FilterRule[] = [] if (this._titleFilter) { filterRules.push({rule_type: FILTER_TITLE, value: this._titleFilter}) 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 bbc2c8453..26a6dc219 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 @@ -8,7 +8,7 @@
    - +
    diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html index ed9f4f5af..55cd3de5b 100644 --- a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html +++ b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html @@ -9,7 +9,7 @@ - +
    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 be14faf1d..56ffd25bb 100644 --- a/src-ui/src/app/components/manage/logs/logs.component.html +++ b/src-ui/src/app/components/manage/logs/logs.component.html @@ -1,27 +1,18 @@ -
    - -
    - -
    -
    -     -
    + + + +
    + +

    - {{log.created | customDate:'short'}} - {{getLevelText(log.level)}} - {{log.message}} -

    + class="m-0 p-0 log-entry-{{getLogLevel(log)}}" + *ngFor="let log of logs" style="white-space: pre;">{{log}}

    diff --git a/src-ui/src/app/components/manage/logs/logs.component.scss b/src-ui/src/app/components/manage/logs/logs.component.scss index dee9b10dc..a99506c12 100644 --- a/src-ui/src/app/components/manage/logs/logs.component.scss +++ b/src-ui/src/app/components/manage/logs/logs.component.scss @@ -13,4 +13,12 @@ .log-entry-50 { color: lightcoral !important; font-weight: bold; +} + +.log-container { + + overflow: scroll; + + height: calc(100vh - 190px); + top: 70px; } \ No newline at end of file diff --git a/src-ui/src/app/components/manage/logs/logs.component.ts b/src-ui/src/app/components/manage/logs/logs.component.ts index b131796ee..d77fcde4a 100644 --- a/src-ui/src/app/components/manage/logs/logs.component.ts +++ b/src-ui/src/app/components/manage/logs/logs.component.ts @@ -1,5 +1,4 @@ -import { Component, OnInit } from '@angular/core'; -import { LOG_LEVELS, LOG_LEVEL_INFO, PaperlessLog } from 'src/app/data/paperless-log'; +import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; import { LogService } from 'src/app/services/rest/log.service'; @Component({ @@ -11,38 +10,42 @@ export class LogsComponent implements OnInit { constructor(private logService: LogService) { } - logs: PaperlessLog[] = [] - level: number = LOG_LEVEL_INFO + logs: string[] = [] + + logFiles: string[] = [] + + activeLog: string ngOnInit(): void { - this.reload() - } - - reload() { - this.logService.list(1, 50, 'created', true, {'level__gte': this.level}).subscribe(result => this.logs = result.results) - } - - getLevelText(level: number) { - return LOG_LEVELS.find(l => l.id == level)?.name - } - - onScroll() { - let lastCreated = null - if (this.logs.length > 0) { - lastCreated = new Date(this.logs[this.logs.length-1].created).toISOString() - } - this.logService.list(1, 25, 'created', true, {'created__lt': lastCreated, 'level__gte': this.level}).subscribe(result => { - this.logs.push(...result.results) + this.logService.list().subscribe(result => { + this.logFiles = result + if (this.logFiles.length > 0) { + this.activeLog = this.logFiles[0] + this.reloadLogs() + } }) } - getLevels() { - return LOG_LEVELS + reloadLogs() { + this.logService.get(this.activeLog).subscribe(result => { + this.logs = result + }, error => { + this.logs = [] + }) } - setLevel(id) { - this.level = id - this.reload() + getLogLevel(log: string) { + if (log.indexOf("[DEBUG]") != -1) { + return 10 + } else if (log.indexOf("[WARNING]") != -1) { + return 30 + } else if (log.indexOf("[ERROR]") != -1) { + return 40 + } else if (log.indexOf("[CRITICAL]") != -1) { + return 50 + } else { + return 20 + } } } diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html index affe2f0b0..3674bbcb9 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.html +++ b/src-ui/src/app/components/manage/settings/settings.component.html @@ -34,7 +34,7 @@
    @@ -167,7 +167,7 @@
    • -
    +
    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 368a01027..62b4b8be8 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.ts +++ b/src-ui/src/app/components/manage/settings/settings.component.ts @@ -34,7 +34,7 @@ export class SettingsComponent implements OnInit { savedViews: PaperlessSavedView[] get computedDateLocale(): string { - return this.settingsForm.value.dateLocale || this.settingsForm.value.displayLanguage + return this.settingsForm.value.dateLocale || this.settingsForm.value.displayLanguage || this.currentLocale } constructor( @@ -86,11 +86,15 @@ export class SettingsComponent implements OnInit { } get displayLanguageOptions(): LanguageOption[] { - return [{code: "", name: $localize`Use system language`}].concat(this.settings.getLanguageOptions()) + 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()) + return [ + {code: "", name: $localize`Use date format of display language`} + ].concat(this.settings.getDateLocaleOptions()) } get today() { 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 fd4c3b7f0..418a5c281 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 @@ -20,7 +20,7 @@ - +
    diff --git a/src-ui/src/app/data/paperless-log.ts b/src-ui/src/app/data/paperless-log.ts deleted file mode 100644 index 61a6fce99..000000000 --- a/src-ui/src/app/data/paperless-log.ts +++ /dev/null @@ -1,27 +0,0 @@ -export const LOG_LEVEL_DEBUG = 10 -export const LOG_LEVEL_INFO = 20 -export const LOG_LEVEL_WARNING = 30 -export const LOG_LEVEL_ERROR = 40 -export const LOG_LEVEL_CRITICAL = 50 - -export const LOG_LEVELS = [ - {id: LOG_LEVEL_DEBUG, name: "DEBUG"}, - {id: LOG_LEVEL_INFO, name: "INFO"}, - {id: LOG_LEVEL_WARNING, name: "WARNING"}, - {id: LOG_LEVEL_ERROR, name: "ERROR"}, - {id: LOG_LEVEL_CRITICAL, name: "CRITICAL"} -] - -export interface PaperlessLog { - - id?: number - - group?: string - - message?: string - - created?: Date - - level?: number - -} diff --git a/src-ui/src/app/pipes/custom-date.pipe.ts b/src-ui/src/app/pipes/custom-date.pipe.ts index 19989fbdd..cf5a931cb 100644 --- a/src-ui/src/app/pipes/custom-date.pipe.ts +++ b/src-ui/src/app/pipes/custom-date.pipe.ts @@ -2,18 +2,29 @@ import { DatePipe } from '@angular/common'; import { Inject, LOCALE_ID, Pipe, PipeTransform } from '@angular/core'; import { SettingsService, SETTINGS_KEYS } from '../services/settings.service'; +const FORMAT_TO_ISO_FORMAT = { + "longDate": "y-MM-dd", + "mediumDate": "yy-MM-dd", + "shortDate": "yy-MM-dd" +} + @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) - + super(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) + let l = locale || this.settings.get(SETTINGS_KEYS.DATE_LOCALE) + let f = format || this.settings.get(SETTINGS_KEYS.DATE_FORMAT) + if (l == "iso-8601") { + return super.transform(value, FORMAT_TO_ISO_FORMAT[f], timezone) + } else { + return super.transform(value, format || this.settings.get(SETTINGS_KEYS.DATE_FORMAT), timezone, locale) + } } } diff --git a/src-ui/src/app/services/consumer-status.service.ts b/src-ui/src/app/services/consumer-status.service.ts index 38f29a528..e03282175 100644 --- a/src-ui/src/app/services/consumer-status.service.ts +++ b/src-ui/src/app/services/consumer-status.service.ts @@ -169,15 +169,20 @@ export class ConsumerStatusService { } dismiss(status: FileStatus) { - let index = this.consumerStatus.findIndex(s => s.filename == status.filename) + let index + if (status.taskId != null) { + index = this.consumerStatus.findIndex(s => s.taskId == status.taskId) + } else { + index = this.consumerStatus.findIndex(s => s.filename == status.filename) + } if (index > -1) { this.consumerStatus.splice(index, 1) } } - dismissAll() { - this.consumerStatus = this.consumerStatus.filter(status => status.phase < FileStatusPhase.SUCCESS) + dismissCompleted() { + this.consumerStatus = this.consumerStatus.filter(status => status.phase != FileStatusPhase.SUCCESS) } onDocumentConsumptionFinished() { 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 4eb0c276c..334706a3c 100644 --- a/src-ui/src/app/services/document-list-view.service.ts +++ b/src-ui/src/app/services/document-list-view.service.ts @@ -8,6 +8,23 @@ import { DOCUMENT_LIST_SERVICE } from '../data/storage-keys'; import { DocumentService } from './rest/document.service'; import { SettingsService, SETTINGS_KEYS } from './settings.service'; +interface ListViewState { + + title?: string + + documents?: PaperlessDocument[] + + currentPage: number + collectionSize: number + + sortField: string + sortReverse: boolean + + filterRules: FilterRule[] + + selected?: Set + +} /** * This service manages the document list which is displayed using the document list view. @@ -20,156 +37,174 @@ import { SettingsService, SETTINGS_KEYS } from './settings.service'; }) export class DocumentListViewService { - static DEFAULT_SORT_FIELD = 'created' - isReloading: boolean = false - documents: PaperlessDocument[] = [] - 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. - */ - private _documentListViewConfig: PaperlessSavedView - /** - * Optionally, this is the currently selected saved view, which might be null. - */ - private _savedViewConfig: PaperlessSavedView + currentPageSize: number = this.settings.get(SETTINGS_KEYS.DOCUMENT_LIST_SIZE) - get savedView(): PaperlessSavedView { - return this._savedViewConfig + private listViewStates: Map = new Map() + + private _activeSavedViewId: number = null + + get activeSavedViewId() { + return this._activeSavedViewId } - set savedView(value: PaperlessSavedView) { - if (value && !this._savedViewConfig || value && value.id != this._savedViewConfig.id) { - //saved view inactive and should be active now, or saved view active, but a different view is requested - //this is here so that we don't modify value, which might be the actual instance of the saved view. - this.selectNone() - this._savedViewConfig = Object.assign({}, value) - } else if (this._savedViewConfig && !value) { - //saved view active, but document list requested - this.selectNone() - this._savedViewConfig = null + get activeSavedViewTitle() { + return this.activeListViewState.title + } + + private defaultListViewState(): ListViewState { + return { + title: null, + documents: [], + currentPage: 1, + collectionSize: null, + sortField: "created", + sortReverse: true, + filterRules: [], + selected: new Set() } } - get savedViewId() { - return this.savedView?.id + private get activeListViewState() { + if (!this.listViewStates.has(this._activeSavedViewId)) { + this.listViewStates.set(this._activeSavedViewId, this.defaultListViewState()) + } + return this.listViewStates.get(this._activeSavedViewId) } - get savedViewTitle() { - return this.savedView?.name - } - - get documentListView() { - return this._documentListViewConfig - } - - set documentListView(value) { - if (value) { - this._documentListViewConfig = Object.assign({}, value) - this.saveDocumentListView() + activateSavedView(view: PaperlessSavedView) { + this.rangeSelectionAnchorIndex = this.lastRangeSelectionToIndex = null + if (view) { + this._activeSavedViewId = view.id + this.loadSavedView(view) + } else { + this._activeSavedViewId = null } } - /** - * This is what switches between the saved views and the document list view. Everything on the document list uses - * this property to determine the settings for the currently displayed document list. - */ - get view() { - return this.savedView || this.documentListView - } - - load(view: PaperlessSavedView) { - this.documentListView.filter_rules = cloneFilterRules(view.filter_rules) - this.documentListView.sort_reverse = view.sort_reverse - this.documentListView.sort_field = view.sort_field - this.saveDocumentListView() - } - - clear() { - this.collectionSize = null - this.documents = [] - this.currentPage = 1 + loadSavedView(view: PaperlessSavedView, closeCurrentView: boolean = false) { + if (closeCurrentView) { + this._activeSavedViewId = null + } + this.activeListViewState.filterRules = cloneFilterRules(view.filter_rules) + this.activeListViewState.sortField = view.sort_field + this.activeListViewState.sortReverse = view.sort_reverse + if (this._activeSavedViewId) { + this.activeListViewState.title = view.name + } + this.reduceSelectionToFilter() } reload(onFinish?) { this.isReloading = true + let activeListViewState = this.activeListViewState + this.documentService.listFiltered( - this.currentPage, + activeListViewState.currentPage, this.currentPageSize, - this.view.sort_field, - this.view.sort_reverse, - this.view.filter_rules).subscribe( + activeListViewState.sortField, + activeListViewState.sortReverse, + activeListViewState.filterRules).subscribe( result => { - this.collectionSize = result.count - this.documents = result.results + this.isReloading = false + activeListViewState.collectionSize = result.count + activeListViewState.documents = result.results if (onFinish) { onFinish() } this.rangeSelectionAnchorIndex = this.lastRangeSelectionToIndex = null - this.isReloading = false }, error => { - if (this.currentPage != 1 && error.status == 404) { + this.isReloading = false + if (activeListViewState.currentPage != 1 && error.status == 404) { // this happens when applying a filter: the current page might not be available anymore due to the reduced result set. - this.currentPage = 1 + activeListViewState.currentPage = 1 this.reload() } - this.isReloading = false }) } set filterRules(filterRules: FilterRule[]) { - //we're going to clone the filterRules object, since we don't - //want changes in the filter editor to propagate into here right away. - this.view.filter_rules = filterRules + this.activeListViewState.filterRules = filterRules this.reload() this.reduceSelectionToFilter() this.saveDocumentListView() } get filterRules(): FilterRule[] { - return this.view.filter_rules + return this.activeListViewState.filterRules } set sortField(field: string) { - this.view.sort_field = field - this.saveDocumentListView() + this.activeListViewState.sortField = field this.reload() + this.saveDocumentListView() } get sortField(): string { - return this.view.sort_field + return this.activeListViewState.sortField } set sortReverse(reverse: boolean) { - this.view.sort_reverse = reverse - this.saveDocumentListView() + this.activeListViewState.sortReverse = reverse this.reload() + this.saveDocumentListView() } get sortReverse(): boolean { - return this.view.sort_reverse + return this.activeListViewState.sortReverse + } + + get collectionSize(): number { + return this.activeListViewState.collectionSize + } + + get currentPage(): number { + return this.activeListViewState.currentPage + } + + set currentPage(page: number) { + this.activeListViewState.currentPage = page + this.reload() + this.saveDocumentListView() + } + + get documents(): PaperlessDocument[] { + return this.activeListViewState.documents + } + + get selected(): Set { + return this.activeListViewState.selected } setSort(field: string, reverse: boolean) { - this.view.sort_field = field - this.view.sort_reverse = reverse - this.saveDocumentListView() + this.activeListViewState.sortField = field + this.activeListViewState.sortReverse = reverse this.reload() + this.saveDocumentListView() } private saveDocumentListView() { - sessionStorage.setItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG, JSON.stringify(this.documentListView)) + if (this._activeSavedViewId == null) { + let savedState: ListViewState = { + collectionSize: this.activeListViewState.collectionSize, + currentPage: this.activeListViewState.currentPage, + filterRules: this.activeListViewState.filterRules, + sortField: this.activeListViewState.sortField, + sortReverse: this.activeListViewState.sortReverse + } + sessionStorage.setItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG, JSON.stringify(savedState)) + } } quickFilter(filterRules: FilterRule[]) { - this.savedView = null - this.view.filter_rules = filterRules + this._activeSavedViewId = null + this.activeListViewState.filterRules = filterRules + this.activeListViewState.currentPage = 1 this.reduceSelectionToFilter() this.saveDocumentListView() this.router.navigate(["documents"]) @@ -217,8 +252,6 @@ export class DocumentListViewService { } } - selected = new Set() - selectNone() { this.selected.clear() this.rangeSelectionAnchorIndex = this.lastRangeSelectionToIndex = null @@ -227,13 +260,11 @@ export class DocumentListViewService { reduceSelectionToFilter() { if (this.selected.size > 0) { this.documentService.listAllFilteredIds(this.filterRules).subscribe(ids => { - let subset = new Set() - for (let id of ids) { - if (this.selected.has(id)) { - subset.add(id) + for (let id of this.selected) { + if (!ids.includes(id)) { + this.selected.delete(id) } } - this.selected = subset }) } } @@ -287,20 +318,21 @@ export class DocumentListViewService { } constructor(private documentService: DocumentService, private settings: SettingsService, private router: Router) { - let documentListViewConfigJson = sessionStorage.getItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG) + let documentListViewConfigJson = sessionStorage.getItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG) if (documentListViewConfigJson) { try { - this.documentListView = JSON.parse(documentListViewConfigJson) + let savedState: ListViewState = JSON.parse(documentListViewConfigJson) + // Remove null elements from the restored state + Object.keys(savedState).forEach(k => { + if (savedState[k] == null) { + delete savedState[k] + } + }) + //only use restored state attributes instead of defaults if they are not null + let newState = Object.assign(this.defaultListViewState(), savedState) + this.listViewStates.set(null, newState) } catch (e) { sessionStorage.removeItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG) - this.documentListView = null - } - } - if (!this.documentListView || this.documentListView.filter_rules == null || this.documentListView.sort_reverse == null || this.documentListView.sort_field == null) { - this.documentListView = { - filter_rules: [], - sort_reverse: true, - sort_field: 'created' } } } diff --git a/src-ui/src/app/services/rest/document.service.ts b/src-ui/src/app/services/rest/document.service.ts index 19b18cfeb..40dbc64f7 100644 --- a/src-ui/src/app/services/rest/document.service.ts +++ b/src-ui/src/app/services/rest/document.service.ts @@ -134,4 +134,8 @@ export class DocumentService extends AbstractPaperlessService return this.http.get(this.getResourceUrl(id, 'suggestions')) } + bulkDownload(ids: number[], content="both") { + return this.http.post(this.getResourceUrl(null, 'bulk_download'), {"documents": ids, "content": content}, { responseType: 'blob' }) + } + } diff --git a/src-ui/src/app/services/rest/log.service.ts b/src-ui/src/app/services/rest/log.service.ts index 797d9b6b9..3abf2fb6f 100644 --- a/src-ui/src/app/services/rest/log.service.ts +++ b/src-ui/src/app/services/rest/log.service.ts @@ -1,14 +1,21 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { PaperlessLog } from 'src/app/data/paperless-log'; -import { AbstractPaperlessService } from './abstract-paperless-service'; +import { Observable } from 'rxjs'; +import { environment } from 'src/environments/environment'; @Injectable({ providedIn: 'root' }) -export class LogService extends AbstractPaperlessService { +export class LogService { - constructor(http: HttpClient) { - super(http, 'logs') + constructor(private http: HttpClient) { + } + + list(): Observable { + return this.http.get(`${environment.apiBaseUrl}logs/`) + } + + get(id: string): Observable { + return this.http.get(`${environment.apiBaseUrl}logs/${id}/`) } } diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts index c8b657300..2d66ed9b7 100644 --- a/src-ui/src/app/services/settings.service.ts +++ b/src-ui/src/app/services/settings.service.ts @@ -1,5 +1,5 @@ import { DOCUMENT } from '@angular/common'; -import { Inject, Injectable, Renderer2, RendererFactory2 } from '@angular/core'; +import { Inject, Injectable, LOCALE_ID, Renderer2, RendererFactory2 } from '@angular/core'; import { Meta } from '@angular/platform-browser'; import { CookieService } from 'ngx-cookie-service'; @@ -10,9 +10,14 @@ export interface PaperlessSettings { } export interface LanguageOption { - code: string, - name: string, + code: string + name: string englishName?: string + + /** + * A date format string for use by the date selectors. MUST contain 'yyyy', 'mm' and 'dd'. + */ + dateInputFormat?: string } export const SETTINGS_KEYS = { @@ -54,7 +59,8 @@ export class SettingsService { private rendererFactory: RendererFactory2, @Inject(DOCUMENT) private document, private cookieService: CookieService, - private meta: Meta + private meta: Meta, + @Inject(LOCALE_ID) private localeId: string ) { this.renderer = rendererFactory.createRenderer(null, null); @@ -77,13 +83,20 @@ 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"} + {code: "en-us", name: $localize`English (US)`, englishName: "English (US)", dateInputFormat: "mm/dd/yyyy"}, + {code: "en-gb", name: $localize`English (GB)`, englishName: "English (GB)", dateInputFormat: "dd/mm/yyyy"}, + {code: "de", name: $localize`German`, englishName: "German", dateInputFormat: "dd.mm.yyyy"}, + {code: "nl", name: $localize`Dutch`, englishName: "Dutch", dateInputFormat: "dd-mm-yyyy"}, + {code: "fr", name: $localize`French`, englishName: "French", dateInputFormat: "dd/mm/yyyy"}, + {code: "pt-br", name: $localize`Portuguese (Brazil)`, englishName: "Portuguese (Brazil)", dateInputFormat: "dd/mm/yyyy"} ] } + getDateLocaleOptions(): LanguageOption[] { + let isoOption: LanguageOption = {code: "iso-8601", name: $localize`ISO 8601`, dateInputFormat: "yyyy-mm-dd"} + return [isoOption].concat(this.getLanguageOptions()) + } + private getLanguageCookieName() { let prefix = "" if (this.meta.getTag('name=cookie_prefix')) { @@ -104,6 +117,11 @@ export class SettingsService { } } + getLocalizedDateInputFormat(): string { + let dateLocale = this.get(SETTINGS_KEYS.DATE_LOCALE) || this.getLanguage() || this.localeId.toLowerCase() + return this.getDateLocaleOptions().find(o => o.code == dateLocale)?.dateInputFormat || "yyyy-mm-dd" + } + get(key: string): any { let setting = SETTINGS.find(s => s.key == key) diff --git a/src-ui/src/app/utils/ngb-date-parser-formatter.ts b/src-ui/src/app/utils/ngb-date-parser-formatter.ts new file mode 100644 index 000000000..7d819a6bf --- /dev/null +++ b/src-ui/src/app/utils/ngb-date-parser-formatter.ts @@ -0,0 +1,59 @@ +import { Injectable } from "@angular/core" +import { NgbDateParserFormatter, NgbDateStruct } from "@ng-bootstrap/ng-bootstrap" +import { SettingsService } from "../services/settings.service" + +@Injectable() +export class LocalizedDateParserFormatter extends NgbDateParserFormatter { + + constructor(private settings: SettingsService) { + super() + } + + private getDateInputFormat() { + return this.settings.getLocalizedDateInputFormat() + } + + /** + * This constructs a regular expression from a date input format which is then + * used to parse dates. + */ + private getDateParseRegex() { + return new RegExp( + "^" + this.getDateInputFormat() + .replace('dd', '(?[0-9]+)') + .replace('mm', '(?[0-9]+)') + .replace('yyyy', '(?[0-9]+)') + .split('.').join('\\.\\s*') + "$" // allow whitespace(s) after dot (specific for German) + ) + } + + parse(value: string): NgbDateStruct | null { + let match = this.getDateParseRegex().exec(value) + if (match) { + let dateStruct = { + day: +match.groups.day, + month: +match.groups.month, + year: +match.groups.year + } + if (dateStruct.year <= (new Date().getFullYear() - 2000)) { + dateStruct.year += 2000 + } else if (dateStruct.year < 100) { + dateStruct.year += 1900 + } + return dateStruct + } else { + return null + } + } + + format(date: NgbDateStruct | null): string { + if (date) { + return this.getDateInputFormat() + .replace('dd', date.day.toString().padStart(2, '0')) + .replace('mm', date.month.toString().padStart(2, '0')) + .replace('yyyy', date.year.toString().padStart(4, '0')) + } else { + return null + } + } +} \ No newline at end of file diff --git a/src-ui/src/app/utils/ngb-iso-date-adapter.ts b/src-ui/src/app/utils/ngb-iso-date-adapter.ts new file mode 100644 index 000000000..e43602a16 --- /dev/null +++ b/src-ui/src/app/utils/ngb-iso-date-adapter.ts @@ -0,0 +1,27 @@ +import { Injectable } from "@angular/core"; +import { NgbDateAdapter, NgbDateStruct } from "@ng-bootstrap/ng-bootstrap"; + +@Injectable() +export class ISODateAdapter extends NgbDateAdapter { + + fromModel(value: string | null): NgbDateStruct | null { + if (value) { + let date = new Date(value) + return { + day : date.getDate(), + month : date.getMonth() + 1, + year : date.getFullYear() + } + } else { + return null + } + } + + toModel(date: NgbDateStruct | null): string | null { + if (date) { + return date.year.toString().padStart(4, '0') + "-" + date.month.toString().padStart(2, '0') + "-" + date.day.toString().padStart(2, '0') + } else { + return null + } + } +} diff --git a/src-ui/src/app/utils/ngb-iso-date-time-adapter.ts b/src-ui/src/app/utils/ngb-iso-date-time-adapter.ts new file mode 100644 index 000000000..21a97a19a --- /dev/null +++ b/src-ui/src/app/utils/ngb-iso-date-time-adapter.ts @@ -0,0 +1,23 @@ +import { Injectable } from "@angular/core"; +import { NgbDateAdapter, NgbDateStruct } from "@ng-bootstrap/ng-bootstrap"; + +@Injectable() +export class ISODateTimeAdapter extends NgbDateAdapter { + + fromModel(value: string | null): NgbDateStruct | null { + if (value) { + let date = new Date(value) + return { + day : date.getDate(), + month : date.getMonth() + 1, + year : date.getFullYear() + } + } else { + return null + } + } + + toModel(date: NgbDateStruct | null): string | null { + return date ? new Date(date.year, date.month - 1, date.day).toISOString() : null + } +} diff --git a/src-ui/src/apple-touch-icon.png b/src-ui/src/apple-touch-icon.png new file mode 100644 index 000000000..46388a873 Binary files /dev/null and b/src-ui/src/apple-touch-icon.png differ diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts index 4e38813b5..6c97ac1cb 100644 --- a/src-ui/src/environments/environment.prod.ts +++ b/src-ui/src/environments/environment.prod.ts @@ -2,7 +2,7 @@ export const environment = { production: true, apiBaseUrl: "/api/", appTitle: "Paperless-ng", - version: "1.1.0", + version: "1.2.1", webSocketHost: window.location.host, webSocketProtocol: (window.location.protocol == "https:" ? "wss:" : "ws:") }; diff --git a/src-ui/src/index.html b/src-ui/src/index.html index b05f9123b..4308a6b16 100644 --- a/src-ui/src/index.html +++ b/src-ui/src/index.html @@ -9,6 +9,7 @@ + diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf index 44fa03f5c..a9762c286 100644 --- a/src-ui/src/locale/messages.de.xlf +++ b/src-ui/src/locale/messages.de.xlf @@ -58,11 +58,11 @@ - View "" saved successfully. - Ansicht "" erfolgreich gespeichert. + View "" saved successfully. + Ansicht "" erfolgreich gespeichert. src/app/components/document-list/document-list.component.ts - 109 + 115 @@ -70,7 +70,7 @@ Ansicht "" erfolgreich erstellt. src/app/components/document-list/document-list.component.ts - 130 + 136 @@ -129,9 +129,9 @@ 72 - - Save "" - "" speichern + + Save "" + "" speichern src/app/components/document-list/document-list.component.html 71 @@ -214,7 +214,7 @@ Löschen bestätigen src/app/components/document-detail/document-detail.component.ts - 199 + 203 @@ -222,7 +222,7 @@ Möchten Sie das Dokument "" wirklich löschen? src/app/components/document-detail/document-detail.component.ts - 200 + 204 @@ -230,7 +230,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 - 201 + 205 @@ -238,7 +238,7 @@ Dokument löschen src/app/components/document-detail/document-detail.component.ts - 203 + 207 @@ -246,7 +246,7 @@ Fehler beim Löschen des Dokuments: src/app/components/document-detail/document-detail.component.ts - 210 + 214 @@ -427,7 +427,7 @@ Original document metadata - Original-Metadaten + Metadaten Original src/app/components/document-detail/document-detail.component.html 121 @@ -435,7 +435,7 @@ Archived document metadata - Metadaten des archivierten Dokuments + Metadaten Archiv src/app/components/document-detail/document-detail.component.html 122 @@ -451,7 +451,7 @@ Hello , welcome to Paperless-ng! - Hallo , Willkommen zu Paperless-ng + Hallo , willkommen zu Paperless-ng! src/app/components/dashboard/dashboard.component.ts 33 @@ -585,14 +585,6 @@ 1 - - Filter - Filtern - - src/app/components/manage/logs/logs.component.html - 7 - - Saved view "" deleted. Gespeicherte Ansicht "" gelöscht. @@ -614,7 +606,7 @@ Benutze Systemsprache src/app/components/manage/settings/settings.component.ts - 91 + 92 @@ -622,7 +614,7 @@ Benutze Datumsformat der Anzeigesprache src/app/components/manage/settings/settings.component.ts - 95 + 98 @@ -630,7 +622,7 @@ Fehler beim Speichern der Einstellungen auf dem Server: src/app/components/manage/settings/settings.component.ts - 111 + 115 @@ -1234,6 +1226,14 @@ 46 + + Title: + Titel: + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 50 + + Filter tags Tags filtern @@ -1392,7 +1392,7 @@ Fehler beim Ausführung der Massenverarbeitung: src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 73 + 74 @@ -1400,7 +1400,7 @@ "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 112 + 113 @@ -1408,7 +1408,7 @@ "" und "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 114 + 115 This is for messages like 'modify "tag1" and "tag2"' @@ -1417,7 +1417,7 @@ , src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 116 + 117 this is used to separate enumerations and should probably be a comma and a whitespace in most languages @@ -1426,7 +1426,7 @@ und "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 117 + 118 this is for messages like 'modify "tag1", "tag2" and "tag3"' @@ -1435,7 +1435,7 @@ Tag-Zuweisung bestätigen src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 126 + 127 @@ -1443,7 +1443,7 @@ Diese Aktion wird ausgewählten Dokumenten das Tag "" hinzufügen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 129 + 130 @@ -1451,7 +1451,7 @@ Diese Aktion wird ausgewählten Dokumenten die Tags hinzufügen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 131 + 132 @@ -1459,7 +1459,7 @@ Diese Aktion wird das Tag "" von ausgewählten Dokumenten entfernen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 134 + 135 @@ -1467,7 +1467,7 @@ Diese Aktion wird die Tags von ausgewählten Dokumenten entfernen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 136 + 137 @@ -1475,7 +1475,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 - 138 + 139 @@ -1483,7 +1483,7 @@ Korrespondent-Zuweisung bestätigen src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 158 + 159 @@ -1491,7 +1491,7 @@ Diese Aktion wird ausgewählten Dokumenten den Korrespondent "" zuweisen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 160 + 161 @@ -1499,7 +1499,7 @@ Diese Aktion wird bei ausgewählten Dokumenten den Korrespondent entfernen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 162 + 163 @@ -1507,7 +1507,7 @@ Dokumenttyp-Zuweisung bestätigen src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 181 + 182 @@ -1515,7 +1515,7 @@ Diese Aktion wird ausgewählten Dokumenten den Dokumenttyp "" zuweisen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 183 + 184 @@ -1523,7 +1523,7 @@ Diese Aktion wird bei ausgewählten Dokumenten den Dokumenttyp entfernen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 185 + 186 @@ -1531,7 +1531,7 @@ Löschen bestätigen src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 200 + 201 @@ -1539,7 +1539,7 @@ Diese Aktion wird ausgewählte Dokumente unwiderruflich löschen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 201 + 202 @@ -1547,7 +1547,7 @@ Diese Aktion kann nicht rückgängig gemacht werden. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 202 + 203 @@ -1555,7 +1555,7 @@ Dokument(e) löschen src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 204 + 205 @@ -1582,6 +1582,14 @@ 27 + + Download originals + Originale herunterladen + + src/app/components/document-list/bulk-editor/bulk-editor.component.html + 68 + + Suggestions: Vorschläge: @@ -1614,22 +1622,22 @@ 1 - - Documents in inbox: - Dokumente im Posteingang: - - src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html - 3 - - - - Total documents: - Anzahl Dokumente gesamt: + + Total documents: + Anzahl Dokumente gesamt: src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html 4 + + Documents in inbox: + Dokumente im Posteingang: + + src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html + 3 + + Processing: Verarbeite: @@ -1678,6 +1686,14 @@ 126 + + HTTP error: + HTTP-Fehler: + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 136 + + Upload new documents Neue Dokumente hochladen @@ -1746,7 +1762,7 @@ You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list. After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and they will appear on the dashboard instead of this message. - Sie können Ihre Dokumente hochladen, indem Sie sie in die Hochladebox auf der rechten Seite ziehen oder in den konfigurierten Ablageordner kopieren/verschieben. Danach werden sie inder Dokumentliste erscheinen. Nachdem Sie den Dokumenten einige Metadaten zugewiesen haben, können Sie die Filtermechanismen zur Erstellung individueller Ansichten benutzen (zum Beispiel "Kürzlich hinzugefügt" oder "Mit TODO markiert") und die Ansichten werden auf der Startseite erscheinen und diese Nachricht ersetzen. + Sie können Ihre Dokumente hochladen, indem Sie sie in die Hochladebox auf der rechten Seite ziehen oder in den konfigurierten Ablageordner kopieren/verschieben. Danach werden sie in der Dokumentenliste erscheinen. Nachdem Sie den Dokumenten einige Metadaten zugewiesen haben, können Sie die Filtermechanismen zur Erstellung individueller Ansichten benutzen (zum Beispiel "Kürzlich hinzugefügt" oder "Mit TODO markiert") und die Ansichten werden auf der Startseite anstelle dieser Nachricht erscheinen. src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html 6,7 @@ -1762,7 +1778,7 @@ Once you've got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically. - Nachdem Sie einige Dokumente hochgeladen und mit Metadatebn haben, kann Paperless diese Metadaten automatisch passenden neuen Dokumenten zuweisen. + Nachdem Sie einige Dokumente hochgeladen und diesen Korrespondenten, Tags und Dokumenttypen zugewiesen haben, kann Paperless-ng diese Metadaten automatisch passenden neuen Dokumenten zuweisen. src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html 10 @@ -1770,7 +1786,7 @@ You can configure paperless to read your mails and add documents from attached files. - Sie können in Paperless Ihre E-Mail-Konten einrichten und Paperless wird automatisch Dokumente aus Dateianhängen erzeugen. + Sie können in Paperless Ihre E-Mail-Konten einrichten und Paperless wird automatisch Dokumente aus Dateianhängen hinzufügen. src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html 11 @@ -1808,6 +1824,14 @@ 21 + + Invalid date. + Ungültiges Datum. + + src/app/components/common/input/date/date.component.html + 13 + + Yes Ja @@ -1837,7 +1861,15 @@ Englisch (US) src/app/services/settings.service.ts - 82 + 88 + + + + English (GB) + Englisch (UK) + + src/app/services/settings.service.ts + 89 @@ -1845,7 +1877,7 @@ Deutsch src/app/services/settings.service.ts - 83 + 90 @@ -1853,7 +1885,7 @@ Niederländisch src/app/services/settings.service.ts - 84 + 91 @@ -1861,7 +1893,23 @@ Französisch src/app/services/settings.service.ts - 85 + 92 + + + + Portuguese (Brazil) + Portugiesisch (Brasilien) + + src/app/services/settings.service.ts + 93 + + + + ISO 8601 + ISO 8601 + + src/app/services/settings.service.ts + 98 @@ -1869,7 +1917,7 @@ Dokument existiert bereits. src/app/services/consumer-status.service.ts - 14 + 15 @@ -1877,7 +1925,7 @@ Datei nicht gefunden. src/app/services/consumer-status.service.ts - 15 + 16 @@ -1885,7 +1933,7 @@ Pre-Consume-Skript existiert nicht. src/app/services/consumer-status.service.ts - 16 + 17 Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation @@ -1894,7 +1942,7 @@ Fehler beim Ausführen des Pre-Consume-Skripts. src/app/services/consumer-status.service.ts - 17 + 18 Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation @@ -1903,7 +1951,7 @@ Post-Consume-Skript existiert nicht. src/app/services/consumer-status.service.ts - 18 + 19 Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation @@ -1912,7 +1960,7 @@ Fehler beim Ausführen des Post-Consume-Skripts. src/app/services/consumer-status.service.ts - 19 + 20 Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation @@ -1921,7 +1969,7 @@ Neue Datei erhalten. src/app/services/consumer-status.service.ts - 20 + 21 @@ -1929,7 +1977,7 @@ Dateityp wird nicht unterstützt. src/app/services/consumer-status.service.ts - 21 + 22 @@ -1937,7 +1985,7 @@ Verarbeite Dokument... src/app/services/consumer-status.service.ts - 22 + 23 @@ -1945,7 +1993,7 @@ Erzeuge Miniaturbild... src/app/services/consumer-status.service.ts - 23 + 24 @@ -1953,7 +2001,7 @@ Ermittle Datum des Dokuments... src/app/services/consumer-status.service.ts - 24 + 25 @@ -1961,7 +2009,7 @@ Speichere Dokument... src/app/services/consumer-status.service.ts - 25 + 26 @@ -1969,7 +2017,7 @@ Abgeschlossen. src/app/services/consumer-status.service.ts - 26 + 27 @@ -2222,7 +2270,7 @@ Any: Document contains any of these words (space separated) - Irgendein Wort: Dokument enthält eins der folgender Wörter + Irgendein Wort: Dokument enthält eins der folgenden Wörter src/app/data/matching-model.ts 12 @@ -2270,7 +2318,7 @@ Regular expression: Document matches this regular expression - Regulärer Ausdruck: Dokument passt zum folgenden Audruck + Regulärer Ausdruck: Dokument passt zum folgenden Ausdruck src/app/data/matching-model.ts 15 @@ -2286,7 +2334,7 @@ Fuzzy: Document contains a word similar to this word - Ungenau: Dokument enthält ein zum folgendem Wort ähnliches Wort + Ungenau: Dokument enthält ein zum folgenden Wort ähnliches Wort src/app/data/matching-model.ts 16 diff --git a/src-ui/src/locale/messages.en_GB.xlf b/src-ui/src/locale/messages.en_GB.xlf new file mode 100644 index 000000000..b413a50a1 --- /dev/null +++ b/src-ui/src/locale/messages.en_GB.xlf @@ -0,0 +1,2353 @@ + + + + + Document added + Document added + + src/app/app.component.ts + 51 + + + + Document was added to paperless. + Document was added to paperless. + + src/app/app.component.ts + 51 + + + + Open document + Open document + + src/app/app.component.ts + 51 + + + + Could not add : + Could not add : + + src/app/app.component.ts + 59 + + + + New document detected + New document detected + + src/app/app.component.ts + 65 + + + + Document is being processed by paperless. + Document is being processed by paperless. + + src/app/app.component.ts + 65 + + + + Documents + Documents + + src/app/components/document-list/document-list.component.ts + 49 + + + + View "" saved successfully. + View "" saved successfully. + + src/app/components/document-list/document-list.component.ts + 115 + + + + View "" created successfully. + View "" created successfully. + + src/app/components/document-list/document-list.component.ts + 136 + + + + Select + Select + + src/app/components/document-list/document-list.component.html + 7 + + + + Select none + Select none + + src/app/components/document-list/document-list.component.html + 10 + + + + Select page + Select page + + src/app/components/document-list/document-list.component.html + 11 + + + + Select all + Select all + + src/app/components/document-list/document-list.component.html + 12 + + + + Sort + Sort + + src/app/components/document-list/document-list.component.html + 39 + + + + Views + Views + + src/app/components/document-list/document-list.component.html + 64 + + + + Save as... + Save as... + + src/app/components/document-list/document-list.component.html + 72 + + + + Save "" + Save "" + + src/app/components/document-list/document-list.component.html + 71 + + + + {VAR_PLURAL, plural, =1 {Selected of one document} other {Selected of documents}} + {VAR_PLURAL, plural, =1 {Selected of one document} other {Selected of documents}} + + src/app/components/document-list/document-list.component.html + 85 + + + + {VAR_PLURAL, plural, =1 {One document} other { documents}} + {VAR_PLURAL, plural, =1 {One document} other { documents}} + + src/app/components/document-list/document-list.component.html + 86 + + + + (filtered) + (filtered) + + src/app/components/document-list/document-list.component.html + 86 + + + + ASN + ASN + + src/app/components/document-list/document-list.component.html + 105 + + + + Correspondent + Correspondent + + src/app/components/document-list/document-list.component.html + 111 + + + + Title + Title + + src/app/components/document-list/document-list.component.html + 117 + + + + Document type + Document type + + src/app/components/document-list/document-list.component.html + 123 + + + + Created + Created + + src/app/components/document-list/document-list.component.html + 129 + + + + Added + Added + + src/app/components/document-list/document-list.component.html + 135 + + + + Confirm delete + Confirm delete + + src/app/components/document-detail/document-detail.component.ts + 203 + + + + Do you really want to delete document ""? + Do you really want to delete document ""? + + src/app/components/document-detail/document-detail.component.ts + 204 + + + + The files for this document will be deleted permanently. This operation cannot be undone. + The files for this document will be deleted permanently. This operation cannot be undone. + + src/app/components/document-detail/document-detail.component.ts + 205 + + + + Delete document + Delete document + + src/app/components/document-detail/document-detail.component.ts + 207 + + + + Error deleting document: + Error deleting document: + + src/app/components/document-detail/document-detail.component.ts + 214 + + + + Delete + Delete + + src/app/components/document-detail/document-detail.component.html + 15 + + + + Download + Download + + src/app/components/document-detail/document-detail.component.html + 23 + + + + More like this + More like this + + src/app/components/document-detail/document-detail.component.html + 38 + + + + Close + Close + + src/app/components/document-detail/document-detail.component.html + 44 + + + + Details + Details + + src/app/components/document-detail/document-detail.component.html + 56 + + + + Content + Content + + src/app/components/document-detail/document-detail.component.html + 72 + + + + Metadata + Metadata + + src/app/components/document-detail/document-detail.component.html + 81 + + + + Discard + Discard + + src/app/components/document-detail/document-detail.component.html + 130 + + + + Save + Save + + src/app/components/document-detail/document-detail.component.html + 132 + + + + Page + Page + + src/app/components/document-detail/document-detail.component.html + 4 + + + + of + of + + src/app/components/document-detail/document-detail.component.html + 8 + + + + Download original + Download original + + src/app/components/document-detail/document-detail.component.html + 29 + + + + Archive serial number + Archive serial number + + src/app/components/document-detail/document-detail.component.html + 60 + + + + Date created + Date created + + src/app/components/document-detail/document-detail.component.html + 61 + + + + Date modified + Date modified + + src/app/components/document-detail/document-detail.component.html + 87 + + + + Date added + Date added + + src/app/components/document-detail/document-detail.component.html + 91 + + + + Media filename + Media filename + + src/app/components/document-detail/document-detail.component.html + 95 + + + + Original MD5 checksum + Original MD5 checksum + + src/app/components/document-detail/document-detail.component.html + 99 + + + + Original file size + Original file size + + src/app/components/document-detail/document-detail.component.html + 103 + + + + Original mime type + Original mime type + + src/app/components/document-detail/document-detail.component.html + 107 + + + + Archive MD5 checksum + Archive MD5 checksum + + src/app/components/document-detail/document-detail.component.html + 111 + + + + Archive file size + Archive file size + + src/app/components/document-detail/document-detail.component.html + 115 + + + + Original document metadata + Original document metadata + + src/app/components/document-detail/document-detail.component.html + 121 + + + + Archived document metadata + Archived document metadata + + src/app/components/document-detail/document-detail.component.html + 122 + + + + Save & next + Save & next + + src/app/components/document-detail/document-detail.component.html + 131 + + + + Hello , welcome to Paperless-ng! + Hello , welcome to Paperless-ng! + + src/app/components/dashboard/dashboard.component.ts + 33 + + + + Welcome to Paperless-ng! + Welcome to Paperless-ng! + + src/app/components/dashboard/dashboard.component.ts + 35 + + + + Dashboard + Dashboard + + src/app/components/dashboard/dashboard.component.html + 1 + + + + Do you really want to delete the tag ""? + Do you really want to delete the tag ""? + + src/app/components/manage/tag-list/tag-list.component.ts + 30 + + + + Tags + Tags + + src/app/components/manage/tag-list/tag-list.component.html + 1 + + + + Create + Create + + src/app/components/manage/tag-list/tag-list.component.html + 2 + + + + Filter by: + Filter by: + + src/app/components/manage/tag-list/tag-list.component.html + 8 + + + + Name + Name + + src/app/components/manage/tag-list/tag-list.component.html + 9 + + + + Color + Colour + + src/app/components/manage/tag-list/tag-list.component.html + 20 + + + + Matching + Matching + + src/app/components/manage/tag-list/tag-list.component.html + 21 + + + + Document count + Document count + + src/app/components/manage/tag-list/tag-list.component.html + 22 + + + + Actions + Actions + + src/app/components/manage/tag-list/tag-list.component.html + 23 + + + + Documents + Documents + + src/app/components/manage/tag-list/tag-list.component.html + 38 + + + + Edit + Edit + + src/app/components/manage/tag-list/tag-list.component.html + 43 + + + + Do you really want to delete the document type ""? + Do you really want to delete the document type ""? + + src/app/components/manage/document-type-list/document-type-list.component.ts + 26 + + + + Document types + Document types + + src/app/components/manage/document-type-list/document-type-list.component.html + 1 + + + + Logs + Logs + + src/app/components/manage/logs/logs.component.html + 1 + + + + Saved view "" deleted. + Saved view "" deleted. + + src/app/components/manage/settings/settings.component.ts + 67 + + + + Settings saved successfully. + Settings saved successfully. + + src/app/components/manage/settings/settings.component.ts + 87 + + + + Use system language + Use system language + + src/app/components/manage/settings/settings.component.ts + 92 + + + + Use date format of display language + Use date format of display language + + src/app/components/manage/settings/settings.component.ts + 98 + + + + Error while storing settings on server: + Error while storing settings on server: + + src/app/components/manage/settings/settings.component.ts + 115 + + + + Settings + Settings + + src/app/components/manage/settings/settings.component.html + 1 + + + + General settings + General settings + + src/app/components/manage/settings/settings.component.html + 10 + + + + Notifications + Notifications + + src/app/components/manage/settings/settings.component.html + 115 + + + + Saved views + Saved views + + src/app/components/manage/settings/settings.component.html + 133 + + + + Appearance + Appearance + + src/app/components/manage/settings/settings.component.html + 13 + + + + Display language + Display language + + src/app/components/manage/settings/settings.component.html + 17 + + + + You need to reload the page after applying a new language. + You need to reload the page after applying a new language. + + src/app/components/manage/settings/settings.component.html + 25 + + + + Date display + Date display + + src/app/components/manage/settings/settings.component.html + 32 + + + + Date format + Date format + + src/app/components/manage/settings/settings.component.html + 45 + + + + Short: + Short: + + src/app/components/manage/settings/settings.component.html + 51 + + + + Medium: + Medium: + + src/app/components/manage/settings/settings.component.html + 55 + + + + Long: + Long: + + src/app/components/manage/settings/settings.component.html + 59 + + + + Items per page + Items per page + + src/app/components/manage/settings/settings.component.html + 67 + + + + Document editor + Document editor + + src/app/components/manage/settings/settings.component.html + 83 + + + + Use PDF viewer provided by the browser + 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. + 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 + Dark mode + + src/app/components/manage/settings/settings.component.html + 94 + + + + Use system settings + Use system settings + + src/app/components/manage/settings/settings.component.html + 97 + + + + Enable dark mode + Enable dark mode + + src/app/components/manage/settings/settings.component.html + 98 + + + + Bulk editing + Bulk editing + + src/app/components/manage/settings/settings.component.html + 102 + + + + Show confirmation dialogs + Show confirmation dialogs + + src/app/components/manage/settings/settings.component.html + 106 + + + + Deleting documents will always ask for confirmation. + Deleting documents will always ask for confirmation. + + src/app/components/manage/settings/settings.component.html + 106 + + + + Apply on close + Apply on close + + src/app/components/manage/settings/settings.component.html + 107 + + + + Document processing + Document processing + + src/app/components/manage/settings/settings.component.html + 118 + + + + Show notifications when new documents are detected + Show notifications when new documents are detected + + src/app/components/manage/settings/settings.component.html + 122 + + + + Show notifications when document processing completes successfully + Show notifications when document processing completes successfully + + src/app/components/manage/settings/settings.component.html + 123 + + + + Show notifications when document processing fails + Show notifications when document processing fails + + src/app/components/manage/settings/settings.component.html + 124 + + + + Suppress notifications on dashboard + Suppress notifications on dashboard + + src/app/components/manage/settings/settings.component.html + 125 + + + + This will suppress all messages about document processing status on the dashboard. + This will suppress all messages about document processing status on the dashboard. + + src/app/components/manage/settings/settings.component.html + 125 + + + + Appears on + Appears on + + src/app/components/manage/settings/settings.component.html + 145 + + + + Show on dashboard + Show on dashboard + + src/app/components/manage/settings/settings.component.html + 148 + + + + Show in sidebar + Show in sidebar + + src/app/components/manage/settings/settings.component.html + 152 + + + + No saved views defined. + No saved views defined. + + src/app/components/manage/settings/settings.component.html + 162 + + + + 404 Not Found + 404 Not Found + + src/app/components/not-found/not-found.component.html + 7 + + + + Do you really want to delete the correspondent ""? + Do you really want to delete the correspondent ""? + + src/app/components/manage/correspondent-list/correspondent-list.component.ts + 26 + + + + Correspondents + Correspondents + + src/app/components/manage/correspondent-list/correspondent-list.component.html + 1 + + + + Last correspondence + Last correspondence + + src/app/components/manage/correspondent-list/correspondent-list.component.html + 22 + + + + Confirmation + Confirmation + + src/app/components/common/confirm-dialog/confirm-dialog.component.ts + 17 + + + + Confirm + Confirm + + src/app/components/common/confirm-dialog/confirm-dialog.component.ts + 29 + + + + Cancel + Cancel + + src/app/components/common/confirm-dialog/confirm-dialog.component.html + 12 + + + + Create new correspondent + Create new correspondent + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts + 21 + + + + Edit correspondent + Edit correspondent + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts + 25 + + + + Matching algorithm + Matching algorithm + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html + 10 + + + + Matching pattern + Matching pattern + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html + 11 + + + + Case insensitive + Case insensitive + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html + 12 + + + + Create new tag + Create new tag + + src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts + 21 + + + + Edit tag + Edit tag + + src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts + 25 + + + + Inbox tag + Inbox tag + + src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html + 21 + + + + Inbox tags are automatically assigned to all consumed documents. + Inbox tags are automatically assigned to all consumed documents. + + src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html + 21 + + + + Create new document type + Create new document type + + src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts + 21 + + + + Edit document type + Edit document type + + src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts + 25 + + + + Search results + Search results + + src/app/components/search/search.component.html + 1 + + + + Invalid search query: + Invalid search query: + + src/app/components/search/search.component.html + 4 + + + + Showing documents similar to + Showing documents similar to + + src/app/components/search/search.component.html + 7 + + + + Search query: + Search query: + + src/app/components/search/search.component.html + 11 + + + + Did you mean ""? + Did you mean ""? + + src/app/components/search/search.component.html + 13 + + + + {VAR_PLURAL, plural, =0 {No results} =1 {One result} other { results}} + {VAR_PLURAL, plural, =0 {No results} =1 {One result} other { results}} + + src/app/components/search/search.component.html + 18 + + + + Paperless-ng + Paperless-ng + + src/app/components/app-frame/app-frame.component.html + 11 + + app title + + + Search documents + Search documents + + src/app/components/app-frame/app-frame.component.html + 15 + + + + Logout + Logout + + src/app/components/app-frame/app-frame.component.html + 45 + + + + Manage + Manage + + src/app/components/app-frame/app-frame.component.html + 107 + + + + Admin + Admin + + src/app/components/app-frame/app-frame.component.html + 149 + + + + Info + Info + + src/app/components/app-frame/app-frame.component.html + 155 + + + + Documentation + Documentation + + src/app/components/app-frame/app-frame.component.html + 162 + + + + GitHub + GitHub + + src/app/components/app-frame/app-frame.component.html + 170 + + + + Suggest an idea + Suggest an idea + + src/app/components/app-frame/app-frame.component.html + 176 + + + + Logged in as + Logged in as + + src/app/components/app-frame/app-frame.component.html + 34 + + + + Open documents + Open documents + + src/app/components/app-frame/app-frame.component.html + 87 + + + + Close all + Close all + + src/app/components/app-frame/app-frame.component.html + 101 + + + + Correspondent: + Correspondent: + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 29 + + + + Without correspondent + Without correspondent + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 31 + + + + Type: + Type: + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 36 + + + + Without document type + Without document type + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 38 + + + + Tag: + Tag: + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 42 + + + + Without any tag + Without any tag + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 46 + + + + Title: + Title: + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 50 + + + + Filter tags + Filter tags + + src/app/components/document-list/filter-editor/filter-editor.component.html + 12 + + + + Filter correspondents + Filter correspondents + + src/app/components/document-list/filter-editor/filter-editor.component.html + 20 + + + + Filter document types + Filter document types + + src/app/components/document-list/filter-editor/filter-editor.component.html + 27 + + + + Reset filters + Reset filters + + src/app/components/document-list/filter-editor/filter-editor.component.html + 50 + + + + Not assigned + Not assigned + + src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts + 166 + + Filter drop down element to filter for documents with no correspondent/type/tag assigned + + + Apply + Apply + + src/app/components/common/filterable-dropdown/filterable-dropdown.component.html + 26 + + + + Last 7 days + Last 7 days + + src/app/components/common/date-dropdown/date-dropdown.component.ts + 24 + + + + Last month + Last month + + src/app/components/common/date-dropdown/date-dropdown.component.ts + 25 + + + + Last 3 months + Last 3 months + + src/app/components/common/date-dropdown/date-dropdown.component.ts + 26 + + + + Last year + Last year + + src/app/components/common/date-dropdown/date-dropdown.component.ts + 27 + + + + After + After + + src/app/components/common/date-dropdown/date-dropdown.component.html + 13 + + + + Before + Before + + src/app/components/common/date-dropdown/date-dropdown.component.html + 29 + + + + Clear + Clear + + src/app/components/common/date-dropdown/date-dropdown.component.html + 18 + + + + View + View + + src/app/components/document-list/document-card-large/document-card-large.component.html + 50 + + + + Created: + Created: + + src/app/components/document-list/document-card-large/document-card-large.component.html + 67 + + + + Filter by correspondent + Filter by correspondent + + src/app/components/document-list/document-card-large/document-card-large.component.html + 20 + + + + Filter by tag + Filter by tag + + src/app/components/document-list/document-card-large/document-card-large.component.html + 24 + + + + Score: + Score: + + src/app/components/document-list/document-card-large/document-card-large.component.html + 62 + + + + View in browser + View in browser + + src/app/components/document-list/document-card-small/document-card-small.component.html + 40 + + + + Error executing bulk operation: + Error executing bulk operation: + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 74 + + + + "" + "" + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 113 + + + + "" and "" + "" and "" + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 115 + + This is for messages like 'modify "tag1" and "tag2"' + + + , + , + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 117 + + this is used to separate enumerations and should probably be a comma and a whitespace in most languages + + + and "" + and "" + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 118 + + this is for messages like 'modify "tag1", "tag2" and "tag3"' + + + Confirm tags assignment + Confirm tags assignment + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 127 + + + + This operation will add the tag "" to selected document(s). + This operation will add the tag "" to selected document(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 130 + + + + This operation will add the tags to selected document(s). + This operation will add the tags to selected document(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 132 + + + + This operation will remove the tag "" from selected document(s). + This operation will remove the tag "" from selected document(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 135 + + + + This operation will remove the tags from selected document(s). + This operation will remove the tags from selected document(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 137 + + + + This operation will add the tags and remove the tags on selected document(s). + 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 + 139 + + + + Confirm correspondent assignment + Confirm correspondent assignment + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 159 + + + + This operation will assign the correspondent "" to selected document(s). + This operation will assign the correspondent "" to selected document(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 161 + + + + This operation will remove the correspondent from selected document(s). + This operation will remove the correspondent from selected document(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 163 + + + + Confirm document type assignment + Confirm document type assignment + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 182 + + + + This operation will assign the document type "" to selected document(s). + This operation will assign the document type "" to selected document(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 184 + + + + This operation will remove the document type from selected document(s). + This operation will remove the document type from selected document(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 186 + + + + Delete confirm + Delete confirm + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 201 + + + + This operation will permanently delete selected document(s). + This operation will permanently delete selected document(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 202 + + + + This operation cannot be undone. + This operation cannot be undone. + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 203 + + + + Delete document(s) + Delete document(s) + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 205 + + + + Select: + Select: + + src/app/components/document-list/bulk-editor/bulk-editor.component.html + 10 + + + + All + All + + src/app/components/document-list/bulk-editor/bulk-editor.component.html + 20 + + + + Edit: + Edit: + + src/app/components/document-list/bulk-editor/bulk-editor.component.html + 27 + + + + Download originals + Download originals + + src/app/components/document-list/bulk-editor/bulk-editor.component.html + 68 + + + + Suggestions: + Suggestions: + + src/app/components/common/input/select/select.component.html + 26 + + + + Save current view + Save current view + + src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html + 3 + + + + Show all + Show all + + src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html + 3 + + + + Statistics + Statistics + + src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html + 1 + + + + Total documents: + Total documents: + + src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html + 4 + + + + Documents in inbox: + Documents in inbox: + + src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html + 3 + + + + Processing: + Processing: + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 32 + + + + Failed: + Failed: + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 35 + + + + Added: + Added: + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 38 + + + + Connecting... + Connecting... + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 118 + + + + Uploading... + Uploading... + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 123 + + + + Upload complete, waiting... + Upload complete, waiting... + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 126 + + + + HTTP error: + HTTP error: + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 136 + + + + Upload new documents + Upload new documents + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 1 + + + + Drop documents here or + Drop documents here or + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 13 + + + + Browse files + Browse files + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 13 + + + + Dismiss completed + Dismiss completed + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 4 + + This button dismisses all status messages about processed documents on the dashboard (failed and successful) + + + {VAR_PLURAL, plural, =1 {One more document} other { more documents}} + {VAR_PLURAL, plural, =1 {One more document} other { more documents}} + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 25 + + This is shown as a summary line when there are more than 5 document in the processing pipeline. + + + Open document + Open document + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 45 + + + + First steps + First steps + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 1 + + + + Paperless is running! :) + Paperless is running! :) + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 5 + + + + You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list. After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and they will appear on the dashboard instead of this message. + You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list. After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and they will appear on the dashboard instead of this message. + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 6,7 + + + + Paperless offers some more features that try to make your life easier: + Paperless offers some more features that try to make your life easier: + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 8 + + + + Once you've got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically. + Once you've got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically. + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 10 + + + + You can configure paperless to read your mails and add documents from attached files. + You can configure paperless to read your mails and add documents from attached files. + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 11 + + + + Consult the documentation on how to use these features. The section on basic usage also has some information on how to use paperless in general. + Consult the documentation on how to use these features. The section on basic usage also has some information on how to use paperless in general. + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 13 + + + + Metadata + Metadata + + src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts + 18 + + + + Select + Select + + src/app/components/common/select-dialog/select-dialog.component.ts + 18 + + + + Please select an object + Please select an object + + src/app/components/common/select-dialog/select-dialog.component.ts + 21 + + + + Invalid date. + Invalid date. + + src/app/components/common/input/date/date.component.html + 13 + + + + Yes + Yes + + src/app/pipes/yes-no.pipe.ts + 9 + + + + No + No + + src/app/pipes/yes-no.pipe.ts + 9 + + + + (no title) + (no title) + + src/app/pipes/document-title.pipe.ts + 12 + + + + English (US) + English (US) + + src/app/services/settings.service.ts + 88 + + + + English (GB) + English (GB) + + src/app/services/settings.service.ts + 89 + + + + German + German + + src/app/services/settings.service.ts + 90 + + + + Dutch + Dutch + + src/app/services/settings.service.ts + 91 + + + + French + French + + src/app/services/settings.service.ts + 92 + + + + Portuguese (Brazil) + Portuguese (Brazil) + + src/app/services/settings.service.ts + 93 + + + + ISO 8601 + ISO 8601 + + src/app/services/settings.service.ts + 98 + + + + Document already exists. + Document already exists. + + src/app/services/consumer-status.service.ts + 15 + + + + File not found. + File not found. + + src/app/services/consumer-status.service.ts + 16 + + + + Pre-consume script does not exist. + Pre-consume script does not exist. + + src/app/services/consumer-status.service.ts + 17 + + Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation + + + Error while executing pre-consume script. + Error while executing pre-consume script. + + src/app/services/consumer-status.service.ts + 18 + + Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation + + + Post-consume script does not exist. + Post-consume script does not exist. + + src/app/services/consumer-status.service.ts + 19 + + Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation + + + Error while executing post-consume script. + Error while executing post-consume script. + + src/app/services/consumer-status.service.ts + 20 + + Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation + + + Received new file. + Received new file. + + src/app/services/consumer-status.service.ts + 21 + + + + File type not supported. + File type not supported. + + src/app/services/consumer-status.service.ts + 22 + + + + Processing document... + Processing document... + + src/app/services/consumer-status.service.ts + 23 + + + + Generating thumbnail... + Generating thumbnail... + + src/app/services/consumer-status.service.ts + 24 + + + + Retrieving date from document... + Retrieving date from document... + + src/app/services/consumer-status.service.ts + 25 + + + + Saving document... + Saving document... + + src/app/services/consumer-status.service.ts + 26 + + + + Finished. + Finished. + + src/app/services/consumer-status.service.ts + 27 + + + + Error + Error + + src/app/services/toast.service.ts + 35 + + + + Information + Information + + src/app/services/toast.service.ts + 39 + + + + ASN + ASN + + src/app/services/rest/document.service.ts + 17 + + + + Correspondent + Correspondent + + src/app/services/rest/document.service.ts + 18 + + + + Title + Title + + src/app/services/rest/document.service.ts + 19 + + + + Document type + Document type + + src/app/services/rest/document.service.ts + 20 + + + + Created + Created + + src/app/services/rest/document.service.ts + 21 + + + + Added + Added + + src/app/services/rest/document.service.ts + 22 + + + + Modified + Modified + + src/app/services/rest/document.service.ts + 23 + + + + Light blue + Light blue + + src/app/data/paperless-tag.ts + 6 + + + + Blue + Blue + + src/app/data/paperless-tag.ts + 7 + + + + Light green + Light green + + src/app/data/paperless-tag.ts + 8 + + + + Green + Green + + src/app/data/paperless-tag.ts + 9 + + + + Light red + Light red + + src/app/data/paperless-tag.ts + 10 + + + + Red + Red + + src/app/data/paperless-tag.ts + 11 + + + + Light orange + Light orange + + src/app/data/paperless-tag.ts + 12 + + + + Orange + Orange + + src/app/data/paperless-tag.ts + 13 + + + + Light violet + Light violet + + src/app/data/paperless-tag.ts + 14 + + + + Violet + Violet + + src/app/data/paperless-tag.ts + 15 + + + + Brown + Brown + + src/app/data/paperless-tag.ts + 16 + + + + Black + Black + + src/app/data/paperless-tag.ts + 17 + + + + Light grey + Light grey + + src/app/data/paperless-tag.ts + 18 + + + + Create new item + Create new item + + src/app/components/common/edit-dialog/edit-dialog.component.ts + 50 + + + + Edit item + Edit item + + src/app/components/common/edit-dialog/edit-dialog.component.ts + 54 + + + + Could not save element: + Could not save element: + + src/app/components/common/edit-dialog/edit-dialog.component.ts + 58 + + + + Automatic + Automatic + + src/app/components/manage/generic-list/generic-list.component.ts + 39 + + + + Do you really want to delete this element? + Do you really want to delete this element? + + src/app/components/manage/generic-list/generic-list.component.ts + 97 + + + + Associated documents will not be deleted. + Associated documents will not be deleted. + + src/app/components/manage/generic-list/generic-list.component.ts + 104 + + + + Delete + Delete + + src/app/components/manage/generic-list/generic-list.component.ts + 106 + + + + Error while deleting element: + Error while deleting element: + + src/app/components/manage/generic-list/generic-list.component.ts + 114 + + + + Any word + Any word + + src/app/data/matching-model.ts + 12 + + + + Any: Document contains any of these words (space separated) + Any: Document contains any of these words (space separated) + + src/app/data/matching-model.ts + 12 + + + + All words + All words + + src/app/data/matching-model.ts + 13 + + + + All: Document contains all of these words (space separated) + All: Document contains all of these words (space separated) + + src/app/data/matching-model.ts + 13 + + + + Exact match + Exact match + + src/app/data/matching-model.ts + 14 + + + + Exact: Document contains this string + Exact: Document contains this string + + src/app/data/matching-model.ts + 14 + + + + Regular expression + Regular expression + + src/app/data/matching-model.ts + 15 + + + + Regular expression: Document matches this regular expression + Regular expression: Document matches this regular expression + + src/app/data/matching-model.ts + 15 + + + + Fuzzy word + Fuzzy word + + src/app/data/matching-model.ts + 16 + + + + Fuzzy: Document contains a word similar to this word + Fuzzy: Document contains a word similar to this word + + src/app/data/matching-model.ts + 16 + + + + Auto: Learn matching automatically + Auto: Learn matching automatically + + src/app/data/matching-model.ts + 17 + + + + + \ No newline at end of file diff --git a/src-ui/src/locale/messages.fr.xlf b/src-ui/src/locale/messages.fr.xlf index b3c84f14c..05b9fdab7 100644 --- a/src-ui/src/locale/messages.fr.xlf +++ b/src-ui/src/locale/messages.fr.xlf @@ -58,11 +58,11 @@ - View "" saved successfully. - Vue "" enregistrée avec succès. + View "" saved successfully. + Vue "" enregistrée avec succès. src/app/components/document-list/document-list.component.ts - 109 + 115 @@ -70,7 +70,7 @@ Vue "" créée avec succès. src/app/components/document-list/document-list.component.ts - 130 + 136 @@ -129,9 +129,9 @@ 72 - - Save "" - Enregistrer "" + + Save "" + Enregistrer "" src/app/components/document-list/document-list.component.html 71 @@ -214,7 +214,7 @@ Confirmer la suppression src/app/components/document-detail/document-detail.component.ts - 199 + 203 @@ -222,7 +222,7 @@ Voulez-vous vraiment supprimer le document "" ? src/app/components/document-detail/document-detail.component.ts - 200 + 204 @@ -230,7 +230,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 - 201 + 205 @@ -238,7 +238,7 @@ Supprimer le document src/app/components/document-detail/document-detail.component.ts - 203 + 207 @@ -246,7 +246,7 @@ Une erreur s'est produite lors de la suppression du document : src/app/components/document-detail/document-detail.component.ts - 210 + 214 @@ -585,14 +585,6 @@ 1 - - Filter - Filtrer - - src/app/components/manage/logs/logs.component.html - 7 - - Saved view "" deleted. Vue "" supprimée. @@ -614,7 +606,7 @@ Utiliser la langue du système src/app/components/manage/settings/settings.component.ts - 91 + 92 @@ -622,7 +614,7 @@ Utiliser le format de date de la langue d'affichage src/app/components/manage/settings/settings.component.ts - 95 + 98 @@ -630,7 +622,7 @@ Une erreur s'est produite lors de l'enregistrement des paramètres sur le serveur : src/app/components/manage/settings/settings.component.ts - 111 + 115 @@ -649,12 +641,20 @@ 10 + + Notifications + Notifications + + src/app/components/manage/settings/settings.component.html + 115 + + Saved views Vues enregistrées src/app/components/manage/settings/settings.component.html - 128 + 133 @@ -777,68 +777,12 @@ 98 - - Notifications - Notifications - - src/app/components/manage/settings/settings.component.html - 102 - - - - Document processing - Traitement de document - - src/app/components/manage/settings/settings.component.html - 106 - - - - Show notifications when new documents are detected - Afficher des notifications lorsque de nouveaux documents sont détectés - - src/app/components/manage/settings/settings.component.html - 109 - - - - Show notifications when document processing completes successfully - Afficher des notifications lorsque le traitement des documents se termine avec succès - - src/app/components/manage/settings/settings.component.html - 110 - - - - Show notifications when document processing fails - Afficher des notifications en cas d'échec du traitement des documents - - src/app/components/manage/settings/settings.component.html - 111 - - - - Suppress notifications on dashboard - Supprimer les notifications du tableau de bord - - src/app/components/manage/settings/settings.component.html - 112 - - - - This will suppress all messages about document processing status on the dashboard. - Cela supprimera tous les messages liés au traitement de documents sur le tableau de bord. - - src/app/components/manage/settings/settings.component.html - 112 - - Bulk editing Edition en masse src/app/components/manage/settings/settings.component.html - 116 + 102 @@ -846,7 +790,7 @@ Afficher les messages de confirmation src/app/components/manage/settings/settings.component.html - 120 + 106 @@ -854,7 +798,7 @@ La suppression de documents requiert toujours une confirmation. src/app/components/manage/settings/settings.component.html - 120 + 106 @@ -862,7 +806,55 @@ Appliquer lors de la fermeture src/app/components/manage/settings/settings.component.html - 121 + 107 + + + + Document processing + Traitement de documents + + src/app/components/manage/settings/settings.component.html + 118 + + + + Show notifications when new documents are detected + Afficher des notifications lorsque de nouveaux documents sont détectés + + src/app/components/manage/settings/settings.component.html + 122 + + + + Show notifications when document processing completes successfully + Afficher des notifications lorsque le traitement des documents se termine avec succès + + src/app/components/manage/settings/settings.component.html + 123 + + + + Show notifications when document processing fails + Afficher des notifications en cas d'échec du traitement des documents + + src/app/components/manage/settings/settings.component.html + 124 + + + + Suppress notifications on dashboard + Supprimer les notifications du tableau de bord + + src/app/components/manage/settings/settings.component.html + 125 + + + + This will suppress all messages about document processing status on the dashboard. + Cela supprimera tous les messages liés au traitement de documents sur le tableau de bord. + + src/app/components/manage/settings/settings.component.html + 125 @@ -870,7 +862,7 @@ Apparaît sur src/app/components/manage/settings/settings.component.html - 140 + 145 @@ -878,7 +870,7 @@ Montrer sur le tableau de bord src/app/components/manage/settings/settings.component.html - 143 + 148 @@ -886,7 +878,7 @@ Montrer dans la barre latérale src/app/components/manage/settings/settings.component.html - 147 + 152 @@ -894,7 +886,7 @@ Aucune vue sauvegardée n'est définie. src/app/components/manage/settings/settings.component.html - 157 + 162 @@ -1119,7 +1111,7 @@ Gestion src/app/components/app-frame/app-frame.component.html - 112 + 107 @@ -1127,15 +1119,15 @@ Administration src/app/components/app-frame/app-frame.component.html - 154 + 149 - - Misc - Divers + + Info + Info src/app/components/app-frame/app-frame.component.html - 160 + 155 @@ -1143,7 +1135,7 @@ Documentation src/app/components/app-frame/app-frame.component.html - 167 + 162 @@ -1151,7 +1143,15 @@ GitHub src/app/components/app-frame/app-frame.component.html - 174 + 170 + + + + Suggest an idea + Suggérer une idée + + src/app/components/app-frame/app-frame.component.html + 176 @@ -1167,7 +1167,7 @@ Documents ouverts src/app/components/app-frame/app-frame.component.html - 92 + 87 @@ -1175,7 +1175,7 @@ Fermer tout src/app/components/app-frame/app-frame.component.html - 106 + 101 @@ -1226,6 +1226,14 @@ 46 + + Title: + Titre : + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 50 + + Filter tags Filtrer les étiquettes @@ -1384,7 +1392,7 @@ 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 - 73 + 74 @@ -1392,7 +1400,7 @@ "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 112 + 113 @@ -1400,7 +1408,7 @@ "" et "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 114 + 115 This is for messages like 'modify "tag1" and "tag2"' @@ -1409,7 +1417,7 @@ , src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 116 + 117 this is used to separate enumerations and should probably be a comma and a whitespace in most languages @@ -1418,7 +1426,7 @@ et "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 117 + 118 this is for messages like 'modify "tag1", "tag2" and "tag3"' @@ -1427,7 +1435,7 @@ Confirmer l'affectation des étiquettes src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 126 + 127 @@ -1435,7 +1443,7 @@ Cette action affectera l'étiquette "" au(x) document(s) sélectionné(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 129 + 130 @@ -1443,7 +1451,7 @@ Cette action affectera les étiquettes au(x) document(s) sélectionné(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 131 + 132 @@ -1451,7 +1459,7 @@ Cette action supprimera l'étiquette "" de(s) document(s) sélectionné(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 134 + 135 @@ -1459,7 +1467,7 @@ Cette action supprimera les étiquettes de(s) document(s) sélectionné(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 136 + 137 @@ -1467,7 +1475,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 - 138 + 139 @@ -1475,7 +1483,7 @@ Confirmer l'affectation du correspondant src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 158 + 159 @@ -1483,7 +1491,7 @@ Cette action affectera le correspondant "" au(x) document(s) sélectionné(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 160 + 161 @@ -1491,7 +1499,7 @@ Cette action supprimera le correspondant de(s) document(s) sélectionné(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 162 + 163 @@ -1499,7 +1507,7 @@ Confirmer l'affectation du type de document src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 181 + 182 @@ -1507,7 +1515,7 @@ 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 - 183 + 184 @@ -1515,7 +1523,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 - 185 + 186 @@ -1523,7 +1531,7 @@ Confirmer la suppression src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 200 + 201 @@ -1531,7 +1539,7 @@ Cette action supprimera définitivement document(s) sélectionné(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 201 + 202 @@ -1539,7 +1547,7 @@ Cette action est irréversible. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 202 + 203 @@ -1547,7 +1555,7 @@ Supprimer le(s) document(s) src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 204 + 205 @@ -1574,6 +1582,14 @@ 27 + + Download originals + Télécharger les originaux + + src/app/components/document-list/bulk-editor/bulk-editor.component.html + 68 + + Suggestions: Suggestions : @@ -1606,22 +1622,22 @@ 1 - - Documents in inbox: - Documents dans la boîte de réception : - - src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html - 3 - - - - Total documents: - Nombre total de documents : + + Total documents: + Nombre total de documents : src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html 4 + + Documents in inbox: + Documents dans la boîte de réception : + + src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html + 3 + + Processing: Traitement : @@ -1670,6 +1686,14 @@ 126 + + HTTP error: + Erreur HTTP : + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 136 + + Upload new documents Charger de nouveaux documents @@ -1800,6 +1824,14 @@ 21 + + Invalid date. + Date incorrecte. + + src/app/components/common/input/date/date.component.html + 13 + + Yes Oui @@ -1829,7 +1861,15 @@ Anglais (US) src/app/services/settings.service.ts - 82 + 88 + + + + English (GB) + Anglais (GB) + + src/app/services/settings.service.ts + 89 @@ -1837,7 +1877,7 @@ Allemand src/app/services/settings.service.ts - 83 + 90 @@ -1845,7 +1885,7 @@ Néerlandais src/app/services/settings.service.ts - 84 + 91 @@ -1853,7 +1893,23 @@ Français src/app/services/settings.service.ts - 85 + 92 + + + + Portuguese (Brazil) + Portugais (Brésil) + + src/app/services/settings.service.ts + 93 + + + + ISO 8601 + ISO 8601 + + src/app/services/settings.service.ts + 98 @@ -1861,7 +1917,7 @@ Le document existe déjà. src/app/services/consumer-status.service.ts - 14 + 15 @@ -1869,7 +1925,7 @@ Fichier non trouvé. src/app/services/consumer-status.service.ts - 15 + 16 @@ -1877,7 +1933,7 @@ Le script de pré-traitement n'existe pas. src/app/services/consumer-status.service.ts - 16 + 17 Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation @@ -1886,7 +1942,7 @@ Erreur lors de l'exécution du script de pré-traitement. src/app/services/consumer-status.service.ts - 17 + 18 Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation @@ -1895,7 +1951,7 @@ Le script de post-traitement n'existe pas. src/app/services/consumer-status.service.ts - 18 + 19 Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation @@ -1904,7 +1960,7 @@ Erreur lors de l'exécution du script de post-traitement. src/app/services/consumer-status.service.ts - 19 + 20 Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation @@ -1913,7 +1969,7 @@ Réception d'un nouveau fichier. src/app/services/consumer-status.service.ts - 20 + 21 @@ -1921,7 +1977,7 @@ Type de fichier non pris en charge. src/app/services/consumer-status.service.ts - 21 + 22 @@ -1929,7 +1985,7 @@ Traitement du document... src/app/services/consumer-status.service.ts - 22 + 23 @@ -1937,7 +1993,7 @@ Génération de vignette... src/app/services/consumer-status.service.ts - 23 + 24 @@ -1945,7 +2001,7 @@ Extraction de la date du document... src/app/services/consumer-status.service.ts - 24 + 25 @@ -1953,7 +2009,7 @@ Enregistrement du document... src/app/services/consumer-status.service.ts - 25 + 26 @@ -1961,7 +2017,7 @@ Terminé. src/app/services/consumer-status.service.ts - 26 + 27 diff --git a/src-ui/src/locale/messages.nl_NL.xlf b/src-ui/src/locale/messages.nl_NL.xlf index 0e164d688..fa997d375 100644 --- a/src-ui/src/locale/messages.nl_NL.xlf +++ b/src-ui/src/locale/messages.nl_NL.xlf @@ -58,11 +58,11 @@ - View "" saved successfully. - View "" met succes opgeslagen. + View "" saved successfully. + View "" met succes opgeslagen. src/app/components/document-list/document-list.component.ts - 109 + 115 @@ -70,7 +70,7 @@ View "" met succes gemaakt. src/app/components/document-list/document-list.component.ts - 130 + 136 @@ -129,9 +129,9 @@ 72 - - Save "" - Opslaan "" + + Save "" + Opslaan "" src/app/components/document-list/document-list.component.html 71 @@ -214,7 +214,7 @@ Bevestig het verwijderen src/app/components/document-detail/document-detail.component.ts - 199 + 203 @@ -222,7 +222,7 @@ Wilt u het document echt verwijderen ""? src/app/components/document-detail/document-detail.component.ts - 200 + 204 @@ -230,7 +230,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 - 201 + 205 @@ -238,7 +238,7 @@ Verwijder document src/app/components/document-detail/document-detail.component.ts - 203 + 207 @@ -246,7 +246,7 @@ Fout bij het verwijderen van het document: src/app/components/document-detail/document-detail.component.ts - 210 + 214 @@ -585,14 +585,6 @@ 1 - - Filter - Filter - - src/app/components/manage/logs/logs.component.html - 7 - - Saved view "" deleted. Opgeslagen view "" verwijderd. @@ -622,7 +614,15 @@ Datumopmaak van weergavetaal gebruiken src/app/components/manage/settings/settings.component.ts - 95 + 96 + + + + ISO 8601 + ISO 8601 + + src/app/components/manage/settings/settings.component.ts + 97 @@ -630,7 +630,7 @@ Fout bij het opslaan van de instellingen: src/app/components/manage/settings/settings.component.ts - 111 + 114 @@ -649,12 +649,20 @@ 10 + + Notifications + Meldingen + + src/app/components/manage/settings/settings.component.html + 115 + + Saved views Opgeslagen views src/app/components/manage/settings/settings.component.html - 128 + 133 @@ -777,68 +785,12 @@ 98 - - Notifications - Meldingen - - src/app/components/manage/settings/settings.component.html - 102 - - - - Consumer status - Status van de verwerker - - src/app/components/manage/settings/settings.component.html - 106 - - - - Show notifications when new documents are detected - Toon meldingen wanneer nieuwe documenten worden gedetecteerd - - src/app/components/manage/settings/settings.component.html - 109 - - - - Show notifications when document consumption completes successfully - Toon meldingen wanneer documenten met succes zijn verwerkt. - - src/app/components/manage/settings/settings.component.html - 110 - - - - Show notifications when document consumption fails - Toon meldingen wanneer het verwerken van documenten faalt. - - src/app/components/manage/settings/settings.component.html - 111 - - - - Suppress notifications on dashboard - Onderdruk meldingen op het dashboard - - src/app/components/manage/settings/settings.component.html - 112 - - - - This will suppress all consumer related status messages on the dashboard. - Dit verbergt alle statusberichten op het dashboard die met de verwerker te maken hebben. - - src/app/components/manage/settings/settings.component.html - 112 - - Bulk editing Massabewerking src/app/components/manage/settings/settings.component.html - 116 + 102 @@ -846,7 +798,7 @@ Toon dialoogvenster ter bevestiging src/app/components/manage/settings/settings.component.html - 120 + 106 @@ -854,7 +806,7 @@ Er zal altijd om bevestiging gevraagd worden voor het verwijderen van documenten. src/app/components/manage/settings/settings.component.html - 120 + 106 @@ -862,7 +814,55 @@ Toepassen bij het sluiten src/app/components/manage/settings/settings.component.html - 121 + 107 + + + + Document processing + Verwerking van documenten + + src/app/components/manage/settings/settings.component.html + 118 + + + + Show notifications when new documents are detected + Toon meldingen wanneer nieuwe documenten worden gedetecteerd + + src/app/components/manage/settings/settings.component.html + 122 + + + + Show notifications when document processing completes successfully + Toon een melding wanneer documenten met succes zijn verwerkt + + src/app/components/manage/settings/settings.component.html + 123 + + + + Show notifications when document processing fails + Toon meldingen wanneer het verwerken van documenten faalt + + src/app/components/manage/settings/settings.component.html + 124 + + + + Suppress notifications on dashboard + Onderdruk meldingen op het dashboard + + src/app/components/manage/settings/settings.component.html + 125 + + + + This will suppress all messages about document processing status on the dashboard. + Dit verbergt alle statusberichten op het dashboard die met het verwerken van documenten te maken hebben. + + src/app/components/manage/settings/settings.component.html + 125 @@ -870,7 +870,7 @@ Komt voor bij src/app/components/manage/settings/settings.component.html - 140 + 145 @@ -878,7 +878,7 @@ Toon op het dashboard src/app/components/manage/settings/settings.component.html - 143 + 148 @@ -886,7 +886,7 @@ Toon in de zijbalk src/app/components/manage/settings/settings.component.html - 147 + 152 @@ -894,7 +894,7 @@ Geen opgeslagen views gedefinieerd. src/app/components/manage/settings/settings.component.html - 157 + 162 @@ -1119,7 +1119,7 @@ Beheren src/app/components/app-frame/app-frame.component.html - 112 + 107 @@ -1127,15 +1127,15 @@ Beheer src/app/components/app-frame/app-frame.component.html - 154 + 149 - - Misc - Andere + + Info + Informatie src/app/components/app-frame/app-frame.component.html - 160 + 155 @@ -1143,7 +1143,7 @@ Handleiding src/app/components/app-frame/app-frame.component.html - 167 + 162 @@ -1151,7 +1151,15 @@ GitHub src/app/components/app-frame/app-frame.component.html - 174 + 170 + + + + Suggest an idea + Ideeënbus + + src/app/components/app-frame/app-frame.component.html + 176 @@ -1167,7 +1175,7 @@ Open documenten src/app/components/app-frame/app-frame.component.html - 92 + 87 @@ -1175,7 +1183,7 @@ Alles sluiten src/app/components/app-frame/app-frame.component.html - 106 + 101 @@ -1226,6 +1234,14 @@ 46 + + Title: + Titel: + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 50 + + Filter tags Etiketten filteren @@ -1384,7 +1400,7 @@ Fout bij het uitvoeren van een massabewerking: src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 73 + 74 @@ -1392,7 +1408,7 @@ "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 112 + 113 @@ -1400,7 +1416,7 @@ "" en "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 114 + 115 This is for messages like 'modify "tag1" and "tag2"' @@ -1409,7 +1425,7 @@ , src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 116 + 117 this is used to separate enumerations and should probably be a comma and a whitespace in most languages @@ -1418,7 +1434,7 @@ en "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 117 + 118 this is for messages like 'modify "tag1", "tag2" and "tag3"' @@ -1427,7 +1443,7 @@ Bevestig toewijzen van etiketten src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 126 + 127 @@ -1435,7 +1451,7 @@ Het etiket "" zal aan geselecteerd(e) document(en) worden toegewezen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 129 + 130 @@ -1443,7 +1459,7 @@ De etiketten zullen aan geselecteerd(e) document(en) worden toegewezen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 131 + 132 @@ -1451,7 +1467,7 @@ Het etiket "" zal verwijderd worden van geselecteerd(e) document(en). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 134 + 135 @@ -1459,7 +1475,7 @@ De etiketten zullen verwijderd worden van geselecteerd(e) document(en). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 136 + 137 @@ -1467,7 +1483,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 - 138 + 139 @@ -1475,7 +1491,7 @@ Bevestig toewijzen van correspondent src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 158 + 159 @@ -1483,7 +1499,7 @@ De correspondent "" zal aan geselecteerd(e) document(en) worden toegewezen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 160 + 161 @@ -1491,7 +1507,7 @@ De correspondent zal verwijderd worden van geselecteerd(e) document(en). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 162 + 163 @@ -1499,7 +1515,7 @@ Bevestig toewijzen van documenttype src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 181 + 182 @@ -1507,7 +1523,7 @@ Het documenttype "" zal aan geselecteerd(e) document(en) worden toegewezen. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 183 + 184 @@ -1515,7 +1531,7 @@ Het documenttype zal verwijderd worden van geselecteerd(e) document(en). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 185 + 186 @@ -1523,7 +1539,7 @@ Bevestig verwijderen src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 200 + 201 @@ -1531,7 +1547,7 @@ geselecteerd(e) document(en) zullen permanent worden verwijderd. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 201 + 202 @@ -1539,7 +1555,7 @@ Deze actie kan niet ongedaan worden gemaakt. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 202 + 203 @@ -1547,7 +1563,7 @@ Verwijder document(en) src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 204 + 205 @@ -1574,6 +1590,14 @@ 27 + + Download originals + Originelen downloaden + + src/app/components/document-list/bulk-editor/bulk-editor.component.html + 68 + + Suggestions: Suggesties: @@ -1606,22 +1630,22 @@ 1 - - Documents in inbox: - Documenten in "Postvak in": - - src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html - 3 - - - - Total documents: - Totaal aantal documenten: + + Total documents: + Totaal aantal documenten: src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html 4 + + Documents in inbox: + Documenten in "Postvak in": + + src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html + 3 + + Processing: Bezig met verwerken: @@ -1662,14 +1686,22 @@ 123 - - Waiting for consumer... - Wachten op het verwerken... + + Upload complete, waiting... + Upload voltooid, klaar voor meer... src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts 126 + + HTTP error: + HTTP fout: + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 136 + + Upload new documents Nieuwe documenten opladen @@ -1701,21 +1733,23 @@ src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html 4 + This button dismisses all status messages about processed documents on the dashboard (failed and successful) - - more hidden - niet getoond + + {VAR_PLURAL, plural, =1 {One more document} other { more documents}} + {VAR_PLURAL, plural, =1 {Nog één document} other {Nog documenten}} src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html - 24 + 25 + This is shown as a summary line when there are more than 5 document in the processing pipeline. Open document Open document src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html - 41 + 45 @@ -1830,12 +1864,20 @@ 82 + + English (GB) + Engels (Brits) + + src/app/services/settings.service.ts + 83 + + German Duits src/app/services/settings.service.ts - 83 + 84 @@ -1843,7 +1885,7 @@ Nederlands src/app/services/settings.service.ts - 84 + 85 @@ -1851,7 +1893,7 @@ Frans src/app/services/settings.service.ts - 85 + 86 @@ -1859,7 +1901,7 @@ Document bestaat al. src/app/services/consumer-status.service.ts - 14 + 15 @@ -1867,7 +1909,7 @@ Bestand niet gevonden. src/app/services/consumer-status.service.ts - 15 + 16 @@ -1875,39 +1917,43 @@ Pre-verwerkingsscript bestaat niet. src/app/services/consumer-status.service.ts - 16 + 17 + Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation Error while executing pre-consume script. Fout tijdens het uitvoeren van het pre-verwerkingsscript src/app/services/consumer-status.service.ts - 17 + 18 + Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation Post-consume script does not exist. Post-verwerkingsscript bestaat niet. src/app/services/consumer-status.service.ts - 18 + 19 + Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation Error while executing post-consume script. Fout tijdens het uitvoeren van het post-verwerkingsscript src/app/services/consumer-status.service.ts - 19 + 20 + Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation Received new file. Nieuw bestand ontvangen. src/app/services/consumer-status.service.ts - 20 + 21 @@ -1915,7 +1961,7 @@ Bestandstype niet ondersteund. src/app/services/consumer-status.service.ts - 21 + 22 @@ -1923,7 +1969,7 @@ Document wordt verwerkt... src/app/services/consumer-status.service.ts - 22 + 23 @@ -1931,7 +1977,7 @@ Voorbeeldweergave wordt gemaakt... src/app/services/consumer-status.service.ts - 23 + 24 @@ -1939,7 +1985,7 @@ Datum wordt gezocht in document... src/app/services/consumer-status.service.ts - 24 + 25 @@ -1947,7 +1993,7 @@ Document wordt opgeslagen... src/app/services/consumer-status.service.ts - 25 + 26 @@ -1955,7 +2001,7 @@ Klaar. src/app/services/consumer-status.service.ts - 26 + 27 diff --git a/src-ui/src/locale/messages.pt_BR.xlf b/src-ui/src/locale/messages.pt_BR.xlf new file mode 100644 index 000000000..ff438073d --- /dev/null +++ b/src-ui/src/locale/messages.pt_BR.xlf @@ -0,0 +1,2353 @@ + + + + + Document added + Documento adicionado + + src/app/app.component.ts + 51 + + + + Document was added to paperless. + Documento foi adicionado ao paperless. + + src/app/app.component.ts + 51 + + + + Open document + Abrir documento + + src/app/app.component.ts + 51 + + + + Could not add : + Não foi possível adicionar : + + src/app/app.component.ts + 59 + + + + New document detected + Novo documento detectado + + src/app/app.component.ts + 65 + + + + Document is being processed by paperless. + Documento está sendo processado pelo paperless. + + src/app/app.component.ts + 65 + + + + Documents + Documentos + + src/app/components/document-list/document-list.component.ts + 49 + + + + View "" saved successfully. + Visualização "" salva com sucesso. + + src/app/components/document-list/document-list.component.ts + 115 + + + + View "" created successfully. + Visualização "" criada com sucesso. + + src/app/components/document-list/document-list.component.ts + 136 + + + + Select + Selecionar + + src/app/components/document-list/document-list.component.html + 7 + + + + Select none + Selecionar nenhum + + src/app/components/document-list/document-list.component.html + 10 + + + + Select page + Selecionar página + + src/app/components/document-list/document-list.component.html + 11 + + + + Select all + Selecionar todos + + src/app/components/document-list/document-list.component.html + 12 + + + + Sort + Ordenar + + src/app/components/document-list/document-list.component.html + 39 + + + + Views + Visualizações + + src/app/components/document-list/document-list.component.html + 64 + + + + Save as... + Salvar como... + + src/app/components/document-list/document-list.component.html + 72 + + + + Save "" + Salvar "" + + src/app/components/document-list/document-list.component.html + 71 + + + + {VAR_PLURAL, plural, =1 {Selected of one document} other {Selected of documents}} + {VAR_PLURAL, plural, =1 {Selecionado de um documento} other {Selecionado of documentos}} + + src/app/components/document-list/document-list.component.html + 85 + + + + {VAR_PLURAL, plural, =1 {One document} other { documents}} + {VAR_PLURAL, plural, =1 {Um documento} other { documentos}} + + src/app/components/document-list/document-list.component.html + 86 + + + + (filtered) + (filtrado) + + src/app/components/document-list/document-list.component.html + 86 + + + + ASN + NSA + + src/app/components/document-list/document-list.component.html + 105 + + + + Correspondent + Correspondente + + src/app/components/document-list/document-list.component.html + 111 + + + + Title + Título + + src/app/components/document-list/document-list.component.html + 117 + + + + Document type + Tipo de Documento + + src/app/components/document-list/document-list.component.html + 123 + + + + Created + Criado + + src/app/components/document-list/document-list.component.html + 129 + + + + Added + Adicionado + + src/app/components/document-list/document-list.component.html + 135 + + + + Confirm delete + Confirmar exclusão + + src/app/components/document-detail/document-detail.component.ts + 203 + + + + Do you really want to delete document ""? + Você realmente deseja excluir o documento ""? + + src/app/components/document-detail/document-detail.component.ts + 204 + + + + The files for this document will be deleted permanently. This operation cannot be undone. + Os arquivos desse documento serão excluídos permanentemente. Essa operação não pode ser revertida. + + src/app/components/document-detail/document-detail.component.ts + 205 + + + + Delete document + Excluir documento + + src/app/components/document-detail/document-detail.component.ts + 207 + + + + Error deleting document: + Erro ao excluir documento: + + src/app/components/document-detail/document-detail.component.ts + 214 + + + + Delete + Excluir + + src/app/components/document-detail/document-detail.component.html + 15 + + + + Download + Baixar + + src/app/components/document-detail/document-detail.component.html + 23 + + + + More like this + Mais como este + + src/app/components/document-detail/document-detail.component.html + 38 + + + + Close + Fechar + + src/app/components/document-detail/document-detail.component.html + 44 + + + + Details + Detalhes + + src/app/components/document-detail/document-detail.component.html + 56 + + + + Content + Conteúdo + + src/app/components/document-detail/document-detail.component.html + 72 + + + + Metadata + Metadados + + src/app/components/document-detail/document-detail.component.html + 81 + + + + Discard + Descartar + + src/app/components/document-detail/document-detail.component.html + 130 + + + + Save + Salvar + + src/app/components/document-detail/document-detail.component.html + 132 + + + + Page + Página + + src/app/components/document-detail/document-detail.component.html + 4 + + + + of + de + + src/app/components/document-detail/document-detail.component.html + 8 + + + + Download original + Baixar original + + src/app/components/document-detail/document-detail.component.html + 29 + + + + Archive serial number + Número de série de arquivamento + + src/app/components/document-detail/document-detail.component.html + 60 + + + + Date created + Data de criação + + src/app/components/document-detail/document-detail.component.html + 61 + + + + Date modified + Data de modificação + + src/app/components/document-detail/document-detail.component.html + 87 + + + + Date added + Data de adição + + src/app/components/document-detail/document-detail.component.html + 91 + + + + Media filename + Nome do arquivo + + src/app/components/document-detail/document-detail.component.html + 95 + + + + Original MD5 checksum + Soma de verificação MD5 original + + src/app/components/document-detail/document-detail.component.html + 99 + + + + Original file size + Tamanho do arquivo original + + src/app/components/document-detail/document-detail.component.html + 103 + + + + Original mime type + Tipo mime original + + src/app/components/document-detail/document-detail.component.html + 107 + + + + Archive MD5 checksum + Soma de verificação MD5 de arquivamento + + src/app/components/document-detail/document-detail.component.html + 111 + + + + Archive file size + Tamanho arquivado + + src/app/components/document-detail/document-detail.component.html + 115 + + + + Original document metadata + Metadados do documento original + + src/app/components/document-detail/document-detail.component.html + 121 + + + + Archived document metadata + Metadados do documento arquivado + + src/app/components/document-detail/document-detail.component.html + 122 + + + + Save & next + Salvar & próximo + + src/app/components/document-detail/document-detail.component.html + 131 + + + + Hello , welcome to Paperless-ng! + Olá , bem-vindo ao Paperless-ng! + + src/app/components/dashboard/dashboard.component.ts + 33 + + + + Welcome to Paperless-ng! + Bem-vindo ao Paperless-ng! + + src/app/components/dashboard/dashboard.component.ts + 35 + + + + Dashboard + Painel de controle + + src/app/components/dashboard/dashboard.component.html + 1 + + + + Do you really want to delete the tag ""? + Você realmente deseja excluir a etiqueta ""? + + src/app/components/manage/tag-list/tag-list.component.ts + 30 + + + + Tags + Etiquetas + + src/app/components/manage/tag-list/tag-list.component.html + 1 + + + + Create + Criar + + src/app/components/manage/tag-list/tag-list.component.html + 2 + + + + Filter by: + Filtrar por: + + src/app/components/manage/tag-list/tag-list.component.html + 8 + + + + Name + Nome + + src/app/components/manage/tag-list/tag-list.component.html + 9 + + + + Color + Cor + + src/app/components/manage/tag-list/tag-list.component.html + 20 + + + + Matching + Detecção + + src/app/components/manage/tag-list/tag-list.component.html + 21 + + + + Document count + Número de documentos + + src/app/components/manage/tag-list/tag-list.component.html + 22 + + + + Actions + Ações + + src/app/components/manage/tag-list/tag-list.component.html + 23 + + + + Documents + Documentos + + src/app/components/manage/tag-list/tag-list.component.html + 38 + + + + Edit + Editar + + src/app/components/manage/tag-list/tag-list.component.html + 43 + + + + Do you really want to delete the document type ""? + Você realmente deseja excluir o tipo de documento ""? + + src/app/components/manage/document-type-list/document-type-list.component.ts + 26 + + + + Document types + Tipos de documento + + src/app/components/manage/document-type-list/document-type-list.component.html + 1 + + + + Logs + Logs + + src/app/components/manage/logs/logs.component.html + 1 + + + + Saved view "" deleted. + Visualização "" excluída. + + src/app/components/manage/settings/settings.component.ts + 67 + + + + Settings saved successfully. + Configurações salvas com sucesso. + + src/app/components/manage/settings/settings.component.ts + 87 + + + + Use system language + Usar linguagem do sistema + + src/app/components/manage/settings/settings.component.ts + 92 + + + + Use date format of display language + Usar formato de data da linguagem de exibição + + src/app/components/manage/settings/settings.component.ts + 98 + + + + Error while storing settings on server: + Erro ao salvar configurações: + + src/app/components/manage/settings/settings.component.ts + 115 + + + + Settings + Configurações + + src/app/components/manage/settings/settings.component.html + 1 + + + + General settings + Configurações gerais + + src/app/components/manage/settings/settings.component.html + 10 + + + + Notifications + Notificações + + src/app/components/manage/settings/settings.component.html + 115 + + + + Saved views + Visualizações + + src/app/components/manage/settings/settings.component.html + 133 + + + + Appearance + Aparência + + src/app/components/manage/settings/settings.component.html + 13 + + + + Display language + Linguagem de exibição + + src/app/components/manage/settings/settings.component.html + 17 + + + + You need to reload the page after applying a new language. + Você precisar recarregar a página depois de escolher uma nova linguagem. + + src/app/components/manage/settings/settings.component.html + 25 + + + + Date display + Exibição de data + + src/app/components/manage/settings/settings.component.html + 32 + + + + Date format + Formato de data + + src/app/components/manage/settings/settings.component.html + 45 + + + + Short: + Curto: + + src/app/components/manage/settings/settings.component.html + 51 + + + + Medium: + Médio: + + src/app/components/manage/settings/settings.component.html + 55 + + + + Long: + Longo: + + src/app/components/manage/settings/settings.component.html + 59 + + + + Items per page + Itens por página + + src/app/components/manage/settings/settings.component.html + 67 + + + + Document editor + Editor de documentos + + src/app/components/manage/settings/settings.component.html + 83 + + + + Use PDF viewer provided by the browser + Usar visualizador de PDF do navegador + + 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. + Isso é geralmente mais rápido para exibir grandes documentos PDF, mas poderá não funcionar em alguns navegadores. + + src/app/components/manage/settings/settings.component.html + 87 + + + + Dark mode + Modo noturno + + src/app/components/manage/settings/settings.component.html + 94 + + + + Use system settings + Usar configurações do sistema + + src/app/components/manage/settings/settings.component.html + 97 + + + + Enable dark mode + Habilitar modo noturno + + src/app/components/manage/settings/settings.component.html + 98 + + + + Bulk editing + Edição em massa + + src/app/components/manage/settings/settings.component.html + 102 + + + + Show confirmation dialogs + Mostrar janelas de confirmação + + src/app/components/manage/settings/settings.component.html + 106 + + + + Deleting documents will always ask for confirmation. + Ao excluir um documento, sempre será pedido uma confirmação. + + src/app/components/manage/settings/settings.component.html + 106 + + + + Apply on close + Aplicar ao fechar + + src/app/components/manage/settings/settings.component.html + 107 + + + + Document processing + Processamento de documentos + + src/app/components/manage/settings/settings.component.html + 118 + + + + Show notifications when new documents are detected + Exibir notificações quando novos documentos forem detectados + + src/app/components/manage/settings/settings.component.html + 122 + + + + Show notifications when document processing completes successfully + Exibir notificações quando o processamento de um documento concluir com sucesso + + src/app/components/manage/settings/settings.component.html + 123 + + + + Show notifications when document processing fails + Exibir notificações quando o processamento de um documento falhar + + src/app/components/manage/settings/settings.component.html + 124 + + + + Suppress notifications on dashboard + Não exibir notificações no painel de controle + + src/app/components/manage/settings/settings.component.html + 125 + + + + This will suppress all messages about document processing status on the dashboard. + Isso esconderá todas as mensagens sobre o status de processamento de documentos no painel de controle. + + src/app/components/manage/settings/settings.component.html + 125 + + + + Appears on + Aparece em + + src/app/components/manage/settings/settings.component.html + 145 + + + + Show on dashboard + Exibir no painel de controle + + src/app/components/manage/settings/settings.component.html + 148 + + + + Show in sidebar + Mostrar na navegação lateral + + src/app/components/manage/settings/settings.component.html + 152 + + + + No saved views defined. + Nenhuma visualização definida. + + src/app/components/manage/settings/settings.component.html + 162 + + + + 404 Not Found + 404 Não Encontrado + + src/app/components/not-found/not-found.component.html + 7 + + + + Do you really want to delete the correspondent ""? + Você realmente deseja excluir o correspondente ""? + + src/app/components/manage/correspondent-list/correspondent-list.component.ts + 26 + + + + Correspondents + Correspondentes + + src/app/components/manage/correspondent-list/correspondent-list.component.html + 1 + + + + Last correspondence + Última correspondência + + src/app/components/manage/correspondent-list/correspondent-list.component.html + 22 + + + + Confirmation + Confirmação + + src/app/components/common/confirm-dialog/confirm-dialog.component.ts + 17 + + + + Confirm + Confirmar + + src/app/components/common/confirm-dialog/confirm-dialog.component.ts + 29 + + + + Cancel + Cancelar + + src/app/components/common/confirm-dialog/confirm-dialog.component.html + 12 + + + + Create new correspondent + Criar novo correspondente + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts + 21 + + + + Edit correspondent + Editar correspondente + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts + 25 + + + + Matching algorithm + Algoritmo de detecção + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html + 10 + + + + Matching pattern + Padrão de detecção + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html + 11 + + + + Case insensitive + Não diferenciar maiúsculas de minúsculas + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html + 12 + + + + Create new tag + Criar nova etiqueta + + src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts + 21 + + + + Edit tag + Editar etiqueta + + src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts + 25 + + + + Inbox tag + Etiqueta caixa de entrada + + src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html + 21 + + + + Inbox tags are automatically assigned to all consumed documents. + Etiquetas de caixa de entrada são atribuídas automaticamente para todos os documentos consumidos. + + src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html + 21 + + + + Create new document type + Criar novo tipo de documento + + src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts + 21 + + + + Edit document type + Editar tipo de documento + + src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts + 25 + + + + Search results + Resultados da busca + + src/app/components/search/search.component.html + 1 + + + + Invalid search query: + Termo de pesquisa inválido: + + src/app/components/search/search.component.html + 4 + + + + Showing documents similar to + Exibindo documentos similares a + + src/app/components/search/search.component.html + 7 + + + + Search query: + Termo de pesquisa: + + src/app/components/search/search.component.html + 11 + + + + Did you mean ""? + Você quis dizer ""? + + src/app/components/search/search.component.html + 13 + + + + {VAR_PLURAL, plural, =0 {No results} =1 {One result} other { results}} + {VAR_PLURAL, plural, =0 {Sem resultados} =1 {Um resultado} other { resultados}} + + src/app/components/search/search.component.html + 18 + + + + Paperless-ng + Paperless-ng + + src/app/components/app-frame/app-frame.component.html + 11 + + app title + + + Search documents + Procurar documentos + + src/app/components/app-frame/app-frame.component.html + 15 + + + + Logout + Encerrar sessão + + src/app/components/app-frame/app-frame.component.html + 45 + + + + Manage + Gerenciar + + src/app/components/app-frame/app-frame.component.html + 107 + + + + Admin + Admin + + src/app/components/app-frame/app-frame.component.html + 149 + + + + Info + Informação + + src/app/components/app-frame/app-frame.component.html + 155 + + + + Documentation + Documentação + + src/app/components/app-frame/app-frame.component.html + 162 + + + + GitHub + GitHub + + src/app/components/app-frame/app-frame.component.html + 170 + + + + Suggest an idea + Sugerir uma idéia + + src/app/components/app-frame/app-frame.component.html + 176 + + + + Logged in as + Sessão iniciada como + + src/app/components/app-frame/app-frame.component.html + 34 + + + + Open documents + Abrir documentos + + src/app/components/app-frame/app-frame.component.html + 87 + + + + Close all + Fechar todos + + src/app/components/app-frame/app-frame.component.html + 101 + + + + Correspondent: + Correspondente: + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 29 + + + + Without correspondent + Sem correspondente + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 31 + + + + Type: + Tipo: + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 36 + + + + Without document type + Sem tipo de documento + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 38 + + + + Tag: + Etiqueta: + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 42 + + + + Without any tag + Sem etiquetas + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 46 + + + + Title: + Título: + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 50 + + + + Filter tags + Filtrar etiquetas + + src/app/components/document-list/filter-editor/filter-editor.component.html + 12 + + + + Filter correspondents + Filtrar correspondentes + + src/app/components/document-list/filter-editor/filter-editor.component.html + 20 + + + + Filter document types + Filtrar tipos de documento + + src/app/components/document-list/filter-editor/filter-editor.component.html + 27 + + + + Reset filters + Limpar filtros + + src/app/components/document-list/filter-editor/filter-editor.component.html + 50 + + + + Not assigned + Não atribuído + + src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts + 166 + + Filter drop down element to filter for documents with no correspondent/type/tag assigned + + + Apply + Aplicar + + src/app/components/common/filterable-dropdown/filterable-dropdown.component.html + 26 + + + + Last 7 days + Últimos 7 dias + + src/app/components/common/date-dropdown/date-dropdown.component.ts + 24 + + + + Last month + Último mês + + src/app/components/common/date-dropdown/date-dropdown.component.ts + 25 + + + + Last 3 months + Últimos 3 meses + + src/app/components/common/date-dropdown/date-dropdown.component.ts + 26 + + + + Last year + Último ano + + src/app/components/common/date-dropdown/date-dropdown.component.ts + 27 + + + + After + Antes + + src/app/components/common/date-dropdown/date-dropdown.component.html + 13 + + + + Before + Depois + + src/app/components/common/date-dropdown/date-dropdown.component.html + 29 + + + + Clear + Limpar + + src/app/components/common/date-dropdown/date-dropdown.component.html + 18 + + + + View + Ver + + src/app/components/document-list/document-card-large/document-card-large.component.html + 50 + + + + Created: + Criado: + + src/app/components/document-list/document-card-large/document-card-large.component.html + 67 + + + + Filter by correspondent + Filtrar por correspondente + + src/app/components/document-list/document-card-large/document-card-large.component.html + 20 + + + + Filter by tag + Filtrar por etiqueta + + src/app/components/document-list/document-card-large/document-card-large.component.html + 24 + + + + Score: + Nota: + + src/app/components/document-list/document-card-large/document-card-large.component.html + 62 + + + + View in browser + Visualizar no navegador + + src/app/components/document-list/document-card-small/document-card-small.component.html + 40 + + + + Error executing bulk operation: + Erro ao executar operação em massa: + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 74 + + + + "" + "" + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 113 + + + + "" and "" + "" e "" + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 115 + + This is for messages like 'modify "tag1" and "tag2"' + + + , + , + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 117 + + this is used to separate enumerations and should probably be a comma and a whitespace in most languages + + + and "" + e "" + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 118 + + this is for messages like 'modify "tag1", "tag2" and "tag3"' + + + Confirm tags assignment + Confirmar atribuição de etiqueta + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 127 + + + + This operation will add the tag "" to selected document(s). + Essa operação irá adicionar a etiqueta "" em documento(s) selecionado(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 130 + + + + This operation will add the tags to selected document(s). + Essa operação irá adicionar as etiquetas em documento(s) selecionado(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 132 + + + + This operation will remove the tag "" from selected document(s). + Essa operação irá remover a etiqueta "" de documento(s) selecionado(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 135 + + + + This operation will remove the tags from selected document(s). + Essa operação irá remover as etiquetas de documento(s) selecionado(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 137 + + + + This operation will add the tags and remove the tags on selected document(s). + Essa operação irá adicionar as etiquetas e remover as etiquetas de documento(s) selecionado(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 139 + + + + Confirm correspondent assignment + Confirmar atribuição de correspondente + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 159 + + + + This operation will assign the correspondent "" to selected document(s). + Essa operação irá atribuir o correspondente "" para documento(s) selecionado(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 161 + + + + This operation will remove the correspondent from selected document(s). + Essa operação irá remover o correspondente de documento(s) selecionado(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 163 + + + + Confirm document type assignment + Confirmar atribuição de tipo de documento + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 182 + + + + This operation will assign the document type "" to selected document(s). + Essa operação irá atribuir o tipo de documento "" para documento(s) selecionado(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 184 + + + + This operation will remove the document type from selected document(s). + Essa operação irá remover o tipo de documento de documento(s) selecionado(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 186 + + + + Delete confirm + Confirmar exlcusão + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 201 + + + + This operation will permanently delete selected document(s). + Essa operação irá excluir permanentemente documento(s) selecionado(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 202 + + + + This operation cannot be undone. + Essa operação não pode ser revertida. + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 203 + + + + Delete document(s) + Apagar documento(s) + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 205 + + + + Select: + Selecionar: + + src/app/components/document-list/bulk-editor/bulk-editor.component.html + 10 + + + + All + Todos + + src/app/components/document-list/bulk-editor/bulk-editor.component.html + 20 + + + + Edit: + Editar: + + src/app/components/document-list/bulk-editor/bulk-editor.component.html + 27 + + + + Download originals + Descarregar originais + + src/app/components/document-list/bulk-editor/bulk-editor.component.html + 68 + + + + Suggestions: + Sugestões: + + src/app/components/common/input/select/select.component.html + 26 + + + + Save current view + Salvar visualização atual + + src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html + 3 + + + + Show all + Mostrar todos + + src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html + 3 + + + + Statistics + Estatísticas + + src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html + 1 + + + + Total documents: + Total de documentos: + + src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html + 4 + + + + Documents in inbox: + Documentos na caixa de entrada: + + src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html + 3 + + + + Processing: + Processando: + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 32 + + + + Failed: + Falha: + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 35 + + + + Added: + Adicionado: + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 38 + + + + Connecting... + Conectando... + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 118 + + + + Uploading... + Enviando... + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 123 + + + + Upload complete, waiting... + Envio concluído, esperando... + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 126 + + + + HTTP error: + Erro HTTP: + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 136 + + + + Upload new documents + Enviar novos documentos + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 1 + + + + Drop documents here or + Solte documentos aqui ou + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 13 + + + + Browse files + Navegar arquivos + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 13 + + + + Dismiss completed + Esconder completos + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 4 + + This button dismisses all status messages about processed documents on the dashboard (failed and successful) + + + {VAR_PLURAL, plural, =1 {One more document} other { more documents}} + {VAR_PLURAL, plural, =1 {Mais um documento} other {Mais documentos} + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 25 + + This is shown as a summary line when there are more than 5 document in the processing pipeline. + + + Open document + Abrir documento + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 45 + + + + First steps + Primeiros passos + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 1 + + + + Paperless is running! :) + O Paperless está a correr! :) + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 5 + + + + You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list. After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and they will appear on the dashboard instead of this message. + Pode começar a carregar documentos deixando-os na caixa de carregamento de ficheiros à direita, ou deixando-os na pasta de consumo pré-configurada, que eles depois aparecem na lista de documentos. Depois de ter adicionado alguns meta-dados aos seus documentos, utilize os mecanismos de filtragem do Paperless para criar visualizações personalizadas (tais como 'Adicionados recentemente', 'Etiquetados com PARAFAZER'). Posteriormente estes aparecerão no painel em vez desta mensagem. + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 6,7 + + + + Paperless offers some more features that try to make your life easier: + O Paperless oferece algumas funcionalidades para tentar tornar a sua vida mais fácil: + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 8 + + + + Once you've got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically. + Assim que já tenha alguns documentos previamente adicionados com os respetivos meta-dados, o Paperless consegue adicionar automaticamente meta-dados aos novos documentos. + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 10 + + + + You can configure paperless to read your mails and add documents from attached files. + Pode configurar o Paperless para ler os seus e-mails e adicionar os documentos em anexo à plataforma. + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 11 + + + + Consult the documentation on how to use these features. The section on basic usage also has some information on how to use paperless in general. + Consulte a documentação para saber como utilizar estas funcionalidades. A secção sobre utilização básica têm informação para o ajudar a utilizar a plataforma de uma forma geral. + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 13 + + + + Metadata + Metadados + + src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts + 18 + + + + Select + Selecione + + src/app/components/common/select-dialog/select-dialog.component.ts + 18 + + + + Please select an object + Por favor selecione um objeto + + src/app/components/common/select-dialog/select-dialog.component.ts + 21 + + + + Invalid date. + Data inválida. + + src/app/components/common/input/date/date.component.html + 13 + + + + Yes + Sim + + src/app/pipes/yes-no.pipe.ts + 9 + + + + No + Não + + src/app/pipes/yes-no.pipe.ts + 9 + + + + (no title) + (sem título) + + src/app/pipes/document-title.pipe.ts + 12 + + + + English (US) + Inglês (US) + + src/app/services/settings.service.ts + 88 + + + + English (GB) + Inglês (GB) + + src/app/services/settings.service.ts + 89 + + + + German + Alemão + + src/app/services/settings.service.ts + 90 + + + + Dutch + Holandês + + src/app/services/settings.service.ts + 91 + + + + French + Francês + + src/app/services/settings.service.ts + 92 + + + + Portuguese (Brazil) + Português (Brasil) + + src/app/services/settings.service.ts + 93 + + + + ISO 8601 + ISO 8601 + + src/app/services/settings.service.ts + 98 + + + + Document already exists. + Documento já existente. + + src/app/services/consumer-status.service.ts + 15 + + + + File not found. + Arquivo não encontrado. + + src/app/services/consumer-status.service.ts + 16 + + + + Pre-consume script does not exist. + Script pré-consumo não existe. + + src/app/services/consumer-status.service.ts + 17 + + Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation + + + Error while executing pre-consume script. + Erro ao executar script pré-consumo. + + src/app/services/consumer-status.service.ts + 18 + + Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation + + + Post-consume script does not exist. + Script pós-consumo não existe. + + src/app/services/consumer-status.service.ts + 19 + + Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation + + + Error while executing post-consume script. + Erro ao executar script pós-consumo. + + src/app/services/consumer-status.service.ts + 20 + + Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation + + + Received new file. + Novo arquivo recebido. + + src/app/services/consumer-status.service.ts + 21 + + + + File type not supported. + Tipo de arquivo não suportado. + + src/app/services/consumer-status.service.ts + 22 + + + + Processing document... + Processando documento... + + src/app/services/consumer-status.service.ts + 23 + + + + Generating thumbnail... + Gerando imagem... + + src/app/services/consumer-status.service.ts + 24 + + + + Retrieving date from document... + Buscando data do documento... + + src/app/services/consumer-status.service.ts + 25 + + + + Saving document... + Salvando documento... + + src/app/services/consumer-status.service.ts + 26 + + + + Finished. + Encerrado. + + src/app/services/consumer-status.service.ts + 27 + + + + Error + Erro + + src/app/services/toast.service.ts + 35 + + + + Information + Informação + + src/app/services/toast.service.ts + 39 + + + + ASN + NSA + + src/app/services/rest/document.service.ts + 17 + + + + Correspondent + Correspondente + + src/app/services/rest/document.service.ts + 18 + + + + Title + Título + + src/app/services/rest/document.service.ts + 19 + + + + Document type + Tipo de Documento + + src/app/services/rest/document.service.ts + 20 + + + + Created + Criado + + src/app/services/rest/document.service.ts + 21 + + + + Added + Adicionado + + src/app/services/rest/document.service.ts + 22 + + + + Modified + Modificado + + src/app/services/rest/document.service.ts + 23 + + + + Light blue + Azul claro + + src/app/data/paperless-tag.ts + 6 + + + + Blue + Azul + + src/app/data/paperless-tag.ts + 7 + + + + Light green + Verde claro + + src/app/data/paperless-tag.ts + 8 + + + + Green + Verde + + src/app/data/paperless-tag.ts + 9 + + + + Light red + Vermelho claro + + src/app/data/paperless-tag.ts + 10 + + + + Red + Vermelho + + src/app/data/paperless-tag.ts + 11 + + + + Light orange + Laranja claro + + src/app/data/paperless-tag.ts + 12 + + + + Orange + Laranja + + src/app/data/paperless-tag.ts + 13 + + + + Light violet + Violeta claro + + src/app/data/paperless-tag.ts + 14 + + + + Violet + Violeta + + src/app/data/paperless-tag.ts + 15 + + + + Brown + Marrom + + src/app/data/paperless-tag.ts + 16 + + + + Black + Preto + + src/app/data/paperless-tag.ts + 17 + + + + Light grey + Cinza claro + + src/app/data/paperless-tag.ts + 18 + + + + Create new item + Criar novo item + + src/app/components/common/edit-dialog/edit-dialog.component.ts + 50 + + + + Edit item + Editar item + + src/app/components/common/edit-dialog/edit-dialog.component.ts + 54 + + + + Could not save element: + Não podemos salvar elemento: + + src/app/components/common/edit-dialog/edit-dialog.component.ts + 58 + + + + Automatic + Automático + + src/app/components/manage/generic-list/generic-list.component.ts + 39 + + + + Do you really want to delete this element? + Você realmente quer excluir esse elemento? + + src/app/components/manage/generic-list/generic-list.component.ts + 97 + + + + Associated documents will not be deleted. + Documentos associados não serão excluidos. + + src/app/components/manage/generic-list/generic-list.component.ts + 104 + + + + Delete + Excluir + + src/app/components/manage/generic-list/generic-list.component.ts + 106 + + + + Error while deleting element: + Erro ao excluir elemento: + + src/app/components/manage/generic-list/generic-list.component.ts + 114 + + + + Any word + Qualquer palavra + + src/app/data/matching-model.ts + 12 + + + + Any: Document contains any of these words (space separated) + Qualquer: Documento contém qualquer uma dessas palavras (separadas por espaço) + + src/app/data/matching-model.ts + 12 + + + + All words + Todas as palavras + + src/app/data/matching-model.ts + 13 + + + + All: Document contains all of these words (space separated) + Todas: Documento contém todas essas palavras (separadas por espaço) + + src/app/data/matching-model.ts + 13 + + + + Exact match + Detecção exata + + src/app/data/matching-model.ts + 14 + + + + Exact: Document contains this string + Exata: Documento contém essa palavra + + src/app/data/matching-model.ts + 14 + + + + Regular expression + Expressão regular + + src/app/data/matching-model.ts + 15 + + + + Regular expression: Document matches this regular expression + Expressão regular: Documento condiz com essa expressão regular + + src/app/data/matching-model.ts + 15 + + + + Fuzzy word + Palavra difusa + + src/app/data/matching-model.ts + 16 + + + + Fuzzy: Document contains a word similar to this word + Fuzzy: Documento contém uma palavra similar à essa. + + src/app/data/matching-model.ts + 16 + + + + Auto: Learn matching automatically + Auto: Aprender detecção automaticamente + + src/app/data/matching-model.ts + 17 + + + + + \ No newline at end of file diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss index 57bb9896e..58c99f96d 100644 --- a/src-ui/src/theme_dark.scss +++ b/src-ui/src/theme_dark.scss @@ -247,6 +247,16 @@ $border-color-dark-mode: #47494f; } } + .btn-light:not(:disabled):not(.disabled) { + background-color: $bg-dark-mode; + color: $text-color-dark-mode-accent; + + &:hover { + background-color: $text-color-dark-mode; + color: $bg-dark-mode; + } + } + .btn-link:not(:disabled):not(.disabled) { color: $primary-dark-mode; } @@ -390,6 +400,11 @@ $border-color-dark-mode: #47494f; border-bottom-color: $bg-dark-mode-accent; } + .ngb-dp-header, + .ngb-dp-weekdays, + .ngb-dp-month { + background-color: $bg-light-dark-mode; + } } body.color-scheme-dark { diff --git a/src/clash.pdf b/src/clash.pdf new file mode 100644 index 000000000..304fbe717 Binary files /dev/null and b/src/clash.pdf differ diff --git a/src/documents/admin.py b/src/documents/admin.py index 78437f91c..aee45b49d 100755 --- a/src/documents/admin.py +++ b/src/documents/admin.py @@ -1,10 +1,6 @@ from django.contrib import admin -from django.utils.html import format_html, format_html_join -from django.utils.safestring import mark_safe -from whoosh.writing import AsyncWriter -from . import index -from .models import Correspondent, Document, DocumentType, Log, Tag, \ +from .models import Correspondent, Document, DocumentType, Tag, \ SavedView, SavedViewFilterRule @@ -50,26 +46,31 @@ class DocumentAdmin(admin.ModelAdmin): "modified", "mime_type", "storage_type", - "filename") + "filename", + "checksum", + "archive_filename", + "archive_checksum" + ) list_display_links = ("title",) list_display = ( - "correspondent", + "id", "title", - "tags_", - "created", + "mime_type", + "filename", + "archive_filename" ) list_filter = ( - "document_type", - "tags", - "correspondent" + ("mime_type"), + ("archive_serial_number", admin.EmptyFieldListFilter), + ("archive_filename", admin.EmptyFieldListFilter), ) filter_horizontal = ("tags",) - ordering = ["-created"] + ordering = ["-id"] date_hierarchy = "created" @@ -81,56 +82,24 @@ class DocumentAdmin(admin.ModelAdmin): created_.short_description = "Created" def delete_queryset(self, request, queryset): - ix = index.open_index() - with AsyncWriter(ix) as writer: + from documents import index + + with index.open_index_writer() as writer: for o in queryset: index.remove_document(writer, o) + super(DocumentAdmin, self).delete_queryset(request, queryset) def delete_model(self, request, obj): + from documents import index index.remove_document_from_index(obj) super(DocumentAdmin, self).delete_model(request, obj) def save_model(self, request, obj, form, change): + from documents import index index.add_or_update_document(obj) super(DocumentAdmin, self).save_model(request, obj, form, change) - @mark_safe - def tags_(self, obj): - r = "" - for tag in obj.tags.all(): - r += self._html_tag( - "span", - tag.name + ", " - ) - return r - - @staticmethod - def _html_tag(kind, inside=None, **kwargs): - attributes = format_html_join(' ', '{}="{}"', kwargs.items()) - - if inside is not None: - return format_html("<{kind} {attributes}>{inside}", - kind=kind, attributes=attributes, inside=inside) - - return format_html("<{} {}/>", kind, attributes) - - -class LogAdmin(admin.ModelAdmin): - - def has_add_permission(self, request): - return False - - def has_change_permission(self, request, obj=None): - return False - - list_display = ("created", "message", "level",) - list_filter = ("level", "created",) - - ordering = ('-created',) - - list_display_links = ("created", "message") - class RuleInline(admin.TabularInline): model = SavedViewFilterRule @@ -149,5 +118,4 @@ admin.site.register(Correspondent, CorrespondentAdmin) admin.site.register(Tag, TagAdmin) admin.site.register(DocumentType, DocumentTypeAdmin) admin.site.register(Document, DocumentAdmin) -admin.site.register(Log, LogAdmin) admin.site.register(SavedView, SavedViewAdmin) diff --git a/src/documents/bulk_download.py b/src/documents/bulk_download.py new file mode 100644 index 000000000..8c675b4b5 --- /dev/null +++ b/src/documents/bulk_download.py @@ -0,0 +1,60 @@ +from zipfile import ZipFile + +from documents.models import Document + + +class BulkArchiveStrategy: + + def __init__(self, zipf: ZipFile): + self.zipf = zipf + + def make_unique_filename(self, + doc: Document, + archive: bool = False, + folder: str = ""): + counter = 0 + while True: + filename = folder + doc.get_public_filename(archive, counter) + if filename in self.zipf.namelist(): + counter += 1 + else: + return filename + + def add_document(self, doc: Document): + raise NotImplementedError() # pragma: no cover + + +class OriginalsOnlyStrategy(BulkArchiveStrategy): + + def add_document(self, doc: Document): + self.zipf.write(doc.source_path, self.make_unique_filename(doc)) + + +class ArchiveOnlyStrategy(BulkArchiveStrategy): + + def __init__(self, zipf): + super(ArchiveOnlyStrategy, self).__init__(zipf) + + def add_document(self, doc: Document): + if doc.has_archive_version: + self.zipf.write(doc.archive_path, + self.make_unique_filename(doc, archive=True)) + else: + self.zipf.write(doc.source_path, + self.make_unique_filename(doc)) + + +class OriginalAndArchiveStrategy(BulkArchiveStrategy): + + def add_document(self, doc: Document): + if doc.has_archive_version: + self.zipf.write( + doc.archive_path, self.make_unique_filename( + doc, archive=True, folder="archive/" + ) + ) + + self.zipf.write( + doc.source_path, + self.make_unique_filename(doc, folder="originals/") + ) diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.py index c0c80a795..7503eafc5 100644 --- a/src/documents/bulk_edit.py +++ b/src/documents/bulk_edit.py @@ -2,9 +2,7 @@ import itertools from django.db.models import Q from django_q.tasks import async_task -from whoosh.writing import AsyncWriter -from documents import index from documents.models import Document, Correspondent, DocumentType @@ -99,8 +97,9 @@ def modify_tags(doc_ids, add_tags, remove_tags): def delete(doc_ids): Document.objects.filter(id__in=doc_ids).delete() - ix = index.open_index() - with AsyncWriter(ix) as writer: + from documents import index + + with index.open_index_writer() as writer: for id in doc_ids: index.remove_document_by_id(writer, id) diff --git a/src/documents/classifier.py b/src/documents/classifier.py index b427264c8..47dd7dfc7 100755 --- a/src/documents/classifier.py +++ b/src/documents/classifier.py @@ -5,10 +5,6 @@ import pickle import re from django.conf import settings -from sklearn.feature_extraction.text import CountVectorizer -from sklearn.neural_network import MLPClassifier -from sklearn.preprocessing import MultiLabelBinarizer, LabelBinarizer -from sklearn.utils.multiclass import type_of_target from documents.models import Document, MatchingModel @@ -17,7 +13,7 @@ class IncompatibleClassifierVersionError(Exception): pass -logger = logging.getLogger(__name__) +logger = logging.getLogger("paperless.classifier") def preprocess_content(content): @@ -34,14 +30,15 @@ def load_classifier(): ) return None + classifier = DocumentClassifier() try: - classifier = DocumentClassifier() - classifier.reload() + classifier.load() + except (EOFError, IncompatibleClassifierVersionError) as e: # there's something wrong with the model file. - logger.error( + logger.exception( f"Unrecoverable error while loading document " - f"classification model: {str(e)}, deleting model file." + f"classification model, deleting model file." ) os.unlink(settings.MODEL_FILE) classifier = None @@ -59,10 +56,6 @@ class DocumentClassifier(object): FORMAT_VERSION = 6 def __init__(self): - # mtime of the model file on disk. used to prevent reloading when - # nothing has changed. - self.classifier_version = 0 - # hash of the training data. used to prevent re-training when the # training data has not changed. self.data_hash = None @@ -73,30 +66,23 @@ class DocumentClassifier(object): self.correspondent_classifier = None self.document_type_classifier = None - def reload(self): - if os.path.getmtime(settings.MODEL_FILE) > self.classifier_version: - with open(settings.MODEL_FILE, "rb") as f: - schema_version = pickle.load(f) + def load(self): + with open(settings.MODEL_FILE, "rb") as f: + schema_version = pickle.load(f) - if schema_version != self.FORMAT_VERSION: - raise IncompatibleClassifierVersionError( - "Cannor load classifier, incompatible versions.") - else: - if self.classifier_version > 0: - # Don't be confused by this check. It's simply here - # so that we wont log anything on initial reload. - logger.info("Classifier updated on disk, " - "reloading classifier models") - self.data_hash = pickle.load(f) - self.data_vectorizer = pickle.load(f) - self.tags_binarizer = pickle.load(f) + if schema_version != self.FORMAT_VERSION: + raise IncompatibleClassifierVersionError( + "Cannor load classifier, incompatible versions.") + else: + self.data_hash = pickle.load(f) + self.data_vectorizer = pickle.load(f) + self.tags_binarizer = pickle.load(f) - self.tags_classifier = pickle.load(f) - self.correspondent_classifier = pickle.load(f) - self.document_type_classifier = pickle.load(f) - self.classifier_version = os.path.getmtime(settings.MODEL_FILE) + self.tags_classifier = pickle.load(f) + self.correspondent_classifier = pickle.load(f) + self.document_type_classifier = pickle.load(f) - def save_classifier(self): + def save(self): with open(settings.MODEL_FILE, "wb") as f: pickle.dump(self.FORMAT_VERSION, f) pickle.dump(self.data_hash, f) @@ -109,13 +95,14 @@ class DocumentClassifier(object): pickle.dump(self.document_type_classifier, f) def train(self): + data = list() labels_tags = list() labels_correspondent = list() labels_document_type = list() # Step 1: Extract and preprocess training data from the database. - logging.getLogger(__name__).debug("Gathering data from database...") + logger.debug("Gathering data from database...") m = hashlib.sha1() for doc in Document.objects.order_by('pk').exclude(tags__is_inbox_tag=True): # NOQA: E501 preprocessed_content = preprocess_content(doc.content) @@ -162,7 +149,7 @@ class DocumentClassifier(object): num_correspondents = len(set(labels_correspondent) | {-1}) - 1 num_document_types = len(set(labels_document_type) | {-1}) - 1 - logging.getLogger(__name__).debug( + logger.debug( "{} documents, {} tag(s), {} correspondent(s), " "{} document type(s).".format( len(data), @@ -172,8 +159,12 @@ class DocumentClassifier(object): ) ) + from sklearn.feature_extraction.text import CountVectorizer + from sklearn.neural_network import MLPClassifier + from sklearn.preprocessing import MultiLabelBinarizer, LabelBinarizer + # Step 2: vectorize data - logging.getLogger(__name__).debug("Vectorizing data...") + logger.debug("Vectorizing data...") self.data_vectorizer = CountVectorizer( analyzer="word", ngram_range=(1, 2), @@ -183,7 +174,7 @@ class DocumentClassifier(object): # Step 3: train the classifiers if num_tags > 0: - logging.getLogger(__name__).debug("Training tags classifier...") + logger.debug("Training tags classifier...") if num_tags == 1: # Special case where only one tag has auto: @@ -202,12 +193,12 @@ class DocumentClassifier(object): self.tags_classifier.fit(data_vectorized, labels_tags_vectorized) else: self.tags_classifier = None - logging.getLogger(__name__).debug( + logger.debug( "There are no tags. Not training tags classifier." ) if num_correspondents > 0: - logging.getLogger(__name__).debug( + logger.debug( "Training correspondent classifier..." ) self.correspondent_classifier = MLPClassifier(tol=0.01) @@ -217,13 +208,13 @@ class DocumentClassifier(object): ) else: self.correspondent_classifier = None - logging.getLogger(__name__).debug( + logger.debug( "There are no correspondents. Not training correspondent " "classifier." ) if num_document_types > 0: - logging.getLogger(__name__).debug( + logger.debug( "Training document type classifier..." ) self.document_type_classifier = MLPClassifier(tol=0.01) @@ -233,7 +224,7 @@ class DocumentClassifier(object): ) else: self.document_type_classifier = None - logging.getLogger(__name__).debug( + logger.debug( "There are no document types. Not training document type " "classifier." ) @@ -265,6 +256,8 @@ class DocumentClassifier(object): return None def predict_tags(self, content): + from sklearn.utils.multiclass import type_of_target + if self.tags_classifier: X = self.data_vectorizer.transform([preprocess_content(content)]) y = self.tags_classifier.predict(X) diff --git a/src/documents/consumer.py b/src/documents/consumer.py index f8f7576ef..3fd62fabc 100755 --- a/src/documents/consumer.py +++ b/src/documents/consumer.py @@ -47,6 +47,8 @@ MESSAGE_FINISHED = "finished" class Consumer(LoggingMixin): + logging_name = "paperless.consumer" + def _send_progress(self, current_progress, max_progress, status, message=None, document_id=None): payload = { @@ -198,8 +200,6 @@ class Consumer(LoggingMixin): MESSAGE_UNSUPPORTED_TYPE, f"Unsupported mime type {mime_type}" ) - else: - self.log("debug", f"Parser: {parser_class.__name__}") # Notify all listeners that we're going to do some work. @@ -220,6 +220,8 @@ class Consumer(LoggingMixin): document_parser = parser_class(self.logging_group, progress_callback) + self.log("debug", f"Parser: {type(document_parser).__name__}") + # However, this already created working directories which we have to # clean up. @@ -239,7 +241,7 @@ class Consumer(LoggingMixin): self._send_progress(70, 100, 'WORKING', MESSAGE_GENERATING_THUMBNAIL) thumbnail = document_parser.get_optimised_thumbnail( - self.path, mime_type) + self.path, mime_type, self.filename) text = document_parser.get_text() date = document_parser.get_date() @@ -290,8 +292,7 @@ class Consumer(LoggingMixin): # After everything is in the database, copy the files into # place. If this fails, we'll also rollback the transaction. with FileLock(settings.MEDIA_LOCK): - document.filename = generate_unique_filename( - document, settings.ORIGINALS_DIR) + document.filename = generate_unique_filename(document) create_source_path_directory(document.source_path) self._write(document.storage_type, @@ -301,6 +302,10 @@ class Consumer(LoggingMixin): thumbnail, document.thumbnail_path) if archive_path and os.path.isfile(archive_path): + document.archive_filename = generate_unique_filename( + document, + archive_filename=True + ) create_source_path_directory(document.archive_path) self._write(document.storage_type, archive_path, document.archive_path) diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py index dd798e8ab..d7a42db24 100644 --- a/src/documents/file_handling.py +++ b/src/documents/file_handling.py @@ -8,6 +8,9 @@ from django.conf import settings from django.template.defaultfilters import slugify +logger = logging.getLogger("paperless.filehandling") + + class defaultdictNoStr(defaultdict): def __str__(self): @@ -76,12 +79,40 @@ def many_to_dictionary(field): return mydictionary -def generate_unique_filename(doc, root): +def generate_unique_filename(doc, + archive_filename=False): + """ + Generates a unique filename for doc in settings.ORIGINALS_DIR. + + The returned filename is guaranteed to be either the current filename + of the document if unchanged, or a new filename that does not correspondent + to any existing files. The function will append _01, _02, etc to the + filename before the extension to avoid conflicts. + + If archive_filename is True, return a unique archive filename instead. + + """ + if archive_filename: + old_filename = doc.archive_filename + root = settings.ARCHIVE_DIR + else: + old_filename = doc.filename + root = settings.ORIGINALS_DIR + + # If generating archive filenames, try to make a name that is similar to + # the original filename first. + + if archive_filename and doc.filename: + new_filename = os.path.splitext(doc.filename)[0] + ".pdf" + if new_filename == old_filename or not os.path.exists(os.path.join(root, new_filename)): # NOQA: E501 + return new_filename + counter = 0 while True: - new_filename = generate_filename(doc, counter) - if new_filename == doc.filename: + new_filename = generate_filename( + doc, counter, archive_filename=archive_filename) + if new_filename == old_filename: # still the same as before. return new_filename @@ -91,7 +122,7 @@ def generate_unique_filename(doc, root): return new_filename -def generate_filename(doc, counter=0, append_gpg=True): +def generate_filename(doc, counter=0, append_gpg=True, archive_filename=False): path = "" try: @@ -120,6 +151,11 @@ def generate_filename(doc, counter=0, append_gpg=True): else: document_type = "none" + if doc.archive_serial_number: + asn = str(doc.archive_serial_number) + else: + asn = "none" + path = settings.PAPERLESS_FILENAME_FORMAT.format( title=pathvalidate.sanitize_filename( doc.title, replacement_text="-"), @@ -133,6 +169,7 @@ def generate_filename(doc, counter=0, append_gpg=True): added_year=doc.added.year if doc.added else "none", added_month=f"{doc.added.month:02}" if doc.added else "none", added_day=f"{doc.added.day:02}" if doc.added else "none", + asn=asn, tags=tags, tag_list=tag_list ).strip() @@ -140,23 +177,21 @@ def generate_filename(doc, counter=0, append_gpg=True): path = path.strip(os.sep) except (ValueError, KeyError, IndexError): - logging.getLogger(__name__).warning( + logger.warning( f"Invalid PAPERLESS_FILENAME_FORMAT: " f"{settings.PAPERLESS_FILENAME_FORMAT}, falling back to default") counter_str = f"_{counter:02}" if counter else "" + + filetype_str = ".pdf" if archive_filename else doc.file_type + if len(path) > 0: - filename = f"{path}{counter_str}{doc.file_type}" + filename = f"{path}{counter_str}{filetype_str}" else: - filename = f"{doc.pk:07}{counter_str}{doc.file_type}" + filename = f"{doc.pk:07}{counter_str}{filetype_str}" # Append .gpg for encrypted files if append_gpg and doc.storage_type == doc.STORAGE_TYPE_GPG: filename += ".gpg" return filename - - -def archive_name_from_filename(filename): - - return os.path.splitext(filename)[0] + ".pdf" diff --git a/src/documents/index.py b/src/documents/index.py index 51197e252..89e56e930 100644 --- a/src/documents/index.py +++ b/src/documents/index.py @@ -12,7 +12,7 @@ from whoosh.qparser.dateparse import DateParserPlugin from whoosh.writing import AsyncWriter -logger = logging.getLogger(__name__) +logger = logging.getLogger("paperless.index") class JsonFormatter(Formatter): @@ -78,14 +78,30 @@ def open_index(recreate=False): try: if exists_in(settings.INDEX_DIR) and not recreate: return open_dir(settings.INDEX_DIR, schema=get_schema()) - except Exception as e: - logger.error(f"Error while opening the index: {e}, recreating.") + except Exception: + logger.exception(f"Error while opening the index, recreating.") if not os.path.isdir(settings.INDEX_DIR): os.makedirs(settings.INDEX_DIR, exist_ok=True) return create_in(settings.INDEX_DIR, get_schema()) +@contextmanager +def open_index_writer(ix=None, optimize=False): + if ix: + writer = AsyncWriter(ix) + else: + writer = AsyncWriter(open_index()) + + try: + yield writer + except Exception as e: + logger.exception(str(e)) + writer.cancel() + finally: + writer.commit(optimize=optimize) + + def update_document(writer, doc): tags = ",".join([t.name for t in doc.tags.all()]) writer.update_document( @@ -110,14 +126,12 @@ def remove_document_by_id(writer, doc_id): def add_or_update_document(document): - ix = open_index() - with AsyncWriter(ix) as writer: + with open_index_writer() as writer: update_document(writer, document) def remove_document_from_index(document): - ix = open_index() - with AsyncWriter(ix) as writer: + with open_index_writer() as writer: remove_document(writer, document) diff --git a/src/documents/loggers.py b/src/documents/loggers.py index 863bc0c34..90f6770e0 100644 --- a/src/documents/loggers.py +++ b/src/documents/loggers.py @@ -4,33 +4,24 @@ import uuid from django.conf import settings -class PaperlessHandler(logging.Handler): - def emit(self, record): - if settings.DISABLE_DBHANDLER: - return - - # We have to do the import here or Django will barf when it tries to - # load this because the apps aren't loaded at that point - from .models import Log - - kwargs = {"message": record.msg, "level": record.levelno} - - if hasattr(record, "group"): - kwargs["group"] = record.group - - Log.objects.create(**kwargs) - - class LoggingMixin: logging_group = None + logging_name = None + def renew_logging_group(self): self.logging_group = uuid.uuid4() def log(self, level, message, **kwargs): - target = ".".join([self.__class__.__module__, self.__class__.__name__]) - logger = logging.getLogger(target) + if self.logging_name: + logger = logging.getLogger(self.logging_name) + else: + name = ".".join([ + self.__class__.__module__, + self.__class__.__name__ + ]) + logger = logging.getLogger(name) getattr(logger, level)(message, extra={ "group": self.logging_group diff --git a/src/documents/management/commands/document_archiver.py b/src/documents/management/commands/document_archiver.py index 01bd819c5..6a6056ed7 100644 --- a/src/documents/management/commands/document_archiver.py +++ b/src/documents/management/commands/document_archiver.py @@ -16,12 +16,12 @@ from whoosh.writing import AsyncWriter from documents.models import Document from ... import index -from ...file_handling import create_source_path_directory -from ...mixins import Renderable +from ...file_handling import create_source_path_directory, \ + generate_unique_filename from ...parsers import get_parser_class_for_mime_type -logger = logging.getLogger(__name__) +logger = logging.getLogger("paperless.management.archiver") def handle_document(document_id): @@ -31,38 +31,57 @@ def handle_document(document_id): parser_class = get_parser_class_for_mime_type(mime_type) + if not parser_class: + logger.error(f"No parser found for mime type {mime_type}, cannot " + f"archive document {document} (ID: {document_id})") + return + parser = parser_class(logging_group=uuid.uuid4()) try: - parser.parse(document.source_path, mime_type) + parser.parse( + document.source_path, + mime_type, + document.get_public_filename()) + + thumbnail = parser.get_optimised_thumbnail( + document.source_path, + mime_type, + document.get_public_filename() + ) if parser.get_archive_path(): with transaction.atomic(): with open(parser.get_archive_path(), 'rb') as f: checksum = hashlib.md5(f.read()).hexdigest() - # i'm going to save first so that in case the file move + # I'm going to save first so that in case the file move # fails, the database is rolled back. - # we also don't use save() since that triggers the filehandling + # We also don't use save() since that triggers the filehandling # logic, and we don't want that yet (file not yet in place) + document.archive_filename = generate_unique_filename( + document, archive_filename=True) Document.objects.filter(pk=document.pk).update( archive_checksum=checksum, - content=parser.get_text() + content=parser.get_text(), + archive_filename=document.archive_filename ) with FileLock(settings.MEDIA_LOCK): create_source_path_directory(document.archive_path) shutil.move(parser.get_archive_path(), document.archive_path) + shutil.move(thumbnail, document.thumbnail_path) - with AsyncWriter(index.open_index()) as writer: - index.update_document(writer, document) + with index.open_index_writer() as writer: + index.update_document(writer, document) except Exception as e: - logger.error(f"Error while parsing document {document}: {str(e)}") + logger.exception(f"Error while parsing document {document} " + f"(ID: {document_id})") finally: parser.cleanup() -class Command(Renderable, BaseCommand): +class Command(BaseCommand): help = """ Using the current classification model, assigns correspondents, tags @@ -71,10 +90,6 @@ class Command(Renderable, BaseCommand): modified) after their initial import. """.replace(" ", "") - def __init__(self, *args, **kwargs): - self.verbosity = 0 - BaseCommand.__init__(self, *args, **kwargs) - def add_arguments(self, parser): parser.add_argument( "-f", "--overwrite", @@ -106,7 +121,7 @@ class Command(Renderable, BaseCommand): document_ids = list(map( lambda doc: doc.id, filter( - lambda d: overwrite or not d.archive_checksum, + lambda d: overwrite or not d.has_archive_version, documents ) )) diff --git a/src/documents/management/commands/document_consumer.py b/src/documents/management/commands/document_consumer.py index 9ba1b1a87..969941af9 100644 --- a/src/documents/management/commands/document_consumer.py +++ b/src/documents/management/commands/document_consumer.py @@ -1,6 +1,7 @@ import logging import os from pathlib import Path +from threading import Thread from time import sleep from django.conf import settings @@ -17,11 +18,11 @@ try: except ImportError: INotify = flags = None -logger = logging.getLogger(__name__) +logger = logging.getLogger("paperless.management.consumer") def _tags_from_path(filepath): - """Walk up the directory tree from filepath to CONSUMPTION_DIr + """Walk up the directory tree from filepath to CONSUMPTION_DIR and get or create Tag IDs for every directory. """ tag_ids = set() @@ -54,10 +55,10 @@ def _consume(filepath): if settings.CONSUMER_SUBDIRS_AS_TAGS: tag_ids = _tags_from_path(filepath) except Exception as e: - logger.error( - "Error creating tags from path: {}".format(e)) + logger.exception("Error creating tags from path") try: + logger.info(f"Adding {filepath} to the task queue.") async_task("documents.tasks.consume_file", filepath, override_tag_ids=tag_ids if tag_ids else None, @@ -66,14 +67,14 @@ def _consume(filepath): # Catch all so that the consumer won't crash. # This is also what the test case is listening for to check for # errors. - logger.error( - "Error while consuming document: {}".format(e)) + logger.exception("Error while consuming document") -def _consume_wait_unmodified(file, num_tries=20, wait_time=1): +def _consume_wait_unmodified(file): + logger.debug(f"Waiting for file {file} to remain unmodified") mtime = -1 current_try = 0 - while current_try < num_tries: + while current_try < settings.CONSUMER_POLLING_RETRY_COUNT: try: new_mtime = os.stat(file).st_mtime except FileNotFoundError: @@ -84,7 +85,7 @@ def _consume_wait_unmodified(file, num_tries=20, wait_time=1): _consume(file) return mtime = new_mtime - sleep(wait_time) + sleep(settings.CONSUMER_POLLING_DELAY) current_try += 1 logger.error(f"Timeout while waiting on file {file} to remain unmodified.") @@ -93,10 +94,14 @@ def _consume_wait_unmodified(file, num_tries=20, wait_time=1): class Handler(FileSystemEventHandler): def on_created(self, event): - _consume_wait_unmodified(event.src_path) + Thread( + target=_consume_wait_unmodified, args=(event.src_path,) + ).start() def on_moved(self, event): - _consume_wait_unmodified(event.dest_path) + Thread( + target=_consume_wait_unmodified, args=(event.dest_path,) + ).start() class Command(BaseCommand): @@ -108,12 +113,7 @@ class Command(BaseCommand): # This is here primarily for the tests and is irrelevant in production. stop_flag = False - def __init__(self, *args, **kwargs): - - self.logger = logging.getLogger(__name__) - - BaseCommand.__init__(self, *args, **kwargs) - self.observer = None + observer = None def add_arguments(self, parser): parser.add_argument( @@ -161,7 +161,7 @@ class Command(BaseCommand): logger.debug("Consumer exiting.") def handle_polling(self, directory, recursive): - logging.getLogger(__name__).info( + logger.info( f"Polling directory for changes: {directory}") self.observer = PollingObserver(timeout=settings.CONSUMER_POLLING) self.observer.schedule(Handler(), directory, recursive=recursive) @@ -176,7 +176,7 @@ class Command(BaseCommand): self.observer.join() def handle_inotify(self, directory, recursive): - logging.getLogger(__name__).info( + logger.info( f"Using inotify to watch directory for changes: {directory}") inotify = INotify() diff --git a/src/documents/management/commands/document_create_classifier.py b/src/documents/management/commands/document_create_classifier.py index fbfb7f7e6..a4ede88b5 100755 --- a/src/documents/management/commands/document_create_classifier.py +++ b/src/documents/management/commands/document_create_classifier.py @@ -1,10 +1,9 @@ from django.core.management.base import BaseCommand -from ...mixins import Renderable from ...tasks import train_classifier -class Command(Renderable, BaseCommand): +class Command(BaseCommand): help = """ Trains the classifier on your data and saves the resulting models to a diff --git a/src/documents/management/commands/document_exporter.py b/src/documents/management/commands/document_exporter.py index 37fcf2024..d8f5861a5 100644 --- a/src/documents/management/commands/document_exporter.py +++ b/src/documents/management/commands/document_exporter.py @@ -16,10 +16,9 @@ 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 -class Command(Renderable, BaseCommand): +class Command(BaseCommand): help = """ Decrypt and rename all files in our collection into a given target @@ -140,7 +139,7 @@ class Command(Renderable, BaseCommand): thumbnail_target = os.path.join(self.target, thumbnail_name) document_dict[EXPORTER_THUMBNAIL_NAME] = thumbnail_name - if os.path.exists(document.archive_path): + if document.has_archive_version: archive_name = base_name + "-archive.pdf" archive_target = os.path.join(self.target, archive_name) document_dict[EXPORTER_ARCHIVE_NAME] = archive_name diff --git a/src/documents/management/commands/document_importer.py b/src/documents/management/commands/document_importer.py index a2e19e3cc..9347b0d4c 100644 --- a/src/documents/management/commands/document_importer.py +++ b/src/documents/management/commands/document_importer.py @@ -15,7 +15,6 @@ from documents.models import Document from documents.settings import EXPORTER_FILE_NAME, EXPORTER_THUMBNAIL_NAME, \ EXPORTER_ARCHIVE_NAME from ...file_handling import create_source_path_directory -from ...mixins import Renderable from ...signals.handlers import update_filename_and_move_files @@ -28,7 +27,7 @@ def disable_signal(sig, receiver, sender): sig.connect(receiver=receiver, sender=sender) -class Command(Renderable, BaseCommand): +class Command(BaseCommand): help = """ Using a manifest.json file, load the data from there, and import the @@ -152,6 +151,9 @@ class Command(Renderable, BaseCommand): shutil.copy2(thumbnail_path, document.thumbnail_path) if archive_path: create_source_path_directory(document.archive_path) + # TODO: this assumes that the export is valid and + # archive_filename is present on all documents with + # archived files shutil.copy2(archive_path, document.archive_path) document.save() diff --git a/src/documents/management/commands/document_index.py b/src/documents/management/commands/document_index.py index 08e20e1d2..5faa70b9f 100644 --- a/src/documents/management/commands/document_index.py +++ b/src/documents/management/commands/document_index.py @@ -1,24 +1,17 @@ from django.core.management import BaseCommand from django.db import transaction -from documents.mixins import Renderable from documents.tasks import index_reindex, index_optimize -class Command(Renderable, BaseCommand): +class Command(BaseCommand): help = "Manages the document index." - def __init__(self, *args, **kwargs): - self.verbosity = 0 - BaseCommand.__init__(self, *args, **kwargs) - def add_arguments(self, parser): parser.add_argument("command", choices=['reindex', 'optimize']) def handle(self, *args, **options): - - self.verbosity = options["verbosity"] with transaction.atomic(): if options['command'] == 'reindex': index_reindex() diff --git a/src/documents/management/commands/document_logs.py b/src/documents/management/commands/document_logs.py deleted file mode 100644 index 06efc3850..000000000 --- a/src/documents/management/commands/document_logs.py +++ /dev/null @@ -1,12 +0,0 @@ -from django.core.management.base import BaseCommand - -from documents.models import Log - - -class Command(BaseCommand): - - help = "A quick & dirty way to see what's in the logs" - - def handle(self, *args, **options): - for log in Log.objects.order_by("pk"): - print(log) diff --git a/src/documents/management/commands/document_renamer.py b/src/documents/management/commands/document_renamer.py index 745d2d03d..f311715c6 100644 --- a/src/documents/management/commands/document_renamer.py +++ b/src/documents/management/commands/document_renamer.py @@ -5,23 +5,16 @@ from django.core.management.base import BaseCommand from django.db.models.signals import post_save from documents.models import Document -from ...mixins import Renderable -class Command(Renderable, BaseCommand): +class Command(BaseCommand): help = """ This will rename all documents to match the latest filename format. """.replace(" ", "") - def __init__(self, *args, **kwargs): - self.verbosity = 0 - BaseCommand.__init__(self, *args, **kwargs) - def handle(self, *args, **options): - self.verbosity = options["verbosity"] - logging.getLogger().handlers[0].level = logging.ERROR for document in tqdm.tqdm(Document.objects.all()): diff --git a/src/documents/management/commands/document_retagger.py b/src/documents/management/commands/document_retagger.py index b2f5d8918..854117fdd 100755 --- a/src/documents/management/commands/document_retagger.py +++ b/src/documents/management/commands/document_retagger.py @@ -4,11 +4,13 @@ from django.core.management.base import BaseCommand from documents.classifier import load_classifier from documents.models import Document -from ...mixins import Renderable from ...signals.handlers import set_correspondent, set_document_type, set_tags -class Command(Renderable, BaseCommand): +logger = logging.getLogger("paperless.management.retagger") + + +class Command(BaseCommand): help = """ Using the current classification model, assigns correspondents, tags @@ -17,10 +19,6 @@ class Command(Renderable, BaseCommand): modified) after their initial import. """.replace(" ", "") - def __init__(self, *args, **kwargs): - self.verbosity = 0 - BaseCommand.__init__(self, *args, **kwargs) - def add_arguments(self, parser): parser.add_argument( "-c", "--correspondent", @@ -61,8 +59,6 @@ class Command(Renderable, BaseCommand): def handle(self, *args, **options): - self.verbosity = options["verbosity"] - if options["inbox_only"]: queryset = Document.objects.filter(tags__is_inbox_tag=True) else: @@ -72,7 +68,7 @@ class Command(Renderable, BaseCommand): classifier = load_classifier() for document in documents: - logging.getLogger(__name__).info( + logger.info( f"Processing document {document.title}") if options['correspondent']: diff --git a/src/documents/management/commands/document_sanity_checker.py b/src/documents/management/commands/document_sanity_checker.py new file mode 100644 index 000000000..c04a5efef --- /dev/null +++ b/src/documents/management/commands/document_sanity_checker.py @@ -0,0 +1,15 @@ +from django.core.management.base import BaseCommand +from documents.sanity_checker import check_sanity + + +class Command(BaseCommand): + + help = """ + This command checks your document archive for issues. + """.replace(" ", "") + + def handle(self, *args, **options): + + messages = check_sanity(progress=True) + + messages.log_messages() diff --git a/src/documents/management/commands/document_thumbnails.py b/src/documents/management/commands/document_thumbnails.py index 6f6451599..b7f935e3b 100644 --- a/src/documents/management/commands/document_thumbnails.py +++ b/src/documents/management/commands/document_thumbnails.py @@ -7,7 +7,6 @@ from django import db from django.core.management.base import BaseCommand from documents.models import Document -from ...mixins import Renderable from ...parsers import get_parser_class_for_mime_type @@ -23,23 +22,22 @@ def _process_document(doc_in): try: thumb = parser.get_optimised_thumbnail( - document.source_path, document.mime_type) + document.source_path, + document.mime_type, + document.get_public_filename() + ) shutil.move(thumb, document.thumbnail_path) finally: parser.cleanup() -class Command(Renderable, BaseCommand): +class Command(BaseCommand): help = """ This will regenerate the thumbnails for all documents. """.replace(" ", "") - def __init__(self, *args, **kwargs): - self.verbosity = 0 - BaseCommand.__init__(self, *args, **kwargs) - def add_arguments(self, parser): parser.add_argument( "-d", "--document", @@ -51,9 +49,6 @@ class Command(Renderable, BaseCommand): ) def handle(self, *args, **options): - - self.verbosity = options["verbosity"] - logging.getLogger().handlers[0].level = logging.ERROR if options['document']: diff --git a/src/documents/matching.py b/src/documents/matching.py index fa9ce6af3..3b70930b6 100644 --- a/src/documents/matching.py +++ b/src/documents/matching.py @@ -1,18 +1,17 @@ import logging import re -from fuzzywuzzy import fuzz from documents.models import MatchingModel, Correspondent, DocumentType, Tag -logger = logging.getLogger(__name__) +logger = logging.getLogger("paperless.matching") 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"{class_name} {matching_model.name} matched on document " f"{document} because {reason}") @@ -123,6 +122,8 @@ def matches(matching_model, document): return bool(match) elif matching_model.matching_algorithm == MatchingModel.MATCH_FUZZY: + from fuzzywuzzy import fuzz + match = re.sub(r'[^\w\s]', '', matching_model.match) text = re.sub(r'[^\w\s]', '', document_content) if matching_model.is_insensitive: diff --git a/src/documents/migrations/1012_fix_archive_files.py b/src/documents/migrations/1012_fix_archive_files.py new file mode 100644 index 000000000..5f5064396 --- /dev/null +++ b/src/documents/migrations/1012_fix_archive_files.py @@ -0,0 +1,330 @@ +# Generated by Django 3.1.6 on 2021-02-07 22:26 +import datetime +import hashlib +import logging +import os +import shutil +from time import sleep + +import pathvalidate +from django.conf import settings +from django.db import migrations, models +from django.template.defaultfilters import slugify + +from documents.file_handling import defaultdictNoStr, many_to_dictionary + + +logger = logging.getLogger("paperless.migrations") + +############################################################################### +# This is code copied straight paperless before the change. +############################################################################### + +def archive_name_from_filename(filename): + return os.path.splitext(filename)[0] + ".pdf" + + +def archive_path_old(doc): + if doc.filename: + fname = archive_name_from_filename(doc.filename) + else: + fname = "{:07}.pdf".format(doc.pk) + + return os.path.join( + settings.ARCHIVE_DIR, + fname + ) + + +STORAGE_TYPE_GPG = "gpg" + + +def archive_path_new(doc): + if doc.archive_filename is not None: + return os.path.join( + settings.ARCHIVE_DIR, + str(doc.archive_filename) + ) + else: + return None + + +def source_path(doc): + if doc.filename: + fname = str(doc.filename) + else: + fname = "{:07}{}".format(doc.pk, doc.file_type) + if doc.storage_type == STORAGE_TYPE_GPG: + fname += ".gpg" # pragma: no cover + + return os.path.join( + settings.ORIGINALS_DIR, + fname + ) + + +def generate_unique_filename(doc, archive_filename=False): + if archive_filename: + old_filename = doc.archive_filename + root = settings.ARCHIVE_DIR + else: + old_filename = doc.filename + root = settings.ORIGINALS_DIR + + counter = 0 + + while True: + new_filename = generate_filename( + doc, counter, archive_filename=archive_filename) + if new_filename == old_filename: + # still the same as before. + return new_filename + + if os.path.exists(os.path.join(root, new_filename)): + counter += 1 + else: + return new_filename + + +def generate_filename(doc, counter=0, append_gpg=True, archive_filename=False): + path = "" + + try: + if settings.PAPERLESS_FILENAME_FORMAT is not None: + tags = defaultdictNoStr(lambda: slugify(None), + many_to_dictionary(doc.tags)) + + tag_list = pathvalidate.sanitize_filename( + ",".join(sorted( + [tag.name for tag in doc.tags.all()] + )), + replacement_text="-" + ) + + if doc.correspondent: + correspondent = pathvalidate.sanitize_filename( + doc.correspondent.name, replacement_text="-" + ) + else: + correspondent = "none" + + if doc.document_type: + document_type = pathvalidate.sanitize_filename( + doc.document_type.name, replacement_text="-" + ) + else: + document_type = "none" + + path = settings.PAPERLESS_FILENAME_FORMAT.format( + title=pathvalidate.sanitize_filename( + doc.title, replacement_text="-"), + correspondent=correspondent, + document_type=document_type, + created=datetime.date.isoformat(doc.created), + created_year=doc.created.year if doc.created else "none", + created_month=f"{doc.created.month:02}" if doc.created else "none", # NOQA: E501 + created_day=f"{doc.created.day:02}" if doc.created else "none", + added=datetime.date.isoformat(doc.added), + added_year=doc.added.year if doc.added else "none", + added_month=f"{doc.added.month:02}" if doc.added else "none", + added_day=f"{doc.added.day:02}" if doc.added else "none", + tags=tags, + tag_list=tag_list + ).strip() + + path = path.strip(os.sep) + + except (ValueError, KeyError, IndexError): + logger.warning( + f"Invalid PAPERLESS_FILENAME_FORMAT: " + f"{settings.PAPERLESS_FILENAME_FORMAT}, falling back to default") + + counter_str = f"_{counter:02}" if counter else "" + + filetype_str = ".pdf" if archive_filename else doc.file_type + + if len(path) > 0: + filename = f"{path}{counter_str}{filetype_str}" + else: + filename = f"{doc.pk:07}{counter_str}{filetype_str}" + + # Append .gpg for encrypted files + if append_gpg and doc.storage_type == STORAGE_TYPE_GPG: + filename += ".gpg" + + return filename + + +############################################################################### +# This code performs bidirection archive file transformation. +############################################################################### + + +def parse_wrapper(parser, path, mime_type, file_name): + # this is here so that I can mock this out for testing. + parser.parse(path, mime_type, file_name) + + +def create_archive_version(doc, retry_count=3): + from documents.parsers import get_parser_class_for_mime_type, \ + DocumentParser, \ + ParseError + + logger.info( + f"Regenerating archive document for document ID:{doc.id}" + ) + parser_class = get_parser_class_for_mime_type(doc.mime_type) + for try_num in range(retry_count): + parser: DocumentParser = parser_class(None, None) + try: + parse_wrapper(parser, source_path(doc), doc.mime_type, + os.path.basename(doc.filename)) + doc.content = parser.get_text() + + if parser.get_archive_path() and os.path.isfile( + parser.get_archive_path()): + doc.archive_filename = generate_unique_filename( + doc, archive_filename=True) + with open(parser.get_archive_path(), "rb") as f: + doc.archive_checksum = hashlib.md5(f.read()).hexdigest() + os.makedirs(os.path.dirname(archive_path_new(doc)), + exist_ok=True) + shutil.copy2(parser.get_archive_path(), archive_path_new(doc)) + else: + doc.archive_checksum = None + logger.error( + f"Parser did not return an archive document for document " + f"ID:{doc.id}. Removing archive document." + ) + doc.save() + return + except ParseError: + if try_num + 1 == retry_count: + logger.exception( + f"Unable to regenerate archive document for ID:{doc.id}. You " + f"need to invoke the document_archiver management command " + f"manually for that document." + ) + doc.archive_checksum = None + doc.save() + return + else: + # This is mostly here for the tika parser in docker + # environemnts. The servers for parsing need to come up first, + # and the docker setup doesn't ensure that tika is running + # before attempting migrations. + logger.error("Parse error, will try again in 5 seconds...") + sleep(5) + finally: + parser.cleanup() + + +def move_old_to_new_locations(apps, schema_editor): + Document = apps.get_model("documents", "Document") + + affected_document_ids = set() + + old_archive_path_to_id = {} + + # check for documents that have incorrect archive versions + for doc in Document.objects.filter(archive_checksum__isnull=False): + old_path = archive_path_old(doc) + + if old_path in old_archive_path_to_id: + affected_document_ids.add(doc.id) + affected_document_ids.add(old_archive_path_to_id[old_path]) + else: + old_archive_path_to_id[old_path] = doc.id + + # check that archive files of all unaffected documents are in place + for doc in Document.objects.filter(archive_checksum__isnull=False): + old_path = archive_path_old(doc) + if doc.id not in affected_document_ids and not os.path.isfile(old_path): + raise ValueError( + f"Archived document ID:{doc.id} does not exist at: " + f"{old_path}") + + # check that we can regenerate affected archive versions + for doc_id in affected_document_ids: + from documents.parsers import get_parser_class_for_mime_type + + doc = Document.objects.get(id=doc_id) + parser_class = get_parser_class_for_mime_type(doc.mime_type) + if not parser_class: + raise ValueError( + f"Document ID:{doc.id} has an invalid archived document, " + f"but no parsers are available. Cannot migrate.") + + for doc in Document.objects.filter(archive_checksum__isnull=False): + + if doc.id in affected_document_ids: + old_path = archive_path_old(doc) + # remove affected archive versions + if os.path.isfile(old_path): + logger.debug( + f"Removing {old_path}" + ) + os.unlink(old_path) + else: + # Set archive path for unaffected files + doc.archive_filename = archive_name_from_filename(doc.filename) + Document.objects.filter(id=doc.id).update( + archive_filename=doc.archive_filename + ) + + # regenerate archive documents + for doc_id in affected_document_ids: + doc = Document.objects.get(id=doc_id) + create_archive_version(doc) + + +def move_new_to_old_locations(apps, schema_editor): + Document = apps.get_model("documents", "Document") + + old_archive_paths = set() + + for doc in Document.objects.filter(archive_checksum__isnull=False): + new_archive_path = archive_path_new(doc) + old_archive_path = archive_path_old(doc) + if old_archive_path in old_archive_paths: + raise ValueError( + f"Cannot migrate: Archive file name {old_archive_path} of " + f"document {doc.filename} would clash with another archive " + f"filename.") + old_archive_paths.add(old_archive_path) + if new_archive_path != old_archive_path and os.path.isfile(old_archive_path): + raise ValueError( + f"Cannot migrate: Cannot move {new_archive_path} to " + f"{old_archive_path}: file already exists." + ) + + for doc in Document.objects.filter(archive_checksum__isnull=False): + new_archive_path = archive_path_new(doc) + old_archive_path = archive_path_old(doc) + if new_archive_path != old_archive_path: + logger.debug(f"Moving {new_archive_path} to {old_archive_path}") + shutil.move(new_archive_path, old_archive_path) + + +class Migration(migrations.Migration): + + dependencies = [ + ('documents', '1011_auto_20210101_2340'), + ] + + operations = [ + migrations.AddField( + model_name='document', + name='archive_filename', + field=models.FilePathField(default=None, editable=False, help_text='Current archive filename in storage', max_length=1024, null=True, unique=True, verbose_name='archive filename'), + ), + migrations.AlterField( + model_name='document', + name='filename', + field=models.FilePathField(default=None, editable=False, help_text='Current filename in storage', max_length=1024, null=True, unique=True, verbose_name='filename'), + ), + migrations.RunPython( + move_old_to_new_locations, + move_new_to_old_locations + ), + ] diff --git a/src/documents/mixins.py b/src/documents/mixins.py deleted file mode 100755 index 949be02e8..000000000 --- a/src/documents/mixins.py +++ /dev/null @@ -1,9 +0,0 @@ -class Renderable: - """ - A handy mixin to make it easier/cleaner to print output based on a - verbosity value. - """ - - def _render(self, text, verbosity): - if self.verbosity >= verbosity: - print(text) diff --git a/src/documents/models.py b/src/documents/models.py index 86878dd7e..1b94b3cc9 100755 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -16,7 +16,6 @@ from django.utils.timezone import is_aware from django.utils.translation import gettext_lazy as _ -from documents.file_handling import archive_name_from_filename from documents.parsers import get_default_file_extension @@ -208,10 +207,21 @@ class Document(models.Model): max_length=1024, editable=False, default=None, + unique=True, null=True, help_text=_("Current filename in storage") ) + archive_filename = models.FilePathField( + _("archive filename"), + max_length=1024, + editable=False, + default=None, + unique=True, + null=True, + help_text=_("Current archive filename in storage") + ) + archive_serial_number = models.IntegerField( _("archive serial number"), blank=True, @@ -256,16 +266,18 @@ class Document(models.Model): return open(self.source_path, "rb") @property - def archive_path(self): - if self.filename: - fname = archive_name_from_filename(self.filename) - else: - fname = "{:07}.pdf".format(self.pk) + def has_archive_version(self): + return self.archive_filename is not None - return os.path.join( - settings.ARCHIVE_DIR, - fname - ) + @property + def archive_path(self): + if self.has_archive_version: + return os.path.join( + settings.ARCHIVE_DIR, + str(self.archive_filename) + ) + else: + return None @property def archive_file(self): diff --git a/src/documents/parsers.py b/src/documents/parsers.py index 3f0879b3c..b2714f6a3 100644 --- a/src/documents/parsers.py +++ b/src/documents/parsers.py @@ -6,7 +6,6 @@ import shutil import subprocess import tempfile -import dateparser import magic from django.conf import settings from django.utils import timezone @@ -36,7 +35,7 @@ DATE_REGEX = re.compile( ) -logger = logging.getLogger(__name__) +logger = logging.getLogger("paperless.parsing") def is_mime_type_supported(mime_type): @@ -200,6 +199,8 @@ def parse_date(filename, text): """ Call dateparser.parse with a particular date ordering """ + import dateparser + return dateparser.parse( ds, settings={ @@ -261,6 +262,8 @@ class DocumentParser(LoggingMixin): `paperless_tesseract.parsers` for inspiration. """ + logging_name = "paperless.parsing" + def __init__(self, logging_group, progress_callback=None): super().__init__() self.logging_group = logging_group @@ -273,10 +276,9 @@ class DocumentParser(LoggingMixin): self.date = None self.progress_callback = progress_callback - def progress(self, current, max): - print(self.progress_callback) + def progress(self, current_progress, max_progress): if self.progress_callback: - self.progress_callback(current, max) + self.progress_callback(current_progress, max_progress) def extract_metadata(self, document_path, mime_type): return [] @@ -287,14 +289,17 @@ class DocumentParser(LoggingMixin): def get_archive_path(self): return self.archive_path - def get_thumbnail(self, document_path, mime_type): + def get_thumbnail(self, document_path, mime_type, file_name=None): """ Returns the path to a file we can use as a thumbnail for this document. """ raise NotImplementedError() - def get_optimised_thumbnail(self, document_path, mime_type): - thumbnail = self.get_thumbnail(document_path, mime_type) + def get_optimised_thumbnail(self, + document_path, + mime_type, + file_name=None): + thumbnail = self.get_thumbnail(document_path, mime_type, file_name) if settings.OPTIMIZE_THUMBNAILS: out_path = os.path.join(self.tempdir, "thumb_optipng.png") @@ -317,5 +322,5 @@ class DocumentParser(LoggingMixin): return self.date def cleanup(self): - self.log("debug", "Deleting directory {}".format(self.tempdir)) + self.log("debug", f"Deleting directory {self.tempdir}") shutil.rmtree(self.tempdir) diff --git a/src/documents/sanity_checker.py b/src/documents/sanity_checker.py index bc0b689d4..2e1777841 100644 --- a/src/documents/sanity_checker.py +++ b/src/documents/sanity_checker.py @@ -1,45 +1,55 @@ import hashlib +import logging import os from django.conf import settings +from tqdm import tqdm from documents.models import Document -class SanityMessage: - message = None +class SanityCheckMessages: + + def __init__(self): + self._messages = [] + + def error(self, message): + self._messages.append({"level": logging.ERROR, "message": message}) + + def warning(self, message): + self._messages.append({"level": logging.WARNING, "message": message}) + + def info(self, message): + self._messages.append({"level": logging.INFO, "message": message}) + + def log_messages(self): + logger = logging.getLogger("paperless.sanity_checker") + + if len(self._messages) == 0: + logger.info("Sanity checker detected no issues.") + else: + for msg in self._messages: + logger.log(msg['level'], msg['message']) + + def __len__(self): + return len(self._messages) + + def __getitem__(self, item): + return self._messages[item] + + def has_error(self): + return any([msg['level'] == logging.ERROR for msg in self._messages]) + + def has_warning(self): + return any([msg['level'] == logging.WARNING for msg in self._messages]) -class SanityWarning(SanityMessage): - def __init__(self, message): - self.message = message - - def __str__(self): - return f"Warning: {self.message}" +class SanityCheckFailedException(Exception): + pass -class SanityError(SanityMessage): - def __init__(self, message): - self.message = message - - def __str__(self): - return f"ERROR: {self.message}" - - -class SanityFailedError(Exception): - - def __init__(self, messages): - self.messages = messages - - def __str__(self): - message_string = "\n".join([str(m) for m in self.messages]) - return ( - f"The following issuse were found by the sanity checker:\n" - f"{message_string}\n\n===============\n\n") - - -def check_sanity(): - messages = [] +def check_sanity(progress=False): + messages = SanityCheckMessages() present_files = [] for root, subdirs, files in os.walk(settings.MEDIA_ROOT): @@ -50,72 +60,86 @@ def check_sanity(): if lockfile in present_files: present_files.remove(lockfile) - for doc in Document.objects.all(): + if progress: + docs = tqdm(Document.objects.all()) + else: + docs = Document.objects.all() + + for doc in docs: # Check sanity of the thumbnail if not os.path.isfile(doc.thumbnail_path): - messages.append(SanityError( - f"Thumbnail of document {doc.pk} does not exist.")) + messages.error(f"Thumbnail of document {doc.pk} does not exist.") else: - present_files.remove(os.path.normpath(doc.thumbnail_path)) + if os.path.normpath(doc.thumbnail_path) in present_files: + present_files.remove(os.path.normpath(doc.thumbnail_path)) try: with doc.thumbnail_file as f: f.read() except OSError as e: - messages.append(SanityError( + messages.error( f"Cannot read thumbnail file of document {doc.pk}: {e}" - )) + ) # Check sanity of the original file # TODO: extract method if not os.path.isfile(doc.source_path): - messages.append(SanityError( - f"Original of document {doc.pk} does not exist.")) + messages.error(f"Original of document {doc.pk} does not exist.") else: - present_files.remove(os.path.normpath(doc.source_path)) + if os.path.normpath(doc.source_path) in present_files: + present_files.remove(os.path.normpath(doc.source_path)) try: with doc.source_file as f: checksum = hashlib.md5(f.read()).hexdigest() except OSError as e: - messages.append(SanityError( - f"Cannot read original file of document {doc.pk}: {e}")) + messages.error( + f"Cannot read original file of document {doc.pk}: {e}") else: if not checksum == doc.checksum: - messages.append(SanityError( + messages.error( f"Checksum mismatch of document {doc.pk}. " f"Stored: {doc.checksum}, actual: {checksum}." - )) + ) # Check sanity of the archive file. - if doc.archive_checksum: + if doc.archive_checksum and not doc.archive_filename: + messages.error( + f"Document {doc.pk} has an archive file checksum, but no " + f"archive filename." + ) + elif not doc.archive_checksum and doc.archive_filename: + messages.error( + f"Document {doc.pk} has an archive file, but its checksum is " + f"missing." + ) + elif doc.has_archive_version: if not os.path.isfile(doc.archive_path): - messages.append(SanityError( + messages.error( f"Archived version of document {doc.pk} does not exist." - )) + ) else: - present_files.remove(os.path.normpath(doc.archive_path)) + if os.path.normpath(doc.archive_path) in present_files: + present_files.remove(os.path.normpath(doc.archive_path)) try: with doc.archive_file as f: checksum = hashlib.md5(f.read()).hexdigest() except OSError as e: - messages.append(SanityError( + messages.error( f"Cannot read archive file of document {doc.pk}: {e}" - )) + ) else: if not checksum == doc.archive_checksum: - messages.append(SanityError( - f"Checksum mismatch of archive {doc.pk}. " - f"Stored: {doc.checksum}, actual: {checksum}." - )) + messages.error( + f"Checksum mismatch of archived document " + f"{doc.pk}. " + f"Stored: {doc.archive_checksum}, " + f"actual: {checksum}." + ) # other document checks if not doc.content: - messages.append(SanityWarning( - f"Document {doc.pk} has no content." - )) + messages.info(f"Document {doc.pk} has no content.") for extra_file in present_files: - messages.append(SanityWarning( - f"Orphaned file in media dir: {extra_file}" - )) + messages.warning(f"Orphaned file in media dir: {extra_file}") return messages diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index aa4ef4bf8..adda7117e 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -1,11 +1,13 @@ +import re + import magic from django.utils.text import slugify from rest_framework import serializers from rest_framework.fields import SerializerMethodField from . import bulk_edit -from .models import Correspondent, Tag, Document, Log, DocumentType, \ - SavedView, SavedViewFilterRule +from .models import Correspondent, Tag, Document, DocumentType, \ + SavedView, SavedViewFilterRule, MatchingModel from .parsers import is_mime_type_supported from django.utils.translation import gettext as _ @@ -33,16 +35,30 @@ class DynamicFieldsModelSerializer(serializers.ModelSerializer): self.fields.pop(field_name) -class CorrespondentSerializer(serializers.ModelSerializer): +class MatchingModelSerializer(serializers.ModelSerializer): document_count = serializers.IntegerField(read_only=True) - last_correspondence = serializers.DateTimeField(read_only=True) - def get_slug(self, obj): return slugify(obj.name) slug = SerializerMethodField() + def validate_match(self, match): + if 'matching_algorithm' in self.initial_data and self.initial_data['matching_algorithm'] == MatchingModel.MATCH_REGEX: # NOQA: E501 + try: + re.compile(match) + except Exception as e: + raise serializers.ValidationError( + _("Invalid regular expresssion: %(error)s") % + {'error': str(e)} + ) + return match + + +class CorrespondentSerializer(MatchingModelSerializer): + + last_correspondence = serializers.DateTimeField(read_only=True) + class Meta: model = Correspondent fields = ( @@ -57,13 +73,7 @@ class CorrespondentSerializer(serializers.ModelSerializer): ) -class DocumentTypeSerializer(serializers.ModelSerializer): - - document_count = serializers.IntegerField(read_only=True) - - def get_slug(self, obj): - return slugify(obj.name) - slug = SerializerMethodField() +class DocumentTypeSerializer(MatchingModelSerializer): class Meta: model = DocumentType @@ -78,13 +88,7 @@ class DocumentTypeSerializer(serializers.ModelSerializer): ) -class TagSerializer(serializers.ModelSerializer): - - document_count = serializers.IntegerField(read_only=True) - - def get_slug(self, obj): - return slugify(obj.name) - slug = SerializerMethodField() +class TagSerializer(MatchingModelSerializer): class Meta: model = Tag @@ -129,7 +133,7 @@ class DocumentSerializer(DynamicFieldsModelSerializer): return obj.get_public_filename() def get_archived_file_name(self, obj): - if obj.archive_checksum: + if obj.has_archive_version: return obj.get_public_filename(archive=True) else: return None @@ -153,19 +157,6 @@ class DocumentSerializer(DynamicFieldsModelSerializer): ) -class LogSerializer(serializers.ModelSerializer): - - class Meta: - model = Log - fields = ( - "id", - "created", - "message", - "group", - "level" - ) - - class SavedViewFilterRuleSerializer(serializers.ModelSerializer): class Meta: @@ -205,14 +196,34 @@ class SavedViewSerializer(serializers.ModelSerializer): return saved_view -class BulkEditSerializer(serializers.Serializer): +class DocumentListSerializer(serializers.Serializer): documents = serializers.ListField( - child=serializers.IntegerField(), + required=True, label="Documents", - write_only=True + write_only=True, + child=serializers.IntegerField() ) + def _validate_document_id_list(self, documents, name="documents"): + if not type(documents) == list: + raise serializers.ValidationError(f"{name} must be a list") + if not all([type(i) == int for i in documents]): + raise serializers.ValidationError( + f"{name} must be a list of integers") + count = Document.objects.filter(id__in=documents).count() + if not count == len(documents): + raise serializers.ValidationError( + f"Some documents in {name} don't exist or were " + f"specified twice.") + + def validate_documents(self, documents): + self._validate_document_id_list(documents) + return documents + + +class BulkEditSerializer(DocumentListSerializer): + method = serializers.ChoiceField( choices=[ "set_correspondent", @@ -228,18 +239,6 @@ class BulkEditSerializer(serializers.Serializer): parameters = serializers.DictField(allow_empty=True) - def _validate_document_id_list(self, documents, name="documents"): - if not type(documents) == list: - raise serializers.ValidationError(f"{name} must be a list") - if not all([type(i) == int for i in documents]): - raise serializers.ValidationError( - f"{name} must be a list of integers") - count = Document.objects.filter(id__in=documents).count() - if not count == len(documents): - raise serializers.ValidationError( - f"Some documents in {name} don't exist or were " - f"specified twice.") - def _validate_tag_id_list(self, tags, name="tags"): if not type(tags) == list: raise serializers.ValidationError(f"{name} must be a list") @@ -251,10 +250,6 @@ class BulkEditSerializer(serializers.Serializer): raise serializers.ValidationError( f"Some tags in {name} don't exist or were specified twice.") - def validate_documents(self, documents): - self._validate_document_id_list(documents) - return documents - def validate_method(self, method): if method == "set_correspondent": return bulk_edit.set_correspondent @@ -405,9 +400,24 @@ class PostDocumentSerializer(serializers.Serializer): return None -class SelectionDataSerializer(serializers.Serializer): +class BulkDownloadSerializer(DocumentListSerializer): - documents = serializers.ListField( - required=True, - child=serializers.IntegerField() + content = serializers.ChoiceField( + choices=["archive", "originals", "both"], + default="archive" ) + + compression = serializers.ChoiceField( + choices=["none", "deflated", "bzip2", "lzma"], + default="none" + ) + + def validate_compression(self, compression): + import zipfile + + return { + "none": zipfile.ZIP_STORED, + "deflated": zipfile.ZIP_DEFLATED, + "bzip2": zipfile.ZIP_BZIP2, + "lzma": zipfile.ZIP_LZMA + }[compression] diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py index 76c1e76ed..ad63bf301 100755 --- a/src/documents/signals/handlers.py +++ b/src/documents/signals/handlers.py @@ -1,6 +1,5 @@ import logging import os -from subprocess import Popen from django.conf import settings from django.contrib.admin.models import ADDITION, LogEntry @@ -12,15 +11,14 @@ from django.dispatch import receiver from django.utils import timezone from filelock import FileLock -from .. import index, matching +from .. import matching from ..file_handling import delete_empty_directories, \ - create_source_path_directory, archive_name_from_filename, \ + create_source_path_directory, \ generate_unique_filename from ..models import Document, Tag -def logger(message, group): - logging.getLogger(__name__).debug(message, extra={"group": group}) +logger = logging.getLogger("paperless.handlers") def add_inbox_tags(sender, document=None, logging_group=None, **kwargs): @@ -48,23 +46,23 @@ def set_correspondent(sender, selected = None if potential_count > 1: if use_first: - logger( + logger.info( f"Detected {potential_count} potential correspondents, " f"so we've opted for {selected}", - logging_group + extra={'group': logging_group} ) else: - logger( + logger.info( f"Detected {potential_count} potential correspondents, " f"not assigning any correspondent", - logging_group + extra={'group': logging_group} ) return if selected or replace: - logger( + logger.info( f"Assigning correspondent {selected} to {document}", - logging_group + extra={'group': logging_group} ) document.correspondent = selected @@ -92,23 +90,23 @@ def set_document_type(sender, if potential_count > 1: if use_first: - logger( + logger.info( f"Detected {potential_count} potential document types, " f"so we've opted for {selected}", - logging_group + extra={'group': logging_group} ) else: - logger( + logger.info( f"Detected {potential_count} potential document types, " f"not assigning any document type", - logging_group + extra={'group': logging_group} ) return if selected or replace: - logger( + logger.info( f"Assigning document type {selected} to {document}", - logging_group + extra={'group': logging_group} ) document.document_type = selected @@ -138,9 +136,9 @@ def set_tags(sender, return message = 'Tagging "{}" with "{}"' - logger( + logger.info( message.format(document, ", ".join([t.name for t in relevant_tags])), - logging_group + extra={'group': logging_group} ) document.tags.add(*relevant_tags) @@ -149,18 +147,18 @@ def set_tags(sender, @receiver(models.signals.post_delete, sender=Document) def cleanup_document_deletion(sender, instance, using, **kwargs): with FileLock(settings.MEDIA_LOCK): - for f in (instance.source_path, - instance.archive_path, - instance.thumbnail_path): - if os.path.isfile(f): + for filename in (instance.source_path, + instance.archive_path, + instance.thumbnail_path): + if filename and os.path.isfile(filename): try: - os.unlink(f) - logging.getLogger(__name__).debug( - f"Deleted file {f}.") + os.unlink(filename) + logger.debug( + f"Deleted file {filename}.") except OSError as e: - logging.getLogger(__name__).warning( + logger.warning( f"While deleting document {str(instance)}, the file " - f"{f} could not be deleted: {e}" + f"{filename} could not be deleted: {e}" ) delete_empty_directories( @@ -168,27 +166,30 @@ def cleanup_document_deletion(sender, instance, using, **kwargs): root=settings.ORIGINALS_DIR ) - delete_empty_directories( - os.path.dirname(instance.archive_path), - root=settings.ARCHIVE_DIR - ) + if instance.has_archive_version: + delete_empty_directories( + os.path.dirname(instance.archive_path), + root=settings.ARCHIVE_DIR + ) + + +class CannotMoveFilesException(Exception): + pass def validate_move(instance, old_path, new_path): if not os.path.isfile(old_path): # Can't do anything if the old file does not exist anymore. - logging.getLogger(__name__).fatal( + logger.fatal( f"Document {str(instance)}: File {old_path} has gone.") - return False + raise CannotMoveFilesException() if os.path.isfile(new_path): # Can't do anything if the new file already exists. Skip updating file. - logging.getLogger(__name__).warning( + logger.warning( f"Document {str(instance)}: Cannot rename file " f"since target path {new_path} already exists.") - return False - - return True + raise CannotMoveFilesException() @receiver(models.signals.m2m_changed, sender=Document.tags.through) @@ -207,56 +208,61 @@ def update_filename_and_move_files(sender, instance, **kwargs): return with FileLock(settings.MEDIA_LOCK): - old_filename = instance.filename - new_filename = generate_unique_filename( - instance, settings.ORIGINALS_DIR) + try: + old_filename = instance.filename + old_source_path = instance.source_path - if new_filename == instance.filename: - # Don't do anything if its the same. - return + instance.filename = generate_unique_filename(instance) + move_original = old_filename != instance.filename - old_source_path = instance.source_path - new_source_path = os.path.join(settings.ORIGINALS_DIR, new_filename) - - if not validate_move(instance, old_source_path, new_source_path): - return - - # archive files are optional, archive checksum tells us if we have one, - # since this is None for documents without archived files. - if instance.archive_checksum: - new_archive_filename = archive_name_from_filename(new_filename) + old_archive_filename = instance.archive_filename old_archive_path = instance.archive_path - new_archive_path = os.path.join(settings.ARCHIVE_DIR, - new_archive_filename) - if not validate_move(instance, old_archive_path, new_archive_path): + if instance.has_archive_version: + + instance.archive_filename = generate_unique_filename( + instance, archive_filename=True + ) + + move_archive = old_archive_filename != instance.archive_filename # NOQA: E501 + else: + move_archive = False + + if not move_original and not move_archive: + # Don't do anything if filenames did not change. return - create_source_path_directory(new_archive_path) - else: - old_archive_path = None - new_archive_path = None + if move_original: + validate_move(instance, old_source_path, instance.source_path) + create_source_path_directory(instance.source_path) + os.rename(old_source_path, instance.source_path) - create_source_path_directory(new_source_path) - - try: - os.rename(old_source_path, new_source_path) - if instance.archive_checksum: - os.rename(old_archive_path, new_archive_path) - instance.filename = new_filename + if move_archive: + validate_move( + instance, old_archive_path, instance.archive_path) + create_source_path_directory(instance.archive_path) + os.rename(old_archive_path, instance.archive_path) # Don't save() here to prevent infinite recursion. Document.objects.filter(pk=instance.pk).update( - filename=new_filename) + filename=instance.filename, + archive_filename=instance.archive_filename, + ) - except OSError as e: - instance.filename = old_filename - # this happens when we can't move a file. If that's the case for - # the archive file, we try our best to revert the changes. - # no need to save the instance, the update() has not happened yet. + except (OSError, DatabaseError, CannotMoveFilesException): + # This happens when either: + # - moving the files failed due to file system errors + # - saving to the database failed due to database errors + # In both cases, we need to revert to the original state. + + # Try to move files to their original location. try: - os.rename(new_source_path, old_source_path) - os.rename(new_archive_path, old_archive_path) + if move_original and os.path.isfile(instance.source_path): + os.rename(instance.source_path, old_source_path) + + if move_archive and os.path.isfile(instance.archive_path): + os.rename(instance.archive_path, old_archive_path) + except Exception as e: # This is fine, since: # A: if we managed to move source from A to B, we will also @@ -267,16 +273,10 @@ def update_filename_and_move_files(sender, instance, **kwargs): # B: if moving the orignal file failed, nothing has changed # anyway. pass - except DatabaseError as e: - # this happens after moving files, so move them back into place. - # since moving them once succeeded, it's very likely going to - # succeed again. - os.rename(new_source_path, old_source_path) - if instance.archive_checksum: - os.rename(new_archive_path, old_archive_path) + + # restore old values on the instance instance.filename = old_filename - # again, no need to save the instance, since the actual update() - # operation failed. + instance.archive_filename = old_archive_filename # finally, remove any empty sub folders. This will do nothing if # something has failed above. @@ -284,7 +284,7 @@ def update_filename_and_move_files(sender, instance, **kwargs): delete_empty_directories(os.path.dirname(old_source_path), root=settings.ORIGINALS_DIR) - if old_archive_path and not os.path.isfile(old_archive_path): + if instance.has_archive_version and not os.path.isfile(old_archive_path): # NOQA: E501 delete_empty_directories(os.path.dirname(old_archive_path), root=settings.ARCHIVE_DIR) @@ -305,4 +305,6 @@ def set_log_entry(sender, document=None, logging_group=None, **kwargs): def add_to_index(sender, document, **kwargs): + from documents import index + index.add_or_update_document(document) diff --git a/src/documents/tasks.py b/src/documents/tasks.py index e0d726d3e..ddfd2eac3 100644 --- a/src/documents/tasks.py +++ b/src/documents/tasks.py @@ -9,7 +9,9 @@ from documents import index, sanity_checker from documents.classifier import DocumentClassifier, load_classifier from documents.consumer import Consumer, ConsumerError from documents.models import Document, Tag, DocumentType, Correspondent -from documents.sanity_checker import SanityFailedError +from documents.sanity_checker import SanityCheckFailedException + +logger = logging.getLogger("paperless.tasks") def index_optimize(): @@ -45,18 +47,18 @@ def train_classifier(): try: if classifier.train(): - logging.getLogger(__name__).info( + logger.info( "Saving updated classifier model to {}...".format( settings.MODEL_FILE) ) - classifier.save_classifier() + classifier.save() else: - logging.getLogger(__name__).debug( + logger.debug( "Training data unchanged." ) except Exception as e: - logging.getLogger(__name__).warning( + logger.warning( "Classifier error: " + str(e) ) @@ -91,8 +93,15 @@ def consume_file(path, def sanity_check(): messages = sanity_checker.check_sanity() - if len(messages) > 0: - raise SanityFailedError(messages) + messages.log_messages() + + if messages.has_error(): + raise SanityCheckFailedException( + "Sanity check failed with errors. See log.") + elif messages.has_warning(): + return "Sanity check exited with warnings. See log." + elif len(messages) > 0: + return "Sanity check exited with infos. See log." else: return "No issues detected." diff --git a/src/documents/templates/index.html b/src/documents/templates/index.html index 285e48d3f..b71aaaeb6 100644 --- a/src/documents/templates/index.html +++ b/src/documents/templates/index.html @@ -15,6 +15,7 @@ + {% translate "Paperless-ng is loading..." %} diff --git a/src/documents/tests/data/model.pickle b/src/documents/tests/data/model.pickle new file mode 100644 index 000000000..db303ec80 Binary files /dev/null and b/src/documents/tests/data/model.pickle differ diff --git a/src/documents/tests/samples/simple-noalpha.png b/src/documents/tests/samples/simple-noalpha.png new file mode 100644 index 000000000..9a76e76a0 Binary files /dev/null and b/src/documents/tests/samples/simple-noalpha.png differ diff --git a/src/documents/tests/samples/simple.jpg b/src/documents/tests/samples/simple.jpg new file mode 100644 index 000000000..a8c58af0d Binary files /dev/null and b/src/documents/tests/samples/simple.jpg differ diff --git a/src/documents/tests/samples/simple.png b/src/documents/tests/samples/simple.png new file mode 100644 index 000000000..a3a768401 Binary files /dev/null and b/src/documents/tests/samples/simple.png differ diff --git a/src/documents/tests/samples/simple.txt b/src/documents/tests/samples/simple.txt new file mode 100644 index 000000000..6de7b8c69 --- /dev/null +++ b/src/documents/tests/samples/simple.txt @@ -0,0 +1 @@ +This is a test file. diff --git a/src/documents/tests/test_admin.py b/src/documents/tests/test_admin.py index 6915f595d..ce00a0698 100644 --- a/src/documents/tests/test_admin.py +++ b/src/documents/tests/test_admin.py @@ -4,6 +4,7 @@ from django.contrib.admin.sites import AdminSite from django.test import TestCase from django.utils import timezone +from documents import index from documents.admin import DocumentAdmin from documents.models import Document from documents.tests.utils import DirectoriesMixin @@ -11,49 +12,52 @@ from documents.tests.utils import DirectoriesMixin class TestDocumentAdmin(DirectoriesMixin, TestCase): + def get_document_from_index(self, doc): + ix = index.open_index() + with ix.searcher() as searcher: + return searcher.document(id=doc.id) + 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") - def test_save_model(self, m): + def test_save_model(self): doc = Document.objects.create(title="test") + doc.title = "new title" self.doc_admin.save_model(None, doc, None, None) self.assertEqual(Document.objects.get(id=doc.id).title, "new title") - m.assert_called_once() + self.assertEqual(self.get_document_from_index(doc)['title'], "new title") - def test_tags(self): + def test_delete_model(self): doc = Document.objects.create(title="test") - doc.tags.create(name="t1") - doc.tags.create(name="t2") + index.add_or_update_document(doc) + self.assertIsNotNone(self.get_document_from_index(doc)) - self.assertEqual(self.doc_admin.tags_(doc), "t1, t2, ") - - def test_tags_empty(self): - doc = Document.objects.create(title="test") - - self.assertEqual(self.doc_admin.tags_(doc), "") - - @mock.patch("documents.admin.index.remove_document") - def test_delete_model(self, m): - doc = Document.objects.create(title="test") self.doc_admin.delete_model(None, doc) - self.assertRaises(Document.DoesNotExist, Document.objects.get, id=doc.id) - m.assert_called_once() - @mock.patch("documents.admin.index.remove_document") - def test_delete_queryset(self, m): + self.assertRaises(Document.DoesNotExist, Document.objects.get, id=doc.id) + self.assertIsNone(self.get_document_from_index(doc)) + + def test_delete_queryset(self): + docs = [] for i in range(42): - Document.objects.create(title="Many documents with the same title", checksum=f"{i:02}") + doc = Document.objects.create(title="Many documents with the same title", checksum=f"{i:02}") + docs.append(doc) + index.add_or_update_document(doc) self.assertEqual(Document.objects.count(), 42) + for doc in docs: + self.assertIsNotNone(self.get_document_from_index(doc)) + self.doc_admin.delete_queryset(None, Document.objects.all()) - self.assertEqual(m.call_count, 42) self.assertEqual(Document.objects.count(), 0) + for doc in docs: + self.assertIsNone(self.get_document_from_index(doc)) + def test_created(self): doc = Document.objects.create(title="test", created=timezone.datetime(2020, 4, 12)) self.assertEqual(self.doc_admin.created_(doc), "2020-04-12") diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py index 9e4b77189..cbd10ac71 100644 --- a/src/documents/tests/test_api.py +++ b/src/documents/tests/test_api.py @@ -1,15 +1,20 @@ +import datetime +import io import json import os import shutil import tempfile +import zipfile from unittest import mock +from django.conf import settings from django.contrib.auth.models import User +from django.test import override_settings from rest_framework.test import APITestCase from whoosh.writing import AsyncWriter from documents import index, bulk_edit -from documents.models import Document, Correspondent, DocumentType, Tag, SavedView +from documents.models import Document, Correspondent, DocumentType, Tag, SavedView, MatchingModel from documents.tests.utils import DirectoriesMixin @@ -144,21 +149,19 @@ class TestDocumentApi(DirectoriesMixin, APITestCase): self.assertEqual(response.status_code, 200) self.assertEqual(response.content, content_thumbnail) + @override_settings(PAPERLESS_FILENAME_FORMAT="") def test_download_with_archive(self): - _, filename = tempfile.mkstemp(dir=self.dirs.originals_dir) - content = b"This is a test" content_archive = b"This is the same test but archived" - with open(filename, "wb") as f: - f.write(content) - - filename = os.path.basename(filename) - - doc = Document.objects.create(title="none", filename=filename, + doc = Document.objects.create(title="none", filename="my_document.pdf", + archive_filename="archived.pdf", mime_type="application/pdf") + with open(doc.source_path, "wb") as f: + f.write(content) + with open(doc.archive_path, "wb") as f: f.write(content_archive) @@ -442,6 +445,13 @@ class TestDocumentApi(DirectoriesMixin, APITestCase): self.assertEqual(response.data['documents_total'], 3) self.assertEqual(response.data['documents_inbox'], 1) + def test_statistics_no_inbox_tag(self): + Document.objects.create(title="none1", checksum="A") + + response = self.client.get("/api/statistics/") + self.assertEqual(response.status_code, 200) + self.assertEqual(response.data['documents_inbox'], None) + @mock.patch("documents.views.async_task") def test_upload(self, m): @@ -575,10 +585,13 @@ class TestDocumentApi(DirectoriesMixin, APITestCase): async_task.assert_not_called() def test_get_metadata(self): - doc = Document.objects.create(title="test", filename="file.pdf", mime_type="image/png", archive_checksum="A") + doc = Document.objects.create(title="test", filename="file.pdf", mime_type="image/png", archive_checksum="A", archive_filename="archive.pdf") - shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", "0000001.png"), doc.source_path) - shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), doc.archive_path) + source_file = os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", "0000001.png") + archive_file = os.path.join(os.path.dirname(__file__), "samples", "simple.pdf") + + shutil.copy(source_file, doc.source_path) + shutil.copy(archive_file, doc.archive_path) response = self.client.get(f"/api/documents/{doc.pk}/metadata/") self.assertEqual(response.status_code, 200) @@ -589,6 +602,10 @@ class TestDocumentApi(DirectoriesMixin, APITestCase): self.assertTrue(meta['has_archive_version']) self.assertEqual(len(meta['original_metadata']), 0) self.assertGreater(len(meta['archive_metadata']), 0) + self.assertEqual(meta['media_filename'], "file.pdf") + self.assertEqual(meta['archive_media_filename'], "archive.pdf") + self.assertEqual(meta['original_size'], os.stat(source_file).st_size) + self.assertEqual(meta['archive_size'], os.stat(archive_file).st_size) def test_get_metadata_invalid_doc(self): response = self.client.get(f"/api/documents/34576/metadata/") @@ -608,6 +625,22 @@ class TestDocumentApi(DirectoriesMixin, APITestCase): self.assertFalse(meta['has_archive_version']) self.assertGreater(len(meta['original_metadata']), 0) self.assertIsNone(meta['archive_metadata']) + self.assertIsNone(meta['archive_media_filename']) + + def test_get_metadata_missing_files(self): + doc = Document.objects.create(title="test", filename="file.pdf", mime_type="application/pdf", archive_filename="file.pdf", archive_checksum="B", checksum="A") + + response = self.client.get(f"/api/documents/{doc.pk}/metadata/") + self.assertEqual(response.status_code, 200) + + meta = response.data + + self.assertTrue(meta['has_archive_version']) + self.assertIsNone(meta['original_metadata']) + self.assertIsNone(meta['original_size']) + self.assertIsNone(meta['archive_metadata']) + self.assertIsNone(meta['archive_size']) + def test_get_empty_suggestions(self): doc = Document.objects.create(title="test", mime_type="application/pdf") @@ -717,6 +750,63 @@ class TestDocumentApi(DirectoriesMixin, APITestCase): v1 = SavedView.objects.get(id=v1.id) self.assertEqual(v1.filter_rules.count(), 0) + def test_get_logs(self): + response = self.client.get("/api/logs/") + self.assertEqual(response.status_code, 200) + self.assertCountEqual(response.data, ["mail", "paperless"]) + + def test_get_invalid_log(self): + response = self.client.get("/api/logs/bogus_log/") + self.assertEqual(response.status_code, 404) + + @override_settings(LOGGING_DIR="bogus_dir") + def test_get_nonexistent_log(self): + response = self.client.get("/api/logs/paperless/") + self.assertEqual(response.status_code, 404) + + def test_get_log(self): + log_data = "test\ntest2\n" + with open(os.path.join(settings.LOGGING_DIR, "paperless.log"), "w") as f: + f.write(log_data) + response = self.client.get("/api/logs/paperless/") + self.assertEqual(response.status_code, 200) + self.assertListEqual(response.data, ["test", "test2"]) + + def test_invalid_regex_other_algorithm(self): + for endpoint in ['correspondents', 'tags', 'document_types']: + response = self.client.post(f"/api/{endpoint}/", { + "name": "test", + "matching_algorithm": MatchingModel.MATCH_ANY, + "match": "[" + }, format='json') + self.assertEqual(response.status_code, 201, endpoint) + + def test_invalid_regex(self): + for endpoint in ['correspondents', 'tags', 'document_types']: + response = self.client.post(f"/api/{endpoint}/", { + "name": "test", + "matching_algorithm": MatchingModel.MATCH_REGEX, + "match": "[" + }, format='json') + self.assertEqual(response.status_code, 400, endpoint) + + def test_valid_regex(self): + for endpoint in ['correspondents', 'tags', 'document_types']: + response = self.client.post(f"/api/{endpoint}/", { + "name": "test", + "matching_algorithm": MatchingModel.MATCH_REGEX, + "match": "[0-9]" + }, format='json') + self.assertEqual(response.status_code, 201, endpoint) + + def test_regex_no_algorithm(self): + for endpoint in ['correspondents', 'tags', 'document_types']: + response = self.client.post(f"/api/{endpoint}/", { + "name": "test", + "match": "[0-9]" + }, format='json') + self.assertEqual(response.status_code, 201, endpoint) + class TestBulkEdit(DirectoriesMixin, APITestCase): @@ -1071,6 +1161,113 @@ class TestBulkEdit(DirectoriesMixin, APITestCase): self.assertCountEqual(response.data['selected_document_types'], [{"id": self.c1.id, "document_count": 1}, {"id": self.c2.id, "document_count": 0}]) +class TestBulkDownload(DirectoriesMixin, APITestCase): + + def setUp(self): + super(TestBulkDownload, self).setUp() + + user = User.objects.create_superuser(username="temp_admin") + self.client.force_login(user=user) + + self.doc1 = Document.objects.create(title="unrelated", checksum="A") + self.doc2 = Document.objects.create(title="document A", filename="docA.pdf", mime_type="application/pdf", checksum="B", created=datetime.datetime(2021, 1, 1)) + self.doc2b = Document.objects.create(title="document A", filename="docA2.pdf", mime_type="application/pdf", checksum="D", created=datetime.datetime(2021, 1, 1)) + self.doc3 = Document.objects.create(title="document B", filename="docB.jpg", mime_type="image/jpeg", checksum="C", created=datetime.datetime(2020, 3, 21), archive_filename="docB.pdf", archive_checksum="D") + + shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), self.doc2.source_path) + shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.png"), self.doc2b.source_path) + shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.jpg"), self.doc3.source_path) + shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "test_with_bom.pdf"), self.doc3.archive_path) + + def test_download_originals(self): + response = self.client.post("/api/documents/bulk_download/", json.dumps({ + "documents": [self.doc2.id, self.doc3.id], + "content": "originals" + }), content_type='application/json') + + self.assertEqual(response.status_code, 200) + self.assertEqual(response['Content-Type'], 'application/zip') + + with zipfile.ZipFile(io.BytesIO(response.content)) as zipf: + self.assertEqual(len(zipf.filelist), 2) + self.assertIn("2021-01-01 document A.pdf", zipf.namelist()) + self.assertIn("2020-03-21 document B.jpg", zipf.namelist()) + + with self.doc2.source_file as f: + self.assertEqual(f.read(), zipf.read("2021-01-01 document A.pdf")) + + with self.doc3.source_file as f: + self.assertEqual(f.read(), zipf.read("2020-03-21 document B.jpg")) + + def test_download_default(self): + response = self.client.post("/api/documents/bulk_download/", json.dumps({ + "documents": [self.doc2.id, self.doc3.id] + }), content_type='application/json') + + self.assertEqual(response.status_code, 200) + self.assertEqual(response['Content-Type'], 'application/zip') + + with zipfile.ZipFile(io.BytesIO(response.content)) as zipf: + self.assertEqual(len(zipf.filelist), 2) + self.assertIn("2021-01-01 document A.pdf", zipf.namelist()) + self.assertIn("2020-03-21 document B.pdf", zipf.namelist()) + + with self.doc2.source_file as f: + self.assertEqual(f.read(), zipf.read("2021-01-01 document A.pdf")) + + with self.doc3.archive_file as f: + self.assertEqual(f.read(), zipf.read("2020-03-21 document B.pdf")) + + def test_download_both(self): + response = self.client.post("/api/documents/bulk_download/", json.dumps({ + "documents": [self.doc2.id, self.doc3.id], + "content": "both" + }), content_type='application/json') + + self.assertEqual(response.status_code, 200) + self.assertEqual(response['Content-Type'], 'application/zip') + + with zipfile.ZipFile(io.BytesIO(response.content)) as zipf: + self.assertEqual(len(zipf.filelist), 3) + self.assertIn("originals/2021-01-01 document A.pdf", zipf.namelist()) + self.assertIn("archive/2020-03-21 document B.pdf", zipf.namelist()) + self.assertIn("originals/2020-03-21 document B.jpg", zipf.namelist()) + + with self.doc2.source_file as f: + self.assertEqual(f.read(), zipf.read("originals/2021-01-01 document A.pdf")) + + with self.doc3.archive_file as f: + self.assertEqual(f.read(), zipf.read("archive/2020-03-21 document B.pdf")) + + with self.doc3.source_file as f: + self.assertEqual(f.read(), zipf.read("originals/2020-03-21 document B.jpg")) + + def test_filename_clashes(self): + response = self.client.post("/api/documents/bulk_download/", json.dumps({ + "documents": [self.doc2.id, self.doc2b.id] + }), content_type='application/json') + + self.assertEqual(response.status_code, 200) + self.assertEqual(response['Content-Type'], 'application/zip') + + with zipfile.ZipFile(io.BytesIO(response.content)) as zipf: + self.assertEqual(len(zipf.filelist), 2) + + self.assertIn("2021-01-01 document A.pdf", zipf.namelist()) + self.assertIn("2021-01-01 document A_01.pdf", zipf.namelist()) + + with self.doc2.source_file as f: + self.assertEqual(f.read(), zipf.read("2021-01-01 document A.pdf")) + + with self.doc2b.source_file as f: + self.assertEqual(f.read(), zipf.read("2021-01-01 document A_01.pdf")) + + def test_compression(self): + response = self.client.post("/api/documents/bulk_download/", json.dumps({ + "documents": [self.doc2.id, self.doc2b.id], + "compression": "lzma" + }), content_type='application/json') + class TestApiAuth(APITestCase): def test_auth_required(self): @@ -1094,4 +1291,5 @@ class TestApiAuth(APITestCase): self.assertEqual(self.client.get("/api/search/").status_code, 401) self.assertEqual(self.client.get("/api/search/auto_complete/").status_code, 401) self.assertEqual(self.client.get("/api/documents/bulk_edit/").status_code, 401) + self.assertEqual(self.client.get("/api/documents/bulk_download/").status_code, 401) self.assertEqual(self.client.get("/api/documents/selection_data/").status_code, 401) diff --git a/src/documents/tests/test_classifier.py b/src/documents/tests/test_classifier.py index 43c38b691..fcc08f842 100644 --- a/src/documents/tests/test_classifier.py +++ b/src/documents/tests/test_classifier.py @@ -1,9 +1,9 @@ import os import tempfile from pathlib import Path -from time import sleep from unittest import mock +import pytest from django.conf import settings from django.test import TestCase, override_settings @@ -85,37 +85,19 @@ class TestClassifier(DirectoriesMixin, TestCase): self.assertTrue(self.classifier.train()) self.assertFalse(self.classifier.train()) - self.classifier.save_classifier() + self.classifier.save() classifier2 = DocumentClassifier() current_ver = DocumentClassifier.FORMAT_VERSION with mock.patch("documents.classifier.DocumentClassifier.FORMAT_VERSION", current_ver+1): # assure that we won't load old classifiers. - self.assertRaises(IncompatibleClassifierVersionError, classifier2.reload) + self.assertRaises(IncompatibleClassifierVersionError, classifier2.load) - self.classifier.save_classifier() + self.classifier.save() # assure that we can load the classifier after saving it. - classifier2.reload() - - def testReload(self): - - self.generate_test_data() - self.assertTrue(self.classifier.train()) - self.classifier.save_classifier() - - classifier2 = DocumentClassifier() - classifier2.reload() - v1 = classifier2.classifier_version - - # change the classifier after some time. - sleep(1) - self.classifier.save_classifier() - - classifier2.reload() - v2 = classifier2.classifier_version - self.assertNotEqual(v1, v2) + classifier2.load() @override_settings(DATA_DIR=tempfile.mkdtemp()) def testSaveClassifier(self): @@ -124,12 +106,21 @@ class TestClassifier(DirectoriesMixin, TestCase): self.classifier.train() - self.classifier.save_classifier() + self.classifier.save() new_classifier = DocumentClassifier() - new_classifier.reload() + new_classifier.load() self.assertFalse(new_classifier.train()) + @override_settings(MODEL_FILE=os.path.join(os.path.dirname(__file__), "data", "model.pickle")) + def test_load_and_classify(self): + self.generate_test_data() + + new_classifier = DocumentClassifier() + new_classifier.load() + + self.assertCountEqual(new_classifier.predict_tags(self.doc2.content), [45, 12]) + def test_one_correspondent_predict(self): c1 = Correspondent.objects.create(name="c1", matching_algorithm=Correspondent.MATCH_AUTO) doc1 = Document.objects.create(title="doc1", content="this is a document from c1", correspondent=c1, checksum="A") @@ -243,25 +234,37 @@ class TestClassifier(DirectoriesMixin, TestCase): self.assertFalse(os.path.exists(settings.MODEL_FILE)) self.assertIsNone(load_classifier()) - @mock.patch("documents.classifier.DocumentClassifier.reload") - def test_load_classifier(self, reload): + @mock.patch("documents.classifier.DocumentClassifier.load") + def test_load_classifier(self, load): Path(settings.MODEL_FILE).touch() self.assertIsNotNone(load_classifier()) + load.assert_called_once() - @mock.patch("documents.classifier.DocumentClassifier.reload") - def test_load_classifier_incompatible_version(self, reload): + @override_settings(CACHES={'default': {'BACKEND': 'django.core.cache.backends.locmem.LocMemCache'}}) + @override_settings(MODEL_FILE=os.path.join(os.path.dirname(__file__), "data", "model.pickle")) + @pytest.mark.skip(reason="Disabled caching due to high memory usage - need to investigate.") + def test_load_classifier_cached(self): + classifier = load_classifier() + self.assertIsNotNone(classifier) + + with mock.patch("documents.classifier.DocumentClassifier.load") as load: + classifier2 = load_classifier() + load.assert_not_called() + + @mock.patch("documents.classifier.DocumentClassifier.load") + def test_load_classifier_incompatible_version(self, load): Path(settings.MODEL_FILE).touch() self.assertTrue(os.path.exists(settings.MODEL_FILE)) - reload.side_effect = IncompatibleClassifierVersionError() + load.side_effect = IncompatibleClassifierVersionError() self.assertIsNone(load_classifier()) self.assertFalse(os.path.exists(settings.MODEL_FILE)) - @mock.patch("documents.classifier.DocumentClassifier.reload") - def test_load_classifier_os_error(self, reload): + @mock.patch("documents.classifier.DocumentClassifier.load") + def test_load_classifier_os_error(self, load): Path(settings.MODEL_FILE).touch() self.assertTrue(os.path.exists(settings.MODEL_FILE)) - reload.side_effect = OSError() + load.side_effect = OSError() self.assertIsNone(load_classifier()) self.assertTrue(os.path.exists(settings.MODEL_FILE)) diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py index a6f0cc55a..44effd39e 100644 --- a/src/documents/tests/test_consumer.py +++ b/src/documents/tests/test_consumer.py @@ -5,12 +5,14 @@ import tempfile from unittest import mock from unittest.mock import MagicMock +from django.conf import settings from django.test import TestCase, override_settings from .utils import DirectoriesMixin from ..consumer import Consumer, ConsumerError from ..models import FileInfo, Tag, Correspondent, DocumentType, Document from ..parsers import DocumentParser, ParseError +from ..tasks import sanity_check class TestAttributes(TestCase): @@ -165,7 +167,7 @@ class TestFieldPermutations(TestCase): class DummyParser(DocumentParser): - def get_thumbnail(self, document_path, mime_type): + def get_thumbnail(self, document_path, mime_type, file_name=None): # not important during tests raise NotImplementedError() @@ -174,16 +176,34 @@ class DummyParser(DocumentParser): _, self.fake_thumb = tempfile.mkstemp(suffix=".png", dir=scratch_dir) self.archive_path = archive_path - def get_optimised_thumbnail(self, document_path, mime_type): + def get_optimised_thumbnail(self, document_path, mime_type, file_name=None): return self.fake_thumb def parse(self, document_path, mime_type, file_name=None): self.text = "The Text" +class CopyParser(DocumentParser): + + def get_thumbnail(self, document_path, mime_type, file_name=None): + return self.fake_thumb + + def get_optimised_thumbnail(self, document_path, mime_type, file_name=None): + return self.fake_thumb + + def __init__(self, logging_group, progress_callback=None): + super(CopyParser, self).__init__(logging_group, progress_callback) + _, self.fake_thumb = tempfile.mkstemp(suffix=".png", dir=self.tempdir) + + def parse(self, document_path, mime_type, file_name=None): + self.text = "The text" + self.archive_path = os.path.join(self.tempdir, "archive.pdf") + shutil.copy(document_path, self.archive_path) + + class FaultyParser(DocumentParser): - def get_thumbnail(self, document_path, mime_type): + def get_thumbnail(self, document_path, mime_type, file_name=None): # not important during tests raise NotImplementedError() @@ -191,7 +211,7 @@ class FaultyParser(DocumentParser): super(FaultyParser, self).__init__(logging_group) _, self.fake_thumb = tempfile.mkstemp(suffix=".png", dir=scratch_dir) - def get_optimised_thumbnail(self, document_path, mime_type): + def get_optimised_thumbnail(self, document_path, mime_type, file_name=None): return self.fake_thumb def parse(self, document_path, mime_type, file_name=None): @@ -203,6 +223,8 @@ def fake_magic_from_file(file, mime=False): if mime: if os.path.splitext(file)[1] == ".pdf": return "application/pdf" + elif os.path.splitext(file)[1] == ".png": + return "image/png" else: return "unknown" else: @@ -274,6 +296,7 @@ class TestConsumer(DirectoriesMixin, TestCase): self.assertIsNone(document.correspondent) self.assertIsNone(document.document_type) self.assertEqual(document.filename, "0000001.pdf") + self.assertEqual(document.archive_filename, "0000001.pdf") self.assertTrue(os.path.isfile( document.source_path @@ -432,6 +455,7 @@ class TestConsumer(DirectoriesMixin, TestCase): self.assertEqual(document.title, "new docs") self.assertEqual(document.filename, "none/new docs.pdf") + self.assertEqual(document.archive_filename, "none/new docs.pdf") self._assert_first_last_send_progress() @@ -446,7 +470,7 @@ class TestConsumer(DirectoriesMixin, TestCase): filenames.insert(0, f) return f - m.side_effect = lambda f, root: get_filename() + m.side_effect = lambda f, archive_filename = False: get_filename() filename = self.get_test_file() @@ -457,6 +481,7 @@ class TestConsumer(DirectoriesMixin, TestCase): self.assertEqual(document.title, "new docs") self.assertIsNotNone(os.path.isfile(document.title)) self.assertTrue(os.path.isfile(document.source_path)) + self.assertTrue(os.path.isfile(document.archive_path)) self._assert_first_last_send_progress() @@ -516,6 +541,30 @@ class TestConsumer(DirectoriesMixin, TestCase): self._assert_first_last_send_progress(last_status="FAILED") + @override_settings(PAPERLESS_FILENAME_FORMAT="{title}") + @mock.patch("documents.parsers.document_consumer_declaration.send") + def test_similar_filenames(self, m): + shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), os.path.join(settings.CONSUMPTION_DIR, "simple.pdf")) + shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.png"), os.path.join(settings.CONSUMPTION_DIR, "simple.png")) + shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple-noalpha.png"), os.path.join(settings.CONSUMPTION_DIR, "simple.png.pdf")) + m.return_value = [(None, { + "parser": CopyParser, + "mime_types": {"application/pdf": ".pdf", "image/png": ".png"}, + "weight": 0 + })] + doc1 = self.consumer.try_consume_file(os.path.join(settings.CONSUMPTION_DIR, "simple.png")) + doc2 = self.consumer.try_consume_file(os.path.join(settings.CONSUMPTION_DIR, "simple.pdf")) + doc3 = self.consumer.try_consume_file(os.path.join(settings.CONSUMPTION_DIR, "simple.png.pdf")) + + self.assertEqual(doc1.filename, "simple.png") + self.assertEqual(doc1.archive_filename, "simple.pdf") + self.assertEqual(doc2.filename, "simple.pdf") + self.assertEqual(doc2.archive_filename, "simple_01.pdf") + self.assertEqual(doc3.filename, "simple.png.pdf") + self.assertEqual(doc3.archive_filename, "simple.png.pdf") + + sanity_check() + class PreConsumeTestCase(TestCase): diff --git a/src/documents/tests/test_date_parsing.py b/src/documents/tests/test_date_parsing.py index 9cbb19c2b..50543ee75 100644 --- a/src/documents/tests/test_date_parsing.py +++ b/src/documents/tests/test_date_parsing.py @@ -1,7 +1,6 @@ import datetime import os import shutil -from unittest import mock from uuid import uuid4 from dateutil import tz @@ -9,7 +8,6 @@ from django.conf import settings from django.test import TestCase, override_settings from documents.parsers import parse_date -from paperless_tesseract.parsers import RasterisedDocumentParser class TestDate(TestCase): @@ -152,4 +150,4 @@ class TestDate(TestCase): 2018, 2, 13, 0, 0, tzinfo=tz.gettz(settings.TIME_ZONE) ) - ) \ No newline at end of file + ) diff --git a/src/documents/tests/test_file_handling.py b/src/documents/tests/test_file_handling.py index b24f52aa2..59af7e317 100644 --- a/src/documents/tests/test_file_handling.py +++ b/src/documents/tests/test_file_handling.py @@ -201,6 +201,13 @@ class TestFileHandling(DirectoriesMixin, TestCase): self.assertEqual(generate_filename(d), "my_doc_type - the_doc.pdf") + @override_settings(PAPERLESS_FILENAME_FORMAT="{asn} - {title}") + def test_asn(self): + d1 = Document.objects.create(title="the_doc", mime_type="application/pdf", archive_serial_number=652, checksum="A") + d2 = Document.objects.create(title="the_doc", mime_type="application/pdf", archive_serial_number=None, checksum="B") + self.assertEqual(generate_filename(d1), "652 - the_doc.pdf") + self.assertEqual(generate_filename(d2), "none - the_doc.pdf") + @override_settings(PAPERLESS_FILENAME_FORMAT="{tags[type]}") def test_tags_with_underscore(self): document = Document() @@ -439,6 +446,18 @@ class TestFileHandling(DirectoriesMixin, TestCase): self.assertEqual(document2.filename, "qwe.pdf") + @override_settings(PAPERLESS_FILENAME_FORMAT="{title}") + @mock.patch("documents.signals.handlers.Document.objects.filter") + def test_no_update_without_change(self, m): + doc = Document.objects.create(title="document", filename="document.pdf", archive_filename="document.pdf", checksum="A", archive_checksum="B", mime_type="application/pdf") + Path(doc.source_path).touch() + Path(doc.archive_path).touch() + + doc.save() + + m.assert_not_called() + + class TestFileHandlingWithArchive(DirectoriesMixin, TestCase): @@ -448,7 +467,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase): archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf") Path(original).touch() Path(archive).touch() - doc = Document.objects.create(mime_type="application/pdf", filename="0000001.pdf", checksum="A", archive_checksum="B") + doc = Document.objects.create(mime_type="application/pdf", filename="0000001.pdf", checksum="A", archive_filename="0000001.pdf", archive_checksum="B") self.assertTrue(os.path.isfile(original)) self.assertTrue(os.path.isfile(archive)) @@ -461,7 +480,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase): archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf") Path(original).touch() Path(archive).touch() - doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B") + doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B", archive_filename="0000001.pdf") self.assertFalse(os.path.isfile(original)) self.assertFalse(os.path.isfile(archive)) @@ -475,7 +494,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase): original = os.path.join(settings.ORIGINALS_DIR, "0000001.pdf") archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf") Path(original).touch() - doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B") + doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B", archive_filename="0000001.pdf") self.assertTrue(os.path.isfile(original)) self.assertFalse(os.path.isfile(archive)) @@ -486,14 +505,49 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase): def test_move_archive_exists(self): original = os.path.join(settings.ORIGINALS_DIR, "0000001.pdf") archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf") + existing_archive_file = os.path.join(settings.ARCHIVE_DIR, "none", "my_doc.pdf") Path(original).touch() Path(archive).touch() os.makedirs(os.path.join(settings.ARCHIVE_DIR, "none")) - Path(os.path.join(settings.ARCHIVE_DIR, "none", "my_doc.pdf")).touch() - doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B") + Path(existing_archive_file).touch() + doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B", archive_filename="0000001.pdf") + + self.assertFalse(os.path.isfile(original)) + self.assertFalse(os.path.isfile(archive)) + self.assertTrue(os.path.isfile(doc.source_path)) + self.assertTrue(os.path.isfile(doc.archive_path)) + self.assertTrue(os.path.isfile(existing_archive_file)) + self.assertEqual(doc.archive_filename, "none/my_doc_01.pdf") + + @override_settings(PAPERLESS_FILENAME_FORMAT="{title}") + def test_move_original_only(self): + original = os.path.join(settings.ORIGINALS_DIR, "document_01.pdf") + archive = os.path.join(settings.ARCHIVE_DIR, "document.pdf") + Path(original).touch() + Path(archive).touch() + + doc = Document.objects.create(mime_type="application/pdf", title="document", filename="document_01.pdf", checksum="A", + archive_checksum="B", archive_filename="document.pdf") + + self.assertEqual(doc.filename, "document.pdf") + self.assertEqual(doc.archive_filename, "document.pdf") + + self.assertTrue(os.path.isfile(doc.source_path)) + self.assertTrue(os.path.isfile(doc.archive_path)) + + @override_settings(PAPERLESS_FILENAME_FORMAT="{title}") + def test_move_archive_only(self): + original = os.path.join(settings.ORIGINALS_DIR, "document.pdf") + archive = os.path.join(settings.ARCHIVE_DIR, "document_01.pdf") + Path(original).touch() + Path(archive).touch() + + doc = Document.objects.create(mime_type="application/pdf", title="document", filename="document.pdf", checksum="A", + archive_checksum="B", archive_filename="document_01.pdf") + + self.assertEqual(doc.filename, "document.pdf") + self.assertEqual(doc.archive_filename, "document.pdf") - self.assertTrue(os.path.isfile(original)) - self.assertTrue(os.path.isfile(archive)) self.assertTrue(os.path.isfile(doc.source_path)) self.assertTrue(os.path.isfile(doc.archive_path)) @@ -514,8 +568,9 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase): archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf") Path(original).touch() Path(archive).touch() - doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B") + doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B", archive_filename="0000001.pdf") + m.assert_called() self.assertTrue(os.path.isfile(original)) self.assertTrue(os.path.isfile(archive)) self.assertTrue(os.path.isfile(doc.source_path)) @@ -527,7 +582,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase): archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf") #Path(original).touch() Path(archive).touch() - doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B") + doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", archive_filename="0000001.pdf", checksum="A", archive_checksum="B") self.assertFalse(os.path.isfile(original)) self.assertTrue(os.path.isfile(archive)) @@ -551,19 +606,21 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase): archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf") Path(original).touch() Path(archive).touch() - doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B") + doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", archive_filename="0000001.pdf", checksum="A", archive_checksum="B") + m.assert_called() self.assertTrue(os.path.isfile(original)) self.assertTrue(os.path.isfile(archive)) self.assertTrue(os.path.isfile(doc.source_path)) self.assertTrue(os.path.isfile(doc.archive_path)) + @override_settings(PAPERLESS_FILENAME_FORMAT="") def test_archive_deleted(self): original = os.path.join(settings.ORIGINALS_DIR, "0000001.pdf") archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf") Path(original).touch() Path(archive).touch() - doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B") + doc = Document.objects.create(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B", archive_filename="0000001.pdf") self.assertTrue(os.path.isfile(original)) self.assertTrue(os.path.isfile(archive)) @@ -577,6 +634,28 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase): self.assertFalse(os.path.isfile(doc.source_path)) self.assertFalse(os.path.isfile(doc.archive_path)) + @override_settings(PAPERLESS_FILENAME_FORMAT="{title}") + def test_archive_deleted2(self): + original = os.path.join(settings.ORIGINALS_DIR, "document.png") + original2 = os.path.join(settings.ORIGINALS_DIR, "0000001.pdf") + archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf") + Path(original).touch() + Path(original2).touch() + Path(archive).touch() + + doc1 = Document.objects.create(mime_type="image/png", title="document", filename="document.png", checksum="A", archive_checksum="B", archive_filename="0000001.pdf") + doc2 = Document.objects.create(mime_type="application/pdf", title="0000001", filename="0000001.pdf", checksum="C") + + self.assertTrue(os.path.isfile(doc1.source_path)) + self.assertTrue(os.path.isfile(doc1.archive_path)) + self.assertTrue(os.path.isfile(doc2.source_path)) + + doc2.delete() + + self.assertTrue(os.path.isfile(doc1.source_path)) + self.assertTrue(os.path.isfile(doc1.archive_path)) + self.assertFalse(os.path.isfile(doc2.source_path)) + @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}") def test_database_error(self): @@ -584,7 +663,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase): archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf") Path(original).touch() Path(archive).touch() - doc = Document(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_checksum="B") + doc = Document(mime_type="application/pdf", title="my_doc", filename="0000001.pdf", checksum="A", archive_filename="0000001.pdf", archive_checksum="B") with mock.patch("documents.signals.handlers.Document.objects.filter") as m: m.side_effect = DatabaseError() doc.save() @@ -594,6 +673,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase): self.assertTrue(os.path.isfile(doc.source_path)) self.assertTrue(os.path.isfile(doc.archive_path)) + class TestFilenameGeneration(TestCase): @override_settings( @@ -617,7 +697,7 @@ class TestFilenameGeneration(TestCase): def run(): doc = Document.objects.create(checksum=str(uuid.uuid4()), title=str(uuid.uuid4()), content="wow") - doc.filename = generate_unique_filename(doc, settings.ORIGINALS_DIR) + doc.filename = generate_unique_filename(doc) Path(doc.thumbnail_path).touch() with open(doc.source_path, "w") as f: f.write(str(uuid.uuid4())) diff --git a/src/documents/tests/test_logger.py b/src/documents/tests/test_logger.py deleted file mode 100644 index bbc9c2b5d..000000000 --- a/src/documents/tests/test_logger.py +++ /dev/null @@ -1,66 +0,0 @@ -import logging -import uuid -from unittest import mock - -from django.test import TestCase, override_settings - -from ..models import Log - - -class TestPaperlessLog(TestCase): - - def __init__(self, *args, **kwargs): - TestCase.__init__(self, *args, **kwargs) - self.logger = logging.getLogger( - "documents.management.commands.document_consumer") - - @override_settings(DISABLE_DBHANDLER=False) - def test_that_it_saves_at_all(self): - - kw = {"group": uuid.uuid4()} - - self.assertEqual(Log.objects.all().count(), 0) - - with mock.patch("logging.StreamHandler.emit") as __: - - # Debug messages are ignored by default - self.logger.debug("This is a debugging message", extra=kw) - self.assertEqual(Log.objects.all().count(), 1) - - self.logger.info("This is an informational message", extra=kw) - self.assertEqual(Log.objects.all().count(), 2) - - self.logger.warning("This is an warning message", extra=kw) - self.assertEqual(Log.objects.all().count(), 3) - - self.logger.error("This is an error message", extra=kw) - self.assertEqual(Log.objects.all().count(), 4) - - self.logger.critical("This is a critical message", extra=kw) - self.assertEqual(Log.objects.all().count(), 5) - - @override_settings(DISABLE_DBHANDLER=False) - def test_groups(self): - - kw1 = {"group": uuid.uuid4()} - kw2 = {"group": uuid.uuid4()} - - self.assertEqual(Log.objects.all().count(), 0) - - with mock.patch("logging.StreamHandler.emit") as __: - - self.logger.info("This is an informational message", extra=kw2) - self.assertEqual(Log.objects.all().count(), 1) - self.assertEqual(Log.objects.filter(group=kw2["group"]).count(), 1) - - self.logger.warning("This is an warning message", extra=kw1) - self.assertEqual(Log.objects.all().count(), 2) - self.assertEqual(Log.objects.filter(group=kw1["group"]).count(), 1) - - self.logger.error("This is an error message", extra=kw2) - self.assertEqual(Log.objects.all().count(), 3) - self.assertEqual(Log.objects.filter(group=kw2["group"]).count(), 2) - - self.logger.critical("This is a critical message", extra=kw1) - self.assertEqual(Log.objects.all().count(), 4) - self.assertEqual(Log.objects.filter(group=kw1["group"]).count(), 2) diff --git a/src/documents/tests/test_management.py b/src/documents/tests/test_management.py index a71baa8ba..f7beb8907 100644 --- a/src/documents/tests/test_management.py +++ b/src/documents/tests/test_management.py @@ -20,6 +20,7 @@ from documents.tests.utils import DirectoriesMixin sample_file = os.path.join(os.path.dirname(__file__), "samples", "simple.pdf") +@override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}") class TestArchiver(DirectoriesMixin, TestCase): def make_models(self): @@ -42,9 +43,42 @@ class TestArchiver(DirectoriesMixin, TestCase): doc = Document.objects.get(id=doc.id) self.assertIsNotNone(doc.checksum) + self.assertIsNotNone(doc.archive_checksum) self.assertTrue(os.path.isfile(doc.archive_path)) self.assertTrue(os.path.isfile(doc.source_path)) self.assertTrue(filecmp.cmp(sample_file, doc.source_path)) + self.assertEqual(doc.archive_filename, "none/A.pdf") + + def test_unknown_mime_type(self): + doc = self.make_models() + doc.mime_type = "sdgfh" + doc.save() + shutil.copy(sample_file, doc.source_path) + + handle_document(doc.pk) + + doc = Document.objects.get(id=doc.id) + + self.assertIsNotNone(doc.checksum) + self.assertIsNone(doc.archive_checksum) + self.assertIsNone(doc.archive_filename) + self.assertTrue(os.path.isfile(doc.source_path)) + + @override_settings(PAPERLESS_FILENAME_FORMAT="{title}") + def test_naming_priorities(self): + doc1 = Document.objects.create(checksum="A", title="document", content="first document", mime_type="application/pdf", filename="document.pdf") + doc2 = Document.objects.create(checksum="B", title="document", content="second document", mime_type="application/pdf", filename="document_01.pdf") + shutil.copy(sample_file, os.path.join(self.dirs.originals_dir, f"document.pdf")) + shutil.copy(sample_file, os.path.join(self.dirs.originals_dir, f"document_01.pdf")) + + handle_document(doc2.pk) + handle_document(doc1.pk) + + doc1 = Document.objects.get(id=doc1.id) + doc2 = Document.objects.get(id=doc2.id) + + self.assertEqual(doc1.archive_filename, "document.pdf") + self.assertEqual(doc2.archive_filename, "document_01.pdf") class TestDecryptDocuments(TestCase): @@ -106,24 +140,27 @@ class TestMakeIndex(TestCase): class TestRenamer(DirectoriesMixin, TestCase): + @override_settings(PAPERLESS_FILENAME_FORMAT="") def test_rename(self): - doc = Document.objects.create(title="test", mime_type="application/pdf") + doc = Document.objects.create(title="test", mime_type="image/jpeg") doc.filename = generate_filename(doc) + doc.archive_filename = generate_filename(doc, archive_filename=True) doc.save() Path(doc.source_path).touch() + Path(doc.archive_path).touch() - old_source_path = doc.source_path - - with override_settings(PAPERLESS_FILENAME_FORMAT="{title}"): + with override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}"): call_command("document_renamer") doc2 = Document.objects.get(id=doc.id) - self.assertEqual(doc2.filename, "test.pdf") - self.assertFalse(os.path.isfile(old_source_path)) + self.assertEqual(doc2.filename, "none/test.jpg") + self.assertEqual(doc2.archive_filename, "none/test.pdf") self.assertFalse(os.path.isfile(doc.source_path)) + self.assertFalse(os.path.isfile(doc.archive_path)) self.assertTrue(os.path.isfile(doc2.source_path)) + self.assertTrue(os.path.isfile(doc2.archive_path)) class TestCreateClassifier(TestCase): @@ -133,3 +170,24 @@ class TestCreateClassifier(TestCase): call_command("document_create_classifier") m.assert_called_once() + + +class TestSanityChecker(DirectoriesMixin, TestCase): + + def test_no_issues(self): + with self.assertLogs() as capture: + call_command("document_sanity_checker") + + self.assertEqual(len(capture.output), 1) + self.assertIn("Sanity checker detected no issues.", capture.output[0]) + + def test_errors(self): + doc = Document.objects.create(title="test", content="test", filename="test.pdf", checksum="abc") + Path(doc.source_path).touch() + Path(doc.thumbnail_path).touch() + + with self.assertLogs() as capture: + call_command("document_sanity_checker") + + self.assertEqual(len(capture.output), 1) + self.assertIn("Checksum mismatch of document", capture.output[0]) diff --git a/src/documents/tests/test_management_consumer.py b/src/documents/tests/test_management_consumer.py index b6a61a167..2111705e0 100644 --- a/src/documents/tests/test_management_consumer.py +++ b/src/documents/tests/test_management_consumer.py @@ -203,7 +203,7 @@ class TestConsumer(DirectoriesMixin, ConsumerMixin, TransactionTestCase): self.assertRaises(CommandError, call_command, 'document_consumer', '--oneshot') -@override_settings(CONSUMER_POLLING=1) +@override_settings(CONSUMER_POLLING=1, CONSUMER_POLLING_DELAY=1, CONSUMER_POLLING_RETRY_COUNT=20) class TestConsumerPolling(TestConsumer): # just do all the tests with polling pass @@ -215,8 +215,7 @@ class TestConsumerRecursive(TestConsumer): pass -@override_settings(CONSUMER_RECURSIVE=True) -@override_settings(CONSUMER_POLLING=1) +@override_settings(CONSUMER_RECURSIVE=True, CONSUMER_POLLING=1, CONSUMER_POLLING_DELAY=1, CONSUMER_POLLING_RETRY_COUNT=20) class TestConsumerRecursivePolling(TestConsumer): # just do all the tests with polling and recursive pass @@ -257,6 +256,6 @@ class TestConsumerTags(DirectoriesMixin, ConsumerMixin, TransactionTestCase): # their order. self.assertCountEqual(kwargs["override_tag_ids"], tag_ids) - @override_settings(CONSUMER_POLLING=1) + @override_settings(CONSUMER_POLLING=1, CONSUMER_POLLING_DELAY=1, CONSUMER_POLLING_RETRY_COUNT=20) def test_consume_file_with_path_tags_polling(self): self.test_consume_file_with_path_tags() diff --git a/src/documents/tests/test_management_exporter.py b/src/documents/tests/test_management_exporter.py index 986e458b9..cdc745305 100644 --- a/src/documents/tests/test_management_exporter.py +++ b/src/documents/tests/test_management_exporter.py @@ -22,7 +22,7 @@ class TestExportImport(DirectoriesMixin, TestCase): 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.d1 = Document.objects.create(content="Content", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", title="wow1", filename="0000001.pdf", mime_type="application/pdf", archive_filename="0000001.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) diff --git a/src/documents/tests/test_migration_archive_files.py b/src/documents/tests/test_migration_archive_files.py new file mode 100644 index 000000000..6217ae05f --- /dev/null +++ b/src/documents/tests/test_migration_archive_files.py @@ -0,0 +1,325 @@ +import hashlib +import os +import shutil +from pathlib import Path +from unittest import mock + +from django.conf import settings +from django.test import override_settings + +from documents.parsers import ParseError +from documents.tests.utils import DirectoriesMixin, TestMigrations + + +STORAGE_TYPE_GPG = "gpg" + + +def archive_name_from_filename(filename): + return os.path.splitext(filename)[0] + ".pdf" + + +def archive_path_old(self): + if self.filename: + fname = archive_name_from_filename(self.filename) + else: + fname = "{:07}.pdf".format(self.pk) + + return os.path.join( + settings.ARCHIVE_DIR, + fname + ) + + +def archive_path_new(doc): + if doc.archive_filename is not None: + return os.path.join( + settings.ARCHIVE_DIR, + str(doc.archive_filename) + ) + else: + return None + + +def source_path(doc): + if doc.filename: + fname = str(doc.filename) + else: + fname = "{:07}{}".format(doc.pk, doc.file_type) + if doc.storage_type == STORAGE_TYPE_GPG: + fname += ".gpg" # pragma: no cover + + return os.path.join( + settings.ORIGINALS_DIR, + fname + ) + + +def thumbnail_path(doc): + file_name = "{:07}.png".format(doc.pk) + if doc.storage_type == STORAGE_TYPE_GPG: + file_name += ".gpg" + + return os.path.join( + settings.THUMBNAIL_DIR, + file_name + ) + + +def make_test_document(document_class, title: str, mime_type: str, original: str, original_filename: str, archive: str = None, archive_filename: str = None): + doc = document_class() + doc.filename = original_filename + doc.title = title + doc.mime_type = mime_type + doc.content = "the content, does not matter for this test" + doc.save() + + shutil.copy2(original, source_path(doc)) + with open(original, "rb") as f: + doc.checksum = hashlib.md5(f.read()).hexdigest() + + if archive: + if archive_filename: + doc.archive_filename = archive_filename + shutil.copy2(archive, archive_path_new(doc)) + else: + shutil.copy2(archive, archive_path_old(doc)) + + with open(archive, "rb") as f: + doc.archive_checksum = hashlib.md5(f.read()).hexdigest() + + doc.save() + + Path(thumbnail_path(doc)).touch() + + return doc + + +simple_jpg = os.path.join(os.path.dirname(__file__), "samples", "simple.jpg") +simple_pdf = os.path.join(os.path.dirname(__file__), "samples", "simple.pdf") +simple_pdf2 = os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000002.pdf") +simple_pdf3 = os.path.join(os.path.dirname(__file__), "samples", "documents", "originals", "0000003.pdf") +simple_txt = os.path.join(os.path.dirname(__file__), "samples", "simple.txt") +simple_png = os.path.join(os.path.dirname(__file__), "samples", "simple-noalpha.png") +simple_png2 = os.path.join(os.path.dirname(__file__), "examples", "no-text.png") + + +@override_settings(PAPERLESS_FILENAME_FORMAT="") +class TestMigrateArchiveFiles(DirectoriesMixin, TestMigrations): + + migrate_from = '1011_auto_20210101_2340' + migrate_to = '1012_fix_archive_files' + + def setUpBeforeMigration(self, apps): + Document = apps.get_model("documents", "Document") + + self.unrelated = make_test_document(Document, "unrelated", "application/pdf", simple_pdf3, "unrelated.pdf", simple_pdf) + self.no_text = make_test_document(Document, "no-text", "image/png", simple_png2, "no-text.png", simple_pdf) + self.doc_no_archive = make_test_document(Document, "no_archive", "text/plain", simple_txt, "no_archive.txt") + self.clash1 = make_test_document(Document, "clash", "application/pdf", simple_pdf, "clash.pdf", simple_pdf) + self.clash2 = make_test_document(Document, "clash", "image/jpeg", simple_jpg, "clash.jpg", simple_pdf) + self.clash3 = make_test_document(Document, "clash", "image/png", simple_png, "clash.png", simple_pdf) + self.clash4 = make_test_document(Document, "clash.png", "application/pdf", simple_pdf2, "clash.png.pdf", simple_pdf2) + + self.assertEqual(archive_path_old(self.clash1), archive_path_old(self.clash2)) + self.assertEqual(archive_path_old(self.clash1), archive_path_old(self.clash3)) + self.assertNotEqual(archive_path_old(self.clash1), archive_path_old(self.clash4)) + + def testArchiveFilesMigrated(self): + Document = self.apps.get_model('documents', 'Document') + + for doc in Document.objects.all(): + if doc.archive_checksum: + self.assertIsNotNone(doc.archive_filename) + self.assertTrue(os.path.isfile(archive_path_new(doc))) + else: + self.assertIsNone(doc.archive_filename) + + with open(source_path(doc), "rb") as f: + original_checksum = hashlib.md5(f.read()).hexdigest() + self.assertEqual(original_checksum, doc.checksum) + + if doc.archive_checksum: + self.assertTrue(os.path.isfile(archive_path_new(doc))) + with open(archive_path_new(doc), "rb") as f: + archive_checksum = hashlib.md5(f.read()).hexdigest() + self.assertEqual(archive_checksum, doc.archive_checksum) + + self.assertEqual(Document.objects.filter(archive_checksum__isnull=False).count(), 6) + + def test_filenames(self): + Document = self.apps.get_model('documents', 'Document') + self.assertEqual(Document.objects.get(id=self.unrelated.id).archive_filename, "unrelated.pdf") + self.assertEqual(Document.objects.get(id=self.no_text.id).archive_filename, "no-text.pdf") + self.assertEqual(Document.objects.get(id=self.doc_no_archive.id).archive_filename, None) + self.assertEqual(Document.objects.get(id=self.clash1.id).archive_filename, f"{self.clash1.id:07}.pdf") + self.assertEqual(Document.objects.get(id=self.clash2.id).archive_filename, f"{self.clash2.id:07}.pdf") + self.assertEqual(Document.objects.get(id=self.clash3.id).archive_filename, f"{self.clash3.id:07}.pdf") + self.assertEqual(Document.objects.get(id=self.clash4.id).archive_filename, "clash.png.pdf") + + +@override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}") +class TestMigrateArchiveFilesWithFilenameFormat(TestMigrateArchiveFiles): + + def test_filenames(self): + Document = self.apps.get_model('documents', 'Document') + self.assertEqual(Document.objects.get(id=self.unrelated.id).archive_filename, "unrelated.pdf") + self.assertEqual(Document.objects.get(id=self.no_text.id).archive_filename, "no-text.pdf") + self.assertEqual(Document.objects.get(id=self.doc_no_archive.id).archive_filename, None) + self.assertEqual(Document.objects.get(id=self.clash1.id).archive_filename, "none/clash.pdf") + self.assertEqual(Document.objects.get(id=self.clash2.id).archive_filename, "none/clash_01.pdf") + self.assertEqual(Document.objects.get(id=self.clash3.id).archive_filename, "none/clash_02.pdf") + self.assertEqual(Document.objects.get(id=self.clash4.id).archive_filename, "clash.png.pdf") + + +def fake_parse_wrapper(parser, path, mime_type, file_name): + parser.archive_path = None + parser.text = "the text" + + +@override_settings(PAPERLESS_FILENAME_FORMAT="") +class TestMigrateArchiveFilesErrors(DirectoriesMixin, TestMigrations): + + migrate_from = '1011_auto_20210101_2340' + migrate_to = '1012_fix_archive_files' + auto_migrate = False + + def test_archive_missing(self): + + Document = self.apps.get_model("documents", "Document") + + doc = make_test_document(Document, "clash", "application/pdf", simple_pdf, "clash.pdf", simple_pdf) + os.unlink(archive_path_old(doc)) + + self.assertRaisesMessage(ValueError, "does not exist at: ", self.performMigration) + + def test_parser_missing(self): + Document = self.apps.get_model("documents", "Document") + + doc1 = make_test_document(Document, "document", "invalid/typesss768", simple_png, "document.png", simple_pdf) + doc2 = make_test_document(Document, "document", "invalid/typesss768", simple_jpg, "document.jpg", simple_pdf) + + self.assertRaisesMessage(ValueError, "no parsers are available", self.performMigration) + + @mock.patch("documents.migrations.1012_fix_archive_files.parse_wrapper") + def test_parser_error(self, m): + m.side_effect = ParseError() + Document = self.apps.get_model("documents", "Document") + + doc1 = make_test_document(Document, "document", "image/png", simple_png, "document.png", simple_pdf) + doc2 = make_test_document(Document, "document", "application/pdf", simple_jpg, "document.jpg", simple_pdf) + + self.assertIsNotNone(doc1.archive_checksum) + self.assertIsNotNone(doc2.archive_checksum) + + with self.assertLogs() as capture: + self.performMigration() + + self.assertEqual(m.call_count, 6) + + self.assertEqual( + len(list(filter(lambda log: "Parse error, will try again in 5 seconds" in log, capture.output))), + 4) + + self.assertEqual( + len(list(filter(lambda log: "Unable to regenerate archive document for ID:" in log, capture.output))), + 2) + + Document = self.apps.get_model("documents", "Document") + + doc1 = Document.objects.get(id=doc1.id) + doc2 = Document.objects.get(id=doc2.id) + + self.assertIsNone(doc1.archive_checksum) + self.assertIsNone(doc2.archive_checksum) + self.assertIsNone(doc1.archive_filename) + self.assertIsNone(doc2.archive_filename) + + @mock.patch("documents.migrations.1012_fix_archive_files.parse_wrapper") + def test_parser_no_archive(self, m): + m.side_effect = fake_parse_wrapper + + Document = self.apps.get_model("documents", "Document") + + doc1 = make_test_document(Document, "document", "image/png", simple_png, "document.png", simple_pdf) + doc2 = make_test_document(Document, "document", "application/pdf", simple_jpg, "document.jpg", simple_pdf) + + with self.assertLogs() as capture: + self.performMigration() + + self.assertEqual( + len(list(filter(lambda log: "Parser did not return an archive document for document" in log, capture.output))), + 2) + + Document = self.apps.get_model("documents", "Document") + + doc1 = Document.objects.get(id=doc1.id) + doc2 = Document.objects.get(id=doc2.id) + + self.assertIsNone(doc1.archive_checksum) + self.assertIsNone(doc2.archive_checksum) + self.assertIsNone(doc1.archive_filename) + self.assertIsNone(doc2.archive_filename) + + +@override_settings(PAPERLESS_FILENAME_FORMAT="") +class TestMigrateArchiveFilesBackwards(DirectoriesMixin, TestMigrations): + + migrate_from = '1012_fix_archive_files' + migrate_to = '1011_auto_20210101_2340' + + def setUpBeforeMigration(self, apps): + + Document = apps.get_model("documents", "Document") + + doc_unrelated = make_test_document(Document, "unrelated", "application/pdf", simple_pdf2, "unrelated.txt", simple_pdf2, "unrelated.pdf") + doc_no_archive = make_test_document(Document, "no_archive", "text/plain", simple_txt, "no_archive.txt") + clashB = make_test_document(Document, "clash", "image/jpeg", simple_jpg, "clash.jpg", simple_pdf, "clash_02.pdf") + + def testArchiveFilesReverted(self): + Document = self.apps.get_model('documents', 'Document') + + for doc in Document.objects.all(): + if doc.archive_checksum: + self.assertTrue(os.path.isfile(archive_path_old(doc))) + with open(source_path(doc), "rb") as f: + original_checksum = hashlib.md5(f.read()).hexdigest() + self.assertEqual(original_checksum, doc.checksum) + + if doc.archive_checksum: + self.assertTrue(os.path.isfile(archive_path_old(doc))) + with open(archive_path_old(doc), "rb") as f: + archive_checksum = hashlib.md5(f.read()).hexdigest() + self.assertEqual(archive_checksum, doc.archive_checksum) + + self.assertEqual(Document.objects.filter(archive_checksum__isnull=False).count(), 2) + + +@override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}") +class TestMigrateArchiveFilesBackwardsWithFilenameFormat(TestMigrateArchiveFilesBackwards): + pass + + +@override_settings(PAPERLESS_FILENAME_FORMAT="") +class TestMigrateArchiveFilesBackwardsErrors(DirectoriesMixin, TestMigrations): + + migrate_from = '1012_fix_archive_files' + migrate_to = '1011_auto_20210101_2340' + auto_migrate = False + + def test_filename_clash(self): + + Document = self.apps.get_model("documents", "Document") + + self.clashA = make_test_document(Document, "clash", "application/pdf", simple_pdf, "clash.pdf", simple_pdf, "clash_02.pdf") + self.clashB = make_test_document(Document, "clash", "image/jpeg", simple_jpg, "clash.jpg", simple_pdf, "clash_01.pdf") + + self.assertRaisesMessage(ValueError, "would clash with another archive filename", self.performMigration) + + def test_filename_exists(self): + + Document = self.apps.get_model("documents", "Document") + + self.clashA = make_test_document(Document, "clash", "application/pdf", simple_pdf, "clash.pdf", simple_pdf, "clash.pdf") + self.clashB = make_test_document(Document, "clash", "image/jpeg", simple_jpg, "clash.jpg", simple_pdf, "clash_01.pdf") + + self.assertRaisesMessage(ValueError, "file already exists.", self.performMigration) diff --git a/src/documents/tests/test_migrations.py b/src/documents/tests/test_migration_mime_type.py similarity index 66% rename from src/documents/tests/test_migrations.py rename to src/documents/tests/test_migration_mime_type.py index ee7180c63..5e825e89d 100644 --- a/src/documents/tests/test_migrations.py +++ b/src/documents/tests/test_migration_mime_type.py @@ -1,52 +1,11 @@ import os import shutil -from pathlib import Path -from django.apps import apps from django.conf import settings -from django.db import connection -from django.db.migrations.executor import MigrationExecutor -from django.test import TestCase, TransactionTestCase, override_settings +from django.test import override_settings -from documents.models import Document from documents.parsers import get_default_file_extension -from documents.tests.utils import DirectoriesMixin - - -class TestMigrations(TransactionTestCase): - - @property - def app(self): - return apps.get_containing_app_config(type(self).__module__).name - - migrate_from = None - migrate_to = None - - def setUp(self): - super(TestMigrations, self).setUp() - - assert self.migrate_from and self.migrate_to, \ - "TestCase '{}' must define migrate_from and migrate_to properties".format(type(self).__name__) - self.migrate_from = [(self.app, self.migrate_from)] - self.migrate_to = [(self.app, self.migrate_to)] - executor = MigrationExecutor(connection) - old_apps = executor.loader.project_state(self.migrate_from).apps - - # Reverse to the original migration - executor.migrate(self.migrate_from) - - self.setUpBeforeMigration(old_apps) - - # Run the migration to test - executor = MigrationExecutor(connection) - executor.loader.build_graph() # reload. - executor.migrate(self.migrate_to) - - self.apps = executor.loader.project_state(self.migrate_to).apps - - def setUpBeforeMigration(self, apps): - pass - +from documents.tests.utils import DirectoriesMixin, TestMigrations STORAGE_TYPE_UNENCRYPTED = "unencrypted" STORAGE_TYPE_GPG = "gpg" diff --git a/src/documents/tests/test_parsers.py b/src/documents/tests/test_parsers.py index 392c0504f..9dd74313f 100644 --- a/src/documents/tests/test_parsers.py +++ b/src/documents/tests/test_parsers.py @@ -68,7 +68,7 @@ class TestParserDiscovery(TestCase): ) -def fake_get_thumbnail(self, path, mimetype): +def fake_get_thumbnail(self, path, mimetype, file_name): return os.path.join(os.path.dirname(__file__), "examples", "no-text.png") @@ -89,15 +89,15 @@ class TestBaseParser(TestCase): def test_get_optimised_thumbnail(self): parser = DocumentParser(None) - parser.get_optimised_thumbnail("any", "not important") + parser.get_optimised_thumbnail("any", "not important", "document.pdf") @mock.patch("documents.parsers.DocumentParser.get_thumbnail", fake_get_thumbnail) @override_settings(OPTIMIZE_THUMBNAILS=False) def test_get_optimised_thumb_disabled(self): parser = DocumentParser(None) - path = parser.get_optimised_thumbnail("any", "not important") - self.assertEqual(path, fake_get_thumbnail(None, None, None)) + path = parser.get_optimised_thumbnail("any", "not important", "document.pdf") + self.assertEqual(path, fake_get_thumbnail(None, None, None, None)) class TestParserAvailability(TestCase): @@ -114,8 +114,8 @@ class TestParserAvailability(TestCase): self.assertEqual(get_default_file_extension('application/zip'), ".zip") self.assertEqual(get_default_file_extension('aasdasd/dgfgf'), "") - self.assertEqual(get_parser_class_for_mime_type('application/pdf'), RasterisedDocumentParser) - self.assertEqual(get_parser_class_for_mime_type('text/plain'), TextDocumentParser) + self.assertIsInstance(get_parser_class_for_mime_type('application/pdf')(logging_group=None), RasterisedDocumentParser) + self.assertIsInstance(get_parser_class_for_mime_type('text/plain')(logging_group=None), TextDocumentParser) self.assertEqual(get_parser_class_for_mime_type('text/sdgsdf'), None) self.assertTrue(is_file_ext_supported('.pdf')) diff --git a/src/documents/tests/test_sanity_check.py b/src/documents/tests/test_sanity_check.py index 0554cd7cd..b07ba930a 100644 --- a/src/documents/tests/test_sanity_check.py +++ b/src/documents/tests/test_sanity_check.py @@ -1,3 +1,4 @@ +import logging import os import shutil from pathlib import Path @@ -7,10 +8,59 @@ from django.conf import settings from django.test import TestCase from documents.models import Document -from documents.sanity_checker import check_sanity, SanityFailedError +from documents.sanity_checker import check_sanity, SanityCheckMessages from documents.tests.utils import DirectoriesMixin +class TestSanityCheckMessages(TestCase): + + def test_no_messages(self): + messages = SanityCheckMessages() + self.assertEqual(len(messages), 0) + self.assertFalse(messages.has_error()) + self.assertFalse(messages.has_warning()) + with self.assertLogs() as capture: + messages.log_messages() + self.assertEqual(len(capture.output), 1) + self.assertEqual(capture.records[0].levelno, logging.INFO) + self.assertEqual(capture.records[0].message, "Sanity checker detected no issues.") + + def test_info(self): + messages = SanityCheckMessages() + messages.info("Something might be wrong") + self.assertEqual(len(messages), 1) + self.assertFalse(messages.has_error()) + self.assertFalse(messages.has_warning()) + with self.assertLogs() as capture: + messages.log_messages() + self.assertEqual(len(capture.output), 1) + self.assertEqual(capture.records[0].levelno, logging.INFO) + self.assertEqual(capture.records[0].message, "Something might be wrong") + + def test_warning(self): + messages = SanityCheckMessages() + messages.warning("Something is wrong") + self.assertEqual(len(messages), 1) + self.assertFalse(messages.has_error()) + self.assertTrue(messages.has_warning()) + with self.assertLogs() as capture: + messages.log_messages() + self.assertEqual(len(capture.output), 1) + self.assertEqual(capture.records[0].levelno, logging.WARNING) + self.assertEqual(capture.records[0].message, "Something is wrong") + + def test_error(self): + messages = SanityCheckMessages() + messages.error("Something is seriously wrong") + self.assertEqual(len(messages), 1) + self.assertTrue(messages.has_error()) + self.assertFalse(messages.has_warning()) + with self.assertLogs() as capture: + messages.log_messages() + self.assertEqual(len(capture.output), 1) + self.assertEqual(capture.records[0].levelno, logging.ERROR) + self.assertEqual(capture.records[0].message, "Something is seriously wrong") + class TestSanityCheck(DirectoriesMixin, TestCase): def make_test_data(self): @@ -21,7 +71,12 @@ class TestSanityCheck(DirectoriesMixin, TestCase): shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "archive", "0000001.pdf"), os.path.join(self.dirs.archive_dir, "0000001.pdf")) shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "documents", "thumbnails", "0000001.png"), os.path.join(self.dirs.thumbnail_dir, "0000001.png")) - return Document.objects.create(title="test", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", content="test", pk=1, filename="0000001.pdf", mime_type="application/pdf") + return Document.objects.create(title="test", checksum="42995833e01aea9b3edee44bbfdd7ce1", archive_checksum="62acb0bcbfbcaa62ca6ad3668e4e404b", content="test", pk=1, filename="0000001.pdf", mime_type="application/pdf", archive_filename="0000001.pdf") + + def assertSanityError(self, messageRegex): + messages = check_sanity() + self.assertTrue(messages.has_error()) + self.assertRegex(messages[0]['message'], messageRegex) def test_no_docs(self): self.assertEqual(len(check_sanity()), 0) @@ -33,59 +88,75 @@ class TestSanityCheck(DirectoriesMixin, TestCase): def test_no_thumbnail(self): doc = self.make_test_data() os.remove(doc.thumbnail_path) - self.assertEqual(len(check_sanity()), 1) + self.assertSanityError("Thumbnail of document .* does not exist") def test_thumbnail_no_access(self): doc = self.make_test_data() os.chmod(doc.thumbnail_path, 0o000) - self.assertEqual(len(check_sanity()), 1) + self.assertSanityError("Cannot read thumbnail file of document") os.chmod(doc.thumbnail_path, 0o777) def test_no_original(self): doc = self.make_test_data() os.remove(doc.source_path) - self.assertEqual(len(check_sanity()), 1) + self.assertSanityError("Original of document .* does not exist.") def test_original_no_access(self): doc = self.make_test_data() os.chmod(doc.source_path, 0o000) - self.assertEqual(len(check_sanity()), 1) + self.assertSanityError("Cannot read original file of document") os.chmod(doc.source_path, 0o777) def test_original_checksum_mismatch(self): doc = self.make_test_data() doc.checksum = "WOW" doc.save() - self.assertEqual(len(check_sanity()), 1) + self.assertSanityError("Checksum mismatch of document") def test_no_archive(self): doc = self.make_test_data() os.remove(doc.archive_path) - self.assertEqual(len(check_sanity()), 1) + self.assertSanityError("Archived version of document .* does not exist.") def test_archive_no_access(self): doc = self.make_test_data() os.chmod(doc.archive_path, 0o000) - self.assertEqual(len(check_sanity()), 1) + self.assertSanityError("Cannot read archive file of document") os.chmod(doc.archive_path, 0o777) def test_archive_checksum_mismatch(self): doc = self.make_test_data() doc.archive_checksum = "WOW" doc.save() - self.assertEqual(len(check_sanity()), 1) + self.assertSanityError("Checksum mismatch of archived document") def test_empty_content(self): doc = self.make_test_data() doc.content = "" doc.save() - self.assertEqual(len(check_sanity()), 1) + messages = check_sanity() + self.assertFalse(messages.has_error()) + self.assertFalse(messages.has_warning()) + self.assertEqual(len(messages), 1) + self.assertRegex(messages[0]['message'], "Document .* has no content.") def test_orphaned_file(self): doc = self.make_test_data() Path(self.dirs.originals_dir, "orphaned").touch() - self.assertEqual(len(check_sanity()), 1) + messages = check_sanity() + self.assertFalse(messages.has_error()) + self.assertTrue(messages.has_warning()) + self.assertEqual(len(messages), 1) + self.assertRegex(messages[0]['message'], "Orphaned file in media dir") - def test_all(self): - Document.objects.create(title="test", checksum="dgfhj", archive_checksum="dfhg", content="", pk=1, filename="0000001.pdf") - string = str(SanityFailedError(check_sanity())) + def test_archive_filename_no_checksum(self): + doc = self.make_test_data() + doc.archive_checksum = None + doc.save() + self.assertSanityError("has an archive file, but its checksum is missing.") + + def test_archive_checksum_no_filename(self): + doc = self.make_test_data() + doc.archive_filename = None + doc.save() + self.assertSanityError("has an archive file checksum, but no archive filename.") diff --git a/src/documents/tests/test_tasks.py b/src/documents/tests/test_tasks.py index d008f995a..dab8ebfb9 100644 --- a/src/documents/tests/test_tasks.py +++ b/src/documents/tests/test_tasks.py @@ -7,7 +7,7 @@ from django.utils import timezone from documents import tasks from documents.models import Document, Tag, Correspondent, DocumentType -from documents.sanity_checker import SanityError, SanityFailedError +from documents.sanity_checker import SanityCheckMessages, SanityCheckFailedException from documents.tests.utils import DirectoriesMixin @@ -74,13 +74,33 @@ class TestTasks(DirectoriesMixin, TestCase): self.assertNotEqual(mtime2, mtime3) @mock.patch("documents.tasks.sanity_checker.check_sanity") - def test_sanity_check(self, m): - m.return_value = [] - tasks.sanity_check() + def test_sanity_check_success(self, m): + m.return_value = SanityCheckMessages() + self.assertEqual(tasks.sanity_check(), "No issues detected.") m.assert_called_once() - m.reset_mock() - m.return_value = [SanityError("")] - self.assertRaises(SanityFailedError, tasks.sanity_check) + + @mock.patch("documents.tasks.sanity_checker.check_sanity") + def test_sanity_check_error(self, m): + messages = SanityCheckMessages() + messages.error("Some error") + m.return_value = messages + self.assertRaises(SanityCheckFailedException, tasks.sanity_check) + m.assert_called_once() + + @mock.patch("documents.tasks.sanity_checker.check_sanity") + def test_sanity_check_warning(self, m): + messages = SanityCheckMessages() + messages.warning("Some warning") + m.return_value = messages + self.assertEqual(tasks.sanity_check(), "Sanity check exited with warnings. See log.") + m.assert_called_once() + + @mock.patch("documents.tasks.sanity_checker.check_sanity") + def test_sanity_check_info(self, m): + messages = SanityCheckMessages() + messages.info("Some info") + m.return_value = messages + self.assertEqual(tasks.sanity_check(), "Sanity check exited with infos. See log.") m.assert_called_once() def test_bulk_update_documents(self): diff --git a/src/documents/tests/utils.py b/src/documents/tests/utils.py index dfefc4061..da8d3d429 100644 --- a/src/documents/tests/utils.py +++ b/src/documents/tests/utils.py @@ -4,7 +4,10 @@ import tempfile from collections import namedtuple from contextlib import contextmanager -from django.test import override_settings +from django.apps import apps +from django.db import connection +from django.db.migrations.executor import MigrationExecutor +from django.test import override_settings, TransactionTestCase def setup_directories(): @@ -19,12 +22,15 @@ def setup_directories(): dirs.originals_dir = os.path.join(dirs.media_dir, "documents", "originals") dirs.thumbnail_dir = os.path.join(dirs.media_dir, "documents", "thumbnails") dirs.archive_dir = os.path.join(dirs.media_dir, "documents", "archive") + dirs.logging_dir = os.path.join(dirs.data_dir, "log") os.makedirs(dirs.index_dir, exist_ok=True) os.makedirs(dirs.originals_dir, exist_ok=True) os.makedirs(dirs.thumbnail_dir, exist_ok=True) os.makedirs(dirs.archive_dir, exist_ok=True) + os.makedirs(dirs.logging_dir, exist_ok=True) + dirs.settings_override = override_settings( DATA_DIR=dirs.data_dir, SCRATCH_DIR=dirs.scratch_dir, @@ -33,6 +39,7 @@ def setup_directories(): THUMBNAIL_DIR=dirs.thumbnail_dir, ARCHIVE_DIR=dirs.archive_dir, CONSUMPTION_DIR=dirs.consumption_dir, + LOGGING_DIR=dirs.logging_dir, INDEX_DIR=dirs.index_dir, MODEL_FILE=os.path.join(dirs.data_dir, "classification_model.pickle"), MEDIA_LOCK=os.path.join(dirs.media_dir, "media.lock") @@ -75,3 +82,45 @@ class DirectoriesMixin: def tearDown(self) -> None: super(DirectoriesMixin, self).tearDown() remove_dirs(self.dirs) + + +class TestMigrations(TransactionTestCase): + + @property + def app(self): + return apps.get_containing_app_config(type(self).__module__).name + + migrate_from = None + migrate_to = None + auto_migrate = True + + def setUp(self): + super(TestMigrations, self).setUp() + + assert self.migrate_from and self.migrate_to, \ + "TestCase '{}' must define migrate_from and migrate_to properties".format(type(self).__name__) + self.migrate_from = [(self.app, self.migrate_from)] + self.migrate_to = [(self.app, self.migrate_to)] + executor = MigrationExecutor(connection) + old_apps = executor.loader.project_state(self.migrate_from).apps + + # Reverse to the original migration + executor.migrate(self.migrate_from) + + self.setUpBeforeMigration(old_apps) + + self.apps = old_apps + + if self.auto_migrate: + self.performMigration() + + def performMigration(self): + # Run the migration to test + executor = MigrationExecutor(connection) + executor.loader.build_graph() # reload. + executor.migrate(self.migrate_to) + + self.apps = executor.loader.project_state(self.migrate_to).apps + + def setUpBeforeMigration(self, apps): + pass diff --git a/src/documents/views.py b/src/documents/views.py index c2b31c996..f5ddd88ee 100755 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -2,6 +2,7 @@ import logging import os import tempfile import uuid +import zipfile from datetime import datetime from time import mktime @@ -29,35 +30,39 @@ from rest_framework.views import APIView from rest_framework.viewsets import ( GenericViewSet, ModelViewSet, - ReadOnlyModelViewSet + ViewSet ) -import documents.index as index from paperless.db import GnuPG from paperless.views import StandardPagination +from .bulk_download import OriginalAndArchiveStrategy, OriginalsOnlyStrategy, \ + ArchiveOnlyStrategy from .classifier import load_classifier from .filters import ( CorrespondentFilterSet, DocumentFilterSet, TagFilterSet, - DocumentTypeFilterSet, - LogFilterSet + DocumentTypeFilterSet ) from .matching import match_correspondents, match_tags, match_document_types -from .models import Correspondent, Document, Log, Tag, DocumentType, SavedView +from .models import Correspondent, Document, Tag, DocumentType, SavedView from .parsers import get_parser_class_for_mime_type from .serialisers import ( CorrespondentSerializer, DocumentSerializer, - LogSerializer, TagSerializer, DocumentTypeSerializer, PostDocumentSerializer, SavedViewSerializer, - BulkEditSerializer, SelectionDataSerializer + BulkEditSerializer, + DocumentListSerializer, + BulkDownloadSerializer ) +logger = logging.getLogger("paperless.api") + + class IndexView(TemplateView): template_name = "index.html" @@ -175,10 +180,12 @@ class DocumentViewSet(RetrieveModelMixin, def update(self, request, *args, **kwargs): response = super(DocumentViewSet, self).update( request, *args, **kwargs) + from documents import index index.add_or_update_document(self.get_object()) return response def destroy(self, request, *args, **kwargs): + from documents import index index.remove_document_from_index(self.get_object()) return super(DocumentViewSet, self).destroy(request, *args, **kwargs) @@ -191,7 +198,7 @@ class DocumentViewSet(RetrieveModelMixin, def file_response(self, pk, request, disposition): doc = Document.objects.get(id=pk) - if not self.original_requested(request) and os.path.isfile(doc.archive_path): # NOQA: E501 + if not self.original_requested(request) and doc.has_archive_version: # NOQA: E501 file_handle = doc.archive_file filename = doc.get_public_filename(archive=True) mime_type = 'application/pdf' @@ -224,6 +231,12 @@ class DocumentViewSet(RetrieveModelMixin, else: return [] + def get_filesize(self, filename): + if os.path.isfile(filename): + return os.stat(filename).st_size + else: + return None + @action(methods=['get'], detail=True) def metadata(self, request, pk=None): try: @@ -233,21 +246,21 @@ class DocumentViewSet(RetrieveModelMixin, meta = { "original_checksum": doc.checksum, - "original_size": os.stat(doc.source_path).st_size, + "original_size": self.get_filesize(doc.source_path), "original_mime_type": doc.mime_type, "media_filename": doc.filename, - "has_archive_version": os.path.isfile(doc.archive_path), + "has_archive_version": doc.has_archive_version, "original_metadata": self.get_metadata( - doc.source_path, doc.mime_type) + doc.source_path, doc.mime_type), + "archive_checksum": doc.archive_checksum, + "archive_media_filename": doc.archive_filename } - if doc.archive_checksum and os.path.isfile(doc.archive_path): - meta['archive_checksum'] = doc.archive_checksum - meta['archive_size'] = os.stat(doc.archive_path).st_size, + if doc.has_archive_version: + meta['archive_size'] = self.get_filesize(doc.archive_path) meta['archive_metadata'] = self.get_metadata( doc.archive_path, "application/pdf") else: - meta['archive_checksum'] = None meta['archive_size'] = None meta['archive_metadata'] = None @@ -290,6 +303,8 @@ class DocumentViewSet(RetrieveModelMixin, handle = GnuPG.decrypted(doc.thumbnail_file) else: handle = doc.thumbnail_file + # TODO: Send ETag information and use that to send new thumbnails + # if available return HttpResponse(handle, content_type='image/png') except (FileNotFoundError, Document.DoesNotExist): @@ -304,16 +319,28 @@ class DocumentViewSet(RetrieveModelMixin, raise Http404() -class LogViewSet(ReadOnlyModelViewSet): - model = Log +class LogViewSet(ViewSet): - queryset = Log.objects.all() - serializer_class = LogSerializer - pagination_class = StandardPagination permission_classes = (IsAuthenticated,) - filter_backends = (DjangoFilterBackend, OrderingFilter) - filterset_class = LogFilterSet - ordering_fields = ("created",) + + log_files = ["paperless", "mail"] + + def retrieve(self, request, pk=None, *args, **kwargs): + if pk not in self.log_files: + raise Http404() + + filename = os.path.join(settings.LOGGING_DIR, f"{pk}.log") + + if not os.path.isfile(filename): + raise Http404() + + with open(filename, "r") as f: + lines = [line.rstrip() for line in f.readlines()] + + return Response(lines) + + def list(self, request, *args, **kwargs): + return Response(self.log_files) class SavedViewViewSet(ModelViewSet): @@ -422,7 +449,7 @@ class PostDocumentView(APIView): class SelectionDataView(APIView): permission_classes = (IsAuthenticated,) - serializer_class = SelectionDataSerializer + serializer_class = DocumentListSerializer parser_classes = (parsers.MultiPartParser, parsers.JSONParser) def get_serializer_context(self): @@ -480,15 +507,11 @@ class SearchView(APIView): permission_classes = (IsAuthenticated,) - def __init__(self, *args, **kwargs): - super(SearchView, self).__init__(*args, **kwargs) - self.ix = index.open_index() - def add_infos_to_hit(self, r): try: doc = Document.objects.get(id=r['id']) except Document.DoesNotExist: - logging.getLogger(__name__).warning( + logger.warning( f"Search index returned a non-existing document: " f"id: {r['id']}, title: {r['title']}. " f"Search index needs reindex." @@ -504,6 +527,7 @@ class SearchView(APIView): } def get(self, request, format=None): + from documents import index if 'query' in request.query_params: query = request.query_params['query'] @@ -533,8 +557,10 @@ class SearchView(APIView): if page < 1: page = 1 + ix = index.open_index() + try: - with index.query_page(self.ix, page, query, more_like_id, more_like_content) as (result_page, corrected_query): # NOQA: E501 + with index.query_page(ix, page, query, more_like_id, more_like_content) as (result_page, corrected_query): # NOQA: E501 return Response( {'count': len(result_page), 'page': result_page.pagenum, @@ -549,10 +575,6 @@ class SearchAutoCompleteView(APIView): permission_classes = (IsAuthenticated,) - def __init__(self, *args, **kwargs): - super(SearchAutoCompleteView, self).__init__(*args, **kwargs) - self.ix = index.open_index() - def get(self, request, format=None): if 'term' in request.query_params: term = request.query_params['term'] @@ -566,7 +588,11 @@ class SearchAutoCompleteView(APIView): else: limit = 10 - return Response(index.autocomplete(self.ix, term, limit)) + from documents import index + + ix = index.open_index() + + return Response(index.autocomplete(ix, term, limit)) class StatisticsView(APIView): @@ -574,8 +600,66 @@ class StatisticsView(APIView): permission_classes = (IsAuthenticated,) def get(self, request, format=None): - return Response({ - 'documents_total': Document.objects.all().count(), - 'documents_inbox': Document.objects.filter( + documents_total = Document.objects.all().count() + if Tag.objects.filter(is_inbox_tag=True).exists(): + documents_inbox = Document.objects.filter( tags__is_inbox_tag=True).distinct().count() + else: + documents_inbox = None + + return Response({ + 'documents_total': documents_total, + 'documents_inbox': documents_inbox, }) + + +class BulkDownloadView(APIView): + + permission_classes = (IsAuthenticated,) + serializer_class = BulkDownloadSerializer + parser_classes = (parsers.JSONParser,) + + def get_serializer_context(self): + return { + 'request': self.request, + 'format': self.format_kwarg, + 'view': self + } + + def get_serializer(self, *args, **kwargs): + kwargs['context'] = self.get_serializer_context() + return self.serializer_class(*args, **kwargs) + + def post(self, request, format=None): + serializer = self.get_serializer(data=request.data) + serializer.is_valid(raise_exception=True) + + ids = serializer.validated_data.get('documents') + compression = serializer.validated_data.get('compression') + content = serializer.validated_data.get('content') + + os.makedirs(settings.SCRATCH_DIR, exist_ok=True) + temp = tempfile.NamedTemporaryFile( + dir=settings.SCRATCH_DIR, + suffix="-compressed-archive", + delete=False) + + if content == 'both': + strategy_class = OriginalAndArchiveStrategy + elif content == 'originals': + strategy_class = OriginalsOnlyStrategy + else: + strategy_class = ArchiveOnlyStrategy + + with zipfile.ZipFile(temp.name, "w", compression) as zipf: + strategy = strategy_class(zipf) + for id in ids: + doc = Document.objects.get(id=id) + strategy.add_document(doc) + + with open(temp.name, "rb") as f: + response = HttpResponse(f, content_type="application/zip") + response["Content-Disposition"] = '{}; filename="{}"'.format( + "attachment", "documents.zip") + + return response diff --git a/src/locale/cs/LC_MESSAGES/django.po b/src/locale/cs/LC_MESSAGES/django.po new file mode 100644 index 000000000..959246aab --- /dev/null +++ b/src/locale/cs/LC_MESSAGES/django.po @@ -0,0 +1,650 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +# Translators: +# Štěpán Šebestian , 2021 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-01-28 22:02+0100\n" +"PO-Revision-Date: 2020-12-30 19:27+0000\n" +"Last-Translator: Štěpán Šebestian , 2021\n" +"Language-Team: Czech (https://www.transifex.com/paperless/teams/115905/cs/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: cs\n" +"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n" + +#: documents/apps.py:10 +msgid "Documents" +msgstr "Dokumenty" + +#: documents/models.py:33 +msgid "Any word" +msgstr "Jakékoliv slovo" + +#: documents/models.py:34 +msgid "All words" +msgstr "Všechna slova" + +#: documents/models.py:35 +msgid "Exact match" +msgstr "Přesná shoda" + +#: documents/models.py:36 +msgid "Regular expression" +msgstr "Regulární výraz" + +#: documents/models.py:37 +msgid "Fuzzy word" +msgstr "Fuzzy slovo" + +#: documents/models.py:38 +msgid "Automatic" +msgstr "Automatický" + +#: documents/models.py:42 documents/models.py:352 paperless_mail/models.py:25 +#: paperless_mail/models.py:109 +msgid "name" +msgstr "název" + +#: documents/models.py:46 +msgid "match" +msgstr "shoda" + +#: documents/models.py:50 +msgid "matching algorithm" +msgstr "algoritmus pro shodu" + +#: documents/models.py:56 +msgid "is insensitive" +msgstr "je ignorováno" + +#: documents/models.py:75 documents/models.py:135 +msgid "correspondent" +msgstr "korespondent" + +#: documents/models.py:76 +msgid "correspondents" +msgstr "korespondenti" + +#: documents/models.py:98 +msgid "color" +msgstr "barva" + +#: documents/models.py:102 +msgid "is inbox tag" +msgstr "tag přichozí" + +#: documents/models.py:104 +msgid "" +"Marks this tag as an inbox tag: All newly consumed documents will be tagged " +"with inbox tags." +msgstr "" +"Označí tento tag jako tag pro příchozí: Všechny nově zkonzumované dokumenty " +"budou označeny tagem pro přichozí" + +#: documents/models.py:109 +msgid "tag" +msgstr "tag" + +#: documents/models.py:110 documents/models.py:166 +msgid "tags" +msgstr "tagy" + +#: documents/models.py:116 documents/models.py:148 +msgid "document type" +msgstr "typ dokumentu" + +#: documents/models.py:117 +msgid "document types" +msgstr "typy dokumentu" + +#: documents/models.py:125 +msgid "Unencrypted" +msgstr "Nešifrované" + +#: documents/models.py:126 +msgid "Encrypted with GNU Privacy Guard" +msgstr "Šifrované pomocí GNU Privacy Guard" + +#: documents/models.py:139 +msgid "title" +msgstr "titulek" + +#: documents/models.py:152 +msgid "content" +msgstr "obsah" + +#: documents/models.py:154 +msgid "" +"The raw, text-only data of the document. This field is primarily used for " +"searching." +msgstr "" +"Nezpracovaná, pouze textová data dokumentu. Toto pole je používáno především" +" pro vyhledávání." + +#: documents/models.py:159 +msgid "mime type" +msgstr "mime typ" + +#: documents/models.py:170 +msgid "checksum" +msgstr "kontrolní součet" + +#: documents/models.py:174 +msgid "The checksum of the original document." +msgstr "Kontrolní součet původního dokumentu" + +#: documents/models.py:178 +msgid "archive checksum" +msgstr "kontrolní součet archivu" + +#: documents/models.py:183 +msgid "The checksum of the archived document." +msgstr "Kontrolní součet archivovaného dokumentu." + +#: documents/models.py:187 documents/models.py:330 +msgid "created" +msgstr "vytvořeno" + +#: documents/models.py:191 +msgid "modified" +msgstr "upraveno" + +#: documents/models.py:195 +msgid "storage type" +msgstr "typ úložiště" + +#: documents/models.py:203 +msgid "added" +msgstr "přidáno" + +#: documents/models.py:207 +msgid "filename" +msgstr "název souboru" + +#: documents/models.py:212 +msgid "Current filename in storage" +msgstr "Aktuální název souboru v úložišti" + +#: documents/models.py:216 +msgid "archive serial number" +msgstr "sériové číslo archivu" + +#: documents/models.py:221 +msgid "The position of this document in your physical document archive." +msgstr "Pozice dokumentu ve vašem archivu fyzických dokumentů" + +#: documents/models.py:227 +msgid "document" +msgstr "dokument" + +#: documents/models.py:228 +msgid "documents" +msgstr "dokumenty" + +#: documents/models.py:313 +msgid "debug" +msgstr "debug" + +#: documents/models.py:314 +msgid "information" +msgstr "informace" + +#: documents/models.py:315 +msgid "warning" +msgstr "varování" + +#: documents/models.py:316 +msgid "error" +msgstr "chyba" + +#: documents/models.py:317 +msgid "critical" +msgstr "kritická" + +#: documents/models.py:321 +msgid "group" +msgstr "skupina" + +#: documents/models.py:324 +msgid "message" +msgstr "zpráva" + +#: documents/models.py:327 +msgid "level" +msgstr "úroveň" + +#: documents/models.py:334 +msgid "log" +msgstr "záznam" + +#: documents/models.py:335 +msgid "logs" +msgstr "záznamy" + +#: documents/models.py:346 documents/models.py:396 +msgid "saved view" +msgstr "uložený pohled" + +#: documents/models.py:347 +msgid "saved views" +msgstr "uložené pohledy" + +#: documents/models.py:350 +msgid "user" +msgstr "uživatel" + +#: documents/models.py:356 +msgid "show on dashboard" +msgstr "zobrazit v dashboardu" + +#: documents/models.py:359 +msgid "show in sidebar" +msgstr "zobrazit v postranním menu" + +#: documents/models.py:363 +msgid "sort field" +msgstr "pole na řazení" + +#: documents/models.py:366 +msgid "sort reverse" +msgstr "třídit opačně" + +#: documents/models.py:372 +msgid "title contains" +msgstr "titulek obsahuje" + +#: documents/models.py:373 +msgid "content contains" +msgstr "obsah obsahuje" + +#: documents/models.py:374 +msgid "ASN is" +msgstr "ASN je" + +#: documents/models.py:375 +msgid "correspondent is" +msgstr "korespondent je" + +#: documents/models.py:376 +msgid "document type is" +msgstr "typ dokumentu je" + +#: documents/models.py:377 +msgid "is in inbox" +msgstr "je v příchozích" + +#: documents/models.py:378 +msgid "has tag" +msgstr "má tag" + +#: documents/models.py:379 +msgid "has any tag" +msgstr "má jakýkoliv tag" + +#: documents/models.py:380 +msgid "created before" +msgstr "vytvořeno před" + +#: documents/models.py:381 +msgid "created after" +msgstr "vytvořeno po" + +#: documents/models.py:382 +msgid "created year is" +msgstr "rok vytvoření je" + +#: documents/models.py:383 +msgid "created month is" +msgstr "měsíc vytvoření je" + +#: documents/models.py:384 +msgid "created day is" +msgstr "den vytvoření je" + +#: documents/models.py:385 +msgid "added before" +msgstr "přidáno před" + +#: documents/models.py:386 +msgid "added after" +msgstr "přidáno po" + +#: documents/models.py:387 +msgid "modified before" +msgstr "upraveno před" + +#: documents/models.py:388 +msgid "modified after" +msgstr "upraveno po" + +#: documents/models.py:389 +msgid "does not have tag" +msgstr "nemá tag" + +#: documents/models.py:400 +msgid "rule type" +msgstr "typ pravidla" + +#: documents/models.py:404 +msgid "value" +msgstr "hodnota" + +#: documents/models.py:410 +msgid "filter rule" +msgstr "filtrovací pravidlo" + +#: documents/models.py:411 +msgid "filter rules" +msgstr "filtrovací pravidla" + +#: documents/serialisers.py:383 +#, python-format +msgid "File type %(type)s not supported" +msgstr "Typ souboru %(type)s není podporován" + +#: documents/templates/index.html:20 +msgid "Paperless-ng is loading..." +msgstr "Paperless-ng se načítá..." + +#: documents/templates/registration/logged_out.html:13 +msgid "Paperless-ng signed out" +msgstr "Odhlášeno od Paperless-ng" + +#: documents/templates/registration/logged_out.html:41 +msgid "You have been successfully logged out. Bye!" +msgstr "Byli jste úspěšně odhlášeni. Nashledanou!" + +#: documents/templates/registration/logged_out.html:42 +msgid "Sign in again" +msgstr "Přihlašte se znovu" + +#: documents/templates/registration/login.html:13 +msgid "Paperless-ng sign in" +msgstr "Paperless-ng přihlášení" + +#: documents/templates/registration/login.html:42 +msgid "Please sign in." +msgstr "Prosím přihlaste se." + +#: documents/templates/registration/login.html:45 +msgid "Your username and password didn't match. Please try again." +msgstr "Vaše uživatelské jméno a heslo se neshodují. Prosím, zkuste to znovu." + +#: documents/templates/registration/login.html:48 +msgid "Username" +msgstr "Uživatelské jméno" + +#: documents/templates/registration/login.html:49 +msgid "Password" +msgstr "Heslo" + +#: documents/templates/registration/login.html:54 +msgid "Sign in" +msgstr "Přihlásit se" + +#: paperless/settings.py:286 +msgid "English" +msgstr "Angličtina" + +#: paperless/settings.py:287 +msgid "German" +msgstr "Němčina" + +#: paperless/settings.py:288 +msgid "Dutch" +msgstr "Holandština" + +#: paperless/settings.py:289 +msgid "French" +msgstr "Francouzština" + +#: paperless/urls.py:114 +msgid "Paperless-ng administration" +msgstr "Správa Paperless-ng" + +#: paperless_mail/admin.py:25 +msgid "Filter" +msgstr "Filtr" + +#: paperless_mail/admin.py:27 +msgid "" +"Paperless will only process mails that match ALL of the filters given below." +msgstr "" +"Paperless zpracuje pouze emaily které odpovídají VŠEM níže zadaným filtrům." + +#: paperless_mail/admin.py:37 +msgid "Actions" +msgstr "Akce" + +#: 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 "" +"Akce provedena na emailu. Tato akce je provedena jen pokud byly dokumenty " +"zkonzumovány z emailu. Emaily bez příloh zůstanou nedotčeny." + +#: paperless_mail/admin.py:46 +msgid "Metadata" +msgstr "Metadata" + +#: 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 "" +"Automaticky přiřadit metadata dokumentům zkonzumovaných z tohoto pravidla. " +"Pokud zde nepřiřadíte tagy, typy nebo korespondenty, paperless stále " +"zpracuje všechna shodující-se pravidla které jste definovali." + +#: paperless_mail/apps.py:9 +msgid "Paperless mail" +msgstr "Paperless pošta" + +#: paperless_mail/models.py:11 +msgid "mail account" +msgstr "emailový účet" + +#: paperless_mail/models.py:12 +msgid "mail accounts" +msgstr "emailové účty" + +#: paperless_mail/models.py:19 +msgid "No encryption" +msgstr "Žádné šifrování" + +#: paperless_mail/models.py:20 +msgid "Use SSL" +msgstr "Používat SSL" + +#: paperless_mail/models.py:21 +msgid "Use STARTTLS" +msgstr "Používat STARTTLS" + +#: paperless_mail/models.py:29 +msgid "IMAP server" +msgstr "IMAP server" + +#: paperless_mail/models.py:33 +msgid "IMAP port" +msgstr "IMAP port" + +#: paperless_mail/models.py:36 +msgid "" +"This is usually 143 for unencrypted and STARTTLS connections, and 993 for " +"SSL connections." +msgstr "" +"Toto je většinou 143 pro nešifrovaná připojení/připojení používající " +"STARTTLS a 993 pro SSL připojení." + +#: paperless_mail/models.py:40 +msgid "IMAP security" +msgstr "IMAP bezpečnost" + +#: paperless_mail/models.py:46 +msgid "username" +msgstr "uživatelské jméno" + +#: paperless_mail/models.py:50 +msgid "password" +msgstr "heslo" + +#: paperless_mail/models.py:60 +msgid "mail rule" +msgstr "mailové pravidlo" + +#: paperless_mail/models.py:61 +msgid "mail rules" +msgstr "mailová pravidla" + +#: paperless_mail/models.py:67 +msgid "Only process attachments." +msgstr "Zpracovávat jen přílohy" + +#: paperless_mail/models.py:68 +msgid "Process all files, including 'inline' attachments." +msgstr "Zpracovat všechny soubory, včetně vložených příloh" + +#: paperless_mail/models.py:78 +msgid "Mark as read, don't process read mails" +msgstr "Označit jako přečtené, nezpracovávat přečtené emaily" + +#: paperless_mail/models.py:79 +msgid "Flag the mail, don't process flagged mails" +msgstr "Označit email, nezpracovávat označené emaily" + +#: paperless_mail/models.py:80 +msgid "Move to specified folder" +msgstr "Přesunout do specifikované složky" + +#: paperless_mail/models.py:81 +msgid "Delete" +msgstr "Odstranit" + +#: paperless_mail/models.py:88 +msgid "Use subject as title" +msgstr "Použít předmět jako titulek" + +#: paperless_mail/models.py:89 +msgid "Use attachment filename as title" +msgstr "Použít název souboru u přílohy jako titulek" + +#: paperless_mail/models.py:99 +msgid "Do not assign a correspondent" +msgstr "Nepřiřazovat korespondenta" + +#: paperless_mail/models.py:101 +msgid "Use mail address" +msgstr "Použít emailovou adresu" + +#: paperless_mail/models.py:103 +msgid "Use name (or mail address if not available)" +msgstr "Použít jméno (nebo emailovou adresu pokud jméno není dostupné)" + +#: paperless_mail/models.py:105 +msgid "Use correspondent selected below" +msgstr "Použít korespondenta vybraného níže" + +#: paperless_mail/models.py:113 +msgid "order" +msgstr "pořadí" + +#: paperless_mail/models.py:120 +msgid "account" +msgstr "účet" + +#: paperless_mail/models.py:124 +msgid "folder" +msgstr "složka" + +#: paperless_mail/models.py:128 +msgid "filter from" +msgstr "filtrovat z" + +#: paperless_mail/models.py:131 +msgid "filter subject" +msgstr "název filtru" + +#: paperless_mail/models.py:134 +msgid "filter body" +msgstr "tělo filtru" + +#: paperless_mail/models.py:138 +msgid "filter attachment filename" +msgstr "název souboru u přílohy filtru" + +#: 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 "" +"Konzumovat jen dokumenty které přesně odpovídají tomuto názvu souboru pokud " +"specifikováno. Zástupné znaky jako *.pdf nebo *invoice* jsou povoleny. " +"Nezáleží na velikosti písmen." + +#: paperless_mail/models.py:146 +msgid "maximum age" +msgstr "maximální stáří" + +#: paperless_mail/models.py:148 +msgid "Specified in days." +msgstr "Specifikováno ve dnech." + +#: paperless_mail/models.py:151 +msgid "attachment type" +msgstr "typ přílohy" + +#: paperless_mail/models.py:154 +msgid "" +"Inline attachments include embedded images, so it's best to combine this " +"option with a filename filter." +msgstr "" +"Vložené přílohy zahrnují vložené obrázky, takže je nejlepší tuto možnost " +"kombinovat s filtrem na název souboru" + +#: paperless_mail/models.py:159 +msgid "action" +msgstr "akce" + +#: paperless_mail/models.py:165 +msgid "action parameter" +msgstr "parametr akce" + +#: 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 "" +"Další parametr pro výše vybranou akci, napříkad cílová složka akce přesunutí" +" do složky." + +#: paperless_mail/models.py:173 +msgid "assign title from" +msgstr "nastavit titulek z" + +#: paperless_mail/models.py:183 +msgid "assign this tag" +msgstr "přiřadit tento tag" + +#: paperless_mail/models.py:191 +msgid "assign this document type" +msgstr "přiřadit tento typ dokumentu" + +#: paperless_mail/models.py:195 +msgid "assign correspondent from" +msgstr "přiřadit korespondenta z" + +#: paperless_mail/models.py:205 +msgid "assign this correspondent" +msgstr "přiřadit tohoto korespondenta" diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po index c53985275..0343c5a94 100644 --- a/src/locale/de/LC_MESSAGES/django.po +++ b/src/locale/de/LC_MESSAGES/django.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-01-28 22:02+0100\n" -"PO-Revision-Date: 2020-12-30 19:27+0000\n" +"POT-Creation-Date: 2021-02-24 16:49+0100\n" +"PO-Revision-Date: 2021-02-16 18:37+0000\n" "Last-Translator: Jonas Winkler, 2021\n" "Language-Team: German (https://www.transifex.com/paperless/teams/115905/de/)\n" "MIME-Version: 1.0\n" @@ -25,64 +25,64 @@ msgstr "" msgid "Documents" msgstr "Dokumente" -#: documents/models.py:33 +#: documents/models.py:32 msgid "Any word" msgstr "Irgendein Wort" -#: documents/models.py:34 +#: documents/models.py:33 msgid "All words" msgstr "Alle Wörter" -#: documents/models.py:35 +#: documents/models.py:34 msgid "Exact match" msgstr "Exakte Übereinstimmung" -#: documents/models.py:36 +#: documents/models.py:35 msgid "Regular expression" msgstr "Regulärer Ausdruck" -#: documents/models.py:37 +#: documents/models.py:36 msgid "Fuzzy word" msgstr "Ungenaues Wort" -#: documents/models.py:38 +#: documents/models.py:37 msgid "Automatic" msgstr "Automatisch" -#: documents/models.py:42 documents/models.py:352 paperless_mail/models.py:25 +#: documents/models.py:41 documents/models.py:364 paperless_mail/models.py:25 #: paperless_mail/models.py:109 msgid "name" msgstr "Name" -#: documents/models.py:46 +#: documents/models.py:45 msgid "match" msgstr "Zuweisungsmuster" -#: documents/models.py:50 +#: documents/models.py:49 msgid "matching algorithm" msgstr "Zuweisungsalgorithmus" -#: documents/models.py:56 +#: documents/models.py:55 msgid "is insensitive" msgstr "Groß-/Kleinschreibung irrelevant" -#: documents/models.py:75 documents/models.py:135 +#: documents/models.py:74 documents/models.py:134 msgid "correspondent" msgstr "Korrespondent" -#: documents/models.py:76 +#: documents/models.py:75 msgid "correspondents" msgstr "Korrespondenten" -#: documents/models.py:98 +#: documents/models.py:97 msgid "color" msgstr "Farbe" -#: documents/models.py:102 +#: documents/models.py:101 msgid "is inbox tag" msgstr "Posteingangs-Tag" -#: documents/models.py:104 +#: documents/models.py:103 msgid "" "Marks this tag as an inbox tag: All newly consumed documents will be tagged " "with inbox tags." @@ -90,39 +90,39 @@ msgstr "" "Markiert das Tag als Posteingangs-Tag. Neue Dokumente werden immer mit " "diesem Tag versehen." -#: documents/models.py:109 +#: documents/models.py:108 msgid "tag" msgstr "Tag" -#: documents/models.py:110 documents/models.py:166 +#: documents/models.py:109 documents/models.py:165 msgid "tags" msgstr "Tags" -#: documents/models.py:116 documents/models.py:148 +#: documents/models.py:115 documents/models.py:147 msgid "document type" msgstr "Dokumenttyp" -#: documents/models.py:117 +#: documents/models.py:116 msgid "document types" msgstr "Dokumenttypen" -#: documents/models.py:125 +#: documents/models.py:124 msgid "Unencrypted" msgstr "Nicht verschlüsselt" -#: documents/models.py:126 +#: documents/models.py:125 msgid "Encrypted with GNU Privacy Guard" msgstr "Verschlüsselt mit GNU Privacy Guard" -#: documents/models.py:139 +#: documents/models.py:138 msgid "title" msgstr "Titel" -#: documents/models.py:152 +#: documents/models.py:151 msgid "content" msgstr "Inhalt" -#: documents/models.py:154 +#: documents/models.py:153 msgid "" "The raw, text-only data of the document. This field is primarily used for " "searching." @@ -130,43 +130,43 @@ msgstr "" "Der Inhalt des Dokuments in Textform. Dieses Feld wird primär für die Suche " "verwendet." -#: documents/models.py:159 +#: documents/models.py:158 msgid "mime type" msgstr "MIME-Typ" -#: documents/models.py:170 +#: documents/models.py:169 msgid "checksum" msgstr "Prüfsumme" -#: documents/models.py:174 +#: documents/models.py:173 msgid "The checksum of the original document." msgstr "Die Prüfsumme des originalen Dokuments." -#: documents/models.py:178 +#: documents/models.py:177 msgid "archive checksum" msgstr "Archiv-Prüfsumme" -#: documents/models.py:183 +#: documents/models.py:182 msgid "The checksum of the archived document." msgstr "Die Prüfsumme des archivierten Dokuments." -#: documents/models.py:187 documents/models.py:330 +#: documents/models.py:186 documents/models.py:342 msgid "created" msgstr "Ausgestellt" -#: documents/models.py:191 +#: documents/models.py:190 msgid "modified" msgstr "Geändert" -#: documents/models.py:195 +#: documents/models.py:194 msgid "storage type" msgstr "Speichertyp" -#: documents/models.py:203 +#: documents/models.py:202 msgid "added" msgstr "Hinzugefügt" -#: documents/models.py:207 +#: documents/models.py:206 msgid "filename" msgstr "Dateiname" @@ -175,178 +175,191 @@ msgid "Current filename in storage" msgstr "Aktueller Dateiname im Datenspeicher" #: documents/models.py:216 +msgid "archive filename" +msgstr "Archiv-Dateiname" + +#: documents/models.py:222 +msgid "Current archive filename in storage" +msgstr "Aktueller Dateiname im Archiv" + +#: documents/models.py:226 msgid "archive serial number" msgstr "Archiv-Seriennummer" -#: documents/models.py:221 +#: documents/models.py:231 msgid "The position of this document in your physical document archive." msgstr "Die Position dieses Dokuments in Ihrem physischen Dokumentenarchiv." -#: documents/models.py:227 +#: documents/models.py:237 msgid "document" msgstr "Dokument" -#: documents/models.py:228 +#: documents/models.py:238 msgid "documents" msgstr "Dokumente" -#: documents/models.py:313 +#: documents/models.py:325 msgid "debug" msgstr "Debug" -#: documents/models.py:314 +#: documents/models.py:326 msgid "information" msgstr "Information" -#: documents/models.py:315 +#: documents/models.py:327 msgid "warning" msgstr "Warnung" -#: documents/models.py:316 +#: documents/models.py:328 msgid "error" msgstr "Fehler" -#: documents/models.py:317 +#: documents/models.py:329 msgid "critical" msgstr "Kritisch" -#: documents/models.py:321 +#: documents/models.py:333 msgid "group" msgstr "Gruppe" -#: documents/models.py:324 +#: documents/models.py:336 msgid "message" msgstr "Nachricht" -#: documents/models.py:327 +#: documents/models.py:339 msgid "level" msgstr "Level" -#: documents/models.py:334 +#: documents/models.py:346 msgid "log" msgstr "Protokoll" -#: documents/models.py:335 +#: documents/models.py:347 msgid "logs" msgstr "Protokoll" -#: documents/models.py:346 documents/models.py:396 +#: documents/models.py:358 documents/models.py:408 msgid "saved view" msgstr "Gespeicherte Ansicht" -#: documents/models.py:347 +#: documents/models.py:359 msgid "saved views" msgstr "Gespeicherte Ansichten" -#: documents/models.py:350 +#: documents/models.py:362 msgid "user" msgstr "Benutzer" -#: documents/models.py:356 +#: documents/models.py:368 msgid "show on dashboard" msgstr "Auf Startseite zeigen" -#: documents/models.py:359 +#: documents/models.py:371 msgid "show in sidebar" msgstr "In Seitenleiste zeigen" -#: documents/models.py:363 +#: documents/models.py:375 msgid "sort field" msgstr "Sortierfeld" -#: documents/models.py:366 +#: documents/models.py:378 msgid "sort reverse" msgstr "Umgekehrte Sortierung" -#: documents/models.py:372 +#: documents/models.py:384 msgid "title contains" msgstr "Titel enthält" -#: documents/models.py:373 +#: documents/models.py:385 msgid "content contains" msgstr "Inhalt enthält" -#: documents/models.py:374 +#: documents/models.py:386 msgid "ASN is" msgstr "ASN ist" -#: documents/models.py:375 +#: documents/models.py:387 msgid "correspondent is" msgstr "Korrespondent ist" -#: documents/models.py:376 +#: documents/models.py:388 msgid "document type is" msgstr "Dokumenttyp ist" -#: documents/models.py:377 +#: documents/models.py:389 msgid "is in inbox" msgstr "Ist im Posteingang" -#: documents/models.py:378 +#: documents/models.py:390 msgid "has tag" msgstr "Hat Tag" -#: documents/models.py:379 +#: documents/models.py:391 msgid "has any tag" msgstr "Hat irgendein Tag" -#: documents/models.py:380 +#: documents/models.py:392 msgid "created before" msgstr "Ausgestellt vor" -#: documents/models.py:381 +#: documents/models.py:393 msgid "created after" msgstr "Ausgestellt nach" -#: documents/models.py:382 +#: documents/models.py:394 msgid "created year is" msgstr "Ausgestellt im Jahr" -#: documents/models.py:383 +#: documents/models.py:395 msgid "created month is" msgstr "Ausgestellt im Monat" -#: documents/models.py:384 +#: documents/models.py:396 msgid "created day is" msgstr "Ausgestellt am Tag" -#: documents/models.py:385 +#: documents/models.py:397 msgid "added before" msgstr "Hinzugefügt vor" -#: documents/models.py:386 +#: documents/models.py:398 msgid "added after" msgstr "Hinzugefügt nach" -#: documents/models.py:387 +#: documents/models.py:399 msgid "modified before" msgstr "Geändert vor" -#: documents/models.py:388 +#: documents/models.py:400 msgid "modified after" msgstr "Geändert nach" -#: documents/models.py:389 +#: documents/models.py:401 msgid "does not have tag" msgstr "Hat nicht folgendes Tag" -#: documents/models.py:400 +#: documents/models.py:412 msgid "rule type" msgstr "Regeltyp" -#: documents/models.py:404 +#: documents/models.py:416 msgid "value" msgstr "Wert" -#: documents/models.py:410 +#: documents/models.py:422 msgid "filter rule" msgstr "Filterregel" -#: documents/models.py:411 +#: documents/models.py:423 msgid "filter rules" msgstr "Filterregeln" -#: documents/serialisers.py:383 +#: documents/serialisers.py:52 +#, python-format +msgid "Invalid regular expresssion: %(error)s" +msgstr "Ungültiger regulärer Ausdruck: %(error)s" + +#: documents/serialisers.py:378 #, python-format msgid "File type %(type)s not supported" msgstr "Dateityp %(type)s nicht unterstützt" @@ -393,23 +406,31 @@ msgstr "Passwort" msgid "Sign in" msgstr "Anmelden" -#: paperless/settings.py:286 -msgid "English" -msgstr "Englisch" +#: paperless/settings.py:291 +msgid "English (US)" +msgstr "Englisch (US)" -#: paperless/settings.py:287 +#: paperless/settings.py:292 +msgid "English (GB)" +msgstr "Englisch (UK)" + +#: paperless/settings.py:293 msgid "German" msgstr "Deutsch" -#: paperless/settings.py:288 +#: paperless/settings.py:294 msgid "Dutch" msgstr "Niederländisch" -#: paperless/settings.py:289 +#: paperless/settings.py:295 msgid "French" msgstr "Französisch" -#: paperless/urls.py:114 +#: paperless/settings.py:296 +msgid "Portuguese (Brazil)" +msgstr "Portugiesisch (Brasilien)" + +#: paperless/urls.py:118 msgid "Paperless-ng administration" msgstr "Paperless-ng Administration" diff --git a/src/locale/en_GB/LC_MESSAGES/django.po b/src/locale/en_GB/LC_MESSAGES/django.po new file mode 100644 index 000000000..dbdd4b2a5 --- /dev/null +++ b/src/locale/en_GB/LC_MESSAGES/django.po @@ -0,0 +1,672 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +# Translators: +# Ali Bates, 2021 +# Jonas Winkler, 2021 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-02-24 16:49+0100\n" +"PO-Revision-Date: 2021-02-16 18:37+0000\n" +"Last-Translator: Jonas Winkler, 2021\n" +"Language-Team: English (United Kingdom) (https://www.transifex.com/paperless/teams/115905/en_GB/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: documents/apps.py:10 +msgid "Documents" +msgstr "Documents" + +#: documents/models.py:32 +msgid "Any word" +msgstr "Any word" + +#: documents/models.py:33 +msgid "All words" +msgstr "All words" + +#: documents/models.py:34 +msgid "Exact match" +msgstr "Exact match" + +#: documents/models.py:35 +msgid "Regular expression" +msgstr "Regular expression" + +#: documents/models.py:36 +msgid "Fuzzy word" +msgstr "Fuzzy word" + +#: documents/models.py:37 +msgid "Automatic" +msgstr "Automatic" + +#: documents/models.py:41 documents/models.py:364 paperless_mail/models.py:25 +#: paperless_mail/models.py:109 +msgid "name" +msgstr "name" + +#: documents/models.py:45 +msgid "match" +msgstr "match" + +#: documents/models.py:49 +msgid "matching algorithm" +msgstr "matching algorithm" + +#: documents/models.py:55 +msgid "is insensitive" +msgstr "is insensitive" + +#: documents/models.py:74 documents/models.py:134 +msgid "correspondent" +msgstr "correspondent" + +#: documents/models.py:75 +msgid "correspondents" +msgstr "correspondents" + +#: documents/models.py:97 +msgid "color" +msgstr "colour" + +#: documents/models.py:101 +msgid "is inbox tag" +msgstr "is inbox tag" + +#: documents/models.py:103 +msgid "" +"Marks this tag as an inbox tag: All newly consumed documents will be tagged " +"with inbox tags." +msgstr "" +"Marks this tag as an inbox tag: All newly consumed documents will be tagged " +"with inbox tags." + +#: documents/models.py:108 +msgid "tag" +msgstr "tag" + +#: documents/models.py:109 documents/models.py:165 +msgid "tags" +msgstr "tags" + +#: documents/models.py:115 documents/models.py:147 +msgid "document type" +msgstr "document type" + +#: documents/models.py:116 +msgid "document types" +msgstr "document types" + +#: documents/models.py:124 +msgid "Unencrypted" +msgstr "Unencrypted" + +#: documents/models.py:125 +msgid "Encrypted with GNU Privacy Guard" +msgstr "Encrypted with GNU Privacy Guard" + +#: documents/models.py:138 +msgid "title" +msgstr "title" + +#: documents/models.py:151 +msgid "content" +msgstr "content" + +#: documents/models.py:153 +msgid "" +"The raw, text-only data of the document. This field is primarily used for " +"searching." +msgstr "" +"The raw, text-only data of the document. This field is primarily used for " +"searching." + +#: documents/models.py:158 +msgid "mime type" +msgstr "mime type" + +#: documents/models.py:169 +msgid "checksum" +msgstr "checksum" + +#: documents/models.py:173 +msgid "The checksum of the original document." +msgstr "The checksum of the original document." + +#: documents/models.py:177 +msgid "archive checksum" +msgstr "archive checksum" + +#: documents/models.py:182 +msgid "The checksum of the archived document." +msgstr "The checksum of the archived document." + +#: documents/models.py:186 documents/models.py:342 +msgid "created" +msgstr "created" + +#: documents/models.py:190 +msgid "modified" +msgstr "modified" + +#: documents/models.py:194 +msgid "storage type" +msgstr "storage type" + +#: documents/models.py:202 +msgid "added" +msgstr "added" + +#: documents/models.py:206 +msgid "filename" +msgstr "filename" + +#: documents/models.py:212 +msgid "Current filename in storage" +msgstr "Current filename in storage" + +#: documents/models.py:216 +msgid "archive filename" +msgstr "archive filename" + +#: documents/models.py:222 +msgid "Current archive filename in storage" +msgstr "Current archive filename in storage" + +#: documents/models.py:226 +msgid "archive serial number" +msgstr "archive serial number" + +#: documents/models.py:231 +msgid "The position of this document in your physical document archive." +msgstr "The position of this document in your physical document archive." + +#: documents/models.py:237 +msgid "document" +msgstr "document" + +#: documents/models.py:238 +msgid "documents" +msgstr "documents" + +#: documents/models.py:325 +msgid "debug" +msgstr "debug" + +#: documents/models.py:326 +msgid "information" +msgstr "information" + +#: documents/models.py:327 +msgid "warning" +msgstr "warning" + +#: documents/models.py:328 +msgid "error" +msgstr "error" + +#: documents/models.py:329 +msgid "critical" +msgstr "critical" + +#: documents/models.py:333 +msgid "group" +msgstr "group" + +#: documents/models.py:336 +msgid "message" +msgstr "message" + +#: documents/models.py:339 +msgid "level" +msgstr "level" + +#: documents/models.py:346 +msgid "log" +msgstr "log" + +#: documents/models.py:347 +msgid "logs" +msgstr "logs" + +#: documents/models.py:358 documents/models.py:408 +msgid "saved view" +msgstr "saved view" + +#: documents/models.py:359 +msgid "saved views" +msgstr "saved views" + +#: documents/models.py:362 +msgid "user" +msgstr "user" + +#: documents/models.py:368 +msgid "show on dashboard" +msgstr "show on dashboard" + +#: documents/models.py:371 +msgid "show in sidebar" +msgstr "show in sidebar" + +#: documents/models.py:375 +msgid "sort field" +msgstr "sort field" + +#: documents/models.py:378 +msgid "sort reverse" +msgstr "sort reverse" + +#: documents/models.py:384 +msgid "title contains" +msgstr "title contains" + +#: documents/models.py:385 +msgid "content contains" +msgstr "content contains" + +#: documents/models.py:386 +msgid "ASN is" +msgstr "ASN is" + +#: documents/models.py:387 +msgid "correspondent is" +msgstr "correspondent is" + +#: documents/models.py:388 +msgid "document type is" +msgstr "document type is" + +#: documents/models.py:389 +msgid "is in inbox" +msgstr "is in inbox" + +#: documents/models.py:390 +msgid "has tag" +msgstr "has tag" + +#: documents/models.py:391 +msgid "has any tag" +msgstr "has any tag" + +#: documents/models.py:392 +msgid "created before" +msgstr "created before" + +#: documents/models.py:393 +msgid "created after" +msgstr "created after" + +#: documents/models.py:394 +msgid "created year is" +msgstr "created year is" + +#: documents/models.py:395 +msgid "created month is" +msgstr "created month is" + +#: documents/models.py:396 +msgid "created day is" +msgstr "created day is" + +#: documents/models.py:397 +msgid "added before" +msgstr "added before" + +#: documents/models.py:398 +msgid "added after" +msgstr "added after" + +#: documents/models.py:399 +msgid "modified before" +msgstr "modified before" + +#: documents/models.py:400 +msgid "modified after" +msgstr "modified after" + +#: documents/models.py:401 +msgid "does not have tag" +msgstr "does not have tag" + +#: documents/models.py:412 +msgid "rule type" +msgstr "rule type" + +#: documents/models.py:416 +msgid "value" +msgstr "value" + +#: documents/models.py:422 +msgid "filter rule" +msgstr "filter rule" + +#: documents/models.py:423 +msgid "filter rules" +msgstr "filter rules" + +#: documents/serialisers.py:52 +#, python-format +msgid "Invalid regular expresssion: %(error)s" +msgstr "Invalid regular expresssion: %(error)s" + +#: documents/serialisers.py:378 +#, python-format +msgid "File type %(type)s not supported" +msgstr "File type %(type)s not supported" + +#: documents/templates/index.html:20 +msgid "Paperless-ng is loading..." +msgstr "Paperless-ng is loading..." + +#: documents/templates/registration/logged_out.html:13 +msgid "Paperless-ng signed out" +msgstr "Paperless-ng signed out" + +#: documents/templates/registration/logged_out.html:41 +msgid "You have been successfully logged out. Bye!" +msgstr "You have been successfully logged out. Bye!" + +#: documents/templates/registration/logged_out.html:42 +msgid "Sign in again" +msgstr "Sign in again" + +#: documents/templates/registration/login.html:13 +msgid "Paperless-ng sign in" +msgstr "Paperless-ng sign in" + +#: documents/templates/registration/login.html:42 +msgid "Please sign in." +msgstr "Please sign in." + +#: documents/templates/registration/login.html:45 +msgid "Your username and password didn't match. Please try again." +msgstr "Your username and password didn't match. Please try again." + +#: documents/templates/registration/login.html:48 +msgid "Username" +msgstr "Username" + +#: documents/templates/registration/login.html:49 +msgid "Password" +msgstr "Password" + +#: documents/templates/registration/login.html:54 +msgid "Sign in" +msgstr "Sign in" + +#: paperless/settings.py:291 +msgid "English (US)" +msgstr "English (US)" + +#: paperless/settings.py:292 +msgid "English (GB)" +msgstr "English (GB)" + +#: paperless/settings.py:293 +msgid "German" +msgstr "German" + +#: paperless/settings.py:294 +msgid "Dutch" +msgstr "Dutch" + +#: paperless/settings.py:295 +msgid "French" +msgstr "French" + +#: paperless/settings.py:296 +msgid "Portuguese (Brazil)" +msgstr "Portuguese (Brazil)" + +#: paperless/urls.py:118 +msgid "Paperless-ng administration" +msgstr "Paperless-ng administration" + +#: paperless_mail/admin.py:25 +msgid "Filter" +msgstr "Filter" + +#: paperless_mail/admin.py:27 +msgid "" +"Paperless will only process mails that match ALL of the filters given below." +msgstr "" +"Paperless will only process mails that match ALL of the filters given below." + +#: paperless_mail/admin.py:37 +msgid "Actions" +msgstr "Actions" + +#: 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 "" +"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." + +#: paperless_mail/admin.py:46 +msgid "Metadata" +msgstr "Metadata" + +#: 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 "" +"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." + +#: paperless_mail/apps.py:9 +msgid "Paperless mail" +msgstr "Paperless mail" + +#: paperless_mail/models.py:11 +msgid "mail account" +msgstr "mail account" + +#: paperless_mail/models.py:12 +msgid "mail accounts" +msgstr "mail accounts" + +#: paperless_mail/models.py:19 +msgid "No encryption" +msgstr "No encryption" + +#: paperless_mail/models.py:20 +msgid "Use SSL" +msgstr "Use SSL" + +#: paperless_mail/models.py:21 +msgid "Use STARTTLS" +msgstr "Use STARTTLS" + +#: paperless_mail/models.py:29 +msgid "IMAP server" +msgstr "IMAP server" + +#: paperless_mail/models.py:33 +msgid "IMAP port" +msgstr "IMAP port" + +#: paperless_mail/models.py:36 +msgid "" +"This is usually 143 for unencrypted and STARTTLS connections, and 993 for " +"SSL connections." +msgstr "" +"This is usually 143 for unencrypted and STARTTLS connections, and 993 for " +"SSL connections." + +#: paperless_mail/models.py:40 +msgid "IMAP security" +msgstr "IMAP security" + +#: paperless_mail/models.py:46 +msgid "username" +msgstr "username" + +#: paperless_mail/models.py:50 +msgid "password" +msgstr "password" + +#: paperless_mail/models.py:60 +msgid "mail rule" +msgstr "mail rule" + +#: paperless_mail/models.py:61 +msgid "mail rules" +msgstr "mail rules" + +#: paperless_mail/models.py:67 +msgid "Only process attachments." +msgstr "Only process attachments." + +#: paperless_mail/models.py:68 +msgid "Process all files, including 'inline' attachments." +msgstr "Process all files, including 'inline' attachments." + +#: paperless_mail/models.py:78 +msgid "Mark as read, don't process read mails" +msgstr "Mark as read, don't process read mails" + +#: paperless_mail/models.py:79 +msgid "Flag the mail, don't process flagged mails" +msgstr "Flag the mail, don't process flagged mails" + +#: paperless_mail/models.py:80 +msgid "Move to specified folder" +msgstr "Move to specified folder" + +#: paperless_mail/models.py:81 +msgid "Delete" +msgstr "Delete" + +#: paperless_mail/models.py:88 +msgid "Use subject as title" +msgstr "Use subject as title" + +#: paperless_mail/models.py:89 +msgid "Use attachment filename as title" +msgstr "Use attachment filename as title" + +#: paperless_mail/models.py:99 +msgid "Do not assign a correspondent" +msgstr "Do not assign a correspondent" + +#: paperless_mail/models.py:101 +msgid "Use mail address" +msgstr "Use mail address" + +#: paperless_mail/models.py:103 +msgid "Use name (or mail address if not available)" +msgstr "Use name (or mail address if not available)" + +#: paperless_mail/models.py:105 +msgid "Use correspondent selected below" +msgstr "Use correspondent selected below" + +#: paperless_mail/models.py:113 +msgid "order" +msgstr "order" + +#: paperless_mail/models.py:120 +msgid "account" +msgstr "account" + +#: paperless_mail/models.py:124 +msgid "folder" +msgstr "folder" + +#: paperless_mail/models.py:128 +msgid "filter from" +msgstr "filter from" + +#: paperless_mail/models.py:131 +msgid "filter subject" +msgstr "filter subject" + +#: paperless_mail/models.py:134 +msgid "filter body" +msgstr "filter body" + +#: paperless_mail/models.py:138 +msgid "filter attachment filename" +msgstr "filter attachment filename" + +#: 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 "" +"Only consume documents which entirely match this filename if specified. " +"Wildcards such as *.pdf or *invoice* are allowed. Case insensitive." + +#: paperless_mail/models.py:146 +msgid "maximum age" +msgstr "maximum age" + +#: paperless_mail/models.py:148 +msgid "Specified in days." +msgstr "Specified in days." + +#: paperless_mail/models.py:151 +msgid "attachment type" +msgstr "attachment type" + +#: 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 attachments include embedded images, so it's best to combine this " +"option with a filename filter." + +#: paperless_mail/models.py:159 +msgid "action" +msgstr "action" + +#: paperless_mail/models.py:165 +msgid "action parameter" +msgstr "action parameter" + +#: 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 "" +"Additional parameter for the action selected above, i.e., the target folder " +"of the move to folder action." + +#: paperless_mail/models.py:173 +msgid "assign title from" +msgstr "assign title from" + +#: paperless_mail/models.py:183 +msgid "assign this tag" +msgstr "assign this tag" + +#: paperless_mail/models.py:191 +msgid "assign this document type" +msgstr "assign this document type" + +#: paperless_mail/models.py:195 +msgid "assign correspondent from" +msgstr "assign correspondent from" + +#: paperless_mail/models.py:205 +msgid "assign this correspondent" +msgstr "assign this correspondent" diff --git a/src/locale/en-us/LC_MESSAGES/django.po b/src/locale/en_US/LC_MESSAGES/django.po similarity index 79% rename from src/locale/en-us/LC_MESSAGES/django.po rename to src/locale/en_US/LC_MESSAGES/django.po index fdf3fd809..c4e8ee97b 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-28 22:02+0100\n" +"POT-Creation-Date: 2021-02-24 16:49+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,144 +21,144 @@ msgstr "" msgid "Documents" msgstr "" -#: documents/models.py:33 +#: documents/models.py:32 msgid "Any word" msgstr "" -#: documents/models.py:34 +#: documents/models.py:33 msgid "All words" msgstr "" -#: documents/models.py:35 +#: documents/models.py:34 msgid "Exact match" msgstr "" -#: documents/models.py:36 +#: documents/models.py:35 msgid "Regular expression" msgstr "" -#: documents/models.py:37 +#: documents/models.py:36 msgid "Fuzzy word" msgstr "" -#: documents/models.py:38 +#: documents/models.py:37 msgid "Automatic" msgstr "" -#: documents/models.py:42 documents/models.py:352 paperless_mail/models.py:25 +#: documents/models.py:41 documents/models.py:364 paperless_mail/models.py:25 #: paperless_mail/models.py:109 msgid "name" msgstr "" -#: documents/models.py:46 +#: documents/models.py:45 msgid "match" msgstr "" -#: documents/models.py:50 +#: documents/models.py:49 msgid "matching algorithm" msgstr "" -#: documents/models.py:56 +#: documents/models.py:55 msgid "is insensitive" msgstr "" -#: documents/models.py:75 documents/models.py:135 +#: documents/models.py:74 documents/models.py:134 msgid "correspondent" msgstr "" -#: documents/models.py:76 +#: documents/models.py:75 msgid "correspondents" msgstr "" -#: documents/models.py:98 +#: documents/models.py:97 msgid "color" msgstr "" -#: documents/models.py:102 +#: documents/models.py:101 msgid "is inbox tag" msgstr "" -#: documents/models.py:104 +#: documents/models.py:103 msgid "" "Marks this tag as an inbox tag: All newly consumed documents will be tagged " "with inbox tags." msgstr "" -#: documents/models.py:109 +#: documents/models.py:108 msgid "tag" msgstr "" -#: documents/models.py:110 documents/models.py:166 +#: documents/models.py:109 documents/models.py:165 msgid "tags" msgstr "" -#: documents/models.py:116 documents/models.py:148 +#: documents/models.py:115 documents/models.py:147 msgid "document type" msgstr "" -#: documents/models.py:117 +#: documents/models.py:116 msgid "document types" msgstr "" -#: documents/models.py:125 +#: documents/models.py:124 msgid "Unencrypted" msgstr "" -#: documents/models.py:126 +#: documents/models.py:125 msgid "Encrypted with GNU Privacy Guard" msgstr "" -#: documents/models.py:139 +#: documents/models.py:138 msgid "title" msgstr "" -#: documents/models.py:152 +#: documents/models.py:151 msgid "content" msgstr "" -#: documents/models.py:154 +#: documents/models.py:153 msgid "" "The raw, text-only data of the document. This field is primarily used for " "searching." msgstr "" -#: documents/models.py:159 +#: documents/models.py:158 msgid "mime type" msgstr "" -#: documents/models.py:170 +#: documents/models.py:169 msgid "checksum" msgstr "" -#: documents/models.py:174 +#: documents/models.py:173 msgid "The checksum of the original document." msgstr "" -#: documents/models.py:178 +#: documents/models.py:177 msgid "archive checksum" msgstr "" -#: documents/models.py:183 +#: documents/models.py:182 msgid "The checksum of the archived document." msgstr "" -#: documents/models.py:187 documents/models.py:330 +#: documents/models.py:186 documents/models.py:342 msgid "created" msgstr "" -#: documents/models.py:191 +#: documents/models.py:190 msgid "modified" msgstr "" -#: documents/models.py:195 +#: documents/models.py:194 msgid "storage type" msgstr "" -#: documents/models.py:203 +#: documents/models.py:202 msgid "added" msgstr "" -#: documents/models.py:207 +#: documents/models.py:206 msgid "filename" msgstr "" @@ -167,178 +167,191 @@ msgid "Current filename in storage" msgstr "" #: documents/models.py:216 +msgid "archive filename" +msgstr "" + +#: documents/models.py:222 +msgid "Current archive filename in storage" +msgstr "" + +#: documents/models.py:226 msgid "archive serial number" msgstr "" -#: documents/models.py:221 +#: documents/models.py:231 msgid "The position of this document in your physical document archive." msgstr "" -#: documents/models.py:227 +#: documents/models.py:237 msgid "document" msgstr "" -#: documents/models.py:228 +#: documents/models.py:238 msgid "documents" msgstr "" -#: documents/models.py:313 +#: documents/models.py:325 msgid "debug" msgstr "" -#: documents/models.py:314 +#: documents/models.py:326 msgid "information" msgstr "" -#: documents/models.py:315 +#: documents/models.py:327 msgid "warning" msgstr "" -#: documents/models.py:316 +#: documents/models.py:328 msgid "error" msgstr "" -#: documents/models.py:317 +#: documents/models.py:329 msgid "critical" msgstr "" -#: documents/models.py:321 +#: documents/models.py:333 msgid "group" msgstr "" -#: documents/models.py:324 +#: documents/models.py:336 msgid "message" msgstr "" -#: documents/models.py:327 +#: documents/models.py:339 msgid "level" msgstr "" -#: documents/models.py:334 +#: documents/models.py:346 msgid "log" msgstr "" -#: documents/models.py:335 +#: documents/models.py:347 msgid "logs" msgstr "" -#: documents/models.py:346 documents/models.py:396 +#: documents/models.py:358 documents/models.py:408 msgid "saved view" msgstr "" -#: documents/models.py:347 +#: documents/models.py:359 msgid "saved views" msgstr "" -#: documents/models.py:350 +#: documents/models.py:362 msgid "user" msgstr "" -#: documents/models.py:356 +#: documents/models.py:368 msgid "show on dashboard" msgstr "" -#: documents/models.py:359 +#: documents/models.py:371 msgid "show in sidebar" msgstr "" -#: documents/models.py:363 +#: documents/models.py:375 msgid "sort field" msgstr "" -#: documents/models.py:366 +#: documents/models.py:378 msgid "sort reverse" msgstr "" -#: documents/models.py:372 +#: documents/models.py:384 msgid "title contains" msgstr "" -#: documents/models.py:373 +#: documents/models.py:385 msgid "content contains" msgstr "" -#: documents/models.py:374 +#: documents/models.py:386 msgid "ASN is" msgstr "" -#: documents/models.py:375 +#: documents/models.py:387 msgid "correspondent is" msgstr "" -#: documents/models.py:376 +#: documents/models.py:388 msgid "document type is" msgstr "" -#: documents/models.py:377 +#: documents/models.py:389 msgid "is in inbox" msgstr "" -#: documents/models.py:378 +#: documents/models.py:390 msgid "has tag" msgstr "" -#: documents/models.py:379 +#: documents/models.py:391 msgid "has any tag" msgstr "" -#: documents/models.py:380 +#: documents/models.py:392 msgid "created before" msgstr "" -#: documents/models.py:381 +#: documents/models.py:393 msgid "created after" msgstr "" -#: documents/models.py:382 +#: documents/models.py:394 msgid "created year is" msgstr "" -#: documents/models.py:383 +#: documents/models.py:395 msgid "created month is" msgstr "" -#: documents/models.py:384 +#: documents/models.py:396 msgid "created day is" msgstr "" -#: documents/models.py:385 +#: documents/models.py:397 msgid "added before" msgstr "" -#: documents/models.py:386 +#: documents/models.py:398 msgid "added after" msgstr "" -#: documents/models.py:387 +#: documents/models.py:399 msgid "modified before" msgstr "" -#: documents/models.py:388 +#: documents/models.py:400 msgid "modified after" msgstr "" -#: documents/models.py:389 +#: documents/models.py:401 msgid "does not have tag" msgstr "" -#: documents/models.py:400 +#: documents/models.py:412 msgid "rule type" msgstr "" -#: documents/models.py:404 +#: documents/models.py:416 msgid "value" msgstr "" -#: documents/models.py:410 +#: documents/models.py:422 msgid "filter rule" msgstr "" -#: documents/models.py:411 +#: documents/models.py:423 msgid "filter rules" msgstr "" -#: documents/serialisers.py:383 +#: documents/serialisers.py:52 +#, python-format +msgid "Invalid regular expresssion: %(error)s" +msgstr "" + +#: documents/serialisers.py:378 #, python-format msgid "File type %(type)s not supported" msgstr "" @@ -383,23 +396,31 @@ msgstr "" msgid "Sign in" msgstr "" -#: paperless/settings.py:286 -msgid "English" +#: paperless/settings.py:291 +msgid "English (US)" msgstr "" -#: paperless/settings.py:287 +#: paperless/settings.py:292 +msgid "English (GB)" +msgstr "" + +#: paperless/settings.py:293 msgid "German" msgstr "" -#: paperless/settings.py:288 +#: paperless/settings.py:294 msgid "Dutch" msgstr "" -#: paperless/settings.py:289 +#: paperless/settings.py:295 msgid "French" msgstr "" -#: paperless/urls.py:114 +#: paperless/settings.py:296 +msgid "Portuguese (Brazil)" +msgstr "" + +#: paperless/urls.py:118 msgid "Paperless-ng administration" msgstr "" diff --git a/src/locale/fr/LC_MESSAGES/django.po b/src/locale/fr/LC_MESSAGES/django.po index e956642d4..3b4fbce3f 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, 2021 # Philmo67, 2021 # #, fuzzy @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-01-28 22:02+0100\n" -"PO-Revision-Date: 2020-12-30 19:27+0000\n" +"POT-Creation-Date: 2021-02-24 16:49+0100\n" +"PO-Revision-Date: 2021-02-16 18:37+0000\n" "Last-Translator: Philmo67, 2021\n" "Language-Team: French (https://www.transifex.com/paperless/teams/115905/fr/)\n" "MIME-Version: 1.0\n" @@ -26,64 +26,64 @@ msgstr "" msgid "Documents" msgstr "Documents" -#: documents/models.py:33 +#: documents/models.py:32 msgid "Any word" msgstr "Un des mots" -#: documents/models.py:34 +#: documents/models.py:33 msgid "All words" msgstr "Tous les mots" -#: documents/models.py:35 +#: documents/models.py:34 msgid "Exact match" msgstr "Concordance exacte" -#: documents/models.py:36 +#: documents/models.py:35 msgid "Regular expression" msgstr "Expression régulière" -#: documents/models.py:37 +#: documents/models.py:36 msgid "Fuzzy word" msgstr "Mot approximatif" -#: documents/models.py:38 +#: documents/models.py:37 msgid "Automatic" msgstr "Automatique" -#: documents/models.py:42 documents/models.py:352 paperless_mail/models.py:25 +#: documents/models.py:41 documents/models.py:364 paperless_mail/models.py:25 #: paperless_mail/models.py:109 msgid "name" msgstr "nom" -#: documents/models.py:46 +#: documents/models.py:45 msgid "match" msgstr "rapprochement" -#: documents/models.py:50 +#: documents/models.py:49 msgid "matching algorithm" msgstr "algorithme de rapprochement" -#: documents/models.py:56 +#: documents/models.py:55 msgid "is insensitive" msgstr "est insensible à la casse" -#: documents/models.py:75 documents/models.py:135 +#: documents/models.py:74 documents/models.py:134 msgid "correspondent" msgstr "correspondant" -#: documents/models.py:76 +#: documents/models.py:75 msgid "correspondents" msgstr "correspondants" -#: documents/models.py:98 +#: documents/models.py:97 msgid "color" msgstr "couleur" -#: documents/models.py:102 +#: documents/models.py:101 msgid "is inbox tag" msgstr "est une étiquette de boîte de réception" -#: documents/models.py:104 +#: documents/models.py:103 msgid "" "Marks this tag as an inbox tag: All newly consumed documents will be tagged " "with inbox tags." @@ -91,39 +91,39 @@ msgstr "" "Marque cette étiquette comme étiquette de boîte de réception : ces " "étiquettes sont affectées à tous les documents nouvellement traités." -#: documents/models.py:109 +#: documents/models.py:108 msgid "tag" msgstr "étiquette" -#: documents/models.py:110 documents/models.py:166 +#: documents/models.py:109 documents/models.py:165 msgid "tags" msgstr "étiquettes" -#: documents/models.py:116 documents/models.py:148 +#: documents/models.py:115 documents/models.py:147 msgid "document type" msgstr "type de document" -#: documents/models.py:117 +#: documents/models.py:116 msgid "document types" msgstr "types de document" -#: documents/models.py:125 +#: documents/models.py:124 msgid "Unencrypted" msgstr "Non chiffré" -#: documents/models.py:126 +#: documents/models.py:125 msgid "Encrypted with GNU Privacy Guard" msgstr "Chiffré avec GNU Privacy Guard" -#: documents/models.py:139 +#: documents/models.py:138 msgid "title" msgstr "titre" -#: documents/models.py:152 +#: documents/models.py:151 msgid "content" msgstr "contenu" -#: documents/models.py:154 +#: documents/models.py:153 msgid "" "The raw, text-only data of the document. This field is primarily used for " "searching." @@ -131,43 +131,43 @@ msgstr "" "Les données brutes du document, en format texte uniquement. Ce champ est " "principalement utilisé pour la recherche." -#: documents/models.py:159 +#: documents/models.py:158 msgid "mime type" msgstr "type mime" -#: documents/models.py:170 +#: documents/models.py:169 msgid "checksum" msgstr "somme de contrôle" -#: documents/models.py:174 +#: documents/models.py:173 msgid "The checksum of the original document." msgstr "La somme de contrôle du document original." -#: documents/models.py:178 +#: documents/models.py:177 msgid "archive checksum" msgstr "somme de contrôle de l'archive" -#: documents/models.py:183 +#: documents/models.py:182 msgid "The checksum of the archived document." msgstr "La somme de contrôle du document archivé." -#: documents/models.py:187 documents/models.py:330 +#: documents/models.py:186 documents/models.py:342 msgid "created" msgstr "créé le" -#: documents/models.py:191 +#: documents/models.py:190 msgid "modified" msgstr "modifié" -#: documents/models.py:195 +#: documents/models.py:194 msgid "storage type" msgstr "forme d'enregistrement :" -#: documents/models.py:203 +#: documents/models.py:202 msgid "added" msgstr "date d'ajout" -#: documents/models.py:207 +#: documents/models.py:206 msgid "filename" msgstr "nom du fichier" @@ -176,179 +176,192 @@ msgid "Current filename in storage" msgstr "Nom du fichier courant en base de données" #: documents/models.py:216 +msgid "archive filename" +msgstr "nom de fichier de l'archive" + +#: documents/models.py:222 +msgid "Current archive filename in storage" +msgstr "Nom du fichier d'archive courant en base de données" + +#: documents/models.py:226 msgid "archive serial number" msgstr "numéro de série de l'archive" -#: documents/models.py:221 +#: documents/models.py:231 msgid "The position of this document in your physical document archive." msgstr "" "Le classement de ce document dans votre archive de documents physiques." -#: documents/models.py:227 +#: documents/models.py:237 msgid "document" msgstr "document" -#: documents/models.py:228 +#: documents/models.py:238 msgid "documents" msgstr "documents" -#: documents/models.py:313 +#: documents/models.py:325 msgid "debug" msgstr "débogage" -#: documents/models.py:314 +#: documents/models.py:326 msgid "information" msgstr "information" -#: documents/models.py:315 +#: documents/models.py:327 msgid "warning" msgstr "avertissement" -#: documents/models.py:316 +#: documents/models.py:328 msgid "error" msgstr "erreur" -#: documents/models.py:317 +#: documents/models.py:329 msgid "critical" msgstr "critique" -#: documents/models.py:321 +#: documents/models.py:333 msgid "group" msgstr "groupe" -#: documents/models.py:324 +#: documents/models.py:336 msgid "message" msgstr "message" -#: documents/models.py:327 +#: documents/models.py:339 msgid "level" msgstr "niveau" -#: documents/models.py:334 +#: documents/models.py:346 msgid "log" msgstr "rapport" -#: documents/models.py:335 +#: documents/models.py:347 msgid "logs" msgstr "rapports" -#: documents/models.py:346 documents/models.py:396 +#: documents/models.py:358 documents/models.py:408 msgid "saved view" msgstr "vue enregistrée" -#: documents/models.py:347 +#: documents/models.py:359 msgid "saved views" msgstr "vues enregistrées" -#: documents/models.py:350 +#: documents/models.py:362 msgid "user" msgstr "utilisateur" -#: documents/models.py:356 +#: documents/models.py:368 msgid "show on dashboard" msgstr "montrer sur le tableau de bord" -#: documents/models.py:359 +#: documents/models.py:371 msgid "show in sidebar" msgstr "montrer dans la barre latérale" -#: documents/models.py:363 +#: documents/models.py:375 msgid "sort field" msgstr "champ de tri" -#: documents/models.py:366 +#: documents/models.py:378 msgid "sort reverse" msgstr "tri inverse" -#: documents/models.py:372 +#: documents/models.py:384 msgid "title contains" msgstr "le titre contient" -#: documents/models.py:373 +#: documents/models.py:385 msgid "content contains" msgstr "le contenu contient" -#: documents/models.py:374 +#: documents/models.py:386 msgid "ASN is" msgstr "le NSA est" -#: documents/models.py:375 +#: documents/models.py:387 msgid "correspondent is" msgstr "le correspondant est" -#: documents/models.py:376 +#: documents/models.py:388 msgid "document type is" msgstr "le type de document est" -#: documents/models.py:377 +#: documents/models.py:389 msgid "is in inbox" msgstr "est dans la boîte de réception" -#: documents/models.py:378 +#: documents/models.py:390 msgid "has tag" msgstr "porte l'étiquette" -#: documents/models.py:379 +#: documents/models.py:391 msgid "has any tag" msgstr "porte l'une des étiquettes" -#: documents/models.py:380 +#: documents/models.py:392 msgid "created before" msgstr "créé avant" -#: documents/models.py:381 +#: documents/models.py:393 msgid "created after" msgstr "créé après" -#: documents/models.py:382 +#: documents/models.py:394 msgid "created year is" msgstr "l'année de création est" -#: documents/models.py:383 +#: documents/models.py:395 msgid "created month is" msgstr "le mois de création est" -#: documents/models.py:384 +#: documents/models.py:396 msgid "created day is" msgstr "le jour de création est" -#: documents/models.py:385 +#: documents/models.py:397 msgid "added before" msgstr "ajouté avant" -#: documents/models.py:386 +#: documents/models.py:398 msgid "added after" msgstr "ajouté après" -#: documents/models.py:387 +#: documents/models.py:399 msgid "modified before" msgstr "modifié avant" -#: documents/models.py:388 +#: documents/models.py:400 msgid "modified after" msgstr "modifié après" -#: documents/models.py:389 +#: documents/models.py:401 msgid "does not have tag" msgstr "ne porte pas d'étiquette" -#: documents/models.py:400 +#: documents/models.py:412 msgid "rule type" msgstr "type de règle" -#: documents/models.py:404 +#: documents/models.py:416 msgid "value" msgstr "valeur" -#: documents/models.py:410 +#: documents/models.py:422 msgid "filter rule" msgstr "règle de filtrage" -#: documents/models.py:411 +#: documents/models.py:423 msgid "filter rules" msgstr "règles de filtrage" -#: documents/serialisers.py:383 +#: documents/serialisers.py:52 +#, python-format +msgid "Invalid regular expresssion: %(error)s" +msgstr "Expression régulière incorrecte : %(error)s" + +#: documents/serialisers.py:378 #, python-format msgid "File type %(type)s not supported" msgstr "Type de fichier %(type)s non pris en charge" @@ -395,23 +408,31 @@ msgstr "Mot de passe" msgid "Sign in" msgstr "S'identifier" -#: paperless/settings.py:286 -msgid "English" -msgstr "Anglais" +#: paperless/settings.py:291 +msgid "English (US)" +msgstr "Anglais (US)" -#: paperless/settings.py:287 +#: paperless/settings.py:292 +msgid "English (GB)" +msgstr "Anglais (GB)" + +#: paperless/settings.py:293 msgid "German" msgstr "Allemand" -#: paperless/settings.py:288 +#: paperless/settings.py:294 msgid "Dutch" msgstr "Néerlandais" -#: paperless/settings.py:289 +#: paperless/settings.py:295 msgid "French" msgstr "Français" -#: paperless/urls.py:114 +#: paperless/settings.py:296 +msgid "Portuguese (Brazil)" +msgstr "Portugais (Brésil)" + +#: paperless/urls.py:118 msgid "Paperless-ng administration" msgstr "Administration de Paperless-ng" diff --git a/src/locale/nl_NL/LC_MESSAGES/django.po b/src/locale/nl_NL/LC_MESSAGES/django.po index 63391da15..eefba7fbb 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: +# Jonas Winkler, 2021 # Jo Vandeginste , 2021 -# Ben , 2021 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-01-28 22:02+0100\n" -"PO-Revision-Date: 2020-12-30 19:27+0000\n" -"Last-Translator: Ben , 2021\n" +"POT-Creation-Date: 2021-02-16 14:52+0100\n" +"PO-Revision-Date: 2021-02-16 18:37+0000\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" @@ -26,64 +26,64 @@ msgstr "" msgid "Documents" msgstr "Documenten" -#: documents/models.py:33 +#: documents/models.py:32 msgid "Any word" msgstr "Eender welk woord" -#: documents/models.py:34 +#: documents/models.py:33 msgid "All words" msgstr "Alle woorden" -#: documents/models.py:35 +#: documents/models.py:34 msgid "Exact match" msgstr "Exacte overeenkomst" -#: documents/models.py:36 +#: documents/models.py:35 msgid "Regular expression" msgstr "Reguliere expressie" -#: documents/models.py:37 +#: documents/models.py:36 msgid "Fuzzy word" msgstr "Gelijkaardig woord" -#: documents/models.py:38 +#: documents/models.py:37 msgid "Automatic" msgstr "Automatisch" -#: documents/models.py:42 documents/models.py:352 paperless_mail/models.py:25 +#: documents/models.py:41 documents/models.py:364 paperless_mail/models.py:25 #: paperless_mail/models.py:109 msgid "name" msgstr "naam" -#: documents/models.py:46 +#: documents/models.py:45 msgid "match" msgstr "Overeenkomst" -#: documents/models.py:50 +#: documents/models.py:49 msgid "matching algorithm" msgstr "Algoritme voor het bepalen van de overeenkomst" -#: documents/models.py:56 +#: documents/models.py:55 msgid "is insensitive" msgstr "is niet hoofdlettergevoelig" -#: documents/models.py:75 documents/models.py:135 +#: documents/models.py:74 documents/models.py:134 msgid "correspondent" msgstr "correspondent" -#: documents/models.py:76 +#: documents/models.py:75 msgid "correspondents" msgstr "correspondenten" -#: documents/models.py:98 +#: documents/models.py:97 msgid "color" msgstr "Kleur" -#: documents/models.py:102 +#: documents/models.py:101 msgid "is inbox tag" msgstr "is \"Postvak in\"-etiket" -#: documents/models.py:104 +#: documents/models.py:103 msgid "" "Marks this tag as an inbox tag: All newly consumed documents will be tagged " "with inbox tags." @@ -91,39 +91,39 @@ msgstr "" "Markeer dit etiket als een \"Postvak in\"-etiket: alle nieuw verwerkte " "documenten krijgen de \"Postvak in\"-etiketten." -#: documents/models.py:109 +#: documents/models.py:108 msgid "tag" msgstr "etiket" -#: documents/models.py:110 documents/models.py:166 +#: documents/models.py:109 documents/models.py:165 msgid "tags" msgstr "etiketten" -#: documents/models.py:116 documents/models.py:148 +#: documents/models.py:115 documents/models.py:147 msgid "document type" msgstr "documenttype" -#: documents/models.py:117 +#: documents/models.py:116 msgid "document types" msgstr "documenttypen" -#: documents/models.py:125 +#: documents/models.py:124 msgid "Unencrypted" msgstr "Niet versleuteld" -#: documents/models.py:126 +#: documents/models.py:125 msgid "Encrypted with GNU Privacy Guard" msgstr "Versleuteld met GNU Privacy Guard" -#: documents/models.py:139 +#: documents/models.py:138 msgid "title" msgstr "titel" -#: documents/models.py:152 +#: documents/models.py:151 msgid "content" msgstr "inhoud" -#: documents/models.py:154 +#: documents/models.py:153 msgid "" "The raw, text-only data of the document. This field is primarily used for " "searching." @@ -131,43 +131,43 @@ msgstr "" "De onbewerkte gegevens van het document. Dit veld wordt voornamelijk " "gebruikt om te zoeken." -#: documents/models.py:159 +#: documents/models.py:158 msgid "mime type" msgstr "mimetype" -#: documents/models.py:170 +#: documents/models.py:169 msgid "checksum" msgstr "checksum" -#: documents/models.py:174 +#: documents/models.py:173 msgid "The checksum of the original document." msgstr "Het controlecijfer van het originele document." -#: documents/models.py:178 +#: documents/models.py:177 msgid "archive checksum" msgstr "archief checksum" -#: documents/models.py:183 +#: documents/models.py:182 msgid "The checksum of the archived document." msgstr "De checksum van het gearchiveerde document." -#: documents/models.py:187 documents/models.py:330 +#: documents/models.py:186 documents/models.py:342 msgid "created" msgstr "aangemaakt" -#: documents/models.py:191 +#: documents/models.py:190 msgid "modified" msgstr "gewijzigd" -#: documents/models.py:195 +#: documents/models.py:194 msgid "storage type" msgstr "type opslag" -#: documents/models.py:203 +#: documents/models.py:202 msgid "added" msgstr "toegevoegd" -#: documents/models.py:207 +#: documents/models.py:206 msgid "filename" msgstr "bestandsnaam" @@ -176,178 +176,186 @@ msgid "Current filename in storage" msgstr "Huidige bestandsnaam in opslag" #: documents/models.py:216 +msgid "archive filename" +msgstr "Bestandsnaam in archief" + +#: documents/models.py:222 +msgid "Current archive filename in storage" +msgstr "Huidige bestandsnaam in archief" + +#: documents/models.py:226 msgid "archive serial number" msgstr "serienummer in archief" -#: documents/models.py:221 +#: documents/models.py:231 msgid "The position of this document in your physical document archive." msgstr "De positie van dit document in je fysieke documentenarchief." -#: documents/models.py:227 +#: documents/models.py:237 msgid "document" msgstr "document" -#: documents/models.py:228 +#: documents/models.py:238 msgid "documents" msgstr "documenten" -#: documents/models.py:313 +#: documents/models.py:325 msgid "debug" msgstr "debug" -#: documents/models.py:314 +#: documents/models.py:326 msgid "information" msgstr "informatie" -#: documents/models.py:315 +#: documents/models.py:327 msgid "warning" msgstr "waarschuwing" -#: documents/models.py:316 +#: documents/models.py:328 msgid "error" msgstr "fout" -#: documents/models.py:317 +#: documents/models.py:329 msgid "critical" msgstr "kritisch" -#: documents/models.py:321 +#: documents/models.py:333 msgid "group" msgstr "groep" -#: documents/models.py:324 +#: documents/models.py:336 msgid "message" msgstr "bericht" -#: documents/models.py:327 +#: documents/models.py:339 msgid "level" msgstr "niveau" -#: documents/models.py:334 +#: documents/models.py:346 msgid "log" msgstr "bericht" -#: documents/models.py:335 +#: documents/models.py:347 msgid "logs" msgstr "berichten" -#: documents/models.py:346 documents/models.py:396 +#: documents/models.py:358 documents/models.py:408 msgid "saved view" msgstr "opgeslagen view" -#: documents/models.py:347 +#: documents/models.py:359 msgid "saved views" msgstr "opgeslagen views" -#: documents/models.py:350 +#: documents/models.py:362 msgid "user" msgstr "gebruiker" -#: documents/models.py:356 +#: documents/models.py:368 msgid "show on dashboard" msgstr "weergeven op dashboard" -#: documents/models.py:359 +#: documents/models.py:371 msgid "show in sidebar" msgstr "weergeven in zijbalk" -#: documents/models.py:363 +#: documents/models.py:375 msgid "sort field" msgstr "sorteerveld" -#: documents/models.py:366 +#: documents/models.py:378 msgid "sort reverse" msgstr "omgekeerd sorteren" -#: documents/models.py:372 +#: documents/models.py:384 msgid "title contains" msgstr "titel bevat" -#: documents/models.py:373 +#: documents/models.py:385 msgid "content contains" msgstr "inhoud bevat" -#: documents/models.py:374 +#: documents/models.py:386 msgid "ASN is" msgstr "ASN is" -#: documents/models.py:375 +#: documents/models.py:387 msgid "correspondent is" msgstr "correspondent is" -#: documents/models.py:376 +#: documents/models.py:388 msgid "document type is" msgstr "documenttype is" -#: documents/models.py:377 +#: documents/models.py:389 msgid "is in inbox" msgstr "zit in \"Postvak in\"" -#: documents/models.py:378 +#: documents/models.py:390 msgid "has tag" msgstr "heeft etiket" -#: documents/models.py:379 +#: documents/models.py:391 msgid "has any tag" msgstr "heeft één van de etiketten" -#: documents/models.py:380 +#: documents/models.py:392 msgid "created before" msgstr "aangemaakt voor" -#: documents/models.py:381 +#: documents/models.py:393 msgid "created after" msgstr "aangemaakt na" -#: documents/models.py:382 +#: documents/models.py:394 msgid "created year is" msgstr "aangemaakt jaar is" -#: documents/models.py:383 +#: documents/models.py:395 msgid "created month is" msgstr "aangemaakte maand is" -#: documents/models.py:384 +#: documents/models.py:396 msgid "created day is" msgstr "aangemaakte dag is" -#: documents/models.py:385 +#: documents/models.py:397 msgid "added before" msgstr "toegevoegd voor" -#: documents/models.py:386 +#: documents/models.py:398 msgid "added after" msgstr "toegevoegd na" -#: documents/models.py:387 +#: documents/models.py:399 msgid "modified before" msgstr "gewijzigd voor" -#: documents/models.py:388 +#: documents/models.py:400 msgid "modified after" msgstr "gewijzigd na" -#: documents/models.py:389 +#: documents/models.py:401 msgid "does not have tag" msgstr "heeft geen etiket" -#: documents/models.py:400 +#: documents/models.py:412 msgid "rule type" msgstr "type regel" -#: documents/models.py:404 +#: documents/models.py:416 msgid "value" msgstr "waarde" -#: documents/models.py:410 +#: documents/models.py:422 msgid "filter rule" msgstr "filterregel" -#: documents/models.py:411 +#: documents/models.py:423 msgid "filter rules" msgstr "filterregels" -#: documents/serialisers.py:383 +#: documents/serialisers.py:370 #, python-format msgid "File type %(type)s not supported" msgstr "Bestandstype %(type)s niet ondersteund" @@ -392,19 +400,23 @@ msgstr "Wachtwoord" msgid "Sign in" msgstr "Aanmelden" -#: paperless/settings.py:286 -msgid "English" -msgstr "Engels" +#: paperless/settings.py:291 +msgid "English (US)" +msgstr "Engels (US)" -#: paperless/settings.py:287 +#: paperless/settings.py:292 +msgid "English (GB)" +msgstr "Engels (Brits)" + +#: paperless/settings.py:293 msgid "German" msgstr "Duits" -#: paperless/settings.py:288 +#: paperless/settings.py:294 msgid "Dutch" msgstr "Nederlands" -#: paperless/settings.py:289 +#: paperless/settings.py:295 msgid "French" msgstr "Frans" diff --git a/src/locale/pt_BR/LC_MESSAGES/django.po b/src/locale/pt_BR/LC_MESSAGES/django.po new file mode 100644 index 000000000..7800b0c88 --- /dev/null +++ b/src/locale/pt_BR/LC_MESSAGES/django.po @@ -0,0 +1,672 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +# Translators: +# Jonas Winkler, 2021 +# Rodrigo A , 2021 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-02-24 16:49+0100\n" +"PO-Revision-Date: 2021-02-16 18:37+0000\n" +"Last-Translator: Rodrigo A , 2021\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/paperless/teams/115905/pt_BR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: documents/apps.py:10 +msgid "Documents" +msgstr "Documentos" + +#: documents/models.py:32 +msgid "Any word" +msgstr "Qualquer palavra" + +#: documents/models.py:33 +msgid "All words" +msgstr "Todas as palavras" + +#: documents/models.py:34 +msgid "Exact match" +msgstr "Detecção exata" + +#: documents/models.py:35 +msgid "Regular expression" +msgstr "Expressão regular" + +#: documents/models.py:36 +msgid "Fuzzy word" +msgstr "Palavra difusa (fuzzy)" + +#: documents/models.py:37 +msgid "Automatic" +msgstr "Automático" + +#: documents/models.py:41 documents/models.py:364 paperless_mail/models.py:25 +#: paperless_mail/models.py:109 +msgid "name" +msgstr "nome" + +#: documents/models.py:45 +msgid "match" +msgstr "detecção" + +#: documents/models.py:49 +msgid "matching algorithm" +msgstr "algoritmo de detecção" + +#: documents/models.py:55 +msgid "is insensitive" +msgstr "diferencia maiúsculas de minúsculas" + +#: documents/models.py:74 documents/models.py:134 +msgid "correspondent" +msgstr "correspondente" + +#: documents/models.py:75 +msgid "correspondents" +msgstr "correspondentes" + +#: documents/models.py:97 +msgid "color" +msgstr "cor" + +#: documents/models.py:101 +msgid "is inbox tag" +msgstr "é etiqueta caixa de entrada" + +#: documents/models.py:103 +msgid "" +"Marks this tag as an inbox tag: All newly consumed documents will be tagged " +"with inbox tags." +msgstr "" +"Marca essa etiqueta como caixa de entrada: Todos os novos documentos " +"consumidos terão as etiquetas de caixa de entrada." + +#: documents/models.py:108 +msgid "tag" +msgstr "etiqueta" + +#: documents/models.py:109 documents/models.py:165 +msgid "tags" +msgstr "etiquetas" + +#: documents/models.py:115 documents/models.py:147 +msgid "document type" +msgstr "tipo de documento" + +#: documents/models.py:116 +msgid "document types" +msgstr "tipos de documento" + +#: documents/models.py:124 +msgid "Unencrypted" +msgstr "Não encriptado" + +#: documents/models.py:125 +msgid "Encrypted with GNU Privacy Guard" +msgstr "Encriptado com GNU Privacy Guard" + +#: documents/models.py:138 +msgid "title" +msgstr "título" + +#: documents/models.py:151 +msgid "content" +msgstr "conteúdo" + +#: documents/models.py:153 +msgid "" +"The raw, text-only data of the document. This field is primarily used for " +"searching." +msgstr "" +"O conteúdo de texto bruto do documento. Esse campo é usado principalmente " +"para busca." + +#: documents/models.py:158 +msgid "mime type" +msgstr "tipo mime" + +#: documents/models.py:169 +msgid "checksum" +msgstr "some de verificação" + +#: documents/models.py:173 +msgid "The checksum of the original document." +msgstr "A soma de verificação original do documento." + +#: documents/models.py:177 +msgid "archive checksum" +msgstr "Soma de verificação de arquivamento." + +#: documents/models.py:182 +msgid "The checksum of the archived document." +msgstr "A soma de verificação do documento arquivado." + +#: documents/models.py:186 documents/models.py:342 +msgid "created" +msgstr "criado" + +#: documents/models.py:190 +msgid "modified" +msgstr "modificado" + +#: documents/models.py:194 +msgid "storage type" +msgstr "tipo de armazenamento" + +#: documents/models.py:202 +msgid "added" +msgstr "adicionado" + +#: documents/models.py:206 +msgid "filename" +msgstr "nome do arquivo" + +#: documents/models.py:212 +msgid "Current filename in storage" +msgstr "Nome do arquivo atual armazenado" + +#: documents/models.py:216 +msgid "archive filename" +msgstr "nome do arquivo para arquivamento" + +#: documents/models.py:222 +msgid "Current archive filename in storage" +msgstr "Nome do arquivo para arquivamento armazenado" + +#: documents/models.py:226 +msgid "archive serial number" +msgstr "número de sério de arquivamento" + +#: documents/models.py:231 +msgid "The position of this document in your physical document archive." +msgstr "A posição deste documento no seu arquivamento físico." + +#: documents/models.py:237 +msgid "document" +msgstr "documento" + +#: documents/models.py:238 +msgid "documents" +msgstr "documentos" + +#: documents/models.py:325 +msgid "debug" +msgstr "debug" + +#: documents/models.py:326 +msgid "information" +msgstr "informação" + +#: documents/models.py:327 +msgid "warning" +msgstr "aviso" + +#: documents/models.py:328 +msgid "error" +msgstr "erro" + +#: documents/models.py:329 +msgid "critical" +msgstr "crítico" + +#: documents/models.py:333 +msgid "group" +msgstr "grupo" + +#: documents/models.py:336 +msgid "message" +msgstr "mensagem" + +#: documents/models.py:339 +msgid "level" +msgstr "nível" + +#: documents/models.py:346 +msgid "log" +msgstr "log" + +#: documents/models.py:347 +msgid "logs" +msgstr "logs" + +#: documents/models.py:358 documents/models.py:408 +msgid "saved view" +msgstr "visualização" + +#: documents/models.py:359 +msgid "saved views" +msgstr "visualizações" + +#: documents/models.py:362 +msgid "user" +msgstr "usuário" + +#: documents/models.py:368 +msgid "show on dashboard" +msgstr "exibir no painel de controle" + +#: documents/models.py:371 +msgid "show in sidebar" +msgstr "exibir no painel lateral" + +#: documents/models.py:375 +msgid "sort field" +msgstr "ordenar campo" + +#: documents/models.py:378 +msgid "sort reverse" +msgstr "odernar reverso" + +#: documents/models.py:384 +msgid "title contains" +msgstr "título contém" + +#: documents/models.py:385 +msgid "content contains" +msgstr "conteúdo contém" + +#: documents/models.py:386 +msgid "ASN is" +msgstr "NSA é" + +#: documents/models.py:387 +msgid "correspondent is" +msgstr "correspondente é" + +#: documents/models.py:388 +msgid "document type is" +msgstr "tipo de documento é" + +#: documents/models.py:389 +msgid "is in inbox" +msgstr "é caixa de entrada" + +#: documents/models.py:390 +msgid "has tag" +msgstr "contém etiqueta" + +#: documents/models.py:391 +msgid "has any tag" +msgstr "contém qualquer etiqueta" + +#: documents/models.py:392 +msgid "created before" +msgstr "criado antes de" + +#: documents/models.py:393 +msgid "created after" +msgstr "criado depois de" + +#: documents/models.py:394 +msgid "created year is" +msgstr "ano de criação é" + +#: documents/models.py:395 +msgid "created month is" +msgstr "mês de criação é" + +#: documents/models.py:396 +msgid "created day is" +msgstr "dia de criação é" + +#: documents/models.py:397 +msgid "added before" +msgstr "adicionado antes de" + +#: documents/models.py:398 +msgid "added after" +msgstr "adicionado depois de" + +#: documents/models.py:399 +msgid "modified before" +msgstr "modificado antes de" + +#: documents/models.py:400 +msgid "modified after" +msgstr "modificado depois de" + +#: documents/models.py:401 +msgid "does not have tag" +msgstr "não tem etiqueta" + +#: documents/models.py:412 +msgid "rule type" +msgstr "tipo de regra" + +#: documents/models.py:416 +msgid "value" +msgstr "valor" + +#: documents/models.py:422 +msgid "filter rule" +msgstr "regra de filtragem" + +#: documents/models.py:423 +msgid "filter rules" +msgstr "regras de filtragem" + +#: documents/serialisers.py:52 +#, python-format +msgid "Invalid regular expresssion: %(error)s" +msgstr "Expressão regular inválida: %(error)s" + +#: documents/serialisers.py:378 +#, python-format +msgid "File type %(type)s not supported" +msgstr "Tipo de arquivo %(type)s não suportado" + +#: documents/templates/index.html:20 +msgid "Paperless-ng is loading..." +msgstr "Paperless-ng está carregando..." + +#: documents/templates/registration/logged_out.html:13 +msgid "Paperless-ng signed out" +msgstr "Paperless-ng saiu" + +#: documents/templates/registration/logged_out.html:41 +msgid "You have been successfully logged out. Bye!" +msgstr "Sua sessão foi encerrada com sucesso. Até mais!" + +#: documents/templates/registration/logged_out.html:42 +msgid "Sign in again" +msgstr "Entre novamente" + +#: documents/templates/registration/login.html:13 +msgid "Paperless-ng sign in" +msgstr "Entrar no Paperless-ng" + +#: documents/templates/registration/login.html:42 +msgid "Please sign in." +msgstr "Por favor, entre na sua conta" + +#: documents/templates/registration/login.html:45 +msgid "Your username and password didn't match. Please try again." +msgstr "Seu usuário e senha estão incorretos. Por favor, tente novamente." + +#: documents/templates/registration/login.html:48 +msgid "Username" +msgstr "Usuário" + +#: documents/templates/registration/login.html:49 +msgid "Password" +msgstr "Senha" + +#: documents/templates/registration/login.html:54 +msgid "Sign in" +msgstr "Entrar" + +#: paperless/settings.py:291 +msgid "English (US)" +msgstr "Inglês (EUA)" + +#: paperless/settings.py:292 +msgid "English (GB)" +msgstr "Inglês (GB)" + +#: paperless/settings.py:293 +msgid "German" +msgstr "Alemão" + +#: paperless/settings.py:294 +msgid "Dutch" +msgstr "Holandês" + +#: paperless/settings.py:295 +msgid "French" +msgstr "Francês" + +#: paperless/settings.py:296 +msgid "Portuguese (Brazil)" +msgstr "Português (Brasil)" + +#: paperless/urls.py:118 +msgid "Paperless-ng administration" +msgstr "Administração do Paperless-ng" + +#: paperless_mail/admin.py:25 +msgid "Filter" +msgstr "Filtro" + +#: paperless_mail/admin.py:27 +msgid "" +"Paperless will only process mails that match ALL of the filters given below." +msgstr "" +"Paperless processará somente e-mails que se encaixam em TODOS os filtros " +"abaixo." + +#: paperless_mail/admin.py:37 +msgid "Actions" +msgstr "Ações" + +#: 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 "" +"A ação se aplica ao e-mail. Essa ação só é executada quando documentos foram" +" consumidos do e-mail. E-mails sem anexos permanecerão intactos." + +#: paperless_mail/admin.py:46 +msgid "Metadata" +msgstr "Metadados" + +#: 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 "" +"Atribua metadados aos documentos consumidos por esta regra automaticamente. " +"Se você não atribuir etiquetas, tipos ou correspondentes aqui, paperless " +"ainda sim processará todas as regras de detecção que você definiu." + +#: paperless_mail/apps.py:9 +msgid "Paperless mail" +msgstr "Paperless mail" + +#: paperless_mail/models.py:11 +msgid "mail account" +msgstr "conta de e-mail" + +#: paperless_mail/models.py:12 +msgid "mail accounts" +msgstr "contas de e-mail" + +#: paperless_mail/models.py:19 +msgid "No encryption" +msgstr "Sem encriptação" + +#: paperless_mail/models.py:20 +msgid "Use SSL" +msgstr "Usar SSL" + +#: paperless_mail/models.py:21 +msgid "Use STARTTLS" +msgstr "Usar STARTTLS" + +#: paperless_mail/models.py:29 +msgid "IMAP server" +msgstr "Servidor IMAP" + +#: paperless_mail/models.py:33 +msgid "IMAP port" +msgstr "Porta IMAP" + +#: paperless_mail/models.py:36 +msgid "" +"This is usually 143 for unencrypted and STARTTLS connections, and 993 for " +"SSL connections." +msgstr "" +"É geralmente 143 para não encriptado e conexões STARTTLS, e 993 para " +"conexões SSL." + +#: paperless_mail/models.py:40 +msgid "IMAP security" +msgstr "segurança IMAP" + +#: paperless_mail/models.py:46 +msgid "username" +msgstr "usuário" + +#: paperless_mail/models.py:50 +msgid "password" +msgstr "senha" + +#: paperless_mail/models.py:60 +msgid "mail rule" +msgstr "regra de e-mail" + +#: paperless_mail/models.py:61 +msgid "mail rules" +msgstr "regras de e-mail" + +#: paperless_mail/models.py:67 +msgid "Only process attachments." +msgstr "Processar somente anexos." + +#: paperless_mail/models.py:68 +msgid "Process all files, including 'inline' attachments." +msgstr "Processar todos os arquivos, incluindo anexos 'inline'." + +#: paperless_mail/models.py:78 +msgid "Mark as read, don't process read mails" +msgstr "Marcar como lido, não processar e-mails lidos" + +#: paperless_mail/models.py:79 +msgid "Flag the mail, don't process flagged mails" +msgstr "Sinalizar o e-mail, não processar e-mails sinalizados" + +#: paperless_mail/models.py:80 +msgid "Move to specified folder" +msgstr "Mover para pasta especificada" + +#: paperless_mail/models.py:81 +msgid "Delete" +msgstr "Excluir" + +#: paperless_mail/models.py:88 +msgid "Use subject as title" +msgstr "Usar assunto como título" + +#: paperless_mail/models.py:89 +msgid "Use attachment filename as title" +msgstr "Usar nome do arquivo anexo como título" + +#: paperless_mail/models.py:99 +msgid "Do not assign a correspondent" +msgstr "Não atribuir um correspondente" + +#: paperless_mail/models.py:101 +msgid "Use mail address" +msgstr "Usar endereço de e-mail" + +#: paperless_mail/models.py:103 +msgid "Use name (or mail address if not available)" +msgstr "Usar nome (ou endereço de e-mail se não disponível)" + +#: paperless_mail/models.py:105 +msgid "Use correspondent selected below" +msgstr "Usar correspondente selecionado abaixo" + +#: paperless_mail/models.py:113 +msgid "order" +msgstr "ordem" + +#: paperless_mail/models.py:120 +msgid "account" +msgstr "conta" + +#: paperless_mail/models.py:124 +msgid "folder" +msgstr "pasta" + +#: paperless_mail/models.py:128 +msgid "filter from" +msgstr "filtrar de" + +#: paperless_mail/models.py:131 +msgid "filter subject" +msgstr "filtrar assunto" + +#: paperless_mail/models.py:134 +msgid "filter body" +msgstr "filtrar corpo" + +#: paperless_mail/models.py:138 +msgid "filter attachment filename" +msgstr "filtrar nome do arquivo anexo" + +#: 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 "" +"Consumir somente documentos que correspondem a este nome de arquivo se especificado.\n" +"Curingas como *.pdf ou *invoice* são permitidos. Sem diferenciação de maiúsculas e minúsculas." + +#: paperless_mail/models.py:146 +msgid "maximum age" +msgstr "idade máxima" + +#: paperless_mail/models.py:148 +msgid "Specified in days." +msgstr "Especificada em dias." + +#: paperless_mail/models.py:151 +msgid "attachment type" +msgstr "tipo de anexo" + +#: paperless_mail/models.py:154 +msgid "" +"Inline attachments include embedded images, so it's best to combine this " +"option with a filename filter." +msgstr "" +"Anexos inline incluem imagens inseridas, por isso é melhor combinar essa " +"opção com um filtro de nome de arquivo." + +#: paperless_mail/models.py:159 +msgid "action" +msgstr "ação" + +#: paperless_mail/models.py:165 +msgid "action parameter" +msgstr "parâmetro da ação" + +#: 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 "" +"Parâmetro adicional para a ação selecionada acima, por exemplo: a pasta de " +"destino da ação de mover pasta." + +#: paperless_mail/models.py:173 +msgid "assign title from" +msgstr "atribuir título de" + +#: paperless_mail/models.py:183 +msgid "assign this tag" +msgstr "atribuir esta etiqueta" + +#: paperless_mail/models.py:191 +msgid "assign this document type" +msgstr "atribuir este tipo de documento" + +#: paperless_mail/models.py:195 +msgid "assign correspondent from" +msgstr "atribuir correspondente de" + +#: paperless_mail/models.py:205 +msgid "assign this correspondent" +msgstr "atribuir este correspondente" diff --git a/src/paperless/consumers.py b/src/paperless/consumers.py index 21a0e3ede..45f6ad9c5 100644 --- a/src/paperless/consumers.py +++ b/src/paperless/consumers.py @@ -1,18 +1,29 @@ import json from asgiref.sync import async_to_sync +from channels.exceptions import DenyConnection, AcceptConnection from channels.generic.websocket import WebsocketConsumer class StatusConsumer(WebsocketConsumer): + + def _authenticated(self): + return 'user' in self.scope and self.scope['user'].is_authenticated + def connect(self): - self.accept() - async_to_sync(self.channel_layer.group_add)( - 'status_updates', self.channel_name) + if not self._authenticated(): + raise DenyConnection() + else: + async_to_sync(self.channel_layer.group_add)( + 'status_updates', self.channel_name) + raise AcceptConnection() def disconnect(self, close_code): async_to_sync(self.channel_layer.group_discard)( 'status_updates', self.channel_name) def status_update(self, event): - self.send(json.dumps(event['data'])) + if not self._authenticated(): + self.close() + else: + self.send(json.dumps(event['data'])) diff --git a/src/paperless/settings.py b/src/paperless/settings.py index b6d01ba53..4c860351f 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -4,7 +4,7 @@ import multiprocessing import os import re -import dateparser +from concurrent_log_handler.queue import setup_logging_queues from dotenv import load_dotenv from django.utils.translation import gettext_lazy as _ @@ -63,6 +63,8 @@ MEDIA_LOCK = os.path.join(MEDIA_ROOT, "media.lock") INDEX_DIR = os.path.join(DATA_DIR, "index") MODEL_FILE = os.path.join(DATA_DIR, "classification_model.pickle") +LOGGING_DIR = os.getenv('PAPERLESS_LOGGING_DIR', os.path.join(DATA_DIR, "log")) + CONSUMPTION_DIR = os.getenv("PAPERLESS_CONSUMPTION_DIR", os.path.join(BASE_DIR, "..", "consume")) # This will be created if it doesn't exist @@ -100,10 +102,11 @@ INSTALLED_APPS = [ "django_q", - "channels", - ] + env_apps +if DEBUG: + INSTALLED_APPS.append("channels") + REST_FRAMEWORK = { 'DEFAULT_AUTHENTICATION_CLASSES': [ 'rest_framework.authentication.BasicAuthentication', @@ -161,6 +164,8 @@ CHANNEL_LAYERS = { "BACKEND": "channels_redis.core.RedisChannelLayer", "CONFIG": { "hosts": [os.getenv("PAPERLESS_REDIS", "redis://localhost:6379")], + "capacity": 2000, # default 100 + "expiry": 15, # default 60 }, }, } @@ -283,10 +288,12 @@ if os.getenv("PAPERLESS_DBHOST"): LANGUAGE_CODE = 'en-us' LANGUAGES = [ - ("en-us", _("English")), + ("en-us", _("English (US)")), + ("en-gb", _("English (GB)")), ("de", _("German")), ("nl-nl", _("Dutch")), - ("fr", _("French")) + ("fr", _("French")), + ("pt-br", _("Portuguese (Brazil)")) ] LOCALE_PATHS = [ @@ -305,14 +312,19 @@ USE_TZ = True # Logging # ############################################################################### -DISABLE_DBHANDLER = __get_boolean("PAPERLESS_DISABLE_DBHANDLER") +setup_logging_queues() + +os.makedirs(LOGGING_DIR, exist_ok=True) + +LOGROTATE_MAX_SIZE = os.getenv("PAPERLESS_LOGROTATE_MAX_SIZE", 1024*1024) +LOGROTATE_MAX_BACKUPS = os.getenv("PAPERLESS_LOGROTATE_MAX_BACKUPS", 20) LOGGING = { "version": 1, "disable_existing_loggers": False, 'formatters': { 'verbose': { - 'format': '{levelname} {asctime} {module} {message}', + 'format': '[{asctime}] [{levelname}] [{name}] {message}', 'style': '{', }, 'simple': { @@ -321,34 +333,39 @@ LOGGING = { }, }, "handlers": { - "db": { - "level": "DEBUG", - "class": "documents.loggers.PaperlessHandler", - }, "console": { "level": "DEBUG" if DEBUG else "INFO", "class": "logging.StreamHandler", "formatter": "verbose", + }, + "file_paperless": { + "class": "concurrent_log_handler.ConcurrentRotatingFileHandler", + "formatter": "verbose", + "filename": os.path.join(LOGGING_DIR, "paperless.log"), + "maxBytes": LOGROTATE_MAX_SIZE, + "backupCount": LOGROTATE_MAX_BACKUPS + }, + "file_mail": { + "class": "concurrent_log_handler.ConcurrentRotatingFileHandler", + "formatter": "verbose", + "filename": os.path.join(LOGGING_DIR, "mail.log"), + "maxBytes": LOGROTATE_MAX_SIZE, + "backupCount": LOGROTATE_MAX_BACKUPS } }, "root": { - "handlers": ["console"], - "level": "DEBUG", + "handlers": ["console"] }, "loggers": { - "documents": { - "handlers": ["db"], - "propagate": True, + "paperless": { + "handlers": ["file_paperless"], + "level": "DEBUG" }, "paperless_mail": { - "handlers": ["db"], - "propagate": True, - }, - "paperless_tesseract": { - "handlers": ["db"], - "propagate": True, - }, - }, + "handlers": ["file_mail"], + "level": "DEBUG" + } + } } ############################################################################### @@ -383,6 +400,7 @@ TASK_WORKERS = int(os.getenv("PAPERLESS_TASK_WORKERS", default_task_workers())) Q_CLUSTER = { 'name': 'paperless', 'catch_up': False, + 'recycle': 1, 'workers': TASK_WORKERS, 'redis': os.getenv("PAPERLESS_REDIS", "redis://localhost:6379") } @@ -408,6 +426,12 @@ THREADS_PER_WORKER = os.getenv("PAPERLESS_THREADS_PER_WORKER", default_threads_p CONSUMER_POLLING = int(os.getenv("PAPERLESS_CONSUMER_POLLING", 0)) +CONSUMER_POLLING_DELAY = int(os.getenv("PAPERLESS_CONSUMER_POLLING_DELAY", 5)) + +CONSUMER_POLLING_RETRY_COUNT = int( + os.getenv("PAPERLESS_CONSUMER_POLLING_RETRY_COUNT", 5) +) + CONSUMER_DELETE_DUPLICATES = __get_boolean("PAPERLESS_CONSUMER_DELETE_DUPLICATES") CONSUMER_RECURSIVE = __get_boolean("PAPERLESS_CONSUMER_RECURSIVE") @@ -432,6 +456,14 @@ OCR_MODE = os.getenv("PAPERLESS_OCR_MODE", "skip") OCR_IMAGE_DPI = os.getenv("PAPERLESS_OCR_IMAGE_DPI") +OCR_CLEAN = os.getenv("PAPERLESS_OCR_CLEAN", "clean") + +OCR_DESKEW = __get_boolean("PAPERLESS_OCR_DESKEW", "true") + +OCR_ROTATE_PAGES = __get_boolean("PAPERLESS_OCR_ROTATE_PAGES", "true") + +OCR_ROTATE_PAGES_THRESHOLD = float(os.getenv("PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD", 12.0)) + OCR_USER_ARGS = os.getenv("PAPERLESS_OCR_USER_ARGS", "{}") # GNUPG needs a home directory for some reason @@ -491,7 +523,11 @@ if PAPERLESS_TIKA_ENABLED: # 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()) + +if os.getenv("PAPERLESS_IGNORE_DATES", ""): + import dateparser + + 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/tests/test_websockets.py b/src/paperless/tests/test_websockets.py new file mode 100644 index 000000000..e1b948edf --- /dev/null +++ b/src/paperless/tests/test_websockets.py @@ -0,0 +1,60 @@ +from unittest import mock + +from channels.layers import get_channel_layer +from channels.testing import WebsocketCommunicator +from django.test import TestCase, override_settings + +from paperless.asgi import application + + +TEST_CHANNEL_LAYERS = { + 'default': { + 'BACKEND': 'channels.layers.InMemoryChannelLayer', + }, +} + + +class TestWebSockets(TestCase): + + @override_settings(CHANNEL_LAYERS=TEST_CHANNEL_LAYERS) + async def test_no_auth(self): + communicator = WebsocketCommunicator(application, "/ws/status/") + connected, subprotocol = await communicator.connect() + self.assertFalse(connected) + await communicator.disconnect() + + @override_settings(CHANNEL_LAYERS=TEST_CHANNEL_LAYERS) + @mock.patch("paperless.consumers.StatusConsumer._authenticated") + async def test_auth(self, _authenticated): + _authenticated.return_value = True + + communicator = WebsocketCommunicator(application, "/ws/status/") + connected, subprotocol = await communicator.connect() + self.assertTrue(connected) + + await communicator.disconnect() + + @override_settings(CHANNEL_LAYERS=TEST_CHANNEL_LAYERS) + @mock.patch("paperless.consumers.StatusConsumer._authenticated") + async def test_receive(self, _authenticated): + _authenticated.return_value = True + + communicator = WebsocketCommunicator(application, "/ws/status/") + connected, subprotocol = await communicator.connect() + self.assertTrue(connected) + + message = { + "task_id": "test" + } + + channel_layer = get_channel_layer() + await channel_layer.group_send("status_updates", { + "type": "status_update", + "data": message + }) + + response = await communicator.receive_json_from() + + self.assertEqual(response, message) + + await communicator.disconnect() diff --git a/src/paperless/urls.py b/src/paperless/urls.py index 5b58de454..4e0b8f191 100755 --- a/src/paperless/urls.py +++ b/src/paperless/urls.py @@ -23,7 +23,8 @@ from documents.views import ( PostDocumentView, SavedViewViewSet, BulkEditView, - SelectionDataView + SelectionDataView, + BulkDownloadView ) from paperless.views import FaviconView @@ -31,7 +32,7 @@ api_router = DefaultRouter() api_router.register(r"correspondents", CorrespondentViewSet) api_router.register(r"document_types", DocumentTypeViewSet) api_router.register(r"documents", DocumentViewSet) -api_router.register(r"logs", LogViewSet) +api_router.register(r"logs", LogViewSet, basename="logs") api_router.register(r"tags", TagViewSet) api_router.register(r"saved_views", SavedViewViewSet) @@ -63,6 +64,9 @@ urlpatterns = [ re_path(r"^documents/selection_data/", SelectionDataView.as_view(), name="selection_data"), + re_path(r"^documents/bulk_download/", BulkDownloadView.as_view(), + name="bulk_download"), + path('token/', views.obtain_auth_token) ] + api_router.urls)), diff --git a/src/paperless/version.py b/src/paperless/version.py index 37a1329f2..d93cd02b0 100644 --- a/src/paperless/version.py +++ b/src/paperless/version.py @@ -1 +1 @@ -__version__ = (1, 1, 0) +__version__ = (1, 2, 1) diff --git a/src/paperless_mail/mail.py b/src/paperless_mail/mail.py index e1916c1dd..28a8a0784 100644 --- a/src/paperless_mail/mail.py +++ b/src/paperless_mail/mail.py @@ -102,6 +102,8 @@ def get_mailbox(server, port, security): class MailAccountHandler(LoggingMixin): + logging_name = "paperless_mail" + def _correspondent_from_name(self, name): try: return Correspondent.objects.get_or_create(name=name)[0] diff --git a/src/paperless_mail/tasks.py b/src/paperless_mail/tasks.py index 68fb859a4..c591f04b9 100644 --- a/src/paperless_mail/tasks.py +++ b/src/paperless_mail/tasks.py @@ -4,17 +4,17 @@ from paperless_mail.mail import MailAccountHandler, MailError from paperless_mail.models import MailAccount +logger = logging.getLogger("paperless.mail.tasks") + + def process_mail_accounts(): total_new_documents = 0 for account in MailAccount.objects.all(): try: total_new_documents += MailAccountHandler().handle_mail_account( account) - except MailError as e: - logging.getLogger(__name__).error( - f"Error while processing mail account {account}: {e}", - exc_info=True - ) + except MailError: + logger.exception(f"Error while processing mail account {account}") if total_new_documents > 0: return f"Added {total_new_documents} document(s)." @@ -27,4 +27,4 @@ def process_mail_account(name): account = MailAccount.objects.get(name=name) MailAccountHandler().handle_mail_account(account) except MailAccount.DoesNotExist: - logging.getLogger(__name__).error(f"Unknown mail acccount: {name}") + logger.error(f"Unknown mail acccount: {name}") diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py index 52b50e983..deadf2234 100644 --- a/src/paperless_tesseract/parsers.py +++ b/src/paperless_tesseract/parsers.py @@ -2,28 +2,33 @@ import json import os import re -import ocrmypdf -import pdftotext -import pikepdf from PIL import Image from django.conf import settings -from ocrmypdf import InputFileError, EncryptedPdfError from documents.parsers import DocumentParser, ParseError, \ make_thumbnail_from_pdf +class NoTextFoundException(Exception): + pass + + class RasterisedDocumentParser(DocumentParser): """ This parser uses Tesseract to try and get some text out of a rasterised image, whether it's a PDF, or other graphical format (JPEG, TIFF, etc.) """ + logging_name = "paperless.parsing.tesseract" + def extract_metadata(self, document_path, mime_type): - namespace_pattern = re.compile(r"\{(.*)\}(.*)") result = [] if mime_type == 'application/pdf': + import pikepdf + + namespace_pattern = re.compile(r"\{(.*)\}(.*)") + pdf = pikepdf.open(document_path) meta = pdf.open_metadata() for key, value in meta.items(): @@ -46,9 +51,11 @@ class RasterisedDocumentParser(DocumentParser): ) return result - def get_thumbnail(self, document_path, mime_type): + def get_thumbnail(self, document_path, mime_type, file_name=None): return make_thumbnail_from_pdf( - document_path, self.tempdir, self.logging_group) + self.archive_path or document_path, + self.tempdir, + self.logging_group) def is_image(self, mime_type): return mime_type in [ @@ -88,122 +95,202 @@ class RasterisedDocumentParser(DocumentParser): f"Error while calculating DPI for image {image}: {e}") return None + def extract_text(self, sidecar_file, pdf_file): + if sidecar_file and os.path.isfile(sidecar_file): + with open(sidecar_file, "r") as f: + text = f.read() + + if "[OCR skipped on page" not in text: + # This happens when there's already text in the input file. + # The sidecar file will only contain text for OCR'ed pages. + self.log("debug", "Using text from sidecar file") + return text + else: + self.log("debug", "Incomplete sidecar file: discarding.") + + # no success with the sidecar file, try PDF + + if not os.path.isfile(pdf_file): + return None + + from pdfminer.high_level import extract_text + from pdfminer.pdftypes import PDFException + + try: + text = extract_text(pdf_file) + stripped = strip_excess_whitespace(text) + self.log("debug", f"Extracted text from PDF file {pdf_file}") + return stripped + except PDFException: + # probably not a PDF file. + return None + + def construct_ocrmypdf_parameters(self, + input_file, + mime_type, + output_file, + sidecar_file, + safe_fallback=False): + ocrmypdf_args = { + 'input_file': input_file, + 'output_file': output_file, + # need to use threads, since this will be run in daemonized + # processes by django-q. + 'use_threads': True, + 'jobs': settings.THREADS_PER_WORKER, + 'language': settings.OCR_LANGUAGE, + 'output_type': settings.OCR_OUTPUT_TYPE, + 'progress_bar': False + } + + if settings.OCR_MODE == 'force' or safe_fallback: + ocrmypdf_args['force_ocr'] = True + elif settings.OCR_MODE in ['skip', 'skip_noarchive']: + ocrmypdf_args['skip_text'] = True + elif settings.OCR_MODE == 'redo': + ocrmypdf_args['redo_ocr'] = True + else: + raise ParseError( + f"Invalid ocr mode: {settings.OCR_MODE}") + + if settings.OCR_CLEAN == 'clean': + ocrmypdf_args['clean'] = True + elif settings.OCR_CLEAN == 'clean-final': + if settings.OCR_MODE == 'redo': + ocrmypdf_args['clean'] = True + else: + ocrmypdf_args['clean_final'] = True + + if settings.OCR_DESKEW and not settings.OCR_MODE == 'redo': + ocrmypdf_args['deskew'] = True + + if settings.OCR_ROTATE_PAGES: + ocrmypdf_args['rotate_pages'] = True + ocrmypdf_args['rotate_pages_threshold'] = settings.OCR_ROTATE_PAGES_THRESHOLD # NOQA: E501 + + if settings.OCR_PAGES > 0: + ocrmypdf_args['pages'] = f"1-{settings.OCR_PAGES}" + else: + # sidecar is incompatible with pages + ocrmypdf_args['sidecar'] = sidecar_file + + if self.is_image(mime_type): + dpi = self.get_dpi(input_file) + a4_dpi = self.calculate_a4_dpi(input_file) + if dpi: + self.log( + "debug", + f"Detected DPI for image {input_file}: {dpi}" + ) + ocrmypdf_args['image_dpi'] = dpi + elif settings.OCR_IMAGE_DPI: + ocrmypdf_args['image_dpi'] = settings.OCR_IMAGE_DPI + elif a4_dpi: + ocrmypdf_args['image_dpi'] = a4_dpi + else: + raise ParseError( + f"Cannot produce archive PDF for image {input_file}, " + f"no DPI information is present in this image and " + f"OCR_IMAGE_DPI is not set.") + + if settings.OCR_USER_ARGS and not safe_fallback: + try: + user_args = json.loads(settings.OCR_USER_ARGS) + ocrmypdf_args = {**ocrmypdf_args, **user_args} + except Exception as e: + self.log( + "warning", + f"There is an issue with PAPERLESS_OCR_USER_ARGS, so " + f"they will not be used. Error: {e}") + + return ocrmypdf_args + def parse(self, document_path, mime_type, file_name=None): - mode = settings.OCR_MODE + # This forces tesseract to use one core per page. + os.environ['OMP_THREAD_LIMIT'] = "1" - text_original = get_text_from_pdf(document_path) - has_text = text_original and len(text_original) > 50 + text_original = self.extract_text(None, document_path) + original_has_text = text_original and len(text_original) > 50 - if mode == "skip_noarchive" and has_text: + if settings.OCR_MODE == "skip_noarchive" and original_has_text: self.log("debug", "Document has text, skipping OCRmyPDF entirely.") self.text = text_original return - if mode in ['skip', 'skip_noarchive'] and not has_text: - # upgrade to redo, since there appears to be no text in the - # document. This happens to some weird encrypted documents or - # documents with failed OCR attempts for which OCRmyPDF will - # still report that there actually is text in them. - self.log("debug", - "No text was found in the document and skip is " - "specified. Upgrading OCR mode to redo.") - mode = "redo" + import ocrmypdf + from ocrmypdf import InputFileError, EncryptedPdfError archive_path = os.path.join(self.tempdir, "archive.pdf") + sidecar_file = os.path.join(self.tempdir, "sidecar.txt") - ocr_args = { - 'input_file': document_path, - 'output_file': archive_path, - 'use_threads': True, - 'jobs': settings.THREADS_PER_WORKER, - 'language': settings.OCR_LANGUAGE, - 'output_type': settings.OCR_OUTPUT_TYPE, - 'progress_bar': False, - 'clean': True - } - - if settings.OCR_PAGES > 0: - ocr_args['pages'] = f"1-{settings.OCR_PAGES}" - - # Mode selection. - - if mode in ['skip', 'skip_noarchive']: - ocr_args['skip_text'] = True - elif mode == 'redo': - ocr_args['redo_ocr'] = True - elif mode == 'force': - ocr_args['force_ocr'] = True - else: - raise ParseError( - f"Invalid ocr mode: {mode}") - - if self.is_image(mime_type): - dpi = self.get_dpi(document_path) - a4_dpi = self.calculate_a4_dpi(document_path) - if dpi: - self.log( - "debug", - f"Detected DPI for image {document_path}: {dpi}" - ) - ocr_args['image_dpi'] = dpi - elif settings.OCR_IMAGE_DPI: - ocr_args['image_dpi'] = settings.OCR_IMAGE_DPI - elif a4_dpi: - ocr_args['image_dpi'] = a4_dpi - else: - raise ParseError( - f"Cannot produce archive PDF for image {document_path}, " - f"no DPI information is present in this image and " - f"OCR_IMAGE_DPI is not set.") - - if settings.OCR_USER_ARGS: - try: - user_args = json.loads(settings.OCR_USER_ARGS) - ocr_args = {**ocr_args, **user_args} - except Exception as e: - self.log( - "warning", - f"There is an issue with PAPERLESS_OCR_USER_ARGS, so " - f"they will not be used: {e}") - - # This forces tesseract to use one core per page. - os.environ['OMP_THREAD_LIMIT'] = "1" + args = self.construct_ocrmypdf_parameters( + document_path, mime_type, archive_path, sidecar_file) try: - self.log("debug", - f"Calling OCRmyPDF with {str(ocr_args)}") - ocrmypdf.ocr(**ocr_args) - # success! announce results + self.log("debug", f"Calling OCRmyPDF with args: {args}") + ocrmypdf.ocr(**args) + self.archive_path = archive_path - self.text = get_text_from_pdf(archive_path) + self.text = self.extract_text(sidecar_file, archive_path) - except (InputFileError, EncryptedPdfError) as e: - - self.log("debug", - f"Encountered an error: {e}. Trying to use text from " - f"original.") - # This happens with some PDFs when used with the redo_ocr option. - # This is not the end of the world, we'll just use what we already - # have in the document. - self.text = text_original - # Also, no archived file. if not self.text: - # However, if we don't have anything, fail: - raise ParseError(e.__class__.__name__ + ": " + str(e)) + raise NoTextFoundException( + "No text was found in the original document") + except EncryptedPdfError: + self.log("warning", + "This file is encrypted, OCR is impossible. Using " + "any text present in the original file.") + if original_has_text: + self.text = text_original + except (NoTextFoundException, InputFileError) as e: + self.log("exception", + f"Encountered the following error while running OCR, " + f"attempting force OCR to get the text.") + + archive_path_fallback = os.path.join( + self.tempdir, "archive-fallback.pdf") + sidecar_file_fallback = os.path.join( + self.tempdir, "sidecar-fallback.txt") + + # Attempt to run OCR with safe settings. + + args = self.construct_ocrmypdf_parameters( + document_path, mime_type, + archive_path_fallback, sidecar_file_fallback, + safe_fallback=True + ) + + try: + self.log("debug", + f"Fallback: Calling OCRmyPDF with args: {args}") + ocrmypdf.ocr(**args) + + # Don't return the archived file here, since this file + # is bigger and blurry due to --force-ocr. + + self.text = self.extract_text( + sidecar_file_fallback, archive_path_fallback) + + except Exception as e: + # If this fails, we have a serious issue at hand. + raise ParseError(f"{e.__class__.__name__}: {str(e)}") except Exception as e: # Anything else is probably serious. - raise ParseError(e.__class__.__name__ + ": " + str(e)) + raise ParseError(f"{e.__class__.__name__}: {str(e)}") + # As a last resort, if we still don't have any text for any reason, + # try to extract the text from the original document. if not self.text: - # This may happen for files that don't have any text. - self.log( - 'warning', - f"Document {document_path} does not have any text." - f"This is probably an error or you tried to add an image " - f"without text, or something is wrong with this document.") - self.text = "" + if original_has_text: + self.text = text_original + else: + self.log( + "warning", + f"No text was found in {document_path}, the content will " + f"be empty." + ) def strip_excess_whitespace(text): @@ -218,20 +305,3 @@ def strip_excess_whitespace(text): # TODO: this needs a rework return no_trailing_whitespace.strip() - - -def get_text_from_pdf(pdf_file): - - if not os.path.isfile(pdf_file): - return None - - with open(pdf_file, "rb") as f: - try: - pdf = pdftotext.PDF(f) - except pdftotext.Error: - # might not be a PDF file - return None - - text = "\n".join(pdf) - - return strip_excess_whitespace(text) diff --git a/src/paperless_tesseract/signals.py b/src/paperless_tesseract/signals.py index 1e1cd1e1a..fedd08a92 100644 --- a/src/paperless_tesseract/signals.py +++ b/src/paperless_tesseract/signals.py @@ -1,9 +1,13 @@ -from .parsers import RasterisedDocumentParser + +def get_parser(*args, **kwargs): + from .parsers import RasterisedDocumentParser + + return RasterisedDocumentParser(*args, **kwargs) def tesseract_consumer_declaration(sender, **kwargs): return { - "parser": RasterisedDocumentParser, + "parser": get_parser, "weight": 0, "mime_types": { "application/pdf": ".pdf", diff --git a/src/paperless_tesseract/tests/samples/encrypted.pdf b/src/paperless_tesseract/tests/samples/encrypted.pdf new file mode 100644 index 000000000..5996edeea Binary files /dev/null and b/src/paperless_tesseract/tests/samples/encrypted.pdf differ diff --git a/src/paperless_tesseract/tests/samples/multi-page-mixed.pdf b/src/paperless_tesseract/tests/samples/multi-page-mixed.pdf new file mode 100644 index 000000000..cca8db419 Binary files /dev/null and b/src/paperless_tesseract/tests/samples/multi-page-mixed.pdf differ diff --git a/src/paperless_tesseract/tests/samples/rotated.pdf b/src/paperless_tesseract/tests/samples/rotated.pdf new file mode 100644 index 000000000..8b79a9082 Binary files /dev/null and b/src/paperless_tesseract/tests/samples/rotated.pdf differ diff --git a/src/paperless_tesseract/tests/test_parser.py b/src/paperless_tesseract/tests/test_parser.py index 644587de0..c389d446f 100644 --- a/src/paperless_tesseract/tests/test_parser.py +++ b/src/paperless_tesseract/tests/test_parser.py @@ -7,7 +7,7 @@ from django.test import TestCase, override_settings from documents.parsers import ParseError, run_convert from documents.tests.utils import DirectoriesMixin -from paperless_tesseract.parsers import RasterisedDocumentParser, get_text_from_pdf, strip_excess_whitespace +from paperless_tesseract.parsers import RasterisedDocumentParser, strip_excess_whitespace image_to_string_calls = [] @@ -38,7 +38,12 @@ class TestParser(DirectoriesMixin, TestCase): def assertContainsStrings(self, content, strings): # Asserts that all strings appear in content, in the given order. - indices = [content.index(s) for s in strings] + indices = [] + for s in strings: + if s in content: + indices.append(content.index(s)) + else: + self.fail(f"'{s}' is not in '{content}'") self.assertListEqual(indices, sorted(indices)) text_cases = [ @@ -69,7 +74,8 @@ class TestParser(DirectoriesMixin, TestCase): SAMPLE_FILES = os.path.join(os.path.dirname(__file__), "samples") def test_get_text_from_pdf(self): - text = get_text_from_pdf(os.path.join(self.SAMPLE_FILES, 'simple-digital.pdf')) + parser = RasterisedDocumentParser(uuid.uuid4()) + text = parser.extract_text(None, os.path.join(self.SAMPLE_FILES, 'simple-digital.pdf')) self.assertContainsStrings(text.strip(), ["This is a test document."]) @@ -129,15 +135,21 @@ class TestParser(DirectoriesMixin, TestCase): self.assertIsNone(parser.archive_path) self.assertContainsStrings(parser.get_text(), ["Please enter your name in here:", "This is a PDF document with a form."]) - @override_settings(OCR_MODE="redo") - @mock.patch("paperless_tesseract.parsers.get_text_from_pdf", lambda _: None) - def test_with_form_error_notext(self): + @override_settings(OCR_MODE="skip") + def test_encrypted(self): parser = RasterisedDocumentParser(None) - def f(): - parser.parse(os.path.join(self.SAMPLE_FILES, "with-form.pdf"), "application/pdf") + parser.parse(os.path.join(self.SAMPLE_FILES, "encrypted.pdf"), "application/pdf") - self.assertRaises(ParseError, f) + self.assertIsNone(parser.archive_path) + self.assertContainsStrings(parser.get_text(), ["This is a digitally signed PDF, created with Acrobat Pro for the Paperless project to enable", "automated testing of signed/encrypted PDFs"]) + + @override_settings(OCR_MODE="redo") + def test_with_form_error_notext(self): + parser = RasterisedDocumentParser(None) + parser.parse(os.path.join(self.SAMPLE_FILES, "with-form.pdf"), "application/pdf") + + self.assertContainsStrings(parser.get_text(), ["Please enter your name in here:", "This is a PDF document with a form."]) @override_settings(OCR_MODE="force") def test_with_form_force(self): @@ -164,17 +176,12 @@ class TestParser(DirectoriesMixin, TestCase): self.assertRaises(ParseError, f) - @mock.patch("paperless_tesseract.parsers.ocrmypdf.ocr") - def test_image_calc_a4_dpi(self, m): + def test_image_calc_a4_dpi(self): parser = RasterisedDocumentParser(None) - parser.parse(os.path.join(self.SAMPLE_FILES, "simple-no-dpi.png"), "image/png") + dpi = parser.calculate_a4_dpi(os.path.join(self.SAMPLE_FILES, "simple-no-dpi.png")) - m.assert_called_once() - - args, kwargs = m.call_args - - self.assertEqual(kwargs['image_dpi'], 62) + self.assertEqual(dpi, 62) @mock.patch("paperless_tesseract.parsers.RasterisedDocumentParser.calculate_a4_dpi") def test_image_dpi_fail(self, m): @@ -258,9 +265,82 @@ class TestParser(DirectoriesMixin, TestCase): def test_skip_noarchive_notext(self): parser = RasterisedDocumentParser(None) parser.parse(os.path.join(self.SAMPLE_FILES, "multi-page-images.pdf"), "application/pdf") - self.assertTrue(os.path.join(parser.archive_path)) + self.assertTrue(os.path.isfile(parser.archive_path)) self.assertContainsStrings(parser.get_text().lower(), ["page 1", "page 2", "page 3"]) + @override_settings(OCR_MODE="skip") + def test_multi_page_mixed(self): + parser = RasterisedDocumentParser(None) + parser.parse(os.path.join(self.SAMPLE_FILES, "multi-page-mixed.pdf"), "application/pdf") + self.assertTrue(os.path.isfile(parser.archive_path)) + self.assertContainsStrings(parser.get_text().lower(), ["page 1", "page 2", "page 3", "page 4", "page 5", "page 6"]) + + with open(os.path.join(parser.tempdir, "sidecar.txt")) as f: + sidecar = f.read() + + self.assertIn("[OCR skipped on page 4]", sidecar) + self.assertIn("[OCR skipped on page 5]", sidecar) + self.assertIn("[OCR skipped on page 6]", sidecar) + + @override_settings(OCR_MODE="skip_noarchive") + def test_multi_page_mixed_no_archive(self): + parser = RasterisedDocumentParser(None) + parser.parse(os.path.join(self.SAMPLE_FILES, "multi-page-mixed.pdf"), "application/pdf") + self.assertIsNone(parser.archive_path) + self.assertContainsStrings(parser.get_text().lower(), ["page 4", "page 5", "page 6"]) + + @override_settings(OCR_MODE="skip", OCR_ROTATE_PAGES=True) + def test_rotate(self): + parser = RasterisedDocumentParser(None) + parser.parse(os.path.join(self.SAMPLE_FILES, "rotated.pdf"), "application/pdf") + self.assertContainsStrings(parser.get_text(), [ + "This is the text that appears on the first page. It’s a lot of text.", + "Even if the pages are rotated, OCRmyPDF still gets the job done.", + "This is a really weird file with lots of nonsense text.", + "If you read this, it’s your own fault. Also check your screen orientation." + ]) + + def test_ocrmypdf_parameters(self): + parser = RasterisedDocumentParser(None) + params = parser.construct_ocrmypdf_parameters(input_file="input.pdf", output_file="output.pdf", + sidecar_file="sidecar.txt", mime_type="application/pdf", + safe_fallback=False) + + self.assertEqual(params['input_file'], "input.pdf") + self.assertEqual(params['output_file'], "output.pdf") + self.assertEqual(params['sidecar'], "sidecar.txt") + + with override_settings(OCR_CLEAN="none"): + params = parser.construct_ocrmypdf_parameters("", "", "", "") + self.assertNotIn("clean", params) + self.assertNotIn("clean_final", params) + + with override_settings(OCR_CLEAN="clean"): + params = parser.construct_ocrmypdf_parameters("", "", "", "") + self.assertTrue(params['clean']) + self.assertNotIn("clean_final", params) + + with override_settings(OCR_CLEAN="clean-final", OCR_MODE="skip"): + params = parser.construct_ocrmypdf_parameters("", "", "", "") + self.assertTrue(params['clean_final']) + self.assertNotIn("clean", params) + + with override_settings(OCR_CLEAN="clean-final", OCR_MODE="redo"): + params = parser.construct_ocrmypdf_parameters("", "", "", "") + self.assertTrue(params['clean']) + self.assertNotIn("clean_final", params) + + with override_settings(OCR_DESKEW=True, OCR_MODE="skip"): + params = parser.construct_ocrmypdf_parameters("", "", "", "") + self.assertTrue(params['deskew']) + + with override_settings(OCR_DESKEW=True, OCR_MODE="redo"): + params = parser.construct_ocrmypdf_parameters("", "", "", "") + self.assertNotIn('deskew', params) + + with override_settings(OCR_DESKEW=False, OCR_MODE="skip"): + params = parser.construct_ocrmypdf_parameters("", "", "", "") + self.assertNotIn('deskew', params) class TestParserFileTypes(DirectoriesMixin, TestCase): diff --git a/src/paperless_text/parsers.py b/src/paperless_text/parsers.py index c1afe07fc..837f05c9f 100644 --- a/src/paperless_text/parsers.py +++ b/src/paperless_text/parsers.py @@ -11,7 +11,9 @@ class TextDocumentParser(DocumentParser): This parser directly parses a text document (.txt, .md, or .csv) """ - def get_thumbnail(self, document_path, mime_type): + logging_name = "paperless.parsing.text" + + def get_thumbnail(self, document_path, mime_type, file_name=None): def read_text(): with open(document_path, 'r') as src: diff --git a/src/paperless_text/signals.py b/src/paperless_text/signals.py index 1e0493f4f..833d0be28 100644 --- a/src/paperless_text/signals.py +++ b/src/paperless_text/signals.py @@ -1,9 +1,13 @@ -from .parsers import TextDocumentParser + +def get_parser(*args, **kwargs): + from .parsers import TextDocumentParser + + return TextDocumentParser(*args, **kwargs) def text_consumer_declaration(sender, **kwargs): return { - "parser": TextDocumentParser, + "parser": get_parser, "weight": 10, "mime_types": { "text/plain": ".txt", diff --git a/src/paperless_tika/__init__.py b/src/paperless_tika/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/src/paperless_tika/parsers.py b/src/paperless_tika/parsers.py index cde6543be..6b0f62ada 100644 --- a/src/paperless_tika/parsers.py +++ b/src/paperless_tika/parsers.py @@ -14,9 +14,11 @@ class TikaDocumentParser(DocumentParser): This parser sends documents to a local tika server """ - def get_thumbnail(self, document_path, mime_type): + logging_name = "paperless.parsing.tika" + + def get_thumbnail(self, document_path, mime_type, file_name=None): if not self.archive_path: - self.archive_path = self.convert_to_pdf(document_path) + self.archive_path = self.convert_to_pdf(document_path, file_name) return make_thumbnail_from_pdf( self.archive_path, self.tempdir, self.logging_group) diff --git a/src/paperless_tika/signals.py b/src/paperless_tika/signals.py index 137416abb..dbda377ca 100644 --- a/src/paperless_tika/signals.py +++ b/src/paperless_tika/signals.py @@ -1,9 +1,13 @@ -from .parsers import TikaDocumentParser + +def get_parser(*args, **kwargs): + from .parsers import TikaDocumentParser + + return TikaDocumentParser(*args, **kwargs) def tika_consumer_declaration(sender, **kwargs): return { - "parser": TikaDocumentParser, + "parser": get_parser, "weight": 10, "mime_types": { "application/msword": ".doc",