Grmbl.... Fix bugs on validation of Latest Firmware (not mandatory) a…

…nd on DSM Name
vletroye · Dec 13, 2017 · 9be493a · 9be493a
1 parent 0f26fab
commit 9be493a
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 18 deletions.
diff --git a/Json Editor/obj/Release/Json Editor.csproj.GenerateResource.Cache b/Json Editor/obj/Release/Json Editor.csproj.GenerateResource.Cache
diff --git a/MyOwnDSMShortcuts/.vs/Mods/v14/.suo b/MyOwnDSMShortcuts/.vs/Mods/v14/.suo
diff --git a/MyOwnDSMShortcuts/MainForm.cs b/MyOwnDSMShortcuts/MainForm.cs
@@ -650,18 +650,21 @@ private void buttonReset_Click(object sender, EventArgs e)
         // Click on Button Create Package
         private void buttonPublish_Click(object sender, EventArgs e)
         {
-            GeneratePackage(PackageRootPath);
+            if (ValidateChildren())
+            {
+                GeneratePackage(PackageRootPath);
 
-            SpkRepoBrowserDialog4Mods.Title = "Pick a folder to publish the Package.";
-            if (!string.IsNullOrEmpty(PackageRepoPath))
-                SpkRepoBrowserDialog4Mods.InitialDirectory = PackageRepoPath;
-            else
-                SpkRepoBrowserDialog4Mods.InitialDirectory = Properties.Settings.Default.PackageRepo;
+                SpkRepoBrowserDialog4Mods.Title = "Pick a folder to publish the Package.";
+                if (!string.IsNullOrEmpty(PackageRepoPath))
+                    SpkRepoBrowserDialog4Mods.InitialDirectory = PackageRepoPath;
+                else
+                    SpkRepoBrowserDialog4Mods.InitialDirectory = Properties.Settings.Default.PackageRepo;
 
-            if (SpkRepoBrowserDialog4Mods.ShowDialog())
-            {
-                PackageRepoPath = SpkRepoBrowserDialog4Mods.FileName;
-                PublishPackage(PackageRootPath, PackageRepoPath);
+                if (SpkRepoBrowserDialog4Mods.ShowDialog())
+                {
+                    PackageRepoPath = SpkRepoBrowserDialog4Mods.FileName;
+                    PublishPackage(PackageRootPath, PackageRepoPath);
+                }
             }
         }
 
@@ -2337,7 +2340,7 @@ private void textBoxDsmAppName_Validating(object sender, CancelEventArgs e)
         {
             if (!CheckEmpty(textBoxDsmAppName, ref e))
             {
-                var name = textBoxDsmAppName.Text.Replace(".", "_");
+                var name = textBoxDsmAppName.Text.Replace(".", "_").Replace("__","_");
                 var cleaned = Helper.CleanUpText(textBoxDsmAppName.Text);
                 if (name != cleaned)
                 {
@@ -2756,14 +2759,14 @@ private void PublishPackage(string PackagePath, string PackageRepo)
             try
             {
                 publishFile(Path.Combine(PackagePath, packName + ".spk"), Path.Combine(PackageRepo, packName + ".spk"));
-                publishFile(Path.Combine(PackagePath, "INFO"), Path.Combine(PackageRepo, packName + ".nfo"));
-                publishFile(Path.Combine(PackagePath, "PACKAGE_ICON.PNG"), Path.Combine(PackageRepo, packName + "_thumb_72.png"));
+                //publishFile(Path.Combine(PackagePath, "INFO"), Path.Combine(PackageRepo, packName + ".nfo"));
+                //publishFile(Path.Combine(PackagePath, "PACKAGE_ICON.PNG"), Path.Combine(PackageRepo, packName + "_thumb_72.png"));
 
-                var pathImage = Path.Combine(PackageRepo, packName + "_thumb_120.png");
-                publishFile(Path.Combine(PackagePath, "PACKAGE_ICON_256.PNG"), pathImage);
+                //var pathImage = Path.Combine(PackageRepo, packName + "_thumb_120.png");
+                //publishFile(Path.Combine(PackagePath, "PACKAGE_ICON_256.PNG"), pathImage);
 
-                var image = LoadImage(pathImage, 0, 120);
-                image.Save(pathImage, ImageFormat.Png);
+                //var image = LoadImage(pathImage, 0, 120);
+                //image.Save(pathImage, ImageFormat.Png);
 
                 MessageBox.Show(this, "The package has been successfuly published", "Notification", MessageBoxButtons.OK, MessageBoxIcon.Information);
             }
@@ -3887,7 +3890,7 @@ private void textBoxLatestFirmware_Validated(object sender, EventArgs e)
 
         private void textBoxLatestFirmware_Validating(object sender, CancelEventArgs e)
         {
-            if (!CheckEmpty(textBoxLatestFirmware, ref e))
+            if (textBoxLatestFirmware.Text != "")
             {
                 if (getOldVersion.IsMatch(textBoxLatestFirmware.Text))
                 {

diff --git a/MyOwnDSMShortcuts/bin/Debug/MODS_SSPKS.spk b/MyOwnDSMShortcuts/bin/Debug/MODS_SSPKS.spk
diff --git a/MyOwnDSMShortcuts/bin/Debug/Mods.exe b/MyOwnDSMShortcuts/bin/Debug/Mods.exe
diff --git a/MyOwnDSMShortcuts/bin/Debug/Mods.pdb b/MyOwnDSMShortcuts/bin/Debug/Mods.pdb
diff --git a/MyOwnDSMShortcuts/bin/Debug/Mods.vshost.exe.manifest b/MyOwnDSMShortcuts/bin/Debug/Mods.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git a/MyOwnDSMShortcuts/bin/Release.zip b/MyOwnDSMShortcuts/bin/Release.zip
diff --git a/MyOwnDSMShortcuts/bin/Release/Mods.exe b/MyOwnDSMShortcuts/bin/Release/Mods.exe
diff --git a/MyOwnDSMShortcuts/bin/Release/Mods.pdb b/MyOwnDSMShortcuts/bin/Release/Mods.pdb
diff --git a/MyOwnDSMShortcuts/obj/Debug/Mods.csproj.GenerateResource.Cache b/MyOwnDSMShortcuts/obj/Debug/Mods.csproj.GenerateResource.Cache
diff --git a/MyOwnDSMShortcuts/obj/Debug/Mods.exe b/MyOwnDSMShortcuts/obj/Debug/Mods.exe
diff --git a/MyOwnDSMShortcuts/obj/Debug/Mods.pdb b/MyOwnDSMShortcuts/obj/Debug/Mods.pdb
diff --git a/MyOwnDSMShortcuts/obj/Release/Mods.exe b/MyOwnDSMShortcuts/obj/Release/Mods.exe
diff --git a/MyOwnDSMShortcuts/obj/Release/Mods.pdb b/MyOwnDSMShortcuts/obj/Release/Mods.pdb