bundle WebUI for stable builds

.github/workflows/publish.yml

@@ -65,7 +65,7 @@ jobs:
         with:
           build-root-directory: master
           wrapper-directory: master
-          arguments: :webUI:copyBuild :server:shadowJar --stacktrace
+          arguments: :server:downloadWebUI :server:shadowJar --stacktrace
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true

.gitignore

@@ -6,7 +6,7 @@ gradle.properties
 # Ignore Gradle build output directory
 build
 
-server/src/main/resources/webUI
+server/src/main/resources/WebUI.zip
 server/tmp/
 server/tachiserver-data/
 

server/build.gradle.kts

@@ -181,6 +181,12 @@ tasks {
 
     named<Copy>("processResources") {
         duplicatesStrategy = DuplicatesStrategy.INCLUDE
+        mustRunAfter("downloadWebUI")
+    }
+
+    register<de.undercouch.gradle.tasks.download.Download>("downloadWebUI") {
+        src("https://github.com/Suwayomi/Tachidesk-WebUI-preview/releases/download/$webUIRevisionTag/Tachidesk-WebUI-$webUIRevisionTag.zip")
+        dest("src/main/resources/WebUI.zip")
     }
 
     withType<LintTask> {

server/src/main/kotlin/suwayomi/tachidesk/server/util/WebUIManager.kt

@@ -53,11 +53,18 @@ fun setupWebUI() {
     } else {
         File(applicationDirs.webUIRoot).deleteRecursively()
 
-        // download webUI zip
         val webUIZip = "Tachidesk-WebUI-${BuildConfig.WEBUI_TAG}.zip"
         val webUIZipPath = "$tmpDir/$webUIZip"
-        val webUIZipURL = "${BuildConfig.WEBUI_REPO}/releases/download/${BuildConfig.WEBUI_TAG}/$webUIZip"
         val webUIZipFile = File(webUIZipPath)
+
+        // try with resources first
+        val resourceWebUI = try {
+            BuildConfig::class.java.getResourceAsStream("/WebUI.zip")
+        } catch (e: NullPointerException) { null }
+
+        if (resourceWebUI == null) { // is not bundled
+            // download webUI zip
+            val webUIZipURL = "${BuildConfig.WEBUI_REPO}/releases/download/${BuildConfig.WEBUI_TAG}/$webUIZip"
             webUIZipFile.delete()
 
             logger.info { "Downloading WebUI zip from the Internet..." }
@@ -82,11 +89,20 @@ fun setupWebUI() {
                     logger.info { "Downloading WebUI Done." }
                 }
             }
+        } else {
+            logger.info { "Using the bundled WebUI zip..." }
+
+            resourceWebUI.use { input ->
+                webUIZipFile.outputStream().use { output ->
+                    input.copyTo(output)
+                }
+            }
+        }
 
         // extract webUI zip
-        logger.info { "Extracting downloaded WebUI zip..." }
+        logger.info { "Extracting WebUI zip..." }
         File(applicationDirs.webUIRoot).mkdirs()
         ZipFile(webUIZipPath).extractAll(applicationDirs.webUIRoot)
-        logger.info { "Extracting downloaded WebUI zip Done." }
+        logger.info { "Extracting WebUI zip Done." }
     }
 }