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

Rename package to avoid name clashes

Browse Source
This commit is contained in:
Eike Kettner
2020-05-25 16:21:56 +02:00
parent b4da523347
commit 4b0eb650f2
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/restserver/src/main/scala/docspell/restserver/ConfigFile.scala
View File

@ -1,9 +1,9 @@
package docspell.restserver
import docspell.common.pureconfig.Implicits._
import docspell.common.config.Implicits._
import docspell.backend.signup.{Config => SignupConfig}
import _root_.pureconfig._
import _root_.pureconfig.generic.auto._
import pureconfig._
import pureconfig.generic.auto._
object ConfigFile {
import Implicits._

4
modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala
View File

@ -1,7 +1,7 @@
package docspell.restserver.webapp
import _root_.io.circe._
import _root_.io.circe.generic.semiauto._
import io.circe._
import io.circe.generic.semiauto._
import docspell.common.LenientUri
import docspell.restserver.{BuildInfo, Config}
import docspell.backend.signup.{Config => SignupConfig}

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

@ -1,6 +1,6 @@
package docspell.restserver.webapp
import fs2._
import fs2.{Stream, text}
import cats.effect._
import cats.implicits._
import org.http4s._
@ -8,7 +8,7 @@ import org.http4s.headers._
import org.http4s.HttpRoutes
import org.http4s.dsl.Http4sDsl
import org.log4s._
import _root_.io.circe.syntax._
import io.circe.syntax._
import yamusca.imports._
import yamusca.implicits._
import java.net.URL
@ -69,7 +69,7 @@ object TemplateRoutes {
): F[String] =
Stream
.bracket(Sync[F].delay(url.openStream))(in => Sync[F].delay(in.close()))
.flatMap(in => io.readInputStream(in.pure[F], 64 * 1024, blocker, false))
.flatMap(in => fs2.io.readInputStream(in.pure[F], 64 * 1024, blocker, false))
.through(text.utf8Decode)
.compile
.fold("")(_ + _)