Merge pull request #132 from MattEqualsCoder/v3.3.0-changes

v4.0.0 Changes (Beta)

Author: MattEqualsCoder

.idea/.idea.MSUScripter/.idea/avalonia.xml

@@ -2,6 +2,8 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MSUScripter", "MSUScripter\MSUScripter.csproj", "{2575FDC5-ED6A-49D5-A497-D56AB4360593}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SchemaGenerator", "SchemaGenerator\SchemaGenerator.csproj", "{91EAB44F-EF9B-4439-AFA3-E27D9AAA49D1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -12,5 +14,9 @@ Global
 		{2575FDC5-ED6A-49D5-A497-D56AB4360593}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2575FDC5-ED6A-49D5-A497-D56AB4360593}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2575FDC5-ED6A-49D5-A497-D56AB4360593}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91EAB44F-EF9B-4439-AFA3-E27D9AAA49D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91EAB44F-EF9B-4439-AFA3-E27D9AAA49D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91EAB44F-EF9B-4439-AFA3-E27D9AAA49D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91EAB44F-EF9B-4439-AFA3-E27D9AAA49D1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

MSUScripter.sln

@@ -1,25 +1,26 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-             xmlns:tools="clr-namespace:MSUScripter.Tools"
+             xmlns:msuScripter="clr-namespace:MSUScripter"
              x:Class="MSUScripter.App"
-             
              RequestedThemeVariant="Dark">
              <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
 
+             <Application.DataTemplates>
+                 <msuScripter:ViewLocator/>
+             </Application.DataTemplates>
+  
              <Application.Resources>
-                 <tools:NullableBoolToStringConverter x:Key="NullableBoolToStringConverter" />
-                 <tools:BoolToStringConverter x:Key="BoolToStringConverter" />
+                 <ResourceDictionary>
+                     <ResourceDictionary.MergedDictionaries>
+                         <ResourceInclude Source="avares://AvaloniaControls/Themes/Resources.axaml"></ResourceInclude>
+                     </ResourceDictionary.MergedDictionaries>
+                 </ResourceDictionary>
              </Application.Resources>
+             
              <Application.Styles>
-                 <!--<StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" />-->
                  <SimpleTheme />
-                 <avalonia:MaterialIconStyles />
-                 <StyleInclude Source="Controls/CardControl.axaml"></StyleInclude>
-                 <StyleInclude Source="Controls/LabeledControl.axaml"></StyleInclude>
-                 <StyleInclude Source="Controls/LinkControl.axaml"></StyleInclude>
-                 <StyleInclude Source="Themes/Themes.axaml"></StyleInclude>
                  <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Simple.xaml"/>
+                 <StyleInclude Source="avares://AvaloniaControls/Themes/Themes.axaml"></StyleInclude>
              </Application.Styles>
 
 </Application>

MSUScripter/App.axaml

@@ -1,106 +1,46 @@
-using System;
 using System.Diagnostics;
-using System.IO;
-using System.Linq;
 using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
+using AvaloniaControls.Controls;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using MSURandomizerLibrary.Models;
-using MSURandomizerLibrary.Services;
-using MSUScripter.Controls;
-using MSUScripter.Models;
-using MSUScripter.Services;
+using MSUScripter.Configs;
+using MSUScripter.Views;
 
 namespace MSUScripter;
 
 public partial class App : Application
 {
-    private ILogger<App>? _logger;
-    public static MainWindow? MainWindow { get; private set; }
-    private IServiceProvider? _services;
+    public static MainWindow MainWindow = null!;
 
-    public override void Initialize()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
-
-    public static string GetAppVersion()
+    public static string Version
     {
-        var version = FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly()!.Location); 
-        return (version.ProductVersion ?? "").Split("+")[0];
+        get
+        {
+            var version = FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly()!.Location); 
+            return (version.ProductVersion ?? "").Split("+")[0];
+        }
     }
 
-    private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
+    public override void Initialize()
     {
-        if (e.ExceptionObject is Exception ex)
-            _logger?.LogCritical(ex, "[CRASH] Uncaught {ExceptionType}: ", ex.GetType().Name);
-        else
-            _logger?.LogCritical("Unhandled exception in current domain but exception object is not an exception ({Obj})", e.ExceptionObject);
+        AvaloniaXamlLoader.Load(this);
     }
-    
 
     public override void OnFrameworkInitializationCompleted()
     {
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
-            _services = Program.GetServiceProvider();
-            _logger = _services.GetRequiredService<ILogger<App>>();
-            
-            desktop.ShutdownRequested += DesktopOnShutdownRequested;
-        
-            _logger.LogInformation("Assembly Location: {Location}", Assembly.GetExecutingAssembly().Location);
-            var version = FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly()!.Location);
-            _logger.LogInformation("Starting MSU Scripter {Version}", GetAppVersion());
-            AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
-        
-            var settings = _services.GetRequiredService<SettingsService>().Settings;
+            var settings = Program.MainHost.Services.GetRequiredService<Settings>();
             Current!.RequestedThemeVariant = settings.DarkTheme ? ThemeVariant.Dark : ThemeVariant.Light;
-            
-            var msuInitializationRequest = new MsuRandomizerInitializationRequest
-            {
-                MsuAppSettingsStream = Assembly.GetExecutingAssembly().GetManifestResourceStream("MSUScripter.msu-randomizer-settings.yaml"),
-                UserOptionsPath = Path.Combine(Directories.BaseFolder, "msu-user-settings.yml")
-            };
 
-#if DEBUG
-            msuInitializationRequest.UserOptionsPath = Path.Combine(Directories.BaseFolder, "msu-user-settings-debug.yml");
-#endif
-        
-            _services.GetRequiredService<IMsuRandomizerInitializationService>().Initialize(msuInitializationRequest);
-            _services.GetRequiredService<ConverterService>();
-            Resources[typeof(IServiceProvider)] = _services;
-            desktop.MainWindow = MainWindow = _services?.GetRequiredService<MainWindow>();
+            var mainWindow = new MainWindow();
+            MessageWindow.GlobalParentWindow = mainWindow;
+            desktop.MainWindow = MainWindow = mainWindow;
         }
 
         base.OnFrameworkInitializationCompleted();
     }
-
-    private void DesktopOnShutdownRequested(object? sender, ShutdownRequestedEventArgs e)
-    {
-        if (MainWindow == null) return;
-        
-        var hasPendingChanges = MainWindow.CheckPendingChanges();
-        if (!hasPendingChanges) return;
-        
-        e.Cancel = true;
-            
-        var window = new MessageWindow("You currently have unsaved changes. Do you want to save your changes?", MessageWindowType.YesNo, "MSU Scripter", MainWindow);
-        window.Show();
-
-        window.OnButtonClick += (o, args) =>
-        {
-            var result = window.Result;
-            if (result == MessageWindowResult.Yes)
-            {
-                MainWindow.SaveChanges();
-            }
-        };
-    }
-
 }

MSUScripter/App.axaml.cs

@@ -14,7 +14,7 @@ public class MsuProject
     public string MsuPath { get; set; } = "";
     public string MsuTypeName { get; set; } = "";
     public DateTime LastSaveTime { get; set; }
-    public List<string> IgnoreWarnings { get; set; } = new List<string>();
+    public List<string> IgnoreWarnings { get; set; } = new();
     [YamlIgnore, SkipConvert]
     public MsuType MsuType { get; set; } = null!;
     [SkipConvert]

MSUScripter/Configs/MsuProject.cs

@@ -1,21 +1,53 @@
 using System;
+using System.ComponentModel;
+using NJsonSchema.Annotations;
 
 namespace MSUScripter.Configs;
 
+[Description("Details about a song for YAML and PCM generation")]
 public class MsuSongInfo
 {
+    [JsonSchemaIgnore]
     public int TrackNumber { get; set; }
-    public string TrackName { get; set; } = "";
+    
+    [JsonSchemaIgnore]
+    public string? TrackName { get; set; }
+    
+    [Description("The title of the song")]
     public string? SongName { get; set; }
+    
+    [Description("The artist(s) that created the song")]
     public string? Artist { get; set; } 
+    
+    [Description("The album in which the song was released on or the game the song is from")]
     public string? Album { get; set; }
+    
+    [Description("A url in which the user can purchase the song/album")]
     public string? Url { get; set; }
-    public string OutputPath { get; set; } = "";
+    
+    [Description("Details that are passed to msupcm++ for generation")]
+    public MsuSongMsuPcmInfo MsuPcmInfo { get; set; } = new();
+    
+    [JsonSchemaIgnore]
+    public string? OutputPath { get; set; } = "";
+    
+    [JsonSchemaIgnore]
     public bool IsAlt { get; set; }
+    
+    [JsonSchemaIgnore]
     public bool IsComplete { get; set; }
+    
+    [JsonSchemaIgnore]
     public bool CheckCopyright { get; set; } = true;
+    
+    [JsonSchemaIgnore]
+    public bool ShowPanel { get; set; } = true;
+    
+    [JsonSchemaIgnore]
     public DateTime LastModifiedDate { get; set; }
+    
+    [JsonSchemaIgnore]
     public DateTime LastGeneratedDate { get; set; }
 
-    public MsuSongMsuPcmInfo MsuPcmInfo { get; set; } = new();
+    
 }

MSUScripter/Configs/MsuSongInfo.cs

@@ -1,29 +1,76 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
+using NJsonSchema.Annotations;
+using YamlDotNet.Serialization;
 
 namespace MSUScripter.Configs;
 
+[Description("Details that are passed to msupcm++ for generation")]
 public class MsuSongMsuPcmInfo
 {
+    [Description("The loop point of the current track, relative to this track/sub-track/sub-channel, in samples")]
     public int? Loop { get; set; }
+    
+    [Description("Trim the start of the current track at the specified sample")]
     public int? TrimStart { get; set; }
+    
+    [Description("Trim the end of the current track at the specified sample")]
     public int? TrimEnd { get; set; }
+    
+    [Description("Apply a fade in effect to the current track lasting a specified number of samples")]
     public int? FadeIn { get; set; }
+    
+    [Description("Apply a fade out effect to the current track lasting a specified number of samples")]
     public int? FadeOut { get; set; }
+    
+    [Description("Apply a cross fade effect from the end of the current track to its loop point lasting a specified number of samples")]
     public int? CrossFade { get; set; }
+    
+    [Description("Pad the beginning of the current track with a specified number of silent samples")]
     public int? PadStart { get; set; }
+    
+    [Description("Pad the end of the current track with a specified number of silent samples")]
     public int? PadEnd { get; set; }
+    
+    [Description("Alter the tempo of the current track by a specified ratio")]
     public double? Tempo { get; set; }
+    
+    [Description("Normalize the current track to the specified RMS level, overrides the global normalization value")]
     public double? Normalization { get; set; }
+    
+    [Description("Apply dynamic range compression to the current track")]
     public bool? Compression { get; set; }
+    
+    [JsonSchemaIgnore]
     public DateTime LastModifiedDate { get; set; }
+    
+    [JsonSchemaIgnore]
     public string? Output { get; set; }
+    
+    [Description("The file to be used as the input for this track/sub-track/sub-channel")]
     public string? File { get; set; }
 
+    [JsonSchemaIgnore]
+    public bool ShowPanel { get; set; } = true;
+    
+    [Description("Files which will be concatenated together to form the input to the parent track")]
     public List<MsuSongMsuPcmInfo> SubTracks { get; set; } = new();
+    
+    [Description("Files which will be mixed together to form the input to the parent track")]
     public List<MsuSongMsuPcmInfo> SubChannels { get; set; } = new();
 
+    public void ClearFieldsForYaml()
+    {
+        LastModifiedDate = new DateTime();
+        ShowPanel = false;
+        foreach (var subItem in SubChannels.Concat(SubTracks))
+        {
+            subItem.ClearFieldsForYaml();
+        }
+    }
+
     public List<string> GetFiles()
     {
         List<string> files = new List<string>();
@@ -38,4 +85,15 @@ public List<string> GetFiles()
 
         return files;
     }
+
+    [YamlIgnore]
+    public bool HasBothSubTracksAndSubChannels
+    {
+        get
+        {
+            return (SubTracks.Count > 0 && SubChannels.Count > 0) ||
+                   SubChannels.Any(x => x.HasBothSubTracksAndSubChannels) ||
+                   SubTracks.Any(x => x.HasBothSubTracksAndSubChannels);
+        }
+    }
 }

MSUScripter/Configs/MsuSongMsuPcmInfo.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using MSUScripter.Models;
 
 namespace MSUScripter.Configs;
 
@@ -14,5 +13,7 @@ public class Settings
     public ICollection<RecentProject> RecentProjects { get; set; } = new List<RecentProject>();
     public double Volume { get; set; } = 1;
     public string? PreviousPath { get; set; }
-    public WindowRestoreDetails? MainWindowRestoreDetails { get; set; }
+    public bool HideSubTracksSubChannelsWarning { get; set; }
+    public bool AutomaticallyRunPyMusicLooper { get; set; } = true;
+    public bool RunMsuPcmWithKeepTemps { get; set; }
 }