Don't hash the dev bundle zip twice

PaperMC · Nov 17, 2023 · e80565b · e80565b
1 parent daab4fa
commit e80565b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/paperweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/PaperweightUser.kt b/paperweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/PaperweightUser.kt
@@ -299,6 +299,7 @@ abstract class PaperweightUser : Plugin<Project> {
                 parameters {
                     cache.set(cacheDir)
                     bundleZip.set(devBundleZip)
+                    bundleZipHash.set(bundleHash)
                     downloadService.set(target.download)
                     genSources.set(target.genSources)
                 }

diff --git a/...userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/ExtractDevBundle.kt b/...userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/ExtractDevBundle.kt
@@ -46,10 +46,10 @@ data class ExtractedBundle<C>(
 
 fun extractDevBundle(
     destinationDirectory: Path,
-    devBundle: Path
+    devBundle: Path,
+    newDevBundleHash: String
 ): ExtractedBundle<Any> {
     val hashFile = destinationDirectory.resolve("current.sha256")
-    val newDevBundleHash = devBundle.sha256asHex()
 
     if (destinationDirectory.exists()) {
         val currentDevBundleHash = if (hashFile.isRegularFile()) hashFile.readText(Charsets.UTF_8) else ""

diff --git a/...ght-userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/UserdevSetup.kt b/...ght-userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/UserdevSetup.kt
@@ -47,6 +47,7 @@ abstract class UserdevSetup : BuildService<UserdevSetup.Parameters>, SetupHandle
 
     interface Parameters : BuildServiceParameters {
         val bundleZip: RegularFileProperty
+        val bundleZipHash: Property<String>
         val cache: RegularFileProperty
         val downloadService: Property<DownloadService>
         val genSources: Property<Boolean>
@@ -55,7 +56,8 @@ abstract class UserdevSetup : BuildService<UserdevSetup.Parameters>, SetupHandle
     private val extractDevBundle: ExtractedBundle<Any> = lockSetup(parameters.cache.path) {
         val extract = extractDevBundle(
             parameters.cache.path.resolve(paperSetupOutput("extractDevBundle", "dir")),
-            parameters.bundleZip.path
+            parameters.bundleZip.path,
+            parameters.bundleZipHash.get()
         )
         lastUsedFile(parameters.cache.path).writeText(System.currentTimeMillis().toString())
         extract