upgpkg: docspell 0.26.0-1

upstream release

3 files changed, 114 insertions, 46 deletions

diff --git a/.CHANGELOG b/.CHANGELOG
index 9d374f391f4f..89fcd1ca7bef 100644
--- a/.CHANGELOG
+++ b/.CHANGELOG
@@ -1,5 +1,80 @@
 # Changelog
 
+## v0.26.0
+
+*Aug 28, 2021*
+
+- Add ability to merge items (#414). You can now select multiple items
+  and merge them all into one. The first item in the list is the
+  target item, all others are deleted after a successful merge. The
+  webapp allows to reorder this list, of course.
+- Add option to only import attachments of e-mails (#983). 
+- Improve *Manage Data* page by sorting the tables (#965, #538)
+- Allow wildcard searches in queries using `attach.id` (#971). Before
+  you would have to specify the complete id. This is inconvenient when
+  using from the command line client.
+- Add Hebrew to the document languages (#1027, thans @wallace11).
+  Please note, that the SOLR support is very basic for this language.
+- Add a periodic task to check for Docspell updates (#990). Let's you
+  check periodically for new versions of docspell. It uses an existing
+  user account and its mail settings to send an e-mail.
+- Show the link to an item and its attachments as a QR code in item
+  details (#836). This might be useful when you want to attach this
+  link to physical devices.
+- The search menu highlights the sections that contain active filters
+  (#966)
+- Safe deletion of items (#347). When deleting items, they are now
+  *marked as deleted* and can therefore be restored. A periodic job
+  will really delete them from the database eventually.
+- Improves German translation (#985, thanks @monnypython)
+- The [dsc](https://github.com/docspell/dsc) tool has also been
+  improved, thanks to @seijikun.
+- Upgrade the website to work with newer zola versions (#847)
+- Remove the scripts in `tools/` since these are now obsolete. The new
+  [command line interface](https://github.com/docspell/dsc) covers
+  these features now. Note that the docker images are also NOT built
+  anymore. The directory still exits and is still a place for scripts
+  and little tooling around docspell.
+- Fixes a regression where the browser would not display the pdf (#975)
+- Fixes the health checks in the docker setup (#976)
+- Fixes an issue with text extraction for Japanese documents where
+  numbers were extracted as special unicode points (#973). This only
+  affects the docker setup, when not using the docker images you need
+  to setup tesseract to use different training data for Japanese.
+
+### Rest API Changes
+
+Complete
+[diff](https://github.com/eikek/docspell/compare/v0.25.1...master#diff-5dfb63e478c5511c16420f5e4d139666603d1c625546af06c4de50d0ae64a94f)
+(need to click the *Files changed* tab)
+
+- The routes to fetch a list of tags, organizations, persons, fields
+  etc can now optionally take a `sort` query parameter to specify how
+  to order the list.
+- Added `/sec/collective/emptytrash/startonce` to run the task to
+  empty the trash immediately
+- The search endpoints can now take an optional parameter `searchMode`
+  that defines whether to search in trashed items or not
+- Deleting an item via the api now only changes its state to *Trashed* 
+- Added `/sec/item/{id}/restore` to restore a trashed item (unless it
+  has been deleted from the database).
+- Added `/sec/items/restoreAll` to restore multiple of trashed items
+- Added `/sec/items/merge` that accepts a POST request with a list of
+  items to merge. The first item is the "target" item. All other items
+  are deleted after the merge was successful.
+- The `ScanMailboxSettings`, `Source` and `ItemUploadMeta` structures
+  now contains a boolean field `attachmentsOnly`
+- `ItemInsights` structure now contains a counter for trashed items
+- `CollectiveSettings` structure now has a section to specify settings
+  for periodically deleting trashed items.
+
+### Configuration Changes
+
+- Joex: A new section for configuring the update task has been added.
+  See section `update-check` in the default [config
+  file](https://docspell.org/docs/configure/#joex).
+
+
 ## v0.25.1
 
 *Jul 29, 2021*
diff --git a/.SRCINFO b/.SRCINFO
index 7ef8c27edfa2..8066f5832dfc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,22 @@
 pkgbase = docspell
 	pkgdesc = Assists in organizing your piles of documents, resulting from scanners, e-mails and other sources with miminal effort.
-	pkgver = 0.25.1
+	pkgver = 0.26.0
 	pkgrel = 1
 	url = https://docspell.org/
 	changelog = .CHANGELOG
 	arch = any
 	groups = docspell
 	license = GPL3
-	makedepends = python
-	source = docspell-0.25.1-restserver.zip::https://github.com/eikek/docspell/releases/download/v0.25.1/docspell-restserver-0.25.1.zip
-	source = docspell-0.25.1-joex.zip::https://github.com/eikek/docspell/releases/download/v0.25.1/docspell-joex-0.25.1.zip
-	source = docspell-0.25.1-tools.zip::https://github.com/eikek/docspell/releases/download/v0.25.1/docspell-tools-0.25.1.zip
+	source = docspell-0.26.0-restserver.zip::https://github.com/eikek/docspell/releases/download/v0.26.0/docspell-restserver-0.26.0.zip
+	source = docspell-0.26.0-joex.zip::https://github.com/eikek/docspell/releases/download/v0.26.0/docspell-joex-0.26.0.zip
 	source = docspell-joex.sh
 	source = docspell-restserver.sh
 	source = docspell-joex.service
 	source = docspell-restserver.service
 	source = docspell.sysusers
 	source = docspell.tmpfiles
-	sha512sums = 7300038077244dde9ddf5a8702112ae9e8fef4604a19d088193206a30987b9085542ff8de0fd14583a15520bb3577a984b8e84a3e0a545ee9acbcd173cf3aeb3
-	sha512sums = bc7bb401c9abca4180e3ae8febdcb8d9f90d9a2e5b30df08396d8c950224886a289202448deb352252239131f5ab608f4b832977cf7558489efb5005451e3868
-	sha512sums = fbcbc0e2a3d4cafd00357257f6bb7c5fe80154defad883d37ec08c59deee1a125bf653eac5ccd020b8db6d8a1296da86c197d7f160da1a709121ad728d56502f
+	sha512sums = 4f0a60030e3e0866f86df18b412c3fa1ba82881d206b7d342c0773a1c8e065e67345b666961428ffe8539d92f69aeb6be5be880e761c257855fbec3e56c982b1
+	sha512sums = c0cff7fbce104c8c4f2ebc301b8b65e185b41d2b7b4112169354bba113fea4b3b4971918ff0c346c44d741b51a72fbef61593a2ea54be1263fe6657f6a854db2
 	sha512sums = 6ab8b24eb76f02b68e4fa4194b8771ef4f57c8375b34bf7bf914563528e347ea127beb5547e432910911d4fd15982cccdd1df50aeb76058129b909824ce49093
 	sha512sums = 0b8b08f47f1cb46a3bfc16df4b0574cebfb4a851562d134fcba3c4bf80fb011443499a549c3a04480456c048346d09f36fbcbc9d792810001c9c8b370d3926a8
 	sha512sums = c1a7a9cb942413d0febb083554a15ded0ead5c7124624f0ec5fe43d3bc73a1637f89bc27f7b6e0bbdbd0d886799e5331beb5f45f476db70b69ae17c0d803f004
@@ -43,10 +40,3 @@ pkgname = docspell-restserver
 	depends = java-runtime-headless
 	optdepends = solr: provide fulltext search
 	backup = etc/docspell/restserver.conf
-
-pkgname = docspell-tools
-	pkgdesc = Collection of tools to interact with Docspell
-	depends = curl
-	depends = inotify-tools
-	depends = jq
-	depends = python
diff --git a/PKGBUILD b/PKGBUILD
index 21815aeaed0f..6e05e1b3d6f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,12 @@
 # shellcheck disable=SC2034,2154,2148
 
 pkgbase=docspell
-pkgname=('docspell-joex' 'docspell-restserver' 'docspell-tools')
-pkgver=0.25.1
+pkgname=(
+    'docspell-joex'
+    'docspell-restserver'
+    # 'firefox-extension-docspell'
+)
+pkgver=0.26.0
 pkgrel=1
 changelog=.CHANGELOG
 arch=('any')
@@ -13,16 +17,16 @@ license=('GPL3')
 groups=('docspell')
 source=("$pkgbase-$pkgver-restserver.zip::https://github.com/eikek/$pkgbase/releases/download/v$pkgver/$pkgbase-restserver-$pkgver.zip"
         "$pkgbase-$pkgver-joex.zip::https://github.com/eikek/$pkgbase/releases/download/v$pkgver/$pkgbase-joex-$pkgver.zip"
-        "$pkgbase-$pkgver-tools.zip::https://github.com/eikek/$pkgbase/releases/download/v$pkgver/$pkgbase-tools-$pkgver.zip"
+        # "$pkgbase-$pkgver-tools.zip::https://github.com/eikek/$pkgbase/releases/download/v$pkgver/$pkgbase-tools-$pkgver.zip"
         "${pkgname[0]}.sh"
         "${pkgname[1]}.sh"
         "${pkgname[0]}.service"
         "${pkgname[1]}.service"
         "$pkgbase.sysusers"
         "$pkgbase.tmpfiles")
-sha512sums=('7300038077244dde9ddf5a8702112ae9e8fef4604a19d088193206a30987b9085542ff8de0fd14583a15520bb3577a984b8e84a3e0a545ee9acbcd173cf3aeb3'
-            'bc7bb401c9abca4180e3ae8febdcb8d9f90d9a2e5b30df08396d8c950224886a289202448deb352252239131f5ab608f4b832977cf7558489efb5005451e3868'
-            'fbcbc0e2a3d4cafd00357257f6bb7c5fe80154defad883d37ec08c59deee1a125bf653eac5ccd020b8db6d8a1296da86c197d7f160da1a709121ad728d56502f'
+sha512sums=('4f0a60030e3e0866f86df18b412c3fa1ba82881d206b7d342c0773a1c8e065e67345b666961428ffe8539d92f69aeb6be5be880e761c257855fbec3e56c982b1'
+            'c0cff7fbce104c8c4f2ebc301b8b65e185b41d2b7b4112169354bba113fea4b3b4971918ff0c346c44d741b51a72fbef61593a2ea54be1263fe6657f6a854db2'
+            # '5b71747e2f7758df8dff5a4abfe57ff8e1d302ad5b70fb576696b44d2ef358ebc34f797793a868441d6c8c1990294dc97b42697a37c16f1fc784c3196205b7f4'
             '6ab8b24eb76f02b68e4fa4194b8771ef4f57c8375b34bf7bf914563528e347ea127beb5547e432910911d4fd15982cccdd1df50aeb76058129b909824ce49093'
             '0b8b08f47f1cb46a3bfc16df4b0574cebfb4a851562d134fcba3c4bf80fb011443499a549c3a04480456c048346d09f36fbcbc9d792810001c9c8b370d3926a8'
             'c1a7a9cb942413d0febb083554a15ded0ead5c7124624f0ec5fe43d3bc73a1637f89bc27f7b6e0bbdbd0d886799e5331beb5f45f476db70b69ae17c0d803f004'
@@ -36,11 +40,11 @@ prepare() {
         "${pkgname[0]}-$pkgver/conf/${pkgname[0]}.conf" \
         "${pkgname[1]}-$pkgver/conf/$pkgbase-server.conf"
 
-    sed -i -e 's@/usr/local/share/docspell/native.py@/usr/share/docspell-tools/native.py@' \
-        "${pkgname[2]}-$pkgver/firefox/native/app_manifest.json"
+    # sed -i -e 's@/usr/local/share/docspell/native.py@/usr/share/docspell-tools/native.py@' \
+    #     "${pkgname[2]}-$pkgver/firefox/native/app_manifest.json"
 
-    sed -i -e 's@DS_SH_CMD="ds.sh"@DS_SH_CMD="docspell-ds"@' \
-        "${pkgname[2]}-$pkgver/firefox/native/native.py"
+    # sed -i -e 's@DS_SH_CMD="ds.sh"@DS_SH_CMD="docspell-dsc"@' \
+    #     "${pkgname[2]}-$pkgver/firefox/native/native.py"
 }
 
 # You do not need to compile Java applications from source.
@@ -110,24 +114,23 @@ package_docspell-restserver() {
             "$pkgdir/usr/share/java/${pkgname[1]}/"
 }
 
-makedepends+=('python')
-package_docspell-tools() {
-    pkgdesc="Collection of tools to interact with Docspell"
-    depends=('curl' 'inotify-tools' 'jq' 'python')
-
-    cd "${pkgname[2]}-$pkgver" || return
-
-    # Firefox extension and native messaging host
-    mkdir -p "$pkgdir/usr/share/${pkgname[2]}"
-    mkdir -p "$pkgdir/usr/lib/mozilla/native-messaging-hosts"
-    install -Dm 644 "firefox/$pkgbase-extension.xpi" "$pkgdir/usr/lib/firefox/browser/extensions/docspell@eikek.github.io.xpi"
-    install -Dm 755 "firefox/native/native.py" "$pkgdir/usr/share/${pkgname[2]}/firefox/native/native.py"
-    ln -s "/usr/share/${pkgname[2]}/firefox/native/app_manifest.json" "$pkgdir/usr/lib/mozilla/native-messaging-hosts/$pkgbase.json"
-
-    # https://wiki.archlinux.org/index.php/Python_package_guidelines#Reproducible_bytecode
-    export PYTHONHASHSEED=0
-    python -O -m compileall "$pkgdir/usr/share/${pkgname[2]}/firefox/native/native.py"
-
-    # Scripts
-    find . -type f -name "*.sh" -exec sh -c 'install -Dm 755 "$3" "$1/usr/bin/$2-$(basename "$3" .sh)"' _ "$pkgdir" "$pkgbase" {} \;
-}
+# makedepends+=('python')
+# package_firefox-extension-docspell() {
+#     pkgdesc="Send documents from the context menu in Firefox to Docspell"
+#     depends=('python')
+#     conflicts=('docspell-tools')
+#     # optdepends=('docspell-dsc')
+
+#     cd "${pkgname[2]}-$pkgver" || return
+
+#     # Firefox extension and native messaging host
+#     mkdir -p "$pkgdir/usr/share/${pkgname[2]}"
+#     mkdir -p "$pkgdir/usr/lib/mozilla/native-messaging-hosts"
+#     install -Dm 644 "firefox/$pkgbase-extension.xpi" "$pkgdir/usr/lib/firefox/browser/extensions/docspell@eikek.github.io.xpi"
+#     install -Dm 755 "firefox/native/native.py" "$pkgdir/usr/share/${pkgname[2]}/firefox/native/native.py"
+#     ln -s "/usr/share/${pkgname[2]}/firefox/native/app_manifest.json" "$pkgdir/usr/lib/mozilla/native-messaging-hosts/$pkgbase.json"
+
+#     # https://wiki.archlinux.org/index.php/Python_package_guidelines#Reproducible_bytecode
+#     export PYTHONHASHSEED=0
+#     python -O -m compileall "$pkgdir/usr/share/${pkgname[2]}/firefox/native/native.py"
+# }