fix: route SRR Compare-tab dispatch to Core.Comparison.SRRFileData

After the rename to SRRFileData, both ReScene.NET.Models and
ReScene.Core.Comparison contained types named SRRFileData. The
disambiguation in FileCompareViewModel pointed at Models.SRRFileData,
but FileCompareService.LoadFileData returns the Core.Comparison one,
so the pattern match never fired and the Compare tab tree stayed
empty when an SRR was loaded. Fully qualify the three sites.

Also extends the acronym sweep to mid-identifier positions (matching
the lib commit) — CreateSrrCommand→CreateSRRCommand, ShowIsoSelection
→ShowISOSelection, etc. Lib submodule pointer bumped.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: NeWbY100

ReScene.Lib

@@ -161,7 +161,7 @@ public static List<string> FindSampleFiles(string releaseDir)
     /// <returns>
     /// A list of SFV file paths found in subtitle subdirectories.
     /// </returns>
-    public static List<string> FindSubtitleSfvFiles(string releaseDir)
+    public static List<string> FindSubtitleSFVFiles(string releaseDir)
     {
         var sfvFiles = new List<string>();
 
@@ -242,7 +242,7 @@ public static bool IsMusicRelease(string releaseDir)
     /// <returns>
     /// A list of existing RAR file paths referenced by the SFV.
     /// </returns>
-    public static List<string> FindRarFilesFromSfv(string sfvPath)
+    public static List<string> FindRarFilesFromSFV(string sfvPath)
     {
         string dir = Path.GetDirectoryName(sfvPath) ?? ".";
         var rarFiles = new List<string>();

ReScene.NET/Helpers/ReleaseFileScanner.cs

@@ -10,7 +10,7 @@ public ulong SampleSize
     {
         get; set;
     }
-    public uint ExpectedCrc
+    public uint ExpectedCRC
     {
         get; set;
     }
@@ -20,7 +20,7 @@ public interface ISampleRestorerService
 {
     public event EventHandler<SRSReconstructionProgressEventArgs>? Progress;
 
-    public List<SRSEntryInfo> GetSrsEntries(string srrFilePath);
+    public List<SRSEntryInfo> GetSRSEntries(string srrFilePath);
 
     public Task<SRSReconstructionResult> RestoreSampleAsync(
         string srrFilePath, string srsFileName,

ReScene.NET/Services/ISampleRestorerService.cs

@@ -61,7 +61,7 @@ public Task<SRRCreationResult> CreateFromRarAsync(
     /// <returns>
     /// The creation result including success status and statistics.
     /// </returns>
-    public Task<SRRCreationResult> CreateFromSfvAsync(
+    public Task<SRRCreationResult> CreateFromSFVAsync(
         string outputPath,
         string sfvFilePath,
         IReadOnlyDictionary<string, string>? additionalFiles,

ReScene.NET/Services/ISrrCreationService.cs

@@ -25,10 +25,10 @@ public Task<SRRCreationResult> CreateFromRarAsync(
         CancellationToken ct) => _writer.CreateAsync(outputPath, rarVolumePaths, storedFiles, options, ct);
 
     /// <inheritdoc />
-    public Task<SRRCreationResult> CreateFromSfvAsync(
+    public Task<SRRCreationResult> CreateFromSFVAsync(
         string outputPath,
         string sfvFilePath,
         IReadOnlyDictionary<string, string>? additionalFiles,
         SRRCreationOptions options,
-        CancellationToken ct) => _writer.CreateFromSfvAsync(outputPath, sfvFilePath, additionalFiles, options, ct);
+        CancellationToken ct) => _writer.CreateFromSFVAsync(outputPath, sfvFilePath, additionalFiles, options, ct);
 }

ReScene.NET/Services/SRRCreationService.cs

@@ -14,7 +14,7 @@ public event EventHandler<SRSReconstructionProgressEventArgs>? Progress
         remove => _rebuilder.Progress -= value;
     }
 
-    public List<SRSEntryInfo> GetSrsEntries(string srrFilePath)
+    public List<SRSEntryInfo> GetSRSEntries(string srrFilePath)
     {
         var srr = SRRFile.Load(srrFilePath);
         var entries = new List<SRSEntryInfo>();
@@ -51,7 +51,7 @@ public List<SRSEntryInfo> GetSrsEntries(string srrFilePath)
                             SRSFileName = srsName,
                             SampleFileName = fd.FileName,
                             SampleSize = fd.SampleSize,
-                            ExpectedCrc = fd.CRC32
+                            ExpectedCRC = fd.CRC32
                         });
                     }
                 }
@@ -85,7 +85,7 @@ public async Task<SRSReconstructionResult> RestoreSampleAsync(
             {
                 return new SRSReconstructionResult(
                     Success: false, CRCMatch: false,
-                    ExpectedCrc: 0, ActualCrc: 0,
+                    ExpectedCRC: 0, ActualCRC: 0,
                     ExpectedSize: 0, ActualSize: 0,
                     ErrorMessage: $"Could not extract '{srsFileName}' from SRR");
             }

ReScene.NET/Services/SampleRestorerService.cs

@@ -57,11 +57,11 @@ public CreatorViewModel(ISrrCreationService srrService, ISrsCreationService srsS
 
     // Input
     [ObservableProperty]
-    [NotifyCanExecuteChangedFor(nameof(CreateSrrCommand))]
+    [NotifyCanExecuteChangedFor(nameof(CreateSRRCommand))]
     private string _inputPath = string.Empty;
 
     [ObservableProperty]
-    private bool _isSfvInput = true;
+    private bool _isSFVInput = true;
 
     // Stored Files
     public ObservableCollection<StoredFileItem> StoredFiles { get; } = [];
@@ -71,7 +71,7 @@ public CreatorViewModel(ISrrCreationService srrService, ISrsCreationService srsS
 
     // Output
     [ObservableProperty]
-    [NotifyCanExecuteChangedFor(nameof(CreateSrrCommand))]
+    [NotifyCanExecuteChangedFor(nameof(CreateSRRCommand))]
     private string _outputPath = string.Empty;
 
     // Options
@@ -82,16 +82,16 @@ public CreatorViewModel(ISrrCreationService srrService, ISrsCreationService srsS
     private bool _autoIncludeFiles = true;
 
     [ObservableProperty]
-    private bool _autoCreateSrs = true;
+    private bool _autoCreateSRS = true;
 
     [ObservableProperty]
-    private bool _createVobsubSrr = true;
+    private bool _createVobsubSRR = true;
 
     [ObservableProperty]
     private bool _storeFixRar = true;
 
     [ObservableProperty]
-    private bool _computeOsoHashes;
+    private bool _computeOSOHashes;
 
     [ObservableProperty]
     private bool _generateLanguagesDiz = true;
@@ -107,7 +107,7 @@ public CreatorViewModel(ISrrCreationService srrService, ISrsCreationService srsS
     private string _progressMessage = string.Empty;
 
     [ObservableProperty]
-    [NotifyCanExecuteChangedFor(nameof(CreateSrrCommand))]
+    [NotifyCanExecuteChangedFor(nameof(CreateSRRCommand))]
     private bool _isCreating;
 
     [ObservableProperty]
@@ -133,7 +133,7 @@ partial void OnInputPathChanged(string value)
     {
         if (!string.IsNullOrWhiteSpace(value))
         {
-            IsSfvInput = Path.GetExtension(value).Equals(".sfv", StringComparison.OrdinalIgnoreCase);
+            IsSFVInput = Path.GetExtension(value).Equals(".sfv", StringComparison.OrdinalIgnoreCase);
         }
 
         UpdateStoredNames();
@@ -204,12 +204,12 @@ private void RemoveStoredFile()
     [RelayCommand]
     private void RemoveAllStoredFiles() => StoredFiles.Clear();
 
-    private bool CanCreateSrr() => !IsCreating
+    private bool CanCreateSRR() => !IsCreating
         && !string.IsNullOrWhiteSpace(InputPath)
         && !string.IsNullOrWhiteSpace(OutputPath);
 
-    [RelayCommand(CanExecute = nameof(CanCreateSrr))]
-    private async Task CreateSrrAsync()
+    [RelayCommand(CanExecute = nameof(CanCreateSRR))]
+    private async Task CreateSRRAsync()
     {
         IsCreating = true;
         ShowProgress = true;
@@ -226,7 +226,7 @@ private async Task CreateSrrAsync()
             {
                 AppName = string.IsNullOrWhiteSpace(AppName) ? null : AppName,
                 AllowCompressed = AllowCompressed,
-                ComputeOsoHashes = ComputeOsoHashes,
+                ComputeOSOHashes = ComputeOSOHashes,
                 GenerateLanguagesDiz = GenerateLanguagesDiz
             };
 
@@ -237,13 +237,13 @@ private async Task CreateSrrAsync()
             string releaseDir = Path.GetDirectoryName(InputPath) ?? ".";
 
             // Phase 1: Auto-create SRS files for samples
-            if (AutoCreateSrs)
+            if (AutoCreateSRS)
             {
-                tempDir = await CreateSrsForSamplesAsync(releaseDir, _cts.Token);
+                tempDir = await CreateSRSForSamplesAsync(releaseDir, _cts.Token);
             }
 
             // Phase 2: Create nested SRRs for subtitle archives
-            if (CreateVobsubSrr)
+            if (CreateVobsubSRR)
             {
                 await CreateVobsubSrrsAsync(releaseDir, options, tempDir ??= _tempDir.CreateTempDirectory(), _cts.Token);
             }
@@ -263,9 +263,9 @@ private async Task CreateSrrAsync()
                 storedFiles[item.StoredName] = item.FullPath;
             }
 
-            if (IsSfvInput)
+            if (IsSFVInput)
             {
-                result = await _sRRService.CreateFromSfvAsync(
+                result = await _sRRService.CreateFromSFVAsync(
                     OutputPath, InputPath,
                     storedFiles.Count > 0 ? storedFiles : null,
                     options, _cts.Token);
@@ -391,7 +391,7 @@ private void AutoScanReleaseFiles()
 
     // ── SRS auto-creation ───────────────────────────────────
 
-    private async Task<string?> CreateSrsForSamplesAsync(string releaseDir, CancellationToken ct)
+    private async Task<string?> CreateSRSForSamplesAsync(string releaseDir, CancellationToken ct)
     {
         List<string> samples = ReleaseFileScanner.FindSampleFiles(releaseDir);
         if (samples.Count == 0)
@@ -449,7 +449,7 @@ private void AutoScanReleaseFiles()
 
     private async Task CreateVobsubSrrsAsync(string releaseDir, SRRCreationOptions options, string tempDir, CancellationToken ct)
     {
-        List<string> subtitleSfvs = ReleaseFileScanner.FindSubtitleSfvFiles(releaseDir);
+        List<string> subtitleSfvs = ReleaseFileScanner.FindSubtitleSFVFiles(releaseDir);
         if (subtitleSfvs.Count == 0)
         {
             return;
@@ -467,7 +467,7 @@ private async Task CreateVobsubSrrsAsync(string releaseDir, SRRCreationOptions o
 
             try
             {
-                SRRCreationResult result = await _sRRService.CreateFromSfvAsync(
+                SRRCreationResult result = await _sRRService.CreateFromSFVAsync(
                     srrPath, sfvPath, null, options, ct);
 
                 if (result.Success)
@@ -513,7 +513,7 @@ private void StoreFixRarFile(string releaseDir)
         }
 
         // Find RAR files referenced by the SFV
-        List<string> rarFiles = ReleaseFileScanner.FindRarFilesFromSfv(sfvFiles[0]);
+        List<string> rarFiles = ReleaseFileScanner.FindRarFilesFromSFV(sfvFiles[0]);
         if (rarFiles.Count != 1)
         {
             return;

ReScene.NET/ViewModels/CreatorViewModel.cs

@@ -629,7 +629,7 @@ private void PopulateTree(ObservableCollection<TreeNodeViewModel> roots, object
         {
             PopulateDetailedTree(roots, detailedBlocks, isLeft);
         }
-        else if (data is Models.SRRFileData srrData)
+        else if (data is ReScene.Core.Comparison.SRRFileData srrData)
         {
             PopulateSRRTree(roots, srrData, isLeft);
         }
@@ -684,7 +684,7 @@ private static void PopulateDetailedTree(ObservableCollection<TreeNodeViewModel>
         roots.Add(rootNode);
     }
 
-    private static void PopulateSRRTree(ObservableCollection<TreeNodeViewModel> roots, Models.SRRFileData srrData, bool isLeft)
+    private static void PopulateSRRTree(ObservableCollection<TreeNodeViewModel> roots, ReScene.Core.Comparison.SRRFileData srrData, bool isLeft)
     {
         SRRFile srr = srrData.SRRFile;
 
@@ -1272,31 +1272,31 @@ private void ShowProperties(CompareNodeData nodeData, ObservableCollection<Prope
             case CompareNodeType.SRSFileInfo:
                 if (nodeData.Data is SRSFileDataBlock fd)
                 {
-                    ShowSrsFileInfoProperties(properties, fd);
+                    ShowSRSFileInfoProperties(properties, fd);
                 }
 
                 break;
 
             case CompareNodeType.SRSTrack:
                 if (nodeData.Data is SRSTrackDataBlock track)
                 {
-                    ShowSrsTrackProperties(properties, track, nodeData.FileName);
+                    ShowSRSTrackProperties(properties, track, nodeData.FileName);
                 }
 
                 break;
 
             case CompareNodeType.SRSContainerChunks:
                 if (nodeData.Data is SRSContainerChunk chunk)
                 {
-                    ShowSrsContainerChunkProperties(properties, chunk);
+                    ShowSRSContainerChunkProperties(properties, chunk);
                 }
 
                 break;
 
             case CompareNodeType.OSOHash:
                 if (nodeData.Data is SRROsoHashBlock oso)
                 {
-                    ShowOsoHashProperties(properties, oso);
+                    ShowOSOHashProperties(properties, oso);
                 }
 
                 break;
@@ -1434,9 +1434,9 @@ private void ShowDetailedBlockProperties(ObservableCollection<PropertyItem> prop
         }
 
         var otherData = isLeft ? _rightData : _leftData;
-        if (otherData is Models.SRRFileData otherSrrData)
+        if (otherData is ReScene.Core.Comparison.SRRFileData otherSRRData)
         {
-            foreach (List<RARDetailedBlock> volumeBlocks in otherSrrData.VolumeDetailedBlocks.Values)
+            foreach (List<RARDetailedBlock> volumeBlocks in otherSRRData.VolumeDetailedBlocks.Values)
             {
                 RARDetailedBlock? match = volumeBlocks.FirstOrDefault(b =>
                     b.BlockType == block.BlockType && b.ItemName == block.ItemName);
@@ -1463,7 +1463,7 @@ private void ShowSRRArchiveProperties(ObservableCollection<PropertyItem> propert
         AddComparedProperty(properties, "RAR Volumes", srr.RARFiles.Count.ToString(), "RAR Volumes Count");
         AddComparedProperty(properties, "Stored Files", srr.StoredFiles.Count.ToString(), "Stored Files Count");
         AddComparedProperty(properties, "Archived Files", srr.ArchivedFiles.Count.ToString(), "Archived Files Count");
-        AddComparedProperty(properties, "Header CRC Errors", srr.HeaderCrcMismatches.ToString(), "Header CRC Errors");
+        AddComparedProperty(properties, "Header CRC Errors", srr.HeaderCRCMismatches.ToString(), "Header CRC Errors");
         AddComparedProperty(properties, "Has Comment", FileComparer.FormatBool(!string.IsNullOrEmpty(srr.ArchiveComment)), "Has Comment");
 
         properties.Add(new PropertyItem { Name = "--- Reconstruction Hints ---", Value = "", IsSeparator = true });
@@ -1524,7 +1524,7 @@ private void ShowRAR4FileProperties(ObservableCollection<PropertyItem> propertie
         properties.Add(new PropertyItem { Name = "Type", Value = header.IsDirectory ? "Directory" : "File" });
         AddComparedProperty(properties, "Unpacked Size", $"{header.UnpackedSize:N0} bytes", "Unpacked Size");
         AddComparedProperty(properties, "Packed Size", $"{header.PackedSize:N0} bytes", "Packed Size");
-        AddComparedProperty(properties, "CRC32", header.FileCrc.ToString("X8"), "CRC");
+        AddComparedProperty(properties, "CRC32", header.FileCRC.ToString("X8"), "CRC");
         AddComparedProperty(properties, "Compression Method", FileComparer.GetCompressionMethodName((int?)header.CompressionMethod), "Compression Method");
         properties.Add(new PropertyItem { Name = "Dictionary Size", Value = $"{header.DictionarySizeKB} KB" });
         AddComparedProperty(properties, "Modified Time", header.ModifiedTime?.ToString("yyyy-MM-dd HH:mm:ss") ?? "N/A", "Modified Time");
@@ -1537,7 +1537,7 @@ private void ShowRAR5FileProperties(ObservableCollection<PropertyItem> propertie
         properties.Add(new PropertyItem { Name = "File Name", Value = info.FileName });
         properties.Add(new PropertyItem { Name = "Type", Value = info.IsDirectory ? "Directory" : "File" });
         AddComparedProperty(properties, "Unpacked Size", $"{info.UnpackedSize:N0} bytes", "Unpacked Size");
-        AddComparedProperty(properties, "CRC32", info.FileCrc?.ToString("X8") ?? "N/A", "CRC");
+        AddComparedProperty(properties, "CRC32", info.FileCRC?.ToString("X8") ?? "N/A", "CRC");
         AddComparedProperty(properties, "Compression Method", FileComparer.GetCompressionMethodName(info.CompressionMethod), "Compression Method");
         properties.Add(new PropertyItem { Name = "Dictionary Size", Value = $"{info.DictionarySizeKB} KB" });
         if (info.ModificationTime.HasValue)
@@ -1618,12 +1618,12 @@ private static void ShowRarVolumeProperties(ObservableCollection<PropertyItem> p
         properties.Add(new PropertyItem
         {
             Name = "Header CRC",
-            Value = $"0x{rarFile.Crc:X4}",
+            Value = $"0x{rarFile.CRC:X4}",
             ByteRange = new ByteRange { Offset = p, Length = 2 }
         });
     }
 
-    private void ShowSrsFileInfoProperties(ObservableCollection<PropertyItem> properties, SRSFileDataBlock fd)
+    private void ShowSRSFileInfoProperties(ObservableCollection<PropertyItem> properties, SRSFileDataBlock fd)
     {
         AddComparedProperty(properties, "App Name", fd.AppName, "App Name");
 
@@ -1651,7 +1651,7 @@ private void ShowSrsFileInfoProperties(ObservableCollection<PropertyItem> proper
         });
     }
 
-    private void ShowSrsTrackProperties(ObservableCollection<PropertyItem> properties, SRSTrackDataBlock track, string? trackName)
+    private void ShowSRSTrackProperties(ObservableCollection<PropertyItem> properties, SRSTrackDataBlock track, string? trackName)
     {
         List<PropertyDifference>? trackDiffs = trackName is not null ? GetTrackDiffs(trackName) : null;
 
@@ -1724,7 +1724,7 @@ private void ShowSrsTrackProperties(ObservableCollection<PropertyItem> propertie
         });
     }
 
-    private static void ShowSrsContainerChunkProperties(ObservableCollection<PropertyItem> properties, SRSContainerChunk chunk)
+    private static void ShowSRSContainerChunkProperties(ObservableCollection<PropertyItem> properties, SRSContainerChunk chunk)
     {
         properties.Add(new PropertyItem { Name = "Label", Value = chunk.Label });
         properties.Add(new PropertyItem { Name = "Chunk ID", Value = chunk.ChunkId });
@@ -1734,7 +1734,7 @@ private static void ShowSrsContainerChunkProperties(ObservableCollection<Propert
         properties.Add(new PropertyItem { Name = "Total Size", Value = $"{chunk.BlockSize:N0} bytes ({FormatUtilities.FormatSize(chunk.BlockSize)})" });
     }
 
-    private static void ShowOsoHashProperties(ObservableCollection<PropertyItem> properties, SRROsoHashBlock oso)
+    private static void ShowOSOHashProperties(ObservableCollection<PropertyItem> properties, SRROsoHashBlock oso)
     {
         long p = oso.BlockPosition + 7; // skip base header (CRC + type + flags + headerSize)