some refactoring

DatL4g · Sep 1, 2024 · 5e229f7 · 5e229f7
1 parent 607eccd
commit 5e229f7
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/jcef/build.gradle.kts b/jcef/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
 mavenPublishing {
     publishToMavenCentral(host = SonatypeHost.S01, automaticRelease = true)
     signAllPublications()
-    coordinates("dev.datlag", "jcef", "2024.04.20.1")
+    coordinates("dev.datlag", "jcef", "2024.04.20.2")
 
     pom {
         name.set(project.name)

diff --git a/kcef/build.gradle.kts b/kcef/build.gradle.kts
@@ -35,7 +35,7 @@ tasks.dokkaHtmlPartial {
 mavenPublishing {
     publishToMavenCentral(host = SonatypeHost.S01, automaticRelease = true)
     signAllPublications()
-    coordinates("dev.datlag", "kcef", "2024.04.20.1")
+    coordinates("dev.datlag", "kcef", "2024.04.20.2")
 
     pom {
         name.set(project.name)

diff --git a/kcef/src/main/kotlin/dev/datlag/kcef/KCEF.kt b/kcef/src/main/kotlin/dev/datlag/kcef/KCEF.kt
@@ -5,7 +5,6 @@ import dev.datlag.kcef.KCEF.InitRestartRequired
 import dev.datlag.kcef.KCEF.NewClientOrNullError
 import dev.datlag.kcef.common.existsSafely
 import dev.datlag.kcef.common.suspendCatching
-import dev.datlag.kcef.model.KCEFAcknowledge
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.update

diff --git a/.../dev/datlag/kcef/model/KCEFAcknowledge.kt → ...kotlin/dev/datlag/kcef/KCEFAcknowledge.kt b/.../dev/datlag/kcef/model/KCEFAcknowledge.kt → ...kotlin/dev/datlag/kcef/KCEFAcknowledge.kt
@@ -1,4 +1,4 @@
-package dev.datlag.kcef.model
+package dev.datlag.kcef
 
 @RequiresOptIn(message = "This API may be library and application breaking. Only use it if you fully understand what you are doing.")
 @Retention(AnnotationRetention.BINARY)

diff --git a/kcef/src/main/kotlin/dev/datlag/kcef/KCEFBuilder.kt b/kcef/src/main/kotlin/dev/datlag/kcef/KCEFBuilder.kt
@@ -6,7 +6,6 @@ import dev.datlag.kcef.KCEFBuilder.InitProgress.Builder.ProgressCallback
 import dev.datlag.kcef.KCEFBuilder.Settings
 import dev.datlag.kcef.common.*
 import dev.datlag.kcef.model.GitHubRelease
-import dev.datlag.kcef.model.KCEFAcknowledge
 import dev.datlag.kcef.step.extract.TarGzExtractor
 import dev.datlag.kcef.step.fetch.PackageDownloader
 import dev.datlag.kcef.step.init.CefInitializer
@@ -680,7 +679,11 @@ class KCEFBuilder {
                         release.assets.filter { asset ->
                             platform.os.values.any { os ->
                                 asset.name.contains(os, true) || asset.downloadUrl.contains(os, true)
-                            }
+                            } && asset.downloadUrl.isNotBlank()
+                        }.filter { asset ->
+                            platform.arch.values.any { arch ->
+                                asset.name.contains(arch, ignoreCase = true) || asset.downloadUrl.contains(arch, true)
+                            } && asset.downloadUrl.isNotBlank()
                         }.map { it.downloadUrl }
                     }
                     val platformPackageList = osPackageList.filter { url ->

diff --git a/kcef/src/main/kotlin/dev/datlag/kcef/model/GitHubRelease.kt b/kcef/src/main/kotlin/dev/datlag/kcef/model/GitHubRelease.kt
@@ -10,7 +10,7 @@ internal data class GitHubRelease(
 ) {
     @Serializable
     internal data class Asset(
-        val name: String,
-        @SerialName("browser_download_url") val downloadUrl: String
+        val name: String = "",
+        @SerialName("browser_download_url") val downloadUrl: String = ""
     )
 }