Update dependency installer to upgrade companion app

Author: MattEqualsCoder

MSUScripter/Configs/MsuSongMsuPcmInfo.cs

@@ -99,7 +99,7 @@ public List<string> GetFiles()
         return files;
     }
 
-    [YamlIgnore]
+    [YamlIgnore, JsonSchemaIgnore]
     public bool HasBothSubTracksAndSubChannels
     {
         get
@@ -110,7 +110,7 @@ public bool HasBothSubTracksAndSubChannels
         }
     }
 
-    [YamlIgnore]
+    [YamlIgnore, JsonSchemaIgnore]
     public bool HasValidSubChannelCount
     {
         get
@@ -120,7 +120,7 @@ public bool HasValidSubChannelCount
         }
     }
 
-    [YamlIgnore]
+    [YamlIgnore, JsonSchemaIgnore]
     public bool HasValidChildTypes
     {
         get

MSUScripter/Services/DependencyInstallerService.cs

@@ -32,63 +32,73 @@ public async Task<bool> InstallPyApp(Action<string> response, Func<string, strin
         {
             response.Invoke("Setting up directories");
             var destination = Path.Combine(Directories.Dependencies, "python");
+            
+            var pythonPath = OperatingSystem.IsWindows()
+                ? Path.Combine(destination, "python.exe")
+                : Path.Combine(destination, "bin", "python3.13");
+            var doesHavePython = false;
 
-            if (Directory.Exists(destination))
+            if (File.Exists(pythonPath))
             {
-                logger.LogInformation("Deleting prior Python installation");
-                try
+                var checkPyVersionResult = await runPyFunc(pythonPath, "--version");
+                doesHavePython = checkPyVersionResult.Success && checkPyVersionResult.Result.StartsWith("Python 3.13");
+            }
+
+            if (!doesHavePython)
+            {
+                if (Directory.Exists(destination))
                 {
-                    await ITaskService.Run(() =>
+                    logger.LogInformation("Deleting prior Python installation");
+                    try
                     {
-                        Directory.Delete(destination, true);
-                    });
-                }
-                catch (TaskCanceledException)
-                {
-                    // Do Nothing
+                        await ITaskService.Run(() =>
+                        {
+                            Directory.Delete(destination, true);
+                        });
+                    }
+                    catch (TaskCanceledException)
+                    {
+                        // Do Nothing
+                    }
                 }
-            }
-
-            EnsureFolders(destination);
 
-            var tempFile = Path.Combine(Directories.TempFolder, "python.tar.gz");
-            var url = OperatingSystem.IsWindows() ? PythonWindowsDownloadUrl : PythonLinuxDownloadUrl;
+                EnsureFolders(destination);
 
-            response.Invoke("Downloading Python");
-            if (!await DownloadFileAsync(url, tempFile))
-            {
-                return false;
-            }
+                var tempFile = Path.Combine(Directories.TempFolder, "python.tar.gz");
+                var url = OperatingSystem.IsWindows() ? PythonWindowsDownloadUrl : PythonLinuxDownloadUrl;
 
-            response.Invoke("Extracting Python files");
-            if (!await ExtractTarGzFile(tempFile, Directories.Dependencies))
-            {
-                return false;
-            }
+                response.Invoke("Downloading Python");
+                if (!await DownloadFileAsync(url, tempFile))
+                {
+                    return false;
+                }
 
-            var pythonPath = OperatingSystem.IsWindows()
-                ? Path.Combine(destination, "python.exe")
-                : Path.Combine(destination, "bin", "python3.13");
+                response.Invoke("Extracting Python files");
+                if (!await ExtractTarGzFile(tempFile, Directories.Dependencies))
+                {
+                    return false;
+                }
 
-            if (OperatingSystem.IsLinux())
-            {
-                File.SetUnixFileMode(pythonPath,
-                    UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute);
-            }
+                if (OperatingSystem.IsLinux())
+                {
+                    File.SetUnixFileMode(pythonPath,
+                        UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute);
+                }
 
-            response.Invoke("Verifying Python version");
+                response.Invoke("Verifying Python version");
 
-            var runPyResult = await runPyFunc(pythonPath, "--version");
-            if (!runPyResult.Success || !runPyResult.Result.StartsWith("Python 3"))
-            {
-                logger.LogError("Python version response incorrect: {Response} | {Error}", runPyResult.Result,
-                    runPyResult.Error);
-                return false;
+                var verifyPythonInstallResult = await runPyFunc(pythonPath, "--version");
+                if (!verifyPythonInstallResult.Success || !verifyPythonInstallResult.Result.StartsWith("Python 3.13"))
+                {
+                    logger.LogError("Python version response incorrect: {Response} | {Error}", verifyPythonInstallResult.Result,
+                        verifyPythonInstallResult.Error);
+                    return false;
+                }
             }
-            
+
             response.Invoke("Installing companion app");
 
-            runPyResult = await runPyFunc(pythonPath, "-m pip install py-msu-scripter-app");
+            var runPyResult = await runPyFunc(pythonPath, "-m pip install --upgrade py-msu-scripter-app");
             if (!runPyResult.Success && !runPyResult.Error.StartsWith("[notice]"))
             {
                 logger.LogError("Failed to install Python companion app: {Error}", runPyResult.Error);

MSUScripter/Services/PythonCompanionService.cs

@@ -8,13 +8,14 @@
 using AvaloniaControls.Services;
 using Microsoft.Extensions.Logging;
 using MSUScripter.Models;
+using MSUScripter.Tools;
 
 namespace MSUScripter.Services;
 
 public class PythonCompanionService(ILogger<PythonCompanionService> logger, YamlService yamlService, DependencyInstallerService dependencyInstallerService)
 {
     private const string BaseCommand = "py_msu_scripter_app";
-    private const string MinVersion = "v0.1.5";
+    private const string MinVersion = "v0.1.6";
     private RunMethod _runMethod = RunMethod.Unknown;
     private string? _pythonExecutablePath;
     private string? _ffmpegPath;
@@ -34,7 +35,7 @@ public async Task<bool> VerifyInstalledAsync()
         _pythonExecutablePath = null;
         var response = await RunCommandAsync("--version");
 
-        IsValid = response.Success && response.Result.EndsWith(MinVersion) &&
+        IsValid = response.Success && VerifyVersionNumber(response.Result) &&
                   !response.Error.Contains("Couldn't find ffmpeg");
 
         if (IsValid)
@@ -49,6 +50,13 @@ public async Task<bool> VerifyInstalledAsync()
         return IsValid;
     }
 
+    private bool VerifyVersionNumber(string versionString)
+    {
+        var minVersion = MinVersion.VersionStringToDecimal();
+        var currentVersion = versionString.Substring(versionString.IndexOf('v')).VersionStringToDecimal();
+        return currentVersion >= minVersion;
+    }
+
     public async Task<bool> VerifyFfMpegAsync()
     {
         var ffmpegFolder = Path.Combine(Directories.Dependencies, "ffmpeg", "bin");
@@ -603,7 +611,7 @@ private async Task<RunPyResult> RunInternalAsync(string command, string argument
             await process.WaitForExitAsync(cancellationToken ??  CancellationToken.None);
 
             var resultText = "";
-            var errorText = "";
+            string errorText;
 
             if (isPipInstall)
             {

MSUScripter/Tools/StringExtensions.cs

@@ -14,4 +14,33 @@ public static int GetUnicodeLength(this string str)
     {
         return new StringInfo(str.CleanString()).LengthInTextElements;
     }
+
+    public static decimal? VersionStringToDecimal(this string str)
+    {
+        if (!str.Contains('.'))
+        {
+            return null;
+        }
+
+        if (str.StartsWith('v'))
+        {
+            str = str[1..];
+        }
+
+        var parts = str.Split('.');
+        if (parts.Length <= 2)
+        {
+            return decimal.Parse(str);
+        }
+        else if (parts.Length == 3)
+        {
+            return decimal.Parse(parts[0]) * 1000 + decimal.Parse(parts[1]) + decimal.Parse(parts[2]) / 1000;
+        }
+        else if (parts.Length == 4)
+        {
+            return decimal.Parse(parts[0]) * 1000000 + decimal.Parse(parts[1]) * 1000 + decimal.Parse(parts[2]) + decimal.Parse(parts[3]) / 1000;
+        }
+
+        return null;
+    }
 }

Schemas/MsuSongInfo.json

@@ -156,6 +156,13 @@
           ],
           "description": "The file to be used as the input for this track/sub-track/sub-channel"
         },
+        "Dither": {
+          "type": [
+            "boolean",
+            "null"
+          ],
+          "description": "Whether or not to apply audio dither to the final output."
+        },
         "SubTracks": {
           "type": "array",
           "description": "Files which will be concatenated together to form the input to the parent track",
@@ -169,9 +176,6 @@
           "items": {
             "$ref": "#/definitions/MsuSongMsuPcmInfo"
           }
-        },
-        "HasBothSubTracksAndSubChannels": {
-          "type": "boolean"
         }
       }
     }

Schemas/MsuSongMsuPcmInfo.json

@@ -99,6 +99,13 @@
       ],
       "description": "The file to be used as the input for this track/sub-track/sub-channel"
     },
+    "Dither": {
+      "type": [
+        "boolean",
+        "null"
+      ],
+      "description": "Whether or not to apply audio dither to the final output."
+    },
     "SubTracks": {
       "type": "array",
       "description": "Files which will be concatenated together to form the input to the parent track",
@@ -112,9 +119,6 @@
       "items": {
         "$ref": "#"
       }
-    },
-    "HasBothSubTracksAndSubChannels": {
-      "type": "boolean"
     }
   }
 }