TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-21 09:58:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update scalafmt to 2.5.1 + scalafmtAll

Browse Source
This commit is contained in:
Eike Kettner
2020-05-04 23:52:53 +02:00
parent 169510aec1
commit c41cdeefec
65 changed files with 523 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.scalafmt.conf
View File

@ -1,7 +1,6 @@
version = "2.4.2"
version = "2.5.1"
align = more
#align.arrowEnumeratorGenerator = true
preset = defaultWithAlign
maxColumn = 90

3
modules/analysis/src/main/scala/docspell/analysis/TextAnalyser.scala
View File

@ -49,7 +49,8 @@ object TextAnalyser {
StanfordNerClassifier.nerAnnotate(lang)(text)
}
private def contactNer(text: String): F[Vector[NerLabel]] = Sync[F].delay {
private def contactNer(text: String): F[Vector[NerLabel]] =
Sync[F].delay {
Contact.annotate(text)
}

3
modules/backend/src/main/scala/docspell/backend/auth/Login.scala
View File

@ -71,7 +71,8 @@ object Login {
for {
data <- store.transact(QLogin.findUser(acc))
_ <- Sync[F].delay(logger.trace(s"Account lookup: $data"))
res <- if (data.exists(check(up.pass))) okResult
res <-
if (data.exists(check(up.pass))) okResult
else Result.invalidAuth.pure[F]
} yield res
case Left(_) =>

7
modules/backend/src/main/scala/docspell/backend/ops/OCollective.scala
View File

@ -117,9 +117,12 @@ object OCollective {
val q = for {
optUser <- RUser.findByAccount(accountId)
check = optUser.map(_.password).map(p => PasswordCrypt.check(current, p))
n <- check
n <-
check
.filter(identity)
.traverse(_ => RUser.updatePassword(accountId, PasswordCrypt.crypt(newPass)))
.traverse(_ =>
RUser.updatePassword(accountId, PasswordCrypt.crypt(newPass))
)
res = check match {
case Some(true) =>
if (n.getOrElse(0) > 0) PassChangeResult.success

6
modules/backend/src/main/scala/docspell/backend/ops/OItem.scala
View File

@ -199,9 +199,11 @@ object OItem {
def setTags(item: Ident, tagIds: List[Ident], collective: Ident): F[AddResult] = {
val db = for {
cid <- RItem.getCollective(item)
nd <- if (cid.contains(collective)) RTagItem.deleteItemTags(item)
nd <-
if (cid.contains(collective)) RTagItem.deleteItemTags(item)
else 0.pure[ConnectionIO]
ni <- if (tagIds.nonEmpty && cid.contains(collective))
ni <-
if (tagIds.nonEmpty && cid.contains(collective))
RTagItem.insertItemTags(item, tagIds)
else 0.pure[ConnectionIO]
} yield nd + ni

15
modules/backend/src/main/scala/docspell/backend/ops/OUpload.scala
View File

@ -72,7 +72,8 @@ object OUpload {
data.meta.sourceAbbrev,
data.meta.validFileTypes
)
args = if (data.multiple) files.map(f => ProcessItemArgs(meta, List(f)))
args =
if (data.multiple) files.map(f => ProcessItemArgs(meta, List(f)))
else Vector(ProcessItemArgs(meta, files.toList))
job <- pred.traverse(_ => makeJobs(args, account, data.priority, data.tracker))
_ <- logger.fdebug(s"Storing jobs: $job")
@ -84,7 +85,8 @@ object OUpload {
def submit(data: OUpload.UploadData[F], sourceId: Ident): F[OUpload.UploadResult] =
for {
sOpt <- store
sOpt <-
store
.transact(RSource.find(sourceId))
.map(_.toRight(UploadResult.NoSource))
abbrev = sOpt.map(_.abbrev).toOption.getOrElse(data.meta.sourceAbbrev)
@ -108,10 +110,15 @@ object OUpload {
.lastOrError
.map(fm => Ident.unsafe(fm.id))
.attempt
.map(_.fold(ex => {
.map(
_.fold(
ex => {
logger.warn(ex)(s"Could not store file for processing!")
None
}, id => Some(ProcessItemArgs.File(file.name, id))))
},
id => Some(ProcessItemArgs.File(file.name, id))
)
)
private def checkFileList(
files: Seq[ProcessItemArgs.File]

8
modules/backend/src/main/scala/docspell/backend/ops/OUserTask.scala
View File

@ -27,8 +27,8 @@ trait OUserTask[F[_]] {
* executor's queue. It will not update the corresponding periodic
* task.
*/
def executeNow[A](account: AccountId, task: UserTask[A])(
implicit E: Encoder[A]
def executeNow[A](account: AccountId, task: UserTask[A])(implicit
E: Encoder[A]
): F[Unit]
}
@ -41,8 +41,8 @@ object OUserTask {
): Resource[F, OUserTask[F]] =
Resource.pure[F, OUserTask[F]](new OUserTask[F] {
def executeNow[A](account: AccountId, task: UserTask[A])(
implicit E: Encoder[A]
def executeNow[A](account: AccountId, task: UserTask[A])(implicit
E: Encoder[A]
): F[Unit] =
for {
ptask <- task.encode.toPeriodicTask(account)

15
modules/backend/src/main/scala/docspell/backend/signup/OSignup.scala
View File

@ -25,16 +25,15 @@ object OSignup {
Resource.pure[F, OSignup[F]](new OSignup[F] {
def newInvite(cfg: Config)(password: Password): F[NewInviteResult] =
if (cfg.mode == Config.Mode.Invite) {
if (cfg.mode == Config.Mode.Invite)
if (cfg.newInvitePassword.isEmpty || cfg.newInvitePassword != password)
NewInviteResult.passwordMismatch.pure[F]
else
store
.transact(RInvitation.insertNew)
.map(ri => NewInviteResult.success(ri.id))
} else {
else
Effect[F].pure(NewInviteResult.invitationClosed)
}
def register(cfg: Config)(data: RegisterData): F[SignupResult] =
cfg.mode match {
@ -51,11 +50,15 @@ object OSignup {
now <- Timestamp.current[F]
min = now.minus(cfg.inviteTime)
ok <- store.transact(RInvitation.useInvite(inv, min))
res <- if (ok) addUser(data).map(SignupResult.fromAddResult)
res <-
if (ok) addUser(data).map(SignupResult.fromAddResult)
else SignupResult.invalidInvitationKey.pure[F]
_ <- if (retryInvite(res))
_ <-
if (retryInvite(res))
logger
.fdebug(s"Adding account failed ($res). Allow retry with invite.") *> store
.fdebug(
s"Adding account failed ($res). Allow retry with invite."
) *> store
.transact(
RInvitation.insert(RInvitation(inv, now))
)

3
modules/backend/src/main/scala/docspell/backend/signup/SignupResult.scala
View File

@ -18,7 +18,8 @@ object SignupResult {
def failure(ex: Throwable): SignupResult = Failure(ex)
def success: SignupResult = Success
def fromAddResult(ar: AddResult): SignupResult = ar match {
def fromAddResult(ar: AddResult): SignupResult =
ar match {
case AddResult.Success => Success
case AddResult.Failure(ex) => Failure(ex)
case AddResult.EntityExists(_) => CollectiveExists

12
modules/common/src/main/scala/docspell/common/Binary.scala
View File

@ -37,11 +37,10 @@ object Binary {
Binary(name, MimeType.html.withCharset(cs), Stream.chunk(Chunk.byteVector(content)))
def decode[F[_]](cs: Charset): Pipe[F, Byte, String] =
if (cs == StandardCharsets.UTF_8) {
if (cs == StandardCharsets.UTF_8)
fs2.text.utf8Decode
} else {
else
util.decode[F](cs)
}
def loadAllBytes[F[_]: Sync](data: Stream[F, Byte]): F[ByteVector] =
data.chunks.map(_.toByteVector).compile.fold(ByteVector.empty)((r, e) => r ++ e)
@ -78,17 +77,16 @@ object Binary {
decoder.decode(byteBuffer, charBuffer, false)
val nextStream = stream.consChunk(Chunk.byteBuffer(byteBuffer.slice()))
Pull.output1(charBuffer.flip().toString).as(Some(nextStream))
} else {
} else
Pull.output(Chunk.empty[String]).as(Some(stream))
}
}
}
}
private def skipByteOrderMark[F[_]](chunk: Chunk[Byte]): Chunk[Byte] =
if (chunk.size >= 3 && chunk.take(3) == utf8Bom) {
if (chunk.size >= 3 && chunk.take(3) == utf8Bom)
chunk.drop(3)
} else chunk
else chunk
}
}

3
modules/common/src/main/scala/docspell/common/CollectiveState.scala
View File

@ -33,7 +33,8 @@ object CollectiveState {
def unsafe(str: String): CollectiveState =
fromString(str).fold(sys.error, identity)
def asString(state: CollectiveState): String = state match {
def asString(state: CollectiveState): String =
state match {
case Active => "active"
case Blocked => "blocked"
case Closed => "closed"

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

@ -25,7 +25,8 @@ object File {
): F[Path] =
mkDir(parent).map(p => Files.createTempFile(p, prefix, suffix.orNull))
def deleteDirectory[F[_]: Sync](dir: Path): F[Int] = Sync[F].delay {
def deleteDirectory[F[_]: Sync](dir: Path): F[Int] =
Sync[F].delay {
val count = new AtomicInteger(0)
Files.walkFileTree(
dir,

3
modules/common/src/main/scala/docspell/common/Ident.scala
View File

@ -20,7 +20,8 @@ object Ident {
def randomUUID[F[_]: Sync]: F[Ident] =
Sync[F].delay(unsafe(UUID.randomUUID.toString))
def randomId[F[_]: Sync]: F[Ident] = Sync[F].delay {
def randomId[F[_]: Sync]: F[Ident] =
Sync[F].delay {
val random = new SecureRandom()
val buffer = new Array[Byte](32)
random.nextBytes(buffer)

6
modules/common/src/main/scala/docspell/common/LenientUri.scala
View File

@ -122,7 +122,8 @@ object LenientUri {
val isRoot = false
def /(seg: String): Path =
copy(segs = segs.append(seg))
def asString = segs.head match {
def asString =
segs.head match {
case "." => segments.map(percentEncode).mkString("/")
case ".." => segments.map(percentEncode).mkString("/")
case _ => "/" + segments.map(percentEncode).mkString("/")
@ -136,7 +137,8 @@ object LenientUri {
unsafe(u.toExternalForm)
def parse(str: String): Either[String, LenientUri] = {
def makePath(str: String): Path = str.trim match {
def makePath(str: String): Path =
str.trim match {
case "/" => RootPath
case "" => EmptyPath
case _ =>

3
modules/common/src/main/scala/docspell/common/Logger.scala
View File

@ -17,7 +17,8 @@ trait Logger[F[_]] {
object Logger {
def log4s[F[_]: Sync](log: Log4sLogger): Logger[F] = new Logger[F] {
def log4s[F[_]: Sync](log: Log4sLogger): Logger[F] =
new Logger[F] {
def trace(msg: => String): F[Unit] =
log.ftrace(msg)

9
modules/common/src/main/scala/docspell/common/SystemCommand.scala
View File

@ -47,16 +47,19 @@ object SystemCommand {
for {
_ <- writeToProcess(stdin, proc, blocker)
term <- Sync[F].delay(proc.waitFor(cmd.timeout.seconds, TimeUnit.SECONDS))
_ <- if (term)
_ <-
if (term)
logger.debug(s"Command `${cmd.cmdString}` finished: ${proc.exitValue}")
else
logger.warn(
s"Command `${cmd.cmdString}` did not finish in ${cmd.timeout.formatExact}!"
)
_ <- if (!term) timeoutError(proc, cmd) else Sync[F].pure(())
out <- if (term) inputStreamToString(proc.getInputStream, blocker)
out <-
if (term) inputStreamToString(proc.getInputStream, blocker)
else Sync[F].pure("")
err <- if (term) inputStreamToString(proc.getErrorStream, blocker)
err <-
if (term) inputStreamToString(proc.getErrorStream, blocker)
else Sync[F].pure("")
} yield Result(proc.exitValue, out, err)
}

3
modules/common/src/main/scala/docspell/common/UserState.scala
View File

@ -22,7 +22,8 @@ object UserState {
def unsafe(str: String): UserState =
fromString(str).fold(sys.error, identity)
def asString(s: UserState): String = s match {
def asString(s: UserState): String =
s match {
case Active => "active"
case Disabled => "disabled"
}

6
modules/common/src/main/scala/docspell/common/syntax/EitherSyntax.scala
View File

@ -3,14 +3,16 @@ package docspell.common.syntax
trait EitherSyntax {
implicit final class LeftStringEitherOps[A](e: Either[String, A]) {
def throwLeft: A = e match {
def throwLeft: A =
e match {
case Right(a) => a
case Left(err) => sys.error(err)
}
}
implicit final class ThrowableLeftEitherOps[A](e: Either[Throwable, A]) {
def throwLeft: A = e match {
def throwLeft: A =
e match {
case Right(a) => a
case Left(err) => throw err
}

3
modules/common/src/main/scala/docspell/common/syntax/StreamSyntax.scala
View File

@ -16,7 +16,8 @@ trait StreamSyntax {
.last
.map(optStr =>
for {
str <- optStr
str <-
optStr
.map(_.trim)
.toRight(new Exception("Empty string cannot be parsed into a value"))
json <- parse(str).leftMap(_.underlying)

5
modules/convert/src/main/scala/docspell/convert/Conversion.scala
View File

@ -63,7 +63,7 @@ object Conversion {
case Images(mt) =>
ImageSize.get(in).flatMap {
case Some(dim) =>
if (dim.product > cfg.maxImageSize) {
if (dim.product > cfg.maxImageSize)
logger
.info(
s"Image size (${dim.product}) is too large (max ${cfg.maxImageSize})."
@ -74,12 +74,11 @@ object Conversion {
s"Image size (${dim.width}x${dim.height}) is too large (max ${cfg.maxImageSize})."
)
)
} else {
else
Tesseract.toPDF(cfg.tesseract, lang, cfg.chunkSize, blocker, logger)(
in,
handler
)
}
case None =>
logger.info(

5
modules/convert/src/main/scala/docspell/convert/extern/ExternConv.scala vendored
View File

@ -90,14 +90,13 @@ private[extern] object ExternConv {
val outTxt = out.resolveSibling(s"$outPrefix.txt")
File.exists(outTxt).flatMap { txtExists =>
val pdfData = File.readAll(out, blocker, chunkSize)
if (result.rc == 0) {
if (result.rc == 0)
if (txtExists) successPdfTxt(pdfData, File.readText(outTxt, blocker)).pure[F]
else successPdf(pdfData).pure[F]
} else {
else
logger.warn(s"Command not successful (rc=${result.rc}), but file exists.") *>
successPdf(pdfData).pure[F]
}
}
case false =>
ConversionResult

9
modules/convert/src/test/scala/docspell/convert/extern/ExternConvTest.scala vendored
View File

@ -24,7 +24,7 @@ object ExternConvTest extends SimpleTestSuite with FileChecks {
)
if (!commandExists(cfg.program)) ignore(s"Command ${cfg.program} not found")
else {
else
File
.withTempDir[IO](target, "wkhtmltopdf")
.use(dir =>
@ -43,7 +43,6 @@ object ExternConvTest extends SimpleTestSuite with FileChecks {
)
.unsafeRunSync
}
}
test("convert office to pdf") {
val cfg = SystemCommand.Config(
@ -53,7 +52,7 @@ object ExternConvTest extends SimpleTestSuite with FileChecks {
)
if (!commandExists(cfg.program)) ignore(s"Command ${cfg.program} not found")
else {
else
File
.withTempDir[IO](target, "unoconv")
.use(dir =>
@ -72,7 +71,6 @@ object ExternConvTest extends SimpleTestSuite with FileChecks {
)
.unsafeRunSync
}
}
test("convert image to pdf") {
val cfg = SystemCommand.Config(
@ -82,7 +80,7 @@ object ExternConvTest extends SimpleTestSuite with FileChecks {
)
if (!commandExists(cfg.program)) ignore(s"Command ${cfg.program} not found")
else {
else
File
.withTempDir[IO](target, "tesseract")
.use(dir =>
@ -102,6 +100,5 @@ object ExternConvTest extends SimpleTestSuite with FileChecks {
)
.unsafeRunSync
}
}
}

5
modules/extract/src/main/scala/docspell/extract/Extraction.scala
View File

@ -60,7 +60,7 @@ object Extraction {
ImageSize.get(data).flatMap {
case Some(dim) =>
if (dim.product > cfg.ocr.maxImageSize) {
if (dim.product > cfg.ocr.maxImageSize)
logger.info(
s"Image size (${dim.product}) is too large (max ${cfg.ocr.maxImageSize})."
) *>
@ -71,9 +71,8 @@ object Extraction {
)
)
.pure[F]
} else {
else
doExtract
}
case None =>
logger.info(
s"Cannot read image data from ${mt.asString}. Extracting anyways."

7
modules/extract/src/main/scala/docspell/extract/PdfExtract.scala
View File

@ -33,7 +33,8 @@ object PdfExtract {
//maybe better: inspect the pdf and decide whether ocr or not
for {
pdfboxRes <- logger.debug("Trying to strip text from pdf using pdfbox.") *> PdfboxExtract
pdfboxRes <-
logger.debug("Trying to strip text from pdf using pdfbox.") *> PdfboxExtract
.get[F](in)
res <- pdfboxRes.fold(
ex =>
@ -44,7 +45,9 @@ object PdfExtract {
if (str.length >= stripMinLen) str.pure[F].attempt
else
logger
.info(s"Stripped text from PDF is small (${str.length}). Trying with OCR.") *>
.info(
s"Stripped text from PDF is small (${str.length}). Trying with OCR."
) *>
runOcr.flatMap(ocrStr => chooseResult(ocrStr, str)).attempt
)
} yield res

7
modules/files/src/main/scala/docspell/files/TikaMimetype.scala
View File

@ -36,7 +36,8 @@ object TikaMimetype {
md
}
private def normalize(in: MimeType): MimeType = in match {
private def normalize(in: MimeType): MimeType =
in match {
case MimeType(_, sub, p) if sub contains "xhtml" =>
MimeType.html.copy(params = p)
case _ => in
@ -46,14 +47,14 @@ object TikaMimetype {
val mt = convert(
tika.detect(new java.io.ByteArrayInputStream(bv), makeMetadata(hint))
)
if (mt.primary == "text") {
if (mt.primary == "text")
charsetFromBytes(bv, hint) match {
case Some(cs) =>
mt.withCharset(cs)
case None =>
mt
}
} else mt
else mt
}
private def charsetFromBytes(bv: Array[Byte], hint: MimeTypeHint): Option[Charset] =

6
modules/files/src/test/scala/docspell/files/Playing.scala
View File

@ -8,13 +8,15 @@ import scala.concurrent.ExecutionContext
object Playing extends IOApp {
val blocker = Blocker.liftExecutionContext(ExecutionContext.global)
def run(args: List[String]): IO[ExitCode] = IO {
def run(args: List[String]): IO[ExitCode] =
IO {
//val ods = ExampleFiles.examples_sample_ods.readURL[IO](8192, blocker)
//val odt = ExampleFiles.examples_sample_odt.readURL[IO](8192, blocker)
val rtf = ExampleFiles.examples_sample_rtf.readURL[IO](8192, blocker)
val x = for {
odsm1 <- TikaMimetype
odsm1 <-
TikaMimetype
.detect(
rtf,
MimeTypeHint.filename(ExampleFiles.examples_sample_rtf.path.segments.last)

3
modules/joex/src/main/scala/docspell/joex/JoexServer.scala
View File

@ -28,7 +28,8 @@ object JoexServer {
val app = for {
signal <- Resource.liftF(SignallingRef[F, Boolean](false))
exitCode <- Resource.liftF(Ref[F].of(ExitCode.Success))
joexApp <- JoexAppImpl
joexApp <-
JoexAppImpl
.create[F](cfg, signal, pools.connectEC, pools.httpClientEC, pools.blocker)
httpApp = Router(

3
modules/joex/src/main/scala/docspell/joex/Main.scala
View File

@ -31,9 +31,8 @@ object Main extends IOApp {
if (!Files.exists(path)) {
logger.info(s"Not using config file '$f' because it doesn't exist")
System.clearProperty("config.file")
} else {
} else
logger.info(s"Using config file from system properties: $f")
}
case _ =>
}
}

5
modules/joex/src/main/scala/docspell/joex/hk/CleanupInvitesTask.scala
View File

@ -11,7 +11,7 @@ object CleanupInvitesTask {
def apply[F[_]: Sync](cfg: HouseKeepingConfig.CleanupInvites): Task[F, Unit, Unit] =
Task { ctx =>
if (cfg.enabled) {
if (cfg.enabled)
for {
now <- Timestamp.current[F]
ts = now - cfg.olderThan
@ -19,8 +19,7 @@ object CleanupInvitesTask {
n <- ctx.store.transact(RInvitation.deleteOlderThan(ts))
_ <- ctx.logger.info(s"Removed $n invitations")
} yield ()
} else {
else
ctx.logger.info("CleanupInvites task is disabled in the configuration")
}
}
}

5
modules/joex/src/main/scala/docspell/joex/hk/CleanupJobsTask.scala
View File

@ -13,7 +13,7 @@ object CleanupJobsTask {
def apply[F[_]: Sync](cfg: HouseKeepingConfig.CleanupJobs): Task[F, Unit, Unit] =
Task { ctx =>
if (cfg.enabled) {
if (cfg.enabled)
for {
now <- Timestamp.current[F]
ts = now - cfg.olderThan
@ -21,10 +21,9 @@ object CleanupJobsTask {
n <- deleteDoneJobs(ctx.store, ts, cfg.deleteBatch)
_ <- ctx.logger.info(s"Removed $n jobs")
} yield ()
} else {
else
ctx.logger.info("CleanupJobs task is disabled in the configuration")
}
}
def deleteDoneJobs[F[_]: Sync](store: Store[F], ts: Timestamp, batch: Int): F[Int] =
Stream

3
modules/joex/src/main/scala/docspell/joex/notify/NotifyDueItemsTask.scala
View File

@ -69,7 +69,8 @@ object NotifyDueItemsTask {
def findItems[F[_]: Sync](ctx: Context[F, Args]): F[Vector[QItem.ListItem]] =
for {
now <- Timestamp.current[F]
q = QItem.Query
q =
QItem.Query
.empty(ctx.args.account.collective)
.copy(
states = ItemState.validStates,

14
modules/joex/src/main/scala/docspell/joex/process/CreateItem.scala
View File

@ -89,10 +89,12 @@ object CreateItem {
Task { ctx =>
for {
cand <- ctx.store.transact(QItem.findByFileIds(ctx.args.files.map(_.fileMetaId)))
_ <- if (cand.nonEmpty) ctx.logger.warn("Found existing item with these files.")
_ <-
if (cand.nonEmpty) ctx.logger.warn("Found existing item with these files.")
else ().pure[F]
ht <- cand.drop(1).traverse(ri => QItem.delete(ctx.store)(ri.id, ri.cid))
_ <- if (ht.sum > 0)
_ <-
if (ht.sum > 0)
ctx.logger.warn(s"Removed ${ht.sum} items with same attachments")
else ().pure[F]
rms <- OptionT(
@ -103,7 +105,8 @@ object CreateItem {
orig <- rms.traverse(a =>
ctx.store.transact(RAttachmentSource.findById(a.id)).map(s => (a, s))
)
origMap = orig
origMap =
orig
.map(originFileTuple)
.toMap
} yield cand.headOption.map(ri =>
@ -116,13 +119,12 @@ object CreateItem {
saved: Vector[RAttachment],
saveCount: Int
): F[Unit] =
if (ctx.args.files.size != saved.size) {
if (ctx.args.files.size != saved.size)
ctx.logger.warn(
s"Not all given files (${ctx.args.files.size}) have been stored. Files retained: ${saved.size}; saveCount=$saveCount"
)
} else {
else
().pure[F]
}
private def storeItemError[F[_]: Sync](ctx: Context[F, ProcessItemArgs]): F[Unit] = {
val msg = "Inserting item failed. DB returned 0 update count!"

6
modules/joex/src/main/scala/docspell/joex/process/EvalProposals.scala
View File

@ -79,8 +79,10 @@ object EvalProposals {
if (mt == MetaProposalType.CorrOrg) 0.8
else 1.0
case NerTag.Person =>
if (mt == MetaProposalType.CorrPerson ||
mt == MetaProposalType.ConcPerson) 0.8
if (
mt == MetaProposalType.CorrPerson ||
mt == MetaProposalType.ConcPerson
) 0.8
else 1.0
case NerTag.Website => 0.5
}

10
modules/joex/src/main/scala/docspell/joex/process/FindProposal.scala
View File

@ -103,7 +103,8 @@ object FindProposal {
}
def nextWhenEmpty(f: Finder[F], mt0: MetaProposalType, mts: MetaProposalType*)(
implicit F: FlatMap[F],
implicit
F: FlatMap[F],
F2: Applicative[F]
): Finder[F] =
flatMap { res0 =>
@ -139,11 +140,11 @@ object FindProposal {
val minLength =
if (exact) 2 else 5
if (value.length < minLength) {
if (value.length < minLength)
ctx.logger
.debug(s"Skipping too small value '$value' (original '${nt.label}').")
.map(_ => MetaProposalList.empty)
} else
else
nt.tag match {
case NerTag.Organization =>
ctx.logger.debug(s"Looking for organizations: $value") *>
@ -191,9 +192,8 @@ object FindProposal {
.map(s => s"%$s%")
.getOrElse(value)
searchContact(nt, ContactKind.Website, searchString, ctx)
} else {
} else
searchContact(nt, ContactKind.Website, value, ctx)
}
case NerTag.Date =>
// There is no database search required for this tag

7
modules/joex/src/main/scala/docspell/joex/process/TextAnalysis.scala
View File

@ -18,8 +18,11 @@ object TextAnalysis {
for {
_ <- ctx.logger.info("Starting text analysis")
s <- Duration.stopTime[F]
t <- item.metas.toList
.traverse(annotateAttachment[F](ctx.args.meta.language, ctx.logger, analyser))
t <-
item.metas.toList
.traverse(
annotateAttachment[F](ctx.args.meta.language, ctx.logger, analyser)
)
_ <- ctx.logger.debug(s"Storing tags: ${t.map(_._1.copy(content = None))}")
_ <- t.traverse(m =>
ctx.store.transact(RAttachmentMeta.updateLabels(m._1.id, m._1.nerlabels))

4
modules/joex/src/main/scala/docspell/joex/scheduler/JobTask.scala
View File

@ -28,8 +28,8 @@ object JobTask {
name: Ident,
task: Task[F, A, Unit],
onCancel: Task[F, A, Unit]
)(
implicit D: Decoder[A]
)(implicit
D: Decoder[A]
): JobTask[F] = {
val convert: String => F[A] =
str =>

6
modules/joex/src/main/scala/docspell/joex/scheduler/SchedulerImpl.scala
View File

@ -96,7 +96,8 @@ final class SchedulerImpl[F[_]: ConcurrentEffect: ContextShift](
_ <- permits.acquire
_ <- logger.fdebug("New permit acquired")
down <- state.get.map(_.shutdownRequest)
rjob <- if (down)
rjob <-
if (down)
logger.finfo("") *> permits.release *> (None: Option[RJob]).pure[F]
else
queue.nextJob(
@ -128,7 +129,8 @@ final class SchedulerImpl[F[_]: ConcurrentEffect: ContextShift](
def execute(job: RJob): F[Unit] = {
val task = for {
jobtask <- tasks
jobtask <-
tasks
.find(job.task)
.toRight(s"This executor cannot run tasks with name: ${job.task}")
} yield jobtask

4
modules/joex/src/main/scala/docspell/joex/scheduler/Task.scala
View File

@ -25,8 +25,8 @@ trait Task[F[_], A, B] {
def mapF[C](f: F[B] => F[C]): Task[F, A, C] =
Task(Task.toKleisli(this).mapF(f))
def attempt(
implicit F: ApplicativeError[F, Throwable]
def attempt(implicit
F: ApplicativeError[F, Throwable]
): Task[F, A, Either[Throwable, B]] =
mapF(_.attempt)

3
modules/restserver/src/main/scala/docspell/restserver/Main.scala
View File

@ -31,9 +31,8 @@ object Main extends IOApp {
if (!Files.exists(path)) {
logger.info(s"Not using config file '$f' because it doesn't exist")
System.clearProperty("config.file")
} else {
} else
logger.info(s"Using config file from system properties: $f")
}
case _ =>
}
}

3
modules/restserver/src/main/scala/docspell/restserver/RestServer.scala
View File

@ -23,7 +23,8 @@ object RestServer {
val templates = TemplateRoutes[F](pools.blocker, cfg)
val app = for {
restApp <- RestAppImpl
restApp <-
RestAppImpl
.create[F](cfg, pools.connectEC, pools.httpClientEC, pools.blocker)
httpApp = Router(
"/api/info" -> routes.InfoRoutes(),

3
modules/restserver/src/main/scala/docspell/restserver/auth/CookieData.scala
View File

@ -34,7 +34,8 @@ object CookieData {
def fromCookie[F[_]](req: Request[F]): Either[String, String] =
for {
header <- headers.Cookie.from(req.headers).toRight("Cookie parsing error")
cookie <- header.values.toList
cookie <-
header.values.toList
.find(_.name == cookieName)
.toRight("Couldn't find the authcookie")
} yield cookie.content

21
modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala
View File

@ -199,10 +199,15 @@ trait Conversions {
body
.through(fs2.text.utf8Decode)
.parseJsonAs[ItemUploadMeta]
.map(_.fold(ex => {
.map(
_.fold(
ex => {
logger.error(ex)("Reading upload metadata failed.")
throw ex
}, identity))
},
identity
)
)
val meta: F[(Boolean, UploadMeta)] = mp.parts
.find(_.name.exists(_.equalsIgnoreCase("meta")))
@ -452,19 +457,23 @@ trait Conversions {
BasicResult(true, "The job has been removed from the queue.")
}
def basicResult(ar: AddResult, successMsg: String): BasicResult = ar match {
def basicResult(ar: AddResult, successMsg: String): BasicResult =
ar match {
case AddResult.Success => BasicResult(true, successMsg)
case AddResult.EntityExists(msg) => BasicResult(false, msg)
case AddResult.Failure(ex) => BasicResult(false, s"Internal error: ${ex.getMessage}")
case AddResult.Failure(ex) =>
BasicResult(false, s"Internal error: ${ex.getMessage}")
}
def basicResult(ur: OUpload.UploadResult): BasicResult = ur match {
def basicResult(ur: OUpload.UploadResult): BasicResult =
ur match {
case UploadResult.Success => BasicResult(true, "Files submitted.")
case UploadResult.NoFiles => BasicResult(false, "There were no files to submit.")
case UploadResult.NoSource => BasicResult(false, "The source id is not valid.")
}
def basicResult(cr: PassChangeResult): BasicResult = cr match {
def basicResult(cr: PassChangeResult): BasicResult =
cr match {
case PassChangeResult.Success => BasicResult(true, "Password changed.")
case PassChangeResult.UpdateFailed =>
BasicResult(false, "The database update failed.")

4
modules/restserver/src/main/scala/docspell/restserver/http4s/ResponseGenerator.scala
View File

@ -9,8 +9,8 @@ trait ResponseGenerator[F[_]] {
self: Http4sDsl[F] =>
implicit final class EitherResponses[A, B](e: Either[A, B]) {
def toResponse(headers: Header*)(
implicit F: Applicative[F],
def toResponse(headers: Header*)(implicit
F: Applicative[F],
w0: EntityEncoder[F, A],
w1: EntityEncoder[F, B]
): F[Response[F]] =

21
modules/restserver/src/main/scala/docspell/restserver/routes/AttachmentRoutes.scala
View File

@ -46,7 +46,8 @@ object AttachmentRoutes {
case HEAD -> Root / Ident(id) =>
for {
fileData <- backend.item.findAttachment(id, user.account.collective)
resp <- fileData
resp <-
fileData
.map(data => withResponseHeaders(Ok())(data))
.getOrElse(NotFound(BasicResult(false, "Not found")))
} yield resp
@ -56,7 +57,8 @@ object AttachmentRoutes {
fileData <- backend.item.findAttachment(id, user.account.collective)
inm = req.headers.get(`If-None-Match`).flatMap(_.tags)
matches = matchETag(fileData.map(_.meta), inm)
resp <- fileData
resp <-
fileData
.map { data =>
if (matches) withResponseHeaders(NotModified())(data)
else makeByteResp(data)
@ -67,7 +69,8 @@ object AttachmentRoutes {
case HEAD -> Root / Ident(id) / "original" =>
for {
fileData <- backend.item.findAttachmentSource(id, user.account.collective)
resp <- fileData
resp <-
fileData
.map(data => withResponseHeaders(Ok())(data))
.getOrElse(NotFound(BasicResult(false, "Not found")))
} yield resp
@ -77,7 +80,8 @@ object AttachmentRoutes {
fileData <- backend.item.findAttachmentSource(id, user.account.collective)
inm = req.headers.get(`If-None-Match`).flatMap(_.tags)
matches = matchETag(fileData.map(_.meta), inm)
resp <- fileData
resp <-
fileData
.map { data =>
if (matches) withResponseHeaders(NotModified())(data)
else makeByteResp(data)
@ -88,7 +92,8 @@ object AttachmentRoutes {
case HEAD -> Root / Ident(id) / "archive" =>
for {
fileData <- backend.item.findAttachmentArchive(id, user.account.collective)
resp <- fileData
resp <-
fileData
.map(data => withResponseHeaders(Ok())(data))
.getOrElse(NotFound(BasicResult(false, "Not found")))
} yield resp
@ -98,7 +103,8 @@ object AttachmentRoutes {
fileData <- backend.item.findAttachmentArchive(id, user.account.collective)
inm = req.headers.get(`If-None-Match`).flatMap(_.tags)
matches = matchETag(fileData.map(_.meta), inm)
resp <- fileData
resp <-
fileData
.map { data =>
if (matches) withResponseHeaders(NotModified())(data)
else makeByteResp(data)
@ -123,7 +129,8 @@ object AttachmentRoutes {
case DELETE -> Root / Ident(id) =>
for {
n <- backend.item.deleteAttachment(id, user.account.collective)
res = if (n == 0) BasicResult(false, "Attachment not found")
res =
if (n == 0) BasicResult(false, "Attachment not found")
else BasicResult(true, "Attachment deleted.")
resp <- Ok(res)
} yield resp

6
modules/restserver/src/main/scala/docspell/restserver/routes/CollectiveRoutes.scala
View File

@ -28,7 +28,8 @@ object CollectiveRoutes {
case req @ POST -> Root / "settings" =>
for {
settings <- req.as[CollectiveSettings]
res <- backend.collective
res <-
backend.collective
.updateLanguage(user.account.collective, settings.language)
resp <- Ok(Conversions.basicResult(res, "Language updated."))
} yield resp
@ -43,7 +44,8 @@ object CollectiveRoutes {
case GET -> Root / "contacts" :? QueryParam.QueryOpt(q) +& QueryParam
.ContactKindOpt(kind) =>
for {
res <- backend.collective
res <-
backend.collective
.getContacts(user.account.collective, q.map(_.q), kind)
.take(50)
.compile

3
modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala
View File

@ -36,7 +36,8 @@ object ItemRoutes {
for {
item <- backend.item.findItem(id, user.account.collective)
result = item.map(Conversions.mkItemDetail)
resp <- result
resp <-
result
.map(r => Ok(r))
.getOrElse(NotFound(BasicResult(false, "Not found.")))
} yield resp

3
modules/restserver/src/main/scala/docspell/restserver/routes/MailSendRoutes.scala
View File

@ -40,7 +40,8 @@ object MailSendRoutes {
for {
rec <- s.recipients.traverse(MailAddress.parse)
fileIds <- s.attachmentIds.traverse(Ident.fromString)
sel = if (s.addAllAttachments) AttachSelection.All
sel =
if (s.addAllAttachments) AttachSelection.All
else AttachSelection.Selected(fileIds)
} yield ItemMail(item, s.subject, rec, s.body, sel)

11
modules/restserver/src/main/scala/docspell/restserver/routes/NotifyDueItemsRoutes.scala
View File

@ -31,8 +31,8 @@ object NotifyDueItemsRoutes {
for {
data <- req.as[NotificationSettings]
task = makeTask(cfg, user.account, data)
res <- ut
.executeNow(user.account, task)
res <-
ut.executeNow(user.account, task)
.attempt
.map(Conversions.basicResult(_, "Submitted successfully."))
resp <- Ok(res)
@ -49,8 +49,8 @@ object NotifyDueItemsRoutes {
for {
data <- req.as[NotificationSettings]
task = makeTask(cfg, user.account, data)
res <- ut
.submitNotifyDueItems(user.account, task)
res <-
ut.submitNotifyDueItems(user.account, task)
.attempt
.map(Conversions.basicResult(_, "Saved successfully."))
resp <- Ok(res)
@ -89,7 +89,8 @@ object NotifyDueItemsRoutes {
for {
tinc <- backend.tag.loadAll(task.args.tagsInclude)
texc <- backend.tag.loadAll(task.args.tagsExclude)
conn <- backend.mail
conn <-
backend.mail
.getSettings(account, None)
.map(
_.find(_.name == task.args.smtpConnection)

5
modules/restserver/src/main/scala/docspell/restserver/routes/OrganizationRoutes.scala
View File

@ -21,17 +21,16 @@ object OrganizationRoutes {
HttpRoutes.of {
case GET -> Root :? QueryParam.FullOpt(full) +& QueryParam.QueryOpt(q) =>
if (full.getOrElse(false)) {
if (full.getOrElse(false))
for {
data <- backend.organization.findAllOrg(user.account, q.map(_.q))
resp <- Ok(OrganizationList(data.map(mkOrg).toList))
} yield resp
} else {
else
for {
data <- backend.organization.findAllOrgRefs(user.account, q.map(_.q))
resp <- Ok(ReferenceList(data.map(mkIdName).toList))
} yield resp
}
case req @ POST -> Root =>
for {

5
modules/restserver/src/main/scala/docspell/restserver/routes/PersonRoutes.scala
View File

@ -24,17 +24,16 @@ object PersonRoutes {
HttpRoutes.of {
case GET -> Root :? QueryParam.FullOpt(full) +& QueryParam.QueryOpt(q) =>
if (full.getOrElse(false)) {
if (full.getOrElse(false))
for {
data <- backend.organization.findAllPerson(user.account, q.map(_.q))
resp <- Ok(PersonList(data.map(mkPerson).toList))
} yield resp
} else {
else
for {
data <- backend.organization.findAllPersonRefs(user.account, q.map(_.q))
resp <- Ok(ReferenceList(data.map(mkIdName).toList))
} yield resp
}
case req @ POST -> Root =>
for {

6
modules/restserver/src/main/scala/docspell/restserver/routes/RegisterRoutes.scala
View File

@ -38,7 +38,8 @@ object RegisterRoutes {
}
}
def convert(r: NewInviteResult): InviteResult = r match {
def convert(r: NewInviteResult): InviteResult =
r match {
case NewInviteResult.Success(id) =>
InviteResult(true, "New invitation created.", Some(id))
case NewInviteResult.InvitationDisabled =>
@ -47,7 +48,8 @@ object RegisterRoutes {
InviteResult(false, "Password is invalid.", None)
}
def convert(r: SignupResult): BasicResult = r match {
def convert(r: SignupResult): BasicResult =
r match {
case SignupResult.CollectiveExists =>
BasicResult(false, "A collective with this name already exists.")
case SignupResult.InvalidInvitationKey =>

12
modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala
View File

@ -26,8 +26,8 @@ object TemplateRoutes {
def app: HttpRoutes[F]
}
def apply[F[_]: Effect](blocker: Blocker, cfg: Config)(
implicit C: ContextShift[F]
def apply[F[_]: Effect](blocker: Blocker, cfg: Config)(implicit
C: ContextShift[F]
): InnerRoutes[F] = {
val indexTemplate = memo(
loadResource("/index.html").flatMap(loadTemplate(_, blocker))
@ -64,8 +64,8 @@ object TemplateRoutes {
r.pure[F]
}
def loadUrl[F[_]: Sync](url: URL, blocker: Blocker)(
implicit C: ContextShift[F]
def loadUrl[F[_]: Sync](url: URL, blocker: Blocker)(implicit
C: ContextShift[F]
): F[String] =
Stream
.bracket(Sync[F].delay(url.openStream))(in => Sync[F].delay(in.close()))
@ -82,8 +82,8 @@ object TemplateRoutes {
}
}
def loadTemplate[F[_]: Sync](url: URL, blocker: Blocker)(
implicit C: ContextShift[F]
def loadTemplate[F[_]: Sync](url: URL, blocker: Blocker)(implicit
C: ContextShift[F]
): F[Template] =
loadUrl[F](url, blocker).flatMap(s => parseTemplate(s)).map { t =>
logger.info(s"Compiled template $url")

3
modules/store/src/main/scala/docspell/store/impl/Column.scala
View File

@ -22,7 +22,8 @@ case class Column(name: String, ns: String = "", alias: String = "") {
def is[A: Put](value: A): Fragment =
f ++ fr" = $value"
def is[A: Put](ov: Option[A]): Fragment = ov match {
def is[A: Put](ov: Option[A]): Fragment =
ov match {
case Some(v) => f ++ fr" = $v"
case None => fr"is null"
}

3
modules/store/src/main/scala/docspell/store/migrate/FlywayMigrate.scala
View File

@ -8,7 +8,8 @@ import org.log4s._
object FlywayMigrate {
private[this] val logger = getLogger
def run[F[_]: Sync](jdbc: JdbcConfig): F[Int] = Sync[F].delay {
def run[F[_]: Sync](jdbc: JdbcConfig): F[Int] =
Sync[F].delay {
logger.info("Running db migrations...")
val locations = jdbc.dbmsName match {
case Some(dbtype) =>

13
modules/store/src/main/scala/docspell/store/queries/QAttachment.scala
View File

@ -30,10 +30,12 @@ object QAttachment {
for {
files <- store.transact(loadFiles)
k <- if (files._3 == 1) deleteArchive(store)(attachId)
k <-
if (files._3 == 1) deleteArchive(store)(attachId)
else store.transact(RAttachmentArchive.delete(attachId))
n <- store.transact(RAttachment.delete(attachId))
f <- Stream
f <-
Stream
.emits(files._1.toSeq ++ files._2.toSeq)
.map(_.id)
.flatMap(store.bitpeace.delete)
@ -55,7 +57,8 @@ object QAttachment {
_ <- logger.fdebug[F](
s"Deleted $n meta records (source, meta, archive). Deleting binaries now."
)
f <- Stream
f <-
Stream
.emits(ra.fileId.id +: (s.map(_.fileId.id).toSeq))
.flatMap(store.bitpeace.delete)
.map(flag => if (flag) 1 else 0)
@ -119,7 +122,9 @@ object QAttachment {
val IC = RItem.Columns
val q =
fr"SELECT" ++ commas(MC.all.map(_.prefix("m").f)) ++ fr"FROM" ++ RItem.table ++ fr"i" ++
fr"SELECT" ++ commas(
MC.all.map(_.prefix("m").f)
) ++ fr"FROM" ++ RItem.table ++ fr"i" ++
fr"INNER JOIN" ++ RAttachment.table ++ fr"a ON" ++ IC.id
.prefix("i")
.is(AC.itemId.prefix("a")) ++

4
modules/store/src/main/scala/docspell/store/queries/QCollective.scala
View File

@ -96,7 +96,9 @@ object QCollective {
RC.Columns.all,
RC.table,
and(
Seq(or(RC.Columns.orgId.isIn(orgCond), RC.Columns.personId.isIn(persCond))) ++ queryCond ++ kindCond
Seq(
or(RC.Columns.orgId.isIn(orgCond), RC.Columns.personId.isIn(persCond))
) ++ queryCond ++ kindCond
)
) ++ orderBy(RC.Columns.value.f)

4
modules/store/src/main/scala/docspell/store/queries/QItem.scala
View File

@ -291,7 +291,9 @@ object QItem {
val IC = RItem.Columns
val AC = RAttachment.Columns
val q =
fr"SELECT DISTINCT" ++ commas(IC.all.map(_.prefix("i").f)) ++ fr"FROM" ++ RItem.table ++ fr"i" ++
fr"SELECT DISTINCT" ++ commas(
IC.all.map(_.prefix("i").f)
) ++ fr"FROM" ++ RItem.table ++ fr"i" ++
fr"INNER JOIN" ++ RAttachment.table ++ fr"a ON" ++ AC.itemId
.prefix("a")
.is(IC.id.prefix("i")) ++

6
modules/store/src/main/scala/docspell/store/queries/QJob.scala
View File

@ -55,7 +55,8 @@ object QJob {
def markJob(job: RJob): F[Either[Unit, RJob]] =
store.transact(for {
n <- RJob.setScheduled(job.id, worker)
_ <- if (n == 1) RJobGroupUse.setGroup(RJobGroupUse(worker, job.group))
_ <-
if (n == 1) RJobGroupUse.setGroup(RJobGroupUse(worker, job.group))
else 0.pure[ConnectionIO]
} yield if (n == 1) Right(job) else Left(()))
@ -68,7 +69,8 @@ object QJob {
_ <- logger.ftrace[F](s"Choose group ${group.map(_.id)}")
prio <- group.map(priority).getOrElse((Priority.Low: Priority).pure[F])
_ <- logger.ftrace[F](s"Looking for job of prio $prio")
job <- group
job <-
group
.map(g => store.transact(selectNextJob(g, prio, retryPause, now)))
.getOrElse((None: Option[RJob]).pure[F])
_ <- logger.ftrace[F](s"Found job: ${job.map(_.info)}")

3
modules/store/src/main/scala/docspell/store/queue/PeriodicTaskStore.scala
View File

@ -81,7 +81,8 @@ object PeriodicTaskStore {
def unmark(job: RPeriodicTask): F[Unit] =
for {
now <- Timestamp.current[F]
nextRun <- CalevFs2
nextRun <-
CalevFs2
.nextElapses[F](now.atUTC)(job.timer)
.take(1)
.compile

6
modules/store/src/main/scala/docspell/store/records/RAttachment.scala
View File

@ -43,7 +43,11 @@ object RAttachment {
fId: Ident,
fname: Option[String]
): ConnectionIO[Int] =
updateRow(table, id.is(attachId), commas(fileId.setTo(fId), name.setTo(fname))).update.run
updateRow(
table,
id.is(attachId),
commas(fileId.setTo(fId), name.setTo(fname))
).update.run
def updatePosition(attachId: Ident, pos: Int): ConnectionIO[Int] =
updateRow(table, id.is(attachId), position.setTo(pos)).update.run

6
modules/store/src/main/scala/docspell/store/records/RAttachmentArchive.scala
View File

@ -38,7 +38,11 @@ object RAttachmentArchive {
RAttachmentArchive(ra.id, ra.fileId, ra.name, mId, ra.created)
def insert(v: RAttachmentArchive): ConnectionIO[Int] =
insertRow(table, all, fr"${v.id},${v.fileId},${v.name},${v.messageId},${v.created}").update.run
insertRow(
table,
all,
fr"${v.id},${v.fileId},${v.name},${v.messageId},${v.created}"
).update.run
def findById(attachId: Ident): ConnectionIO[Option[RAttachmentArchive]] =
selectSimple(all, table, id.is(attachId)).query[RAttachmentArchive].option

6
modules/store/src/main/scala/docspell/store/records/RAttachmentMeta.scala
View File

@ -35,7 +35,11 @@ object RAttachmentMeta {
import Columns._
def insert(v: RAttachmentMeta): ConnectionIO[Int] =
insertRow(table, all, fr"${v.id},${v.content},${v.nerlabels},${v.proposals}").update.run
insertRow(
table,
all,
fr"${v.id},${v.content},${v.nerlabels},${v.proposals}"
).update.run
def exists(attachId: Ident): ConnectionIO[Boolean] =
selectCount(id, table, id.is(attachId)).query[Int].unique.map(_ > 0)

6
modules/store/src/main/scala/docspell/store/records/RJobLog.scala
View File

@ -29,7 +29,11 @@ object RJobLog {
import Columns._
def insert(v: RJobLog): ConnectionIO[Int] =
insertRow(table, all, fr"${v.id},${v.jobId},${v.level},${v.created},${v.message}").update.run
insertRow(
table,
all,
fr"${v.id},${v.jobId},${v.level},${v.created},${v.message}"
).update.run
def findLogs(id: Ident): ConnectionIO[Vector[RJobLog]] =
(selectSimple(all, table, jobId.is(id)) ++ orderBy(created.asc))

6
modules/store/src/main/scala/docspell/store/records/RNode.scala
View File

@ -34,7 +34,11 @@ object RNode {
import Columns._
def insert(v: RNode): ConnectionIO[Int] =
insertRow(table, all, fr"${v.id},${v.nodeType},${v.url},${v.updated},${v.created}").update.run
insertRow(
table,
all,
fr"${v.id},${v.nodeType},${v.url},${v.updated},${v.created}"
).update.run
def update(v: RNode): ConnectionIO[Int] =
updateRow(

28
modules/store/src/main/scala/docspell/store/usertask/UserTaskStore.scala
View File

@ -38,8 +38,8 @@ trait UserTaskStore[F[_]] {
/** Return all tasks of the given name and user. The task's arguments
* are decoded using the given json decoder.
*/
def getByName[A](account: AccountId, name: Ident)(
implicit D: Decoder[A]
def getByName[A](account: AccountId, name: Ident)(implicit
D: Decoder[A]
): Stream[F, UserTask[A]]
/** Updates or inserts the given task.
@ -65,8 +65,8 @@ trait UserTaskStore[F[_]] {
* error is returned. The task's arguments are decoded using the
* given json decoder.
*/
def getOneByName[A](account: AccountId, name: Ident)(
implicit D: Decoder[A]
def getOneByName[A](account: AccountId, name: Ident)(implicit
D: Decoder[A]
): OptionT[F, UserTask[A]]
/** Updates or inserts the given task.
@ -80,8 +80,8 @@ trait UserTaskStore[F[_]] {
* the user `account`, they will all be removed and the given task
* inserted!
*/
def updateOneTask[A](account: AccountId, ut: UserTask[A])(
implicit E: Encoder[A]
def updateOneTask[A](account: AccountId, ut: UserTask[A])(implicit
E: Encoder[A]
): F[UserTask[String]]
/** Delete all tasks of the given user that have name `name'.
@ -100,16 +100,16 @@ object UserTaskStore {
def getByNameRaw(account: AccountId, name: Ident): Stream[F, UserTask[String]] =
store.transact(QUserTask.findByName(account, name))
def getByName[A](account: AccountId, name: Ident)(
implicit D: Decoder[A]
def getByName[A](account: AccountId, name: Ident)(implicit
D: Decoder[A]
): Stream[F, UserTask[A]] =
getByNameRaw(account, name).flatMap(_.decode match {
case Right(ua) => Stream.emit(ua)
case Left(err) => Stream.raiseError[F](new Exception(err))
})
def updateTask[A](account: AccountId, ut: UserTask[A])(
implicit E: Encoder[A]
def updateTask[A](account: AccountId, ut: UserTask[A])(implicit
E: Encoder[A]
): F[Int] = {
val exists = QUserTask.exists(ut.id)
val insert = QUserTask.insert(account, ut.encode)
@ -142,8 +142,8 @@ object UserTaskStore {
}
)
def getOneByName[A](account: AccountId, name: Ident)(
implicit D: Decoder[A]
def getOneByName[A](account: AccountId, name: Ident)(implicit
D: Decoder[A]
): OptionT[F, UserTask[A]] =
getOneByNameRaw(account, name)
.semiflatMap(_.decode match {
@ -151,8 +151,8 @@ object UserTaskStore {
case Left(err) => Effect[F].raiseError(new Exception(err))
})
def updateOneTask[A](account: AccountId, ut: UserTask[A])(
implicit E: Encoder[A]
def updateOneTask[A](account: AccountId, ut: UserTask[A])(implicit
E: Encoder[A]
): F[UserTask[String]] =
getByNameRaw(account, ut.name).compile.toList.flatMap {
case a :: rest =>