making the api slightly less insane

DaemonicLabs · Mar 20, 2021 · 9f9e689 · 9f9e689
1 parent a3a6a6a
commit 9f9e689
Show file tree

Hide file tree

Showing 9 changed files with 281 additions and 158 deletions.
diff --git a/core/src/main/kotlin/voodoo/curse/CurseClient.kt b/core/src/main/kotlin/voodoo/curse/CurseClient.kt
@@ -454,7 +454,7 @@ object CurseClient : KLogging() {
 
         var oldFiles = files
 
-        if (version.isNotBlank()) {
+        if (version != null && version.isNotBlank()) {
             files = files.filter { f ->
                 (f.fileName.contains(version.toRegex()) || f.fileName == version)
             }

diff --git a/core/src/main/kotlin/voodoo/data/components/ComponentsMutable.kt b/core/src/main/kotlin/voodoo/data/components/ComponentsMutable.kt
@@ -23,12 +23,12 @@ data class CommonComponent(
     override var description: String? = null,
     override var optionalData: OptionalData? = null,
     override var side: Side = Side.BOTH,
-    override var websiteUrl: String = "",
+    override var websiteUrl: String? = null,
     override var dependencies: MutableMap<String, DependencyType> = mutableMapOf(),
 //    override var replaceDependencies: Map<ProjectID, ProjectID> = mapOf(),
     override var packageType: PackageType = PackageType.MOD,
     override var transient: Boolean = false, // this entry got added as dependency for something else
-    override var version: String = "", // TODO: use regex only ?
+    override var version: String? = null, // TODO: use regex only ?
     override var fileName: String? = null,
     override var fileNameRegex: String = ".*(?<!-sources\\.jar)(?<!-api\\.jar)(?<!-deobf\\.jar)(?<!-lib\\.jar)(?<!-slim\\.jar)$",
     override var validMcVersions: Set<String> = setOf(),
@@ -61,9 +61,9 @@ data class DirectComponent(
 
 @Serializable
 data class JenkinsComponent(
-    override var jenkinsUrl: String = "",
+    override var jenkinsUrl: String? = null,
     override var job: String = "",
-    override var buildNumber: Int = -1,
+    override var buildNumber: Int? = null,
     override var useOriginalUrl: Boolean = true
 ) : JenkinsMutable
 

diff --git a/core/src/main/kotlin/voodoo/data/components/Parts.kt b/core/src/main/kotlin/voodoo/data/components/Parts.kt
@@ -15,11 +15,11 @@ interface Common {
     val description: String?
     val optionalData: OptionalData?
     val side: Side
-    val websiteUrl: String
+    val websiteUrl: String?
     val dependencies: MutableMap<String, DependencyType>
     val packageType: PackageType
     val transient: Boolean // this entry got added as dependency for somethin
-    val version: String // TODO: use regex only ?
+    val version: String? // TODO: use regex only ?
     val fileName: String?
     val fileNameRegex: String
     val validMcVersions: Set<String>
@@ -37,12 +37,12 @@ interface CommonMutable : CommonImmutable {
     override var description: String?
     override var optionalData: OptionalData?
     override var side: Side
-    override var websiteUrl: String
+    override var websiteUrl: String?
     override var dependencies: MutableMap<String, DependencyType>
 //    override var replaceDependencies: Map<ProjectID, ProjectID>
     override var packageType: PackageType
     override var transient: Boolean // this entry got added as dependency for somethin
-    override var version: String // TODO: use regex only ?
+    override var version: String? // TODO: use regex only ?
     override var fileName: String?
     override var fileNameRegex: String
     override var validMcVersions: Set<String>
@@ -88,15 +88,15 @@ interface DirectMutable: DirectImmutable {
 }
 
 interface JenkinsImmutable {
-    val jenkinsUrl: String
+    val jenkinsUrl: String?
     val job: String
-    val buildNumber: Int
+    val buildNumber: Int?
     val useOriginalUrl: Boolean
 }
 interface JenkinsMutable: JenkinsImmutable {
-    override var jenkinsUrl: String
+    override var jenkinsUrl: String?
     override var job: String
-    override var buildNumber: Int
+    override var buildNumber: Int?
     override var useOriginalUrl: Boolean
 }
 

diff --git a/core/src/main/kotlin/voodoo/data/lock/LockEntry.kt b/core/src/main/kotlin/voodoo/data/lock/LockEntry.kt
@@ -74,9 +74,9 @@ sealed class LockEntry() : CommonLockModule, Comparable<LockEntry> {
         override val description: String? = null,
         override val optionalData: OptionalData? = null,
         override val dependencies: Map<String, DependencyType> = mapOf(),
-        val jenkinsUrl: String = "",
-        val job: String = "",
-        val buildNumber: Int = -1,
+        val jenkinsUrl: String,
+        val job: String,
+        val buildNumber: Int,
         val artifactRelativePath: String,
         val artifactFileName: String,
         val fileNameRegex: String = ".*(?<!-sources\\.jar)(?<!-api\\.jar)(?<!-deobf\\.jar)(?<!-lib\\.jar)(?<!-slim\\.jar)$",

diff --git a/core/src/main/kotlin/voodoo/provider/JenkinsProvider.kt b/core/src/main/kotlin/voodoo/provider/JenkinsProvider.kt
@@ -38,10 +38,11 @@ object JenkinsProvider : ProviderBase("Jenkins Provider") {
 //        if (entry.job.isBlank()) {
 //            entry.job = entry.id
 //        }
-        val job = job(entry.job, entry.jenkinsUrl)
-        val buildNumber = job.lastSuccessfulBuild?.number ?: throw IllegalStateException("buildnumber not set")
+        val jenkinsUrl = entry.jenkinsUrl ?: error("jenkins url unset on entry '${entry.id}'")
+        val job = job(entry.job, jenkinsUrl)
+        val buildNumber = entry.buildNumber ?: job.lastSuccessfulBuild?.number ?: throw IllegalStateException("buildnumber not set")
         val common = entry.lockCommon()
-        val artifact = artifact(entry.job, entry.jenkinsUrl, buildNumber, entry.fileNameRegex)
+        val artifact = artifact(entry.job, jenkinsUrl, buildNumber, entry.fileNameRegex)
         return LockEntry.Jenkins(
             id = common.id,
             path = common.path,
@@ -51,7 +52,7 @@ object JenkinsProvider : ProviderBase("Jenkins Provider") {
             description = common.description,
             optionalData = common.optionalData,
             dependencies = common.dependencies,
-            jenkinsUrl = entry.jenkinsUrl,
+            jenkinsUrl = jenkinsUrl,
             job = entry.job,
             buildNumber = buildNumber,
             fileNameRegex = entry.fileNameRegex,

diff --git a/samples/fabricpack/164Version.voodoo.json5 b/samples/fabricpack/164Version.voodoo.json5
@@ -26,7 +26,6 @@
         "type": "curse",
         "curse_projectName": "Fabric/campanion",
       },
-
       {
         "type": "curse",
         "curse_projectName": "Fabric/hwyla",

diff --git a/voodoo/src/main/kotlin/voodoo/cli/ImportCurseCommand.kt b/voodoo/src/main/kotlin/voodoo/cli/ImportCurseCommand.kt
@@ -178,15 +178,21 @@ class ImportCurseCommand() : CliktCommand(
                                 hasCustomProperties = true
                             }
                             if(!addonFile.gameVersion.contains(manifest.minecraft.version)) {
-                                entry.validMcVersions = addonFile.gameVersion.toSet() - "Forge"
+                                entry = entry.copy(
+                                    validMcVersions = addonFile.gameVersion.toSet() - "Forge"
+                                )
                                 hasCustomProperties = true
                             }
                             when (addon.categorySection.name) {
                                 CurseSection.MODS.sectionName -> {
-//                                    folder = "mods"
+//                                    entry = entry.copy(
+//                                        folder = "mods"
+//                                    )
                                 }
                                 CurseSection.RESOURCE_PACKS.sectionName -> {
-                                    entry.folder = "resourcepacks"
+                                    entry = entry.copy(
+                                        folder = "resourcepacks"
+                                    )
                                     hasCustomProperties = true
                                 }
                                 else -> {
@@ -196,6 +202,8 @@ class ImportCurseCommand() : CliktCommand(
 //                                fileNameRegex = "\\Q${addonFile.fileName}\\E"
 
                             if(!hasCustomProperties) {
+                                // had single line string declaration herei n the past
+                                // wo probbably can drop hasCustomProperties flag
                                 FileEntry.Curse(
                                     curse_projectName = entry.curse_projectName
                                 )