scalafmtAll

This commit is contained in:
Eike Kettner
2020-03-26 18:26:00 +01:00
parent 09ea724c13
commit 9656ba62f4
91 changed files with 871 additions and 295 deletions

View File

@ -43,11 +43,13 @@ object ConversionResult {
case class SuccessPdf[F[_]](pdf: Stream[F, Byte]) extends ConversionResult[F] {
val pdfData = pdf
}
case class SuccessPdfTxt[F[_]](pdf: Stream[F, Byte], txt: F[String]) extends ConversionResult[F] {
case class SuccessPdfTxt[F[_]](pdf: Stream[F, Byte], txt: F[String])
extends ConversionResult[F] {
val pdfData = pdf
}
case class InputMalformed[F[_]](mimeType: MimeType, reason: String) extends ConversionResult[F] {
case class InputMalformed[F[_]](mimeType: MimeType, reason: String)
extends ConversionResult[F] {
val pdfData = Stream.empty
}
}

View File

@ -40,9 +40,18 @@ private[extern] object ExternConv {
in.through(createInput).flatMap { _ =>
SystemCommand
.execSuccess[F](sysCfg, blocker, logger, Some(dir), if (useStdin) in else Stream.empty)
.execSuccess[F](
sysCfg,
blocker,
logger,
Some(dir),
if (useStdin) in
else Stream.empty
)
.evalMap(result =>
logResult(name, result, logger).flatMap(_ => reader(out, result)).flatMap(handler.run)
logResult(name, result, logger)
.flatMap(_ => reader(out, result))
.flatMap(handler.run)
)
}
}
@ -106,7 +115,9 @@ private[extern] object ExternConv {
inFile: Path
): Pipe[F, Byte, Unit] =
in =>
Stream.eval(logger.debug(s"Storing input to file ${inFile} for running $name")).drain ++
Stream
.eval(logger.debug(s"Storing input to file ${inFile} for running $name"))
.drain ++
Stream.eval(storeFile(in, inFile, blocker))
private def logResult[F[_]: Sync](

View File

@ -19,7 +19,15 @@ object Unoconv {
val reader: (Path, SystemCommand.Result) => F[ConversionResult[F]] =
ExternConv.readResult[F](blocker, chunkSize, logger)
ExternConv.toPDF[F, A]("unoconv", cfg.command, cfg.workingDir, false, blocker, logger, reader)(
ExternConv.toPDF[F, A](
"unoconv",
cfg.command,
cfg.workingDir,
false,
blocker,
logger,
reader
)(
in,
handler
)

View File

@ -18,7 +18,11 @@ import docspell.common._
object Markdown {
def toHtml(is: InputStream, cfg: MarkdownConfig, cs: Charset): Either[Throwable, String] = {
def toHtml(
is: InputStream,
cfg: MarkdownConfig,
cs: Charset
): Either[Throwable, String] = {
val p = createParser()
val r = createRenderer()
Try {
@ -35,7 +39,11 @@ object Markdown {
wrapHtml(r.render(doc), cfg)
}
def toHtml[F[_]: Sync](data: Stream[F, Byte], cfg: MarkdownConfig, cs: Charset): F[String] =
def toHtml[F[_]: Sync](
data: Stream[F, Byte],
cfg: MarkdownConfig,
cs: Charset
): F[String] =
data.through(Binary.decode(cs)).compile.foldMonoid.map(str => toHtml(str, cfg))
private def wrapHtml(body: String, cfg: MarkdownConfig): String =