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

Adopt deprecated APIs from fs2; use fs2.Path

Browse Source
This commit is contained in:
eikek
2021-08-07 12:20:38 +02:00
parent f92aeb6a0f
commit 1901fe1a8c
41 changed files with 124 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,9 +6,8 @@
package docspell.joex
import java.nio.file.Path
import cats.data.NonEmptyList
import fs2.io.file.Path
import docspell.analysis.TextAnalysisConfig
import docspell.analysis.classifier.TextClassifierConfig

3
modules/joex/src/main/scala/docspell/joex/analysis/NerFile.scala
View File

@ -6,10 +6,9 @@
package docspell.joex.analysis
import java.nio.file.Path
import cats.effect._
import cats.implicits._
import fs2.io.file.Path
import docspell.analysis.split.TextSplitter
import docspell.common._

15
modules/joex/src/main/scala/docspell/joex/analysis/RegexNerFile.scala
View File

@ -6,11 +6,10 @@
package docspell.joex.analysis
import java.nio.file.Path
import cats.effect._
import cats.effect.std.Semaphore
import cats.implicits._
import fs2.io.file.Path
import docspell.common._
import docspell.common.syntax.all._
@ -112,8 +111,11 @@ object RegexNerFile {
writer.permit.use(_ =>
for {
file <- Sync[F].pure(nf.jsonFilePath(cfg.directory))
_ <- File.mkDir(file.getParent)
_ <- File.writeString(file, nf.copy(creation = now).asJson.spaces2)
_ <- file.parent match {
case Some(p) => File.mkDir(p)
case None => ().pure[F]
}
_ <- File.writeString(file, nf.copy(creation = now).asJson.spaces2)
} yield ()
)
@ -129,7 +131,10 @@ object RegexNerFile {
_ <- logger.fdebug(
s"Writing custom NER file for collective '${collective.id}'"
)
_ <- File.mkDir(jsonFile.getParent)
_ <- jsonFile.parent match {
case Some(p) => File.mkDir(p)
case None => ().pure[F]
}
_ <- File.writeString(nf.nerFilePath(cfg.directory), text)
_ <- File.writeString(jsonFile, nf.asJson.spaces2)
} yield ()

3
modules/joex/src/main/scala/docspell/joex/learn/Classify.scala
View File

@ -6,12 +6,11 @@
package docspell.joex.learn
import java.nio.file.Path
import cats.data.OptionT
import cats.effect._
import cats.implicits._
import fs2.io.file.Files
import fs2.io.file.Path
import docspell.analysis.classifier.{ClassifierModel, TextClassifier}
import docspell.common._

2
modules/joex/src/main/scala/docspell/joex/learn/StoreClassifierModel.scala
View File

@ -42,7 +42,7 @@ object StoreClassifierModel {
RClassifierModel.findByName(collective, modelName.name).map(_.map(_.fileId))
)
_ <- logger.debug(s"Storing new trained model for: ${modelName.name}")
fileData = Files[F].readAll(trainedModel.model, 4096)
fileData = Files[F].readAll(trainedModel.model)
newFile <-
store.bitpeace.saveNew(fileData, 4096, MimetypeHint.none).compile.lastOrError
_ <- store.transact(