Merge branch 'main' of https://github.com/MattEqualsCoder/MSURandomizer

Author: MattEqualsCoder

MSURandomizer/Services/MsuWindowService.cs

@@ -23,7 +23,8 @@ public class MsuWindowService(ILogger<MsuWindowService> logger,
     IMsuSelectorService msuSelectorService,
     IMsuLookupService msuLookupService,
     IMsuMonitorService msuMonitorService,
-    IRomLauncherService romLauncherService) : ControlService
+    IRomLauncherService romLauncherService,
+    IRomCopyService romCopyService) : ControlService
 {
     public MsuWindowViewModel Model { get; set; } = new();
 
@@ -156,6 +157,21 @@ public bool GenerateMsu(out string error, out bool openContinuousWindow, out Msu
             openContinuousWindow = false;
             return false;
         }
+
+        if (!string.IsNullOrEmpty(userOptions.MsuUserOptions.OutputRomPath) &&
+            !string.IsNullOrEmpty(userOptions.MsuUserOptions.CopyRomDirectory))
+        {
+            if (romCopyService.CopyRom(userOptions.MsuUserOptions.OutputRomPath, out var outPath, out var copyError))
+            {
+                userOptions.MsuUserOptions.OutputRomPath = outPath;
+            }
+            else
+            {
+                error = copyError ?? "Error copying rom to copy rom directory";
+                openContinuousWindow = false;
+                return false;
+            }
+        }
 
         var options = userOptions.MsuUserOptions;
         if (options.RandomizationStyle == MsuRandomizationStyle.Single)

MSURandomizer/ViewModels/SettingsWindowViewModel.cs

@@ -28,6 +28,8 @@ public class SettingsWindowViewModel : ViewModelBase
 
     [Reactive] public List<MsuTypePath> MsuTypeNamePathsList { get; set; } = new();
 
+    [Reactive] public string? CopyRomDirectory { get; set; }
+    
     [Reactive]
     [ReactiveLinkedProperties(nameof(LaunchArgumentsEnabled))]
     public string? LaunchApplication { get; set; }

MSURandomizer/Views/SettingsWindow.axaml

@@ -87,6 +87,14 @@
                                 </Grid>
                             </controls:LabeledControl>
 
+                            <controls:LabeledControl Text="Copy Rom Directory" Hint="Folder for roms to be copied to for MSUs if desired. If not set, the rom locations will be left alone." DisplayHint="True" Margin="3">
+                                <controls:FileControl 
+                                    FileInputType="Folder"
+                                    DefaultPath="{Binding DefaultDirectory}"
+                                    FilePath="{Binding CopyRomDirectory, Mode=TwoWay}"
+                                ></controls:FileControl>
+                            </controls:LabeledControl>
+                            
                             <controls:LabeledControl Text="Launch Application" Hint="Application to launch a rom in" DisplayHint="True" Margin="3">
                                 <controls:FileControl 
                                     FileInputType="OpenFile"

MSURandomizerLibrary/Configs/MsuUserOptions.cs

@@ -133,6 +133,11 @@ public class MsuUserOptions
     /// </summary>
     public bool LaunchRom { get; set; }
 
+    /// <summary>
+    /// Directory roms should be copied to before randomizing
+    /// </summary>
+    public string? CopyRomDirectory { get; set; }
+    
     /// <summary>
     /// Specific directories to load for specific MSU types
     /// </summary>

MSURandomizerLibrary/MsuRandomizerServiceExtensions.cs

@@ -32,6 +32,7 @@ public static IServiceCollection AddMsuRandomizerServices(this IServiceCollectio
         services.AddSingleton<IMsuMonitorService, MsuMonitorService>();
         services.AddSingleton<IRomLauncherService, RomLauncherService>();
         services.AddSingleton<IMsuHardwareService, MsuHardwareService>();
+        services.AddSingleton<IRomCopyService, RomCopyService>();
 
         services.AddSnesConnectorServices();
 

MSURandomizerLibrary/Services/IRomCopyService.cs

@@ -0,0 +1,16 @@
+namespace MSURandomizerLibrary.Services;
+
+/// <summary>
+/// Service for copying a rom to a specified directory
+/// </summary>
+public interface IRomCopyService
+{
+    /// <summary>
+    /// Copies a rom to the user specified directory
+    /// </summary>
+    /// <param name="romPath">The path to the rom</param>
+    /// <param name="outPath">The path to the copied rom</param>
+    /// <param name="error">The error from copying the folder</param>
+    /// <returns>True if successful, false otherwise</returns>
+    public bool CopyRom(string romPath, out string? outPath, out string? error);
+}

MSURandomizerLibrary/Services/RomCopyService.cs

@@ -0,0 +1,76 @@
+using Microsoft.Extensions.Logging;
+
+namespace MSURandomizerLibrary.Services;
+
+internal class RomCopyService(IMsuUserOptionsService options, ILogger<RomCopyService> logger) : IRomCopyService
+{
+    public bool CopyRom(string romPath, out string? outPath, out string? error)
+    {
+        outPath = null;
+        error = null;
+        
+        if (!File.Exists(romPath))
+        {
+            error = $"{romPath} does not exist";
+            return false;
+        }
+        
+        if (string.IsNullOrEmpty(options.MsuUserOptions.CopyRomDirectory))
+        {
+            error = $"No Copy Rom Directory specified";
+            return false;
+        }
+
+        if (!Directory.Exists(options.MsuUserOptions.CopyRomDirectory))
+        {
+            try
+            {
+                Directory.CreateDirectory(options.MsuUserOptions.CopyRomDirectory);
+            }
+            catch (Exception e)
+            {
+                error = $"Unable to create directory {options.MsuUserOptions.CopyRomDirectory}";
+                logger.LogError(e, "Unable to create directory {Path}", options.MsuUserOptions.CopyRomDirectory);
+                return false;
+            }
+        }
+        
+        var fileInfo = new FileInfo(romPath);
+
+        var outputFolder = Path.Combine(options.MsuUserOptions.CopyRomDirectory,
+            fileInfo.Name.Replace(fileInfo.Extension, ""));
+        
+        if (!Directory.Exists(outputFolder))
+        {
+            try
+            {
+                Directory.CreateDirectory(outputFolder);
+            }
+            catch (Exception e)
+            {
+                error = $"Unable to create directory {outputFolder}";
+                logger.LogError(e, "Unable to create directory {Path}", outputFolder);
+                return false;
+            }
+        }
+        
+        outPath = Path.Combine(outputFolder, fileInfo.Name);
+
+        if (File.Exists(outPath))
+        {
+            return true;
+        }
+        
+        try
+        {
+            File.Move(romPath, outPath);
+            return true;
+        }
+        catch (Exception e)
+        {
+            error = $"Unable to move file to {outPath}";
+            logger.LogError(e, "Unable to move file to {Path}", outPath);
+            return false;
+        }
+    }
+}