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

Update scalafmt to 2.5.1 + scalafmtAll

Browse Source
This commit is contained in:
Eike Kettner
2020-05-04 23:52:53 +02:00
parent 169510aec1
commit c41cdeefec
65 changed files with 523 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/convert/src/main/scala/docspell/convert/Conversion.scala
View File

@ -63,7 +63,7 @@ object Conversion {
case Images(mt) =>
ImageSize.get(in).flatMap {
case Some(dim) =>
if (dim.product > cfg.maxImageSize) {
if (dim.product > cfg.maxImageSize)
logger
.info(
s"Image size (${dim.product}) is too large (max ${cfg.maxImageSize})."
@ -74,12 +74,11 @@ object Conversion {
s"Image size (${dim.width}x${dim.height}) is too large (max ${cfg.maxImageSize})."
)
)
} else {
else
Tesseract.toPDF(cfg.tesseract, lang, cfg.chunkSize, blocker, logger)(
in,
handler
)
}
case None =>
logger.info(

5
modules/convert/src/main/scala/docspell/convert/extern/ExternConv.scala vendored
View File

@ -90,13 +90,12 @@ private[extern] object ExternConv {
val outTxt = out.resolveSibling(s"$outPrefix.txt")
File.exists(outTxt).flatMap { txtExists =>
val pdfData = File.readAll(out, blocker, chunkSize)
if (result.rc == 0) {
if (result.rc == 0)
if (txtExists) successPdfTxt(pdfData, File.readText(outTxt, blocker)).pure[F]
else successPdf(pdfData).pure[F]
} else {
else
logger.warn(s"Command not successful (rc=${result.rc}), but file exists.") *>
successPdf(pdfData).pure[F]
}
}
case false =>

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

@ -24,7 +24,7 @@ object ExternConvTest extends SimpleTestSuite with FileChecks {
)
if (!commandExists(cfg.program)) ignore(s"Command ${cfg.program} not found")
else {
else
File
.withTempDir[IO](target, "wkhtmltopdf")
.use(dir =>
@ -42,7 +42,6 @@ object ExternConvTest extends SimpleTestSuite with FileChecks {
}
)
.unsafeRunSync
}
}
test("convert office to pdf") {
@ -53,7 +52,7 @@ object ExternConvTest extends SimpleTestSuite with FileChecks {
)
if (!commandExists(cfg.program)) ignore(s"Command ${cfg.program} not found")
else {
else
File
.withTempDir[IO](target, "unoconv")
.use(dir =>
@ -71,7 +70,6 @@ object ExternConvTest extends SimpleTestSuite with FileChecks {
}
)
.unsafeRunSync
}
}
test("convert image to pdf") {
@ -82,7 +80,7 @@ object ExternConvTest extends SimpleTestSuite with FileChecks {
)
if (!commandExists(cfg.program)) ignore(s"Command ${cfg.program} not found")
else {
else
File
.withTempDir[IO](target, "tesseract")
.use(dir =>
@ -101,7 +99,6 @@ object ExternConvTest extends SimpleTestSuite with FileChecks {
}
)
.unsafeRunSync
}
}
}