Add exception message to hashFiles(...)

burrunan · Aug 11, 2020 · d5f863c · d5f863c
1 parent 29d2590
commit d5f863c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/layered-cache/src/main/kotlin/com/github/burrunan/gradle/hashFiles.kt b/layered-cache/src/main/kotlin/com/github/burrunan/gradle/hashFiles.kt
@@ -28,7 +28,7 @@ data class HashResult(
  val totalBytes: Int,
 )
 
-suspend fun hashFiles(vararg paths: String, algorithm: String = "sha1"): HashResult {
+suspend fun hashFiles(vararg paths: String, algorithm: String = "sha1"): HashResult = try {
  val globber = create(paths.joinToString("\n")).await()
  val fileNames = globber.glob().await()
  fileNames.sort()
@@ -62,9 +62,11 @@ suspend fun hashFiles(vararg paths: String, algorithm: String = "sha1"): HashRes
  }
  }
  hash.end()
- return HashResult(
+ HashResult(
  hash = hash.digest("hex"),
  numFiles = numFiles,
  totalBytes = totalBytes,
  )
+} catch (e: Throwable) {
+ throw IllegalArgumentException("Unable to hash ${paths.joinToString(", ")}", e)
 }
diff --git a/layered-cache/src/main/kotlin/com/github/burrunan/gradle/hashing/HashDetails.kt b/layered-cache/src/main/kotlin/com/github/burrunan/gradle/hashing/HashDetails.kt
@@ -58,7 +58,7 @@ private fun sha1FromModulesFileName(key: String): String {
  return key.substring(hashStart, lastSlash).padStart(40, '0')
 }
 
-suspend fun hashFilesDetailed(vararg paths: String, algorithm: String = "sha1"): HashDetails {
+suspend fun hashFilesDetailed(vararg paths: String, algorithm: String = "sha1"): HashDetails = try {
  val globber = create(paths.joinToString("\n")).await()
  val fileNames = globber.glob().await()
  // Sorting is needed for stable overall hash
@@ -103,8 +103,10 @@ suspend fun hashFilesDetailed(vararg paths: String, algorithm: String = "sha1"):
  overallHash.update(key)
  overallHash.update(digest)
  }
- return HashDetails(
+ HashDetails(
  HashInfo(totalBytes, overallHash.digest("hex"), files.size),
  HashContents(files),
  )
+} catch (e: Throwable) {
+ throw IllegalArgumentException("Unable to hash ${paths.joinToString(", ")}", e)
 }