Rename HashFailed to HashMismatch & clean up code

juraj-hrivnak · Sep 25, 2024 · fdab827 · fdab827
1 parent bec3867
commit fdab827
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/src/commonMain/kotlin/teksturepako/pakku/api/actions/ActionError.kt b/src/commonMain/kotlin/teksturepako/pakku/api/actions/ActionError.kt
@@ -41,7 +41,7 @@ open class ActionError(
     class NoHashes(val projectFile: ProjectFile) :
         ActionError("File '${projectFile.getPath()}' has no hashes.", isWarning = true)
 
-    class HashFailed(val projectFile: ProjectFile, val originalHash: String, val newHash: String) :
+    class HashMismatch(val projectFile: ProjectFile, val originalHash: String, val newHash: String) :
         ActionError("""Failed to math hash for file '${projectFile.getPath()}'.
             | Original hash: $originalHash
             | New hash: $newHash

diff --git a/src/commonMain/kotlin/teksturepako/pakku/api/actions/fetch/Fetch.kt b/src/commonMain/kotlin/teksturepako/pakku/api/actions/fetch/Fetch.kt
@@ -65,13 +65,10 @@ suspend fun List<ProjectFile>.fetch(
                     return@launch
                 }
 
-                projectFile.checkIntegrity(bytes)?.let {
-                    if (it !is NoHashes)
-                    {
-                        return@launch
-                    }
+                projectFile.checkIntegrity(bytes)?.let { err ->
+                    onError(err)
 
-                    onError(it)
+                    if (err is HashMismatch) return@launch
                 }
 
                 send(projectFile to bytes)
@@ -114,7 +111,9 @@ suspend fun deleteOldFiles(
                 val folder = Path(workingPath, projectType.folderName)
                 if (folder.notExists()) return@mapNotNull null
                 runCatching { folder.listDirectoryEntries() }.get()
-            }.flatten().forEach { file ->
+            }
+            .flatten()
+            .forEach { file ->
                 launch {
                     val bytes = runCatching { file.readBytes() }.get()
                     val fileHash = bytes?.let { createHash("sha1", it) }

diff --git a/src/commonMain/kotlin/teksturepako/pakku/api/projects/ProjectFile.kt b/src/commonMain/kotlin/teksturepako/pakku/api/projects/ProjectFile.kt
@@ -5,7 +5,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import teksturepako.pakku.api.actions.ActionError
-import teksturepako.pakku.api.actions.ActionError.HashFailed
+import teksturepako.pakku.api.actions.ActionError.HashMismatch
 import teksturepako.pakku.api.actions.ActionError.NoHashes
 import teksturepako.pakku.api.data.LockFile
 import teksturepako.pakku.api.data.workingPath
@@ -62,7 +62,7 @@ data class ProjectFile(
 
             if (originalHash != newHash)
             {
-                return HashFailed(this, originalHash, newHash)
+                return HashMismatch(this, originalHash, newHash)
             }
             else continue
         }