TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-03-31 05:15:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update binny to 0.10.0

Browse Source
This commit is contained in:
eikek 2023-11-05 12:59:46 +01:00
parent c0f684eb0d
commit d806a6a65e
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/store/src/main/scala/docspell/store/Store.scala
View File

@ -11,6 +11,7 @@ import scala.concurrent.ExecutionContext
import cats.effect._ import cats.effect._
import cats.~> import cats.~>
import fs2._ import fs2._
import fs2.io.file.Files
import docspell.store.file.{FileRepository, FileRepositoryConfig} import docspell.store.file.{FileRepository, FileRepositoryConfig}
import docspell.store.impl.StoreImpl import docspell.store.impl.StoreImpl
@ -42,7 +43,7 @@ trait Store[F[_]] {
object Store { object Store {
def create[F[_]: Async]( def create[F[_]: Async: Files](
jdbc: JdbcConfig, jdbc: JdbcConfig,
schemaCfg: SchemaMigrateConfig, schemaCfg: SchemaMigrateConfig,
fileRepoConfig: FileRepositoryConfig, fileRepoConfig: FileRepositoryConfig,

4
modules/store/src/main/scala/docspell/store/file/BinnyUtils.scala
View File

@ -9,7 +9,7 @@ package docspell.store.file
import javax.sql.DataSource import javax.sql.DataSource
import cats.effect._ import cats.effect._
import fs2.io.file.Path import fs2.io.file.{Files, Path}
import docspell.common._ import docspell.common._
import docspell.files.TikaMimetype import docspell.files.TikaMimetype
@ -97,7 +97,7 @@ object BinnyUtils {
PathMapping(toPath)(toId) PathMapping(toPath)(toId)
} }
def binaryStore[F[_]: Async]( def binaryStore[F[_]: Async: Files](
cfg: FileRepositoryConfig, cfg: FileRepositoryConfig,
ds: DataSource, ds: DataSource,
logger: Logger[F] logger: Logger[F]

3
modules/store/src/main/scala/docspell/store/file/FileRepository.scala
View File

@ -10,6 +10,7 @@ import javax.sql.DataSource
import cats.effect._ import cats.effect._
import fs2._ import fs2._
import fs2.io.file.Files
import docspell.common._ import docspell.common._
@ -34,7 +35,7 @@ trait FileRepository[F[_]] {
object FileRepository { object FileRepository {
def apply[F[_]: Async]( def apply[F[_]: Async: Files](
xa: Transactor[F], xa: Transactor[F],
ds: DataSource, ds: DataSource,
cfg: FileRepositoryConfig, cfg: FileRepositoryConfig,

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

@ -12,6 +12,7 @@ import cats.arrow.FunctionK
import cats.effect.Async import cats.effect.Async
import cats.implicits._ import cats.implicits._
import cats.~> import cats.~>
import fs2.io.file.Files
import docspell.store._ import docspell.store._
import docspell.store.file.{FileRepository, FileRepositoryConfig} import docspell.store.file.{FileRepository, FileRepositoryConfig}
@ -20,7 +21,7 @@ import docspell.store.migrate.FlywayMigrate
import doobie._ import doobie._
import doobie.implicits._ import doobie.implicits._
final class StoreImpl[F[_]: Async]( final class StoreImpl[F[_]: Async: Files](
val fileRepo: FileRepository[F], val fileRepo: FileRepository[F],
jdbc: JdbcConfig, jdbc: JdbcConfig,
schemaCfg: SchemaMigrateConfig, schemaCfg: SchemaMigrateConfig,

2
project/Dependencies.scala
View File

@ -7,7 +7,7 @@ object Dependencies {
val BcryptVersion = "0.4" val BcryptVersion = "0.4"
val BetterMonadicForVersion = "0.3.1" val BetterMonadicForVersion = "0.3.1"
val BinnyVersion = "0.9.1" val BinnyVersion = "0.10.0"
val CalevVersion = "0.7.0" val CalevVersion = "0.7.0"
val CatsVersion = "2.7.0" val CatsVersion = "2.7.0"
val CatsEffectVersion = "3.5.2" val CatsEffectVersion = "3.5.2"