Merge pull request #40 from Shivansps/mod-upload-fixes-20231112

Sanitize pkg deps, banner image check typo, check directory before delete
KnossosNET · Nov 12, 2023 · ad24c55 · ad24c55
2 parents 87814cd + 0498326
commit ad24c55
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/Knossos.NET/ViewModels/Templates/TaskItemViewModel.cs b/Knossos.NET/ViewModels/Templates/TaskItemViewModel.cs
@@ -580,6 +580,15 @@ private async Task<string> ReleaseMod(Mod mod, bool metaUpdate,CancellationToken
                     cleanMod.members = new List<ModMember>();
                     cleanMod.notes = mod.notes == null ? "" : mod.notes;
 
+                    if(cleanMod.packages != null && cleanMod.packages.Any())
+                    {
+                        foreach(var pkg in cleanMod.packages)
+                        {
+                            if(pkg.dependencies == null)
+                                pkg.dependencies = new ModDependency[0];
+                        }
+                    }
+
                     string? result;
 
                     if (!metaUpdate)
@@ -704,7 +713,7 @@ private async Task<bool> UploadModImages(Mod mod, CancellationTokenSource? cance
                     }
                     ProgressCurrent++;
                     //Banner
-                    if (!string.IsNullOrEmpty(mod.tile))
+                    if (!string.IsNullOrEmpty(mod.banner))
                     {
                         Info = "Banner Image";
                         mod.banner = await Nebula.UploadImage(mod.fullPath + Path.DirectorySeparatorChar + mod.banner);
@@ -1367,7 +1376,7 @@ public async Task<bool> UploadModVersion(Mod mod, bool isNewMod, bool metaOnly,
                     ProgressCurrent = ProgressBarMax;
 
                     //Delete kn_upload folder?
-                    if (Knossos.globalSettings.deleteUploadedFiles)
+                    if (Knossos.globalSettings.deleteUploadedFiles && Directory.Exists(mod.fullPath + Path.DirectorySeparatorChar + "kn_upload"))
                     {
                         try
                         {