Merge branch 'eikek:master' into master

.github/workflows/website.yml

@@ -23,4 +23,6 @@ jobs:
       - name: Build website (${{ env.DOCSPELL_VERSION }})
         run: nix-shell website/shell.nix --run "sbt make-website"
       - name: Publish website (${{ env.DOCSPELL_VERSION }})
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: sbt publish-website

Changelog.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## v0.25.0
+
+*Unreleased*
+
+### Rest API Changes
+
+- Removed `sec/collective/previews` endpoint, in favor for new
+  `admin/attachments/generatePreviews` endpoint which is now an admin
+  task to generate previews for all files. The now removed enpoint did
+  this only for one collective.
+
+
 ## v0.24.0
 
 *Jun 18, 2021*
@@ -61,6 +73,10 @@ state (the master branch). The `latest` tag points to the latest
 release. Each release is also tagged with its version number, like
 `v0.24.0`.
 
+The images changed slightly in that there is no assumption on where
+the config file is placed. Now you need to pass the docspell config
+file explicitely when using the images.
+
 Multiarch: Images are now build for `amd64`, `arm64` and `armv7`.
 
 The consumedir is being replaced by the more generic `docspell/tools`
@@ -80,7 +96,10 @@ The docker-compose setup is now at `docker/docker-compose`. Please
 look at the new [compose
 file](https://github.com/eikek/docspell/blob/master/docker/docker-compose/docker-compose.yml)
 and do the corresponding changes at yours. Especially the consumedir
-container changed significantly.
+container changed significantly. Then due to the fact that the config
+file must be given explicitely, you need to add this argument to each
+docspell component (restserver and joex) via a `command` section (see
+the compose file referenced above).
 
 The `.envrc` has been cleaned from some settings. Since the config
 files is mounted into the image, you can just edit this file instead.
@@ -912,7 +931,7 @@ improvements for processing files.
   upload the file into memory for nothing if something fails (e.g. the
   source doesn't exist)
 - Re-process files. A
-  [route](https://docspell.org/openapi/docspell-openapi.html#api-Item-secItemItemIdReprocessPost)
+  [route](https://docspell.org/openapi/docspell-openapi.html#operation/sec-item-start-reprocess)
   has been added that submits files for re-processing. It is possible
   to re-process some files of an item or all. There is no UI for this
   for now. You'd need to run `curl` or something manually to trigger

NOTICE.txt

@@ -1,5 +1,5 @@
 Docspell
-Copyright 2019-2021, Eike Kettner
+Copyright 2019-2021, Eike Kettner and Contributors
 Licensed under the GPLv3 or later
 
 This software contains portions of code from tika-parser

build.sbt

@@ -2,6 +2,7 @@ import com.github.eikek.sbt.openapi._
 import scala.sys.process._
 import com.typesafe.sbt.SbtGit.GitKeys._
 import docspell.build._
+import de.heikoseeberger.sbtheader.CommentBlockCreator
 
 val toolsPackage   = taskKey[Seq[File]]("Package the scripts/extension tools")
 val elmCompileMode = settingKey[ElmCompileMode]("How to compile elm sources")
@@ -20,6 +21,13 @@ val scalafixSettings = Seq(
 val sharedSettings = Seq(
   organization := "com.github.eikek",
   scalaVersion := "2.13.6",
+  organizationName := "Docspell Contributors",
+  licenses += ("GPL-3.0-or-later", url(
+    "https://spdx.org/licenses/GPL-3.0-or-later.html"
+  )),
+  startYear := Some(2020),
+  headerLicenseStyle := HeaderLicenseStyle.SpdxSyntax,
+  headerSources / excludeFilter := HiddenFileFilter || "*.java" || "StringUtil.scala",
   scalacOptions ++= Seq(
     "-deprecation",
     "-encoding",
@@ -35,6 +43,7 @@ val sharedSettings = Seq(
     "-Wvalue-discard",
     "-Wnumeric-widen"
   ),
+  javacOptions ++= Seq("-target", "1.8", "-source", "1.8"),
   LocalRootProject / toolsPackage := {
     val v      = version.value
     val logger = streams.value.log
@@ -75,7 +84,13 @@ val elmSettings = Seq(
     (Compile / sourceDirectory).value / "elm",
     FileFilter.globFilter("*.elm"),
     HiddenFileFilter
-  )
+  ),
+  Compile / unmanagedSourceDirectories += (Compile / sourceDirectory).value / "elm",
+  headerSources / includeFilter := "*.elm",
+  headerMappings := headerMappings.value + (HeaderFileType("elm") -> HeaderCommentStyle(
+    new CommentBlockCreator("{-", " ", "-}"),
+    HeaderPattern.commentBetween("\\{\\-", " ", "\\-\\}")
+  ))
 )
 val stylesSettings = Seq(
   stylesMode := StylesMode.Dev,
@@ -113,7 +128,7 @@ def webjarSettings(queryJS: Project) = Seq(
 
 def debianSettings(cfgFile: String) =
   Seq(
-    maintainer := "Eike Kettner <eike.kettner@posteo.de>",
+    maintainer := "Eike Kettner <eikek@posteo.de>",
     Universal / mappings += {
       val conf = (Compile / resourceDirectory).value / "reference.conf"
       if (!conf.exists)
@@ -788,8 +803,11 @@ addCommandAlias("make-pkg", ";clean ;make ;make-zip ;make-deb ;make-tools")
 addCommandAlias("ci", "make; lint; test")
 addCommandAlias(
   "lint",
-  "restapi/openapiLint; joexapi/openapiLint; scalafmtSbtCheck; scalafmtCheckAll; Compile/scalafix --check; Test/scalafix --check"
+  "restapi/openapiLint; joexapi/openapiLint; headerCheck; scalafmtSbtCheck; scalafmtCheckAll; Compile/scalafix --check; Test/scalafix --check"
+)
+addCommandAlias(
+  "fix",
+  "headerCreateAll; Compile/scalafix; Test/scalafix; scalafmtSbt; scalafmtAll"
 )
-addCommandAlias("fix", "Compile/scalafix; Test/scalafix; scalafmtSbt; scalafmtAll")
 addCommandAlias("make-website", ";website/clean ;website/zolaBuild ;website/zolaCheck")
 addCommandAlias("publish-website", "website/publishToGitHubPages")

docker/docker-compose/docspell.conf

@@ -18,7 +18,7 @@
 db_url="jdbc:postgresql://db:5432/dbname"
 db_user="dbuser"
 db_pass="dbpass"
-solr_url="http://docspell-solr:8983/docspell"
+solr_url="http://docspell-solr:8983/solr/docspell"
 
 
 # This configures the restserver
@@ -34,6 +34,17 @@ docspell.server {
       header-value = ${?DOCSPELL_HEADER_VALUE}
     }
   }
+
+  # This is a special endpoint that allows some basic administration.
+  #
+  # This is used for some endpoints, for example:
+  # - re-create complete fulltext index:
+  #   curl -XPOST -H'Docspell-Admin-Secret: xyz' http://localhost:7880/api/v1/admin/fts/reIndexAll
+  admin-endpoint {
+    # The secret. If empty, the endpoint is disabled.
+    secret = ""
+  }
+
   # Configuration of the full-text search engine.
   full-text-search {
     enabled = true

modules/analysis/src/main/scala/docspell/analysis/NlpSettings.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis
 
 import java.nio.file.Path

modules/analysis/src/main/scala/docspell/analysis/TextAnalyser.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis
 
 import cats.Applicative

modules/analysis/src/main/scala/docspell/analysis/TextAnalysisConfig.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis
 
 import docspell.analysis.TextAnalysisConfig.NlpConfig

modules/analysis/src/main/scala/docspell/analysis/classifier/ClassifierModel.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.classifier
 
 import java.nio.file.Path

modules/analysis/src/main/scala/docspell/analysis/classifier/StanfordTextClassifier.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.classifier
 
 import java.nio.file.Path

modules/analysis/src/main/scala/docspell/analysis/classifier/TextClassifier.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.classifier
 
 import cats.data.Kleisli

modules/analysis/src/main/scala/docspell/analysis/classifier/TextClassifierConfig.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.classifier
 
 import java.nio.file.Path

modules/analysis/src/main/scala/docspell/analysis/contact/Contact.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.contact
 
 import cats.implicits._

modules/analysis/src/main/scala/docspell/analysis/contact/Domain.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.contact
 
 import cats.data.NonEmptyList

modules/analysis/src/main/scala/docspell/analysis/contact/Tld.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.contact
 
 private[analysis] object Tld {

modules/analysis/src/main/scala/docspell/analysis/date/DateFind.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.date
 
 import java.time.LocalDate

modules/analysis/src/main/scala/docspell/analysis/date/MonthName.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.date
 
 import docspell.common.Language

modules/analysis/src/main/scala/docspell/analysis/nlp/Annotator.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.nlp
 
 import cats.effect.Sync

modules/analysis/src/main/scala/docspell/analysis/nlp/BasicCRFAnnotator.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.nlp
 
 import java.net.URL

modules/analysis/src/main/scala/docspell/analysis/nlp/LabelConverter.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.nlp
 
 import docspell.common.{NerLabel, NerTag}

modules/analysis/src/main/scala/docspell/analysis/nlp/PipelineCache.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.nlp
 
 import scala.concurrent.duration.{Duration => _, _}

modules/analysis/src/main/scala/docspell/analysis/nlp/Properties.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.nlp
 
 import java.nio.file.Path

modules/analysis/src/main/scala/docspell/analysis/nlp/StanfordNerAnnotator.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.nlp
 
 import java.nio.file.Path

modules/analysis/src/main/scala/docspell/analysis/nlp/StanfordNerSettings.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.nlp
 
 import java.nio.file.Path

modules/analysis/src/main/scala/docspell/analysis/split/TextSplitter.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.split
 
 import fs2.Stream

modules/analysis/src/main/scala/docspell/analysis/split/Word.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.split
 
 case class Word(value: String, begin: Int, end: Int) {

modules/analysis/src/test/scala/docspell/analysis/Env.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis
 
 object Env {

modules/analysis/src/test/scala/docspell/analysis/classifier/StanfordTextClassifierSuite.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.classifier
 
 import java.nio.file.Paths

modules/analysis/src/test/scala/docspell/analysis/contact/ContactAnnotateSpec.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.contact
 
 import docspell.common.{NerLabel, NerTag}

modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.date
 
 import java.time._

modules/analysis/src/test/scala/docspell/analysis/nlp/BaseCRFAnnotatorSuite.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.nlp
 
 import docspell.analysis.Env

modules/analysis/src/test/scala/docspell/analysis/nlp/StanfordNerAnnotatorSuite.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.nlp
 
 import java.nio.file.Paths

modules/analysis/src/test/scala/docspell/analysis/split/TestSplitterSpec.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.analysis.split
 
 import munit._

modules/backend/src/main/scala/docspell/backend/BackendApp.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend
 
 import scala.concurrent.ExecutionContext

modules/backend/src/main/scala/docspell/backend/Common.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend
 
 import cats.effect._

modules/backend/src/main/scala/docspell/backend/Config.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend
 
 import docspell.backend.signup.{Config => SignupConfig}

modules/backend/src/main/scala/docspell/backend/JobFactory.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend
 
 import cats.effect._
@@ -139,23 +145,26 @@ object JobFactory {
       prio: Priority,
       tracker: Option[Ident]
   ): F[Vector[RJob]] = {
-    def create(id: Ident, now: Timestamp, arg: ProcessItemArgs): RJob =
+    def create(now: Timestamp, arg: ProcessItemArgs): F[RJob] =
-      RJob.newJob(
+      Ident
-        id,
+        .randomId[F]
-        ProcessItemArgs.taskName,
+        .map(id =>
-        account.collective,
+          RJob.newJob(
-        arg,
+            id,
-        arg.makeSubject,
+            ProcessItemArgs.taskName,
-        now,
+            account.collective,
-        account.user,
+            arg,
-        prio,
+            arg.makeSubject,
-        tracker
+            now,
-      )
+            account.user,
+            prio,
+            tracker
+          )
+        )
 
     for {
-      id  <- Ident.randomId[F]
+      now  <- Timestamp.current[F]
-      now <- Timestamp.current[F]
+      jobs <- args.traverse(a => create(now, a))
-      jobs = args.map(a => create(id, now, a))
     } yield jobs
   }
 

modules/backend/src/main/scala/docspell/backend/PasswordCrypt.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend
 
 import docspell.common.Password

modules/backend/src/main/scala/docspell/backend/auth/AuthToken.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.auth
 
 import java.time.Instant

modules/backend/src/main/scala/docspell/backend/auth/Login.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.auth
 
 import cats.data.OptionT

modules/backend/src/main/scala/docspell/backend/auth/RememberToken.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.auth
 
 import java.time.Instant

modules/backend/src/main/scala/docspell/backend/auth/TokenUtil.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.auth
 
 import javax.crypto.Mac

modules/backend/src/main/scala/docspell/backend/ops/OClientSettings.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.ops
 
 import cats.data.OptionT

modules/backend/src/main/scala/docspell/backend/ops/OCollective.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.ops
 
 import cats.effect.{Async, Resource}

modules/backend/src/main/scala/docspell/backend/ops/OCustomFields.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.ops
 
 import cats.data.EitherT

modules/backend/src/main/scala/docspell/backend/ops/OEquipment.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.ops
 
 import cats.effect.{Async, Resource}

modules/backend/src/main/scala/docspell/backend/ops/OFolder.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.ops
 
 import cats.effect._

modules/backend/src/main/scala/docspell/backend/ops/OFulltext.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.ops
 
 import cats.data.NonEmptyList

modules/backend/src/main/scala/docspell/backend/ops/OItem.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.ops
 
 import cats.data.{NonEmptyList, OptionT}
@@ -187,6 +193,14 @@ trait OItem[F[_]] {
       account: AccountId,
       notifyJoex: Boolean
   ): F[UpdateResult]
+
+  /** Submits a task that (re)generates the preview images for all
+    * attachments.
+    */
+  def generateAllPreviews(
+      storeMode: MakePreviewArgs.StoreMode,
+      notifyJoex: Boolean
+  ): F[UpdateResult]
 }
 
 object OItem {
@@ -693,6 +707,16 @@ object OItem {
             _   <- if (notifyJoex) joex.notifyAllNodes else ().pure[F]
           } yield UpdateResult.success
 
+        def generateAllPreviews(
+            storeMode: MakePreviewArgs.StoreMode,
+            notifyJoex: Boolean
+        ): F[UpdateResult] =
+          for {
+            job <- JobFactory.allPreviews[F](AllPreviewsArgs(None, storeMode), None)
+            _   <- queue.insertIfNew(job)
+            _   <- if (notifyJoex) joex.notifyAllNodes else ().pure[F]
+          } yield UpdateResult.success
+
         private def onSuccessIgnoreError(update: F[Unit])(ar: UpdateResult): F[Unit] =
           ar match {
             case UpdateResult.Success =>

modules/backend/src/main/scala/docspell/backend/ops/OItemSearch.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.ops
 
 import cats.data.OptionT
@@ -49,7 +55,7 @@ trait OItemSearch[F[_]] {
 
   def findByFileCollective(checksum: String, collective: Ident): F[Vector[RItem]]
 
-  def findByFileSource(checksum: String, sourceId: Ident): F[Vector[RItem]]
+  def findByFileSource(checksum: String, sourceId: Ident): F[Option[Vector[RItem]]]
 
 }
 
@@ -274,11 +280,11 @@ object OItemSearch {
       def findByFileCollective(checksum: String, collective: Ident): F[Vector[RItem]] =
         store.transact(QItem.findByChecksum(checksum, collective, Set.empty))
 
-      def findByFileSource(checksum: String, sourceId: Ident): F[Vector[RItem]] =
+      def findByFileSource(checksum: String, sourceId: Ident): F[Option[Vector[RItem]]] =
         store.transact((for {
           coll  <- OptionT(RSource.findCollective(sourceId))
           items <- OptionT.liftF(QItem.findByChecksum(checksum, coll, Set.empty))
-        } yield items).getOrElse(Vector.empty))
+        } yield items).value)
 
     })
 }

modules/backend/src/main/scala/docspell/backend/ops/OJob.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.ops
 
 import cats.data.OptionT

modules/backend/src/main/scala/docspell/backend/ops/OJoex.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.ops
 
 import scala.concurrent.ExecutionContext

modules/backend/src/main/scala/docspell/backend/ops/OMail.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.ops
 
 import cats.data.OptionT

modules/backend/src/main/scala/docspell/backend/ops/ONode.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.ops
 
 import cats.effect.{Async, Resource}

modules/backend/src/main/scala/docspell/backend/ops/OOrganization.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.ops
 
 import cats.effect.{Async, Resource}

modules/backend/src/main/scala/docspell/backend/ops/OSimpleSearch.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.ops
 
 import cats.Applicative

modules/backend/src/main/scala/docspell/backend/ops/OSource.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.ops
 
 import cats.effect.{Async, Resource}

modules/backend/src/main/scala/docspell/backend/ops/OTag.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.ops
 
 import cats.effect.{Async, Resource}

modules/backend/src/main/scala/docspell/backend/ops/OUpload.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.ops
 
 import cats.Functor

modules/backend/src/main/scala/docspell/backend/ops/OUserTask.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.ops
 
 import cats.data.OptionT

modules/backend/src/main/scala/docspell/backend/ops/SendResult.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.ops
 
 import docspell.common._

modules/backend/src/main/scala/docspell/backend/ops/WildcardString.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.ops
 
 final class WildcardString private (str: String) {

modules/backend/src/main/scala/docspell/backend/signup/Config.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.signup
 
 import docspell.common.{Duration, Password}

modules/backend/src/main/scala/docspell/backend/signup/NewInviteResult.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.signup
 
 import docspell.common.Ident

modules/backend/src/main/scala/docspell/backend/signup/OSignup.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.signup
 
 import cats.effect.{Async, Resource}

modules/backend/src/main/scala/docspell/backend/signup/SignupResult.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.backend.signup
 
 import docspell.store.AddResult

modules/common/src/main/scala/docspell/common/AccountId.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import io.circe._

modules/common/src/main/scala/docspell/common/AllPreviewsArgs.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import io.circe.generic.semiauto._

modules/common/src/main/scala/docspell/common/Banner.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 case class Banner(

modules/common/src/main/scala/docspell/common/BaseJsonCodecs.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import java.time.Instant

modules/common/src/main/scala/docspell/common/Binary.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import java.nio.charset.Charset

modules/common/src/main/scala/docspell/common/ByteSize.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import io.circe.Decoder

modules/common/src/main/scala/docspell/common/CollectiveState.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import io.circe.{Decoder, Encoder}

modules/common/src/main/scala/docspell/common/ContactKind.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import io.circe.{Decoder, Encoder}

modules/common/src/main/scala/docspell/common/ConvertAllPdfArgs.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import io.circe._

modules/common/src/main/scala/docspell/common/CustomFieldType.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import java.time.LocalDate

modules/common/src/main/scala/docspell/common/DataType.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 sealed trait DataType {}

modules/common/src/main/scala/docspell/common/Direction.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import io.circe.{Decoder, Encoder}

modules/common/src/main/scala/docspell/common/DocspellSystem.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 object DocspellSystem {

modules/common/src/main/scala/docspell/common/Duration.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import java.time.{Duration => JDur}

modules/common/src/main/scala/docspell/common/EnvMode.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import cats.implicits._

modules/common/src/main/scala/docspell/common/EquipmentUse.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import cats.data.NonEmptyList

modules/common/src/main/scala/docspell/common/File.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import java.nio.file.Path

modules/common/src/main/scala/docspell/common/FileName.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 case class FileName private (name: String) {

modules/common/src/main/scala/docspell/common/Glob.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import cats.data.NonEmptyList

modules/common/src/main/scala/docspell/common/Hash.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import java.nio.charset.StandardCharsets

modules/common/src/main/scala/docspell/common/IdRef.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import cats.Order

modules/common/src/main/scala/docspell/common/Ident.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import java.security.SecureRandom

modules/common/src/main/scala/docspell/common/ItemQueryString.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 final case class ItemQueryString(query: String) {

modules/common/src/main/scala/docspell/common/ItemState.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import cats.data.NonEmptyList

modules/common/src/main/scala/docspell/common/JobState.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import cats.data.NonEmptyList

modules/common/src/main/scala/docspell/common/JvmInfo.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import java.time.Instant

modules/common/src/main/scala/docspell/common/Language.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import cats.data.NonEmptyList

modules/common/src/main/scala/docspell/common/LearnClassifierArgs.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import docspell.common.syntax.all._

modules/common/src/main/scala/docspell/common/LenientUri.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import java.net.HttpURLConnection

modules/common/src/main/scala/docspell/common/ListType.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import cats.data.NonEmptyList

modules/common/src/main/scala/docspell/common/LogLevel.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import io.circe.{Decoder, Encoder}

modules/common/src/main/scala/docspell/common/Logger.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import cats.effect.Sync

modules/common/src/main/scala/docspell/common/MailSendConfig.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 case class MailSendConfig(listId: String)

modules/common/src/main/scala/docspell/common/MakePageCountArgs.scala

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Docspell Contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package docspell.common
 
 import io.circe.generic.semiauto._