Merge #4137 Allow licenses to be absent from netkans

KSP-CKAN · Jul 31, 2024 · 701afa1 · 701afa1
2 parents 393544d + 36a1fd5
commit 701afa1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -63,6 +63,7 @@ All notable changes to this project will be documented in this file.
 - [Build] Refactor + Modernise Actions (#4082, #4088, #4089, #4091, #4093, #4094, #4095, #4117 by: techman83, HebaruSan; reviewed: HebaruSan)
 - [Multiple] Translation updates from Crowdin (#4105 by: vinix38, frankieorabona, ambition, Francesco Ricina, S.O.2; reviewed: HebaruSan)
 - [Netkan] Allow string "Harmony" in DLL parent folder names (#4123 by: HebaruSan)
+- [Netkan] Allow licenses to be absent from netkans (#4137 by: HebaruSan)
 
 ## v1.34.4 (Niven)
 

diff --git a/Netkan/Transformers/SpacedockTransformer.cs b/Netkan/Transformers/SpacedockTransformer.cs
@@ -106,7 +106,7 @@ private Metadata TransformOne(Metadata metadata, JObject json, SpacedockMod sdMo
             // "GPLv3" - Becomes "GPL-3.0"
             // "LGPL" - Specific version is indeterminate
 
-            var sdLicense = sdMod.license.Trim();
+            var sdLicense = sdMod.license.Trim().Replace(' ', '-');
 
             switch (sdLicense)
             {

diff --git a/Netkan/Validators/CkanValidator.cs b/Netkan/Validators/CkanValidator.cs
@@ -17,6 +17,7 @@ public CkanValidator(IHttpService downloader, IModuleService moduleService, IGam
                 new IsCkanModuleValidator(),
                 new DownloadArrayValidator(),
                 new TagsValidator(),
+                new LicensesValidator(),
                 new InstallsFilesValidator(downloader, moduleService, game),
                 new MatchesKnownGameVersionsValidator(game),
                 new ObeysCKANSchemaValidator(),

diff --git a/Netkan/Validators/NetkanValidator.cs b/Netkan/Validators/NetkanValidator.cs
@@ -17,7 +17,6 @@ public NetkanValidator()
                 new KrefValidator(),
                 new AlphaNumericIdentifierValidator(),
                 new RelationshipsValidator(),
-                new LicensesValidator(),
                 new KrefDownloadMutexValidator(),
                 new DownloadVersionValidator(),
                 new OverrideValidator(),