From b862057123c2ad6a21f563b7f0fc54337fc60a95 Mon Sep 17 00:00:00 2001
From: Deterous <138427222+Deterous@users.noreply.github.com>
Date: Sun, 11 Feb 2024 12:39:13 +0900
Subject: [PATCH] Only print warning for non-contiguous files

---
 IRDKit/Program.cs | 2 +-
 LibIRD/IRD.cs     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/IRDKit/Program.cs b/IRDKit/Program.cs
index 3b5b9ed..c537a02 100644
--- a/IRDKit/Program.cs
+++ b/IRDKit/Program.cs
@@ -785,7 +785,7 @@ namespace IRDKit
                 try
                 {
                     // Read key from .key file
-                    byte[] discKey = File.ReadAllBytes(keyPath);
+                    byte[] discKey = File.ReadAllBytes(keyfilePath);
                     if (discKey == null || discKey.Length != 16)
                         Console.Error.WriteLine($"{hexKey} is not a valid key, detecting key automatically...");
                     else
diff --git a/LibIRD/IRD.cs b/LibIRD/IRD.cs
index 58f9094..db04f12 100644
--- a/LibIRD/IRD.cs
+++ b/LibIRD/IRD.cs
@@ -715,7 +715,7 @@ namespace LibIRD
             HashFiles(fs, reader, rootDir);
             if (FileCount != fileCount)
             {
-                Console.WriteLine($"{isoPath} contains split files: detected {FileCount} out of {fileCount} expected files");
+                //Console.WriteLine($"{isoPath} contains split files: detected {FileCount} out of {fileCount} expected files");
                 long[] tempFileKeys = FileKeys;
                 Array.Resize(ref tempFileKeys, (int)FileCount);
                 FileKeys = tempFileKeys;
@@ -943,6 +943,9 @@ namespace LibIRD
                     if (fileClusters[i] == null)
                         throw new InvalidFileSystemException($"Unexpected file extents for {filePath}");
 
+                    if (fileClusters[i].Offset * SectorSize != fileClusters[i - 1].Offset * SectorSize + fileClusters[i - 1].Count)
+                        Console.WriteLine($"Non-contiguous file found: {filePath}");
+
                     if (fileClusters[i].Offset < smallestOffset)
                         smallestOffset = fileClusters[i].Offset;
                 }
@@ -951,9 +954,6 @@ namespace LibIRD
                 if (Array.Exists(FileKeys, element => element == smallestOffset))
                     continue;
 
-                if (fileClusters.Length > 1)
-                    Console.WriteLine($"Split file detected: {filePath}");
-
                 // Add file offset to keys
                 FileKeys[FileCount] = smallestOffset;