TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-04 10:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply autoformat

Browse Source
This commit is contained in:
Eike Kettner 2021-04-10 16:31:58 +02:00
parent e630786104
commit e1bbc2edf5
45 changed files with 151 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.sbt
View File

@ -92,11 +92,11 @@ def webjarSettings(queryJS: Project) = Seq(
}.taskValue,
Compile / resourceGenerators += Def.task {
val logger = streams.value.log
val out = (queryJS/Compile/fullOptJS).value
val out = (queryJS / Compile / fullOptJS).value
logger.info(s"Produced query js file: ${out.data}")
copyWebjarResources(
Seq(out.data),
(Compile/resourceManaged).value,
(Compile / resourceManaged).value,
name.value,
version.value,
logger
@ -218,7 +218,9 @@ val openapiScalaSettings = Seq(
field.copy(typeDef = TypeDef("OrgUse", Imports("docspell.common.OrgUse")))
case "equipmentuse" =>
field =>
field.copy(typeDef = TypeDef("EquipmentUse", Imports("docspell.common.EquipmentUse")))
field.copy(typeDef =
TypeDef("EquipmentUse", Imports("docspell.common.EquipmentUse"))
)
}))
)

18
modules/analysis/src/test/scala/docspell/analysis/classifier/StanfordTextClassifierSuite.scala
View File

@ -1,14 +1,18 @@
package docspell.analysis.classifier
import munit._
import cats.effect._
import scala.concurrent.ExecutionContext
import java.nio.file.Paths
import cats.data.NonEmptyList
import docspell.common._
import fs2.Stream
import scala.concurrent.ExecutionContext
import cats.data.Kleisli
import TextClassifier.Data
import cats.data.NonEmptyList
import cats.effect._
import fs2.Stream
import docspell.analysis.classifier.TextClassifier.Data
import docspell.common._
import munit._
class StanfordTextClassifierSuite extends FunSuite {
val logger = Logger.log4s[IO](org.log4s.getLogger)

1
modules/analysis/src/test/scala/docspell/analysis/contact/ContactAnnotateSpec.scala
View File

@ -1,6 +1,7 @@
package docspell.analysis.contact
import docspell.common.{NerLabel, NerTag}
import munit._
class ContactAnnotateSpec extends FunSuite {

8
modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala
View File

@ -1,10 +1,12 @@
package docspell.analysis.date
import docspell.files.TestFiles
import munit._
import docspell.common._
import java.time._
import docspell.common._
import docspell.files.TestFiles
import munit._
class DateFindSpec extends FunSuite {
test("find simple dates") {

5
modules/analysis/src/test/scala/docspell/analysis/nlp/BaseCRFAnnotatorSuite.scala
View File

@ -2,9 +2,10 @@ package docspell.analysis.nlp
import docspell.analysis.Env
import docspell.common.Language.NLPLanguage
import munit._
import docspell.files.TestFiles
import docspell.common._
import docspell.files.TestFiles
import munit._
class BaseCRFAnnotatorSuite extends FunSuite {

6
modules/analysis/src/test/scala/docspell/analysis/nlp/StanfordNerAnnotatorSuite.scala
View File

@ -3,12 +3,14 @@ package docspell.analysis.nlp
import java.nio.file.Paths
import cats.effect.IO
import docspell.analysis.Env
import munit._
import docspell.files.TestFiles
import docspell.common._
import docspell.common.syntax.FileSyntax._
import docspell.files.TestFiles
import edu.stanford.nlp.pipeline.StanfordCoreNLP
import munit._
class StanfordNerAnnotatorSuite extends FunSuite {
lazy val germanClassifier =

3
modules/common/src/test/scala/docspell/common/GlobTest.scala
View File

@ -1,7 +1,8 @@
package docspell.common
import docspell.common.Glob._
import munit._
import Glob._
class GlobTest extends FunSuite {

1
modules/common/src/test/scala/docspell/common/LenientUriTest.scala
View File

@ -1,6 +1,7 @@
package docspell.common
import cats.implicits._
import munit._
class LenientUriTest extends FunSuite {

4
modules/common/src/test/scala/docspell/common/MetaProposalListTest.scala
View File

@ -1,9 +1,11 @@
package docspell.common
import munit._
import cats.data.NonEmptyList
import docspell.common.MetaProposal.Candidate
import munit._
class MetaProposalListTest extends FunSuite {
test("flatten retains order of candidates") {

6
modules/convert/src/test/scala/docspell/convert/ConversionTest.scala
View File

@ -3,16 +3,18 @@ package docspell.convert
import java.nio.file.Paths
import cats.data.Kleisli
import cats.implicits._
import cats.effect.IO
import cats.implicits._
import fs2.Stream
import docspell.common._
import docspell.convert.ConversionResult.Handler
import docspell.convert.extern.OcrMyPdfConfig
import docspell.convert.extern.{TesseractConfig, UnoconvConfig, WkHtmlPdfConfig}
import docspell.convert.flexmark.MarkdownConfig
import docspell.files.{ExampleFiles, TestFiles}
import munit._
import docspell.convert.extern.OcrMyPdfConfig
class ConversionTest extends FunSuite with FileChecks {
val blocker = TestFiles.blocker

1
modules/convert/src/test/scala/docspell/convert/FileChecks.scala
View File

@ -6,6 +6,7 @@ import java.nio.file.{Files, Path}
import cats.data.Kleisli
import cats.effect.IO
import fs2.{Pipe, Stream}
import docspell.common.MimeType
import docspell.convert.ConversionResult.Handler
import docspell.files.TikaMimetype

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

@ -1,13 +1,15 @@
package docspell.convert.extern
import java.nio.charset.StandardCharsets
import java.nio.file.{Path, Paths}
import cats.effect._
import docspell.common._
import docspell.convert._
import docspell.files.{ExampleFiles, TestFiles}
import munit._
import java.nio.charset.StandardCharsets
class ExternConvTest extends FunSuite with FileChecks {
val blocker = TestFiles.blocker

2
modules/extract/src/test/scala/docspell/extract/ocr/TextExtractionSuite.scala
View File

@ -1,8 +1,10 @@
package docspell.extract.ocr
import cats.effect.IO
import docspell.common.Logger
import docspell.files.TestFiles
import munit._
class TextExtractionSuite extends FunSuite {

2
modules/extract/src/test/scala/docspell/extract/odf/OdfExtractTest.scala
View File

@ -1,7 +1,9 @@
package docspell.extract.odf
import cats.effect._
import docspell.files.{ExampleFiles, TestFiles}
import munit._
class OdfExtractTest extends FunSuite {

2
modules/extract/src/test/scala/docspell/extract/pdfbox/PdfboxExtractTest.scala
View File

@ -1,7 +1,9 @@
package docspell.extract.pdfbox
import cats.effect._
import docspell.files.{ExampleFiles, TestFiles}
import munit._
class PdfboxExtractTest extends FunSuite {

9
modules/extract/src/test/scala/docspell/extract/pdfbox/PdfboxPreviewTest.scala
View File

@ -1,11 +1,14 @@
package docspell.extract.pdfbox
import cats.effect._
import docspell.files.{ExampleFiles, TestFiles}
import munit._
import java.nio.file.Path
import cats.effect._
import fs2.Stream
import docspell.files.{ExampleFiles, TestFiles}
import munit._
class PdfboxPreviewTest extends FunSuite {
val blocker = TestFiles.blocker
implicit val CS = TestFiles.CS

2
modules/extract/src/test/scala/docspell/extract/poi/PoiExtractTest.scala
View File

@ -1,8 +1,10 @@
package docspell.extract.poi
import cats.effect._
import docspell.common.MimeTypeHint
import docspell.files.{ExampleFiles, TestFiles}
import munit._
class PoiExtractTest extends FunSuite {

1
modules/extract/src/test/scala/docspell/extract/rtf/RtfExtractTest.scala
View File

@ -1,6 +1,7 @@
package docspell.extract.rtf
import docspell.files.ExampleFiles
import munit._
class RtfExtractTest extends FunSuite {

9
modules/files/src/test/scala/docspell/files/ImageSizeTest.scala
View File

@ -1,12 +1,13 @@
package docspell.files
import cats.implicits._
import cats.effect.{Blocker, IO}
import munit._
import scala.concurrent.ExecutionContext
import scala.util.Using
import cats.effect.{Blocker, IO}
import cats.implicits._
import munit._
class ImageSizeTest extends FunSuite {
val blocker = Blocker.liftExecutionContext(ExecutionContext.global)
implicit val CS = IO.contextShift(ExecutionContext.global)

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

@ -1,10 +1,11 @@
package docspell.files
import cats.effect.{Blocker, ExitCode, IO, IOApp}
import docspell.common.MimeTypeHint
import scala.concurrent.ExecutionContext
import cats.effect._
import docspell.common.MimeTypeHint
object Playing extends IOApp {
val blocker = Blocker.liftExecutionContext(ExecutionContext.global)

4
modules/files/src/test/scala/docspell/files/TestFiles.scala
View File

@ -1,10 +1,10 @@
package docspell.files
import scala.concurrent.ExecutionContext
import cats.effect.{Blocker, IO}
import fs2.Stream
import scala.concurrent.ExecutionContext
object TestFiles {
val blocker = Blocker.liftExecutionContext(ExecutionContext.global)
implicit val CS = IO.contextShift(ExecutionContext.global)

7
modules/files/src/test/scala/docspell/files/ZipTest.scala
View File

@ -1,11 +1,14 @@
package docspell.files
import munit._
import scala.concurrent.ExecutionContext
import cats.effect._
import cats.implicits._
import scala.concurrent.ExecutionContext
import docspell.common.Glob
import munit._
class ZipTest extends FunSuite {
val blocker = Blocker.liftExecutionContext(ExecutionContext.global)

6
modules/joex/src/test/scala/docspell/joex/analysis/NerFileTest.scala
View File

@ -1,9 +1,11 @@
package docspell.joex.analysis
import munit._
import NerFile.Pattern
import java.{util => ju}
import docspell.joex.analysis.NerFile.Pattern
import munit._
class NerFileTest extends FunSuite {
test("create valid case insensitive patterns") {

1
modules/joex/src/test/scala/docspell/joex/scheduler/CountingSchemeSpec.scala
View File

@ -1,6 +1,7 @@
package docspell.joex.scheduler
import docspell.common.Priority
import munit._
class CountingSchemeSpec extends FunSuite {

4
modules/query/shared/src/test/scala/docspell/query/FulltextExtractTest.scala
View File

@ -1,9 +1,11 @@
package docspell.query
import cats.implicits._
import munit._
import docspell.query.FulltextExtract.Result
import munit._
class FulltextExtractTest extends FunSuite {
def findFts(q: String): Result = {

1
modules/query/shared/src/test/scala/docspell/query/internal/AttrParserTest.scala
View File

@ -2,6 +2,7 @@ package docspell.query.internal
import docspell.query.ItemQuery.Attr
import docspell.query.internal.AttrParser
import munit._
class AttrParserTest extends FunSuite {

4
modules/query/shared/src/test/scala/docspell/query/internal/BasicParserTest.scala
View File

@ -1,9 +1,11 @@
package docspell.query.internal
import munit._
import cats.data.{NonEmptyList => Nel}
import docspell.query.internal.BasicParser
import munit._
class BasicParserTest extends FunSuite {
test("single string values") {
val p = BasicParser.singleString

6
modules/query/shared/src/test/scala/docspell/query/internal/DateParserTest.scala
View File

@ -1,9 +1,11 @@
package docspell.query.internal
import munit._
import docspell.query.Date
import java.time.Period
import docspell.query.Date
import munit._
class DateParserTest extends FunSuite with ValueHelper {
test("local date string") {

6
modules/query/shared/src/test/scala/docspell/query/internal/ExprParserTest.scala
View File

@ -1,9 +1,11 @@
package docspell.query.internal
import docspell.query.ItemQuery._
import munit._
import cats.data.{NonEmptyList => Nel}
import docspell.query.ItemQuery._
import munit._
class ExprParserTest extends FunSuite with ValueHelper {
test("simple expr") {

5
modules/query/shared/src/test/scala/docspell/query/internal/ItemQueryParserTest.scala
View File

@ -2,9 +2,10 @@ package docspell.query.internal
import cats.implicits._
import munit._
import docspell.query.ItemQueryParser
import docspell.query.ItemQuery
import docspell.query.ItemQueryParser
import munit._
class ItemQueryParserTest extends FunSuite {

4
modules/query/shared/src/test/scala/docspell/query/internal/MacroParserTest.scala
View File

@ -1,9 +1,9 @@
package docspell.query.internal
import munit._
//import cats.parse.{Parser => P}
import docspell.query.ItemQuery.Expr
import munit._
class MacroParserTest extends FunSuite {
test("recognize names shortcut") {

3
modules/query/shared/src/test/scala/docspell/query/internal/OperatorParserTest.scala
View File

@ -1,9 +1,10 @@
package docspell.query.internal
import munit._
import docspell.query.ItemQuery.{Operator, TagOperator}
import docspell.query.internal.OperatorParser
import munit._
class OperatorParserTest extends FunSuite {
test("operator values") {
val p = OperatorParser.op

11
modules/query/shared/src/test/scala/docspell/query/internal/SimpleExprParserTest.scala
View File

@ -1,11 +1,14 @@
package docspell.query.internal
import cats.data.{NonEmptyList => Nel}
import docspell.query.ItemQuery._
import munit._
import docspell.query.Date
import java.time.Period
import cats.data.{NonEmptyList => Nel}
import docspell.query.Date
import docspell.query.ItemQuery._
import munit._
class SimpleExprParserTest extends FunSuite with ValueHelper {
test("string expr") {

3
modules/query/shared/src/test/scala/docspell/query/internal/ValueHelper.scala
View File

@ -1,8 +1,9 @@
package docspell.query.internal
import java.time.Period
import docspell.query.Date
import docspell.query.ItemQuery._
import java.time.Period
trait ValueHelper {

6
modules/store/src/test/scala/docspell/store/StoreFixture.scala
View File

@ -1,13 +1,15 @@
package docspell.store
import scala.concurrent.ExecutionContext
import cats.effect._
import docspell.common.LenientUri
import docspell.store.impl.StoreImpl
import doobie._
import org.h2.jdbcx.JdbcConnectionPool
import scala.concurrent.ExecutionContext
trait StoreFixture {
def withStore(db: String)(code: Store[IO] => IO[Unit]): Unit = {
//StoreFixture.store(StoreFixture.memoryDB(db)).use(code).unsafeRunSync()

7
modules/store/src/test/scala/docspell/store/generator/ItemQueryGeneratorTest.scala
View File

@ -2,13 +2,14 @@ package docspell.store.generator
import java.time.LocalDate
import docspell.store.records._
import munit._
import docspell.common._
import docspell.query.ItemQueryParser
import docspell.store.queries.AttachCountTable
import docspell.store.qb.DSL._
import docspell.store.qb.generator.{ItemQueryGenerator, Tables}
import docspell.store.queries.AttachCountTable
import docspell.store.records._
import munit._
class ItemQueryGeneratorTest extends FunSuite {
import docspell.store.impl.DoobieMeta._

5
modules/store/src/test/scala/docspell/store/qb/QueryBuilderTest.scala
View File

@ -1,8 +1,9 @@
package docspell.store.qb
import munit._
import docspell.store.qb.model._
import docspell.store.qb.DSL._
import docspell.store.qb.model._
import munit._
class QueryBuilderTest extends FunSuite {

5
modules/store/src/test/scala/docspell/store/qb/impl/ConditionBuilderTest.scala
View File

@ -1,10 +1,11 @@
package docspell.store.qb.impl
import munit._
import docspell.store.qb._
import docspell.store.qb.DSL._
import docspell.store.qb._
import docspell.store.qb.model.{CourseRecord, PersonRecord}
import munit._
class ConditionBuilderTest extends FunSuite {
val c = CourseRecord.as("c")

5
modules/store/src/test/scala/docspell/store/qb/impl/DSLTest.scala
View File

@ -1,10 +1,11 @@
package docspell.store.qb.impl
import munit._
import docspell.store.qb._
import docspell.store.qb.DSL._
import docspell.store.qb._
import docspell.store.qb.model.{CourseRecord, PersonRecord}
import munit._
class DSLTest extends FunSuite {
val course = CourseRecord.as("c")

5
modules/store/src/test/scala/docspell/store/qb/impl/SelectBuilderTest.scala
View File

@ -1,9 +1,10 @@
package docspell.store.qb.impl
import munit._
import docspell.store.qb.DSL._
import docspell.store.qb._
import docspell.store.qb.model._
import docspell.store.qb.DSL._
import munit._
class SelectBuilderTest extends FunSuite {

1
modules/store/src/test/scala/docspell/store/qb/model/CourseRecord.scala
View File

@ -1,6 +1,7 @@
package docspell.store.qb.model
import cats.data.NonEmptyList
import docspell.store.qb._
case class CourseRecord(

3
modules/store/src/test/scala/docspell/store/qb/model/PersonRecord.scala
View File

@ -1,8 +1,9 @@
package docspell.store.qb.model
import cats.data.NonEmptyList
import docspell.store.qb._
import docspell.common._
import docspell.store.qb._
case class PersonRecord(id: Long, name: String, created: Timestamp)

8
project/Dependencies.scala
View File

@ -272,7 +272,7 @@ object Dependencies {
).map(_ % Test)
val munit = Seq(
"org.scalameta" %% "munit" % MUnitVersion,
"org.scalameta" %% "munit" % MUnitVersion,
"org.scalameta" %% "munit-scalacheck" % MUnitVersion
)
@ -280,9 +280,9 @@ object Dependencies {
val betterMonadicFor = "com.olegpy" %% "better-monadic-for" % BetterMonadicForVersion
val webjars = Seq(
"org.webjars" % "swagger-ui" % SwaggerUIVersion,
"org.webjars" % "viewerjs" % ViewerJSVersion,
"org.webjars" % "clipboard.js" % ClipboardJsVersion
"org.webjars" % "swagger-ui" % SwaggerUIVersion,
"org.webjars" % "viewerjs" % ViewerJSVersion,
"org.webjars" % "clipboard.js" % ClipboardJsVersion
)
val icu4j = Seq(

4
project/ZolaPlugin.scala
View File

@ -35,7 +35,7 @@ object ZolaPlugin extends AutoPlugin {
zolaBuild := {
val logger = streams.value.log
logger.info("Building web site using zola ...")
(Compile/resources).value
(Compile / resources).value
buildSite(zolaCommand.value, zolaRootDir.value, zolaOutputDir.value, None, logger)
logger.info("Website built")
},
@ -43,7 +43,7 @@ object ZolaPlugin extends AutoPlugin {
val logger = streams.value.log
val baseurl = zolaTestBaseUrl.value
logger.info("Building web site (test) using zola ...")
(Compile/resources).value
(Compile / resources).value
buildSite(
zolaCommand.value,
zolaRootDir.value,

24
project/plugins.sbt
View File

@ -1,13 +1,13 @@
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.27")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
addSbtPlugin("com.github.eikek" % "sbt-openapi-schema" % "0.7.1")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1")
addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.27")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
addSbtPlugin("com.github.eikek" % "sbt-openapi-schema" % "0.7.1")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1")
addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7")