From 844a357c63876ced102206deb9f4ba351699a050 Mon Sep 17 00:00:00 2001
From: Michael Green <84688932+michael-j-green@users.noreply.github.com>
Date: Fri, 7 Jul 2023 15:49:25 +1000
Subject: [PATCH] =?UTF-8?q?fix:=20added=20condition=20to=20move=20the=20ga?=
 =?UTF-8?q?me=20file=20if=20it=E2=80=99s=20path=20is=20different=20than=20?=
 =?UTF-8?q?expected?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gaseous-server/Classes/ImportGames.cs |  9 +++++++--
 gaseous-server/ProcessQueue.cs        |  9 ++-------
 gaseous-server/Program.cs             | 11 +----------
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/gaseous-server/Classes/ImportGames.cs b/gaseous-server/Classes/ImportGames.cs
index d72a143..cad8337 100644
--- a/gaseous-server/Classes/ImportGames.cs
+++ b/gaseous-server/Classes/ImportGames.cs
@@ -469,7 +469,7 @@ namespace gaseous_server.Classes
             }
         }
 
-        public static void LibraryScan(bool FullSignatureScan = false)
+        public static void LibraryScan()
         {
             Logging.Log(Logging.LogType.Information, "Library Scan", "Starting library scan");
 
@@ -577,7 +577,7 @@ namespace gaseous_server.Classes
                             FileInfo fi = new FileInfo(romPath);
 
                             Models.Signatures_Games sig = GetFileSignature(hash, fi, romPath);
-                            if (sig.Rom.SignatureSource != Models.Signatures_Games.RomItem.SignatureSourceType.None || FullSignatureScan == true)
+                            if (sig.Rom.SignatureSource != Models.Signatures_Games.RomItem.SignatureSourceType.None)
                             {
                                 Logging.Log(Logging.LogType.Information, "Library Scan", " Update signature found for " + romPath);
 
@@ -593,6 +593,11 @@ namespace gaseous_server.Classes
                                 StoreROM(hash, determinedGame, determinedPlatform, sig, romPath, romId);
                             }
                         }
+
+                        if (romPath != ComputeROMPath(romId))
+                        {
+                            MoveGameFile(romId);
+                        }
                     }
                     else
                     {
diff --git a/gaseous-server/ProcessQueue.cs b/gaseous-server/ProcessQueue.cs
index bff2d59..dcff93d 100644
--- a/gaseous-server/ProcessQueue.cs
+++ b/gaseous-server/ProcessQueue.cs
@@ -93,13 +93,9 @@ namespace gaseous_server
 
                                 case QueueItemType.LibraryScan:
                                     Logging.Log(Logging.LogType.Information, "Timered Event", "Starting Library Scanner");
-                                    Classes.ImportGame.LibraryScan(false);
+                                    Classes.ImportGame.LibraryScan();
                                     break;
 
-                                case QueueItemType.LibraryScanFull:
-                                    Logging.Log(Logging.LogType.Information, "Timered Event", "Starting Full Library Scanner");
-                                    Classes.ImportGame.LibraryScan(true);
-                                    break;
                             }
                         }
                         catch (Exception ex)
@@ -129,8 +125,7 @@ namespace gaseous_server
             TitleIngestor,
             MetadataRefresh,
             OrganiseLibrary,
-            LibraryScan,
-            LibraryScanFull
+            LibraryScan
         }
 
         public enum QueueItemState
diff --git a/gaseous-server/Program.cs b/gaseous-server/Program.cs
index eee053e..82181bf 100644
--- a/gaseous-server/Program.cs
+++ b/gaseous-server/Program.cs
@@ -112,16 +112,7 @@ ProcessQueue.QueueItems.Add(new ProcessQueue.QueueItem(
     ProcessQueue.QueueItemType.LibraryScan, 30, new List<ProcessQueue.QueueItemType>
     {
         ProcessQueue.QueueItemType.TitleIngestor,
-        ProcessQueue.QueueItemType.OrganiseLibrary,
-        ProcessQueue.QueueItemType.LibraryScanFull
-    })
-    );
-ProcessQueue.QueueItems.Add(new ProcessQueue.QueueItem(
-    ProcessQueue.QueueItemType.LibraryScanFull, 10080, new List<ProcessQueue.QueueItemType>
-    {
-        ProcessQueue.QueueItemType.TitleIngestor,
-        ProcessQueue.QueueItemType.OrganiseLibrary,
-        ProcessQueue.QueueItemType.LibraryScan
+        ProcessQueue.QueueItemType.OrganiseLibrary
     })
     );