luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #305 from rtfpessoa/fix-exception-when-reading-files 

Catch exception when reading file
This commit is contained in:
Alexandre Archambault 2016-07-25 00:17:44 +02:00 committed by GitHub
parent 127e73abe9 88cd8909a3
commit 350b4afaeb
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cache/src/main/scala/coursier/Cache.scala vendored
View File

@ -849,9 +849,17 @@ object Cache {
logger = logger, logger = logger,
pool = pool, pool = pool,
ttl = ttl ttl = ttl
).leftMap(_.describe).map { f => ).leftMap(_.describe).flatMap { f =>
// FIXME Catch error here? val res = if (!f.isDirectory && f.exists()) {
new String(NioFiles.readAllBytes(f.toPath), "UTF-8") Try(new String(NioFiles.readAllBytes(f.toPath), "UTF-8")) match {
case scala.util.Success(content) =>
Right(content)
case scala.util.Failure(e) =>
Left(s"Could not read (file:${f.getCanonicalPath}): ${e.getMessage}")
}
} else Left(s"Could not read (file:${f.getCanonicalPath}) (isFile:${!f.isDirectory}) (exists:${f.exists()})")
EitherT.fromEither(Task.now[Either[String, String]](res))
} }
} }