Add first time setup popup for msupcm++

MattEqualsCoder · MattEqualsCoder · commit 477f7655a29a · 2024-07-28T20:13:28.000-04:00
diff --git a/.idea/.idea.MSUScripter/.idea/avalonia.xml b/.idea/.idea.MSUScripter/.idea/avalonia.xml
diff --git a/MSUScripter/Configs/Settings.cs b/MSUScripter/Configs/Settings.cs
@@ -16,4 +16,5 @@ public class Settings
     public bool HideSubTracksSubChannelsWarning { get; set; }
     public bool AutomaticallyRunPyMusicLooper { get; set; } = true;
     public bool RunMsuPcmWithKeepTemps { get; set; }
+    public bool HasDoneFirstTimeSetup { get; set; }
 }
diff --git a/MSUScripter/Services/ControlServices/MainWindowService.cs b/MSUScripter/Services/ControlServices/MainWindowService.cs
@@ -11,14 +11,23 @@ namespace MSUScripter.Services.ControlServices;
 
 public class MainWindowService(Settings settings, SettingsService settingsService, MsuPcmService msuPcmService, PyMusicLooperService pyMusicLooperService, ProjectService projectService, IGitHubReleaseCheckerService gitHubReleaseCheckerService) : ControlService
 {
-    private MainWindowViewModel _model = new();
+    private readonly MainWindowViewModel _model = new();
 
     public MainWindowViewModel InitializeModel()
     {
         _ = CheckForNewRelease();
         _ = CleanUpFolders();
         OpenCommandlineArgsProject();
         _model.AppVersion = $" v{App.Version}";
+        
+        if (!settings.HasDoneFirstTimeSetup && !string.IsNullOrEmpty(settings.MsuPcmPath))
+        {
+            settings.HasDoneFirstTimeSetup = true;
+            settingsService.SaveSettings();
+        }
+        
+        _model.HasDoneFirstTimeSetup = settings.HasDoneFirstTimeSetup;
+        
         UpdateTitle();
         return _model;
     }
@@ -52,6 +61,18 @@ public void CloseNewReleaseBanner(bool permanently)
         _model.GitHubReleaseUrl = "";
     }
     
+    public bool ValidateMsuPcm(string msupcmPath)
+    {
+        return msuPcmService.ValidateMsuPcmPath(msupcmPath, out _);
+    }
+
+    public void UpdateHasDoneFirstTimeSetup(string? msupcmPath)
+    {
+        settings.HasDoneFirstTimeSetup = true;
+        settings.MsuPcmPath = msupcmPath;
+        settingsService.SaveSettings();
+    }
+    
     public void Shutdown()
     {
         settingsService.SaveSettings();
diff --git a/MSUScripter/ViewModels/MainWindowViewModel.cs b/MSUScripter/ViewModels/MainWindowViewModel.cs
@@ -19,7 +19,7 @@ public class MainWindowViewModel : ViewModelBase
 
     [Reactive, ReactiveLinkedProperties(nameof(DisplayNewVersionBanner))]
     public string? GitHubReleaseUrl { get; set; }
-    
+    public bool HasDoneFirstTimeSetup { get; set; }
     public bool DisplayNewPage => CurrentMsuProject == null;
     public bool DisplayEditPage => CurrentMsuProject != null;
     public string AppVersion { get; set; } = "";
diff --git a/MSUScripter/ViewModels/SettingsWindowViewModel.cs b/MSUScripter/ViewModels/SettingsWindowViewModel.cs
@@ -18,6 +18,7 @@ public class SettingsWindowViewModel : ViewModelBase
     [Reactive] public bool RunMsuPcmWithKeepTemps { get; set; }
     [Reactive] public bool AutomaticallyRunPyMusicLooper { get; set; }
     [Reactive] public bool HideSubTracksSubChannelsWarning { get; set; }
+    public bool HasDoneFirstTimeSetup { get; set; }
 
     public override ViewModelBase DesignerExample()
     {
diff --git a/MSUScripter/Views/EditProjectPanel.axaml b/MSUScripter/Views/EditProjectPanel.axaml
@@ -94,27 +94,24 @@
             <Grid ColumnDefinitions="*,*,*">
                 <views:AudioControl Grid.Column="0" CanPopout="True" />
                 <TextBlock Grid.Column="1" Name="StatusMessage" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding StatusBarText}"></TextBlock>
-                <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0 0 5 5">
+                <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0 0 0 0" VerticalAlignment="Center">
                     <Button x:Name="AddSongButton"
-                            Margin="0 2 0 1"
                             IsVisible="{Binding MsuBasicInfoViewModel.IsMsuPcmProject }"
                             Click="AddSongButton_OnClick"
                     >Add _Song</Button>
                     <Button x:Name="AnalysisButton"
-                            Margin="8 2 0 1"
                             IsVisible="{Binding MsuBasicInfoViewModel.IsMsuPcmProject }"
+                            Margin="5 0 0 0"
                             Click="AnalysisButton_OnClick"
                     >_Audio Analysis</Button>
                     <Button x:Name="ExportButton" 
                             IsVisible="{Binding !IsMsuPcmProject }"
-                            Margin="0 2 0 1"
-                            Padding="8 5"
                             Click="ExportButton_OnClick"
                     >_Export</Button>
                     <SplitButton Content="_Export" 
                                  Name="ExportMenuButton" 
                                  IsVisible="{Binding IsMsuPcmProject }"
-                                 Margin="8 2 0 1"
+                                 Margin="5 0 0 0"
                                  Click="ExportButton_OnClick" 
                     >
                         <SplitButton.Flyout>
diff --git a/MSUScripter/Views/MainWindow.axaml b/MSUScripter/Views/MainWindow.axaml
@@ -22,31 +22,30 @@
         <Grid RowDefinitions="Auto, *">
             <controls:HeaderFooter BorderSize="0 0 0 2" Grid.Row="0" IsVisible="{Binding DisplayNewVersionBanner}">
                 
-                    <Grid ColumnDefinitions="Auto, *, Auto" RowDefinitions="Auto, Auto">
-                        
-                        <avalonia:MaterialIcon Grid.Row="0" 
-                                               Grid.Column="0" 
-                                               Grid.RowSpan="2" 
-                                               Kind="Update"
-                                               Width="30"
-                                               Height="30"
-                                               Margin="5 0 0 0"
-                        ></avalonia:MaterialIcon>
-                        
-                        <StackPanel Grid.Row="" Grid.Column="1" Orientation="Horizontal" Margin="5">
-                            <TextBlock>A new version of the MSU Scripter is now available!</TextBlock>
-                            <controls:LinkControl Margin="5 0 0 0" Name="GitHubUrlLink" Click="GitHubUrlLink_OnClick">Click here to go to the download page.</controls:LinkControl>
-                        </StackPanel>
-
-                        <controls:ImageButton Grid.Row="0" Grid.Column="2" HorizontalAlignment="Right" VerticalAlignment="Top" Name="CloseUpdateButton" Click="CloseUpdateButton_OnClick" Margin="0 3 3 0">
-                            <avalonia:MaterialIcon Kind="Close" Width="12" Height="12" Background="Transparent"></avalonia:MaterialIcon>
-                        </controls:ImageButton>
-                        
-                        <StackPanel Grid.Row="1" Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0 0 3 3">
-                            <controls:LinkControl FontSize="10" Margin="5 0 0 0" Name="DisableUpdatesLink" Click="DisableUpdatesLink_OnClick">Don't Check for Updates</controls:LinkControl>
-                        </StackPanel>
-                    </Grid>
+                <Grid ColumnDefinitions="Auto, *, Auto" RowDefinitions="Auto, Auto">
+                    
+                    <avalonia:MaterialIcon Grid.Row="0" 
+                                           Grid.Column="0" 
+                                           Grid.RowSpan="2" 
+                                           Kind="Update"
+                                           Width="30"
+                                           Height="30"
+                                           Margin="5 0 0 0"
+                    ></avalonia:MaterialIcon>
+                    
+                    <StackPanel Grid.Row="" Grid.Column="1" Orientation="Horizontal" Margin="5">
+                        <TextBlock>A new version of the MSU Scripter is now available!</TextBlock>
+                        <controls:LinkControl Margin="5 0 0 0" Name="GitHubUrlLink" Click="GitHubUrlLink_OnClick">Click here to go to the download page.</controls:LinkControl>
+                    </StackPanel>
 
+                    <controls:ImageButton Grid.Row="0" Grid.Column="2" HorizontalAlignment="Right" VerticalAlignment="Top" Name="CloseUpdateButton" Click="CloseUpdateButton_OnClick" Margin="0 3 3 0">
+                        <avalonia:MaterialIcon Kind="Close" Width="12" Height="12" Background="Transparent"></avalonia:MaterialIcon>
+                    </controls:ImageButton>
+                    
+                    <StackPanel Grid.Row="1" Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0 0 3 3">
+                        <controls:LinkControl FontSize="10" Margin="5 0 0 0" Name="DisableUpdatesLink" Click="DisableUpdatesLink_OnClick">Don't Check for Updates</controls:LinkControl>
+                    </StackPanel>
+                </Grid>
 
             </controls:HeaderFooter>
             
diff --git a/MSUScripter/Views/MainWindow.axaml.cs b/MSUScripter/Views/MainWindow.axaml.cs
@@ -1,14 +1,18 @@
 using System;
 using System.IO;
+using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
+using AvaloniaControls;
 using AvaloniaControls.Controls;
 using AvaloniaControls.Extensions;
 using MSUScripter.Configs;
 using MSUScripter.Events;
 using MSUScripter.Models;
 using MSUScripter.Services.ControlServices;
+using MSUScripter.Tools;
 using MSUScripter.ViewModels;
+using FileInputControlType = AvaloniaControls.FileInputControlType;
 
 namespace MSUScripter.Views;
 
@@ -45,6 +49,47 @@ private async void Control_OnLoaded(object? sender, RoutedEventArgs e)
         {
             await GetNewProjectPanel().LoadProject(_model.InitProject, _model.InitBackupProject);
         }
+
+        if (_model.HasDoneFirstTimeSetup) return;
+        await SetupMsuPcm();
+    }
+
+    private async Task SetupMsuPcm()
+    {
+        if (_service == null) return;
+        
+        var result = await MessageWindow.ShowYesNoDialog(
+            "If you want to use msupcm++, you'll need to point the MSU Scripter to its location. Would you like to set the msupcm++ path now? You can always set it later in the settings if needed.",
+            "Setup msupcm++", this);
+        if (!result)
+        {
+            _service.UpdateHasDoneFirstTimeSetup(null);
+        }
+
+        var documentsFolderPath = await this.GetDocumentsFolderPath();
+        var filter = OperatingSystem.IsWindows()
+            ? "msupcm Executable:msupcm.exe;All Files:*.*"
+            : "msupcm Executable:msupcm;All Files:*";
+        var msuPcmPath = await CrossPlatformTools.OpenFileDialogAsync(this, FileInputControlType.OpenFile, filter, documentsFolderPath);
+
+        if (msuPcmPath == null)
+        {
+            _service.UpdateHasDoneFirstTimeSetup(null);
+            return;
+        }
+
+        _service.UpdateHasDoneFirstTimeSetup(msuPcmPath.Path.LocalPath);
+        
+        if (!_service.ValidateMsuPcm(msuPcmPath.Path.LocalPath))
+        {
+            await MessageWindow.ShowErrorDialog(
+                "msupcm++ failed to run successfully. Make sure you can run msupcm -v in the commandline.",
+                "msupcm++ Error", this);
+        }
+        else
+        {
+            await MessageWindow.ShowInfoDialog("msupcm++ setup successful.", "Success", this);
+        }
     }
 
     private async void Window_OnClosing(object? sender, WindowClosingEventArgs e)

Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,5 @@ public class Settings`
`16`	`16`	`public bool HideSubTracksSubChannelsWarning { get; set; }`
`17`	`17`	`public bool AutomaticallyRunPyMusicLooper { get; set; } = true;`
`18`	`18`	`public bool RunMsuPcmWithKeepTemps { get; set; }`
	`19`	`+ public bool HasDoneFirstTimeSetup { get; set; }`
`19`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ public class SettingsWindowViewModel : ViewModelBase`
`18`	`18`	`[Reactive] public bool RunMsuPcmWithKeepTemps { get; set; }`
`19`	`19`	`[Reactive] public bool AutomaticallyRunPyMusicLooper { get; set; }`
`20`	`20`	`[Reactive] public bool HideSubTracksSubChannelsWarning { get; set; }`
	`21`	`+ public bool HasDoneFirstTimeSetup { get; set; }`
`21`	`22`
`22`	`23`	`public override ViewModelBase DesignerExample()`
`23`	`24`	`{`