Treat all IOExceptions as if the file does not exist

SgtSilvio · Jan 8, 2025 · 6709bce · 6709bce
1 parent 3836310
commit 6709bce
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/src/main/kotlin/io/github/sgtsilvio/oci/registry/DistributionRegistryStorage.kt b/src/main/kotlin/io/github/sgtsilvio/oci/registry/DistributionRegistryStorage.kt
@@ -37,13 +37,12 @@ class DistributionRegistryStorage(private val directory: Path) : OciRegistryStor
         resolveBlobLinkFile(repositoryName, digest).getLinkedBlobFile()
 
     override fun mountBlob(repositoryName: String, digest: OciDigest, fromRepositoryName: String): Boolean {
-        val fromBlobLinkFile = resolveBlobLinkFile(fromRepositoryName, digest)
         val blobDigest = try {
-            fromBlobLinkFile.readText()
-        } catch (e: NoSuchFileException) { // TODO is this exception guaranteed? use IOException?
+            resolveBlobLinkFile(fromRepositoryName, digest).readText()
+        } catch (e: IOException) {
             return false
         }.toOciDigest()
-        if (!resolveBlobFile(digest).exists()) {
+        if (!resolveBlobFile(blobDigest).exists()) {
             return false
         }
         resolveBlobLinkFile(repositoryName, digest).createParentDirectories()
@@ -109,7 +108,7 @@ class DistributionRegistryStorage(private val directory: Path) : OciRegistryStor
     private fun Path.getLinkedBlobFile(): Path? {
         val digest = try {
             readText()
-        } catch (e: NoSuchFileException) {
+        } catch (e: IOException) {
             return null
         }.toOciDigest()
         val blobFile = resolveBlobFile(digest)
@@ -122,13 +121,12 @@ class DistributionRegistryStorage(private val directory: Path) : OciRegistryStor
     private fun Path.readLinkedBlob(): ByteArray? {
         val digest = try {
             readText()
-        } catch (e: NoSuchFileException) {
+        } catch (e: IOException) {
             return null
         }.toOciDigest()
-        val blobFile = resolveBlobFile(digest)
         return try {
-            blobFile.readBytes()
-        } catch (e: NoSuchFileException) {
+            resolveBlobFile(digest).readBytes()
+        } catch (e: IOException) {
             null
         }
     }