diff -r 0ebcd5464503 -r 8cfd67425811 base/src/sqwl/cms/package.scala --- a/base/src/sqwl/cms/package.scala Tue Dec 11 21:37:53 2018 +0100 +++ b/base/src/sqwl/cms/package.scala Thu Dec 13 14:21:10 2018 +0100 @@ -7,8 +7,7 @@ package object cms { - def readFile(f: Path, enc: String = "UTF-8"): Try[String] = { - val src = Source.fromFile(f.toFile, enc) + def readSourceFull(src: Source): Try[String] = { try { Success(src.getLines.mkString) } catch { @@ -17,4 +16,11 @@ src.close() } } + + def readFile(f: Path, enc: String = "UTF-8"): Try[String] = + readSourceFull(Source.fromFile(f.toFile, enc)) + + def readFile(f: String): String = + readSourceFull(Source.fromFile(f, "UTF-8")) getOrElse "" + }