Refactor FloppyData to use properties, add Series/System

Refactor FloppyData to use read-only properties instead of public fields and "Get*" methods, improving encapsulation and immutability. Update XML parsing to support attribute inheritance and use the new constructor. Replace all usages of old "Get*" methods with property access. Enhance suggested file name generation and add support for Series and System fields. Update TitleFindResult, SummaryPanel, and XML export to use new properties and display new fields. Add localized "Series" string to resource files. Clean up code and improve normalization and region/language handling.

Author: Digitoxin1

DiskImageTool/Filters/ImageFilters.vb

@@ -1,4 +1,5 @@
-Imports System.Text
+Imports System.Linq.Expressions
+Imports System.Text
 Imports DiskImageTool.DiskImage
 
 Namespace Filters
@@ -210,21 +211,21 @@ Namespace Filters
                     If TitleData IsNot Nothing Then
                         Image_NotInDatabase = False
                         Image_InDatabase = True
-                        If TitleData.GetStatus = FloppyDB.FloppyDBStatus.Verified Then
+                        If TitleData.Status = FloppyDB.FloppyDBStatus.Verified Then
                             Image_Verified = True
                         Else
                             Image_Unverified = True
                         End If
 
                         If App.Globals.AppSettings.Debug Then
-                            If TitleData.GetIsTDC Then
+                            If TitleData.IsTDC Then
                                 Image_InTDC = True
                             Else
                                 Image_NotInTDC = True
                             End If
                             FileData = New FloppyDB.FileNameData(ImageData.FileName, _TitleDB)
 
-                            If TitleData.GetStatus <> FileData.Status Then
+                            If TitleData.Status <> FileData.Status Then
                                 Database_MismatchedStatus = True
                             End If
                         End If
@@ -235,8 +236,10 @@ Namespace Filters
                             Dim FileName = IO.Path.GetFileNameWithoutExtension(ImageData.FileName)
                             Dim FileNameMatch As Boolean = False
                             For Each TitleData In TitleFindResult.Matches
-                                Dim SuggestedFileName = TitleData.GetSuggestedFileName
-                                If SuggestedFileName = FileName Then
+                                Dim SuggestedFileName = TitleData.GetSuggestedFileName(True)
+                                Dim FirstSuggestion = Replace(SuggestedFileName, "{ALT}", "")
+                                Dim SecondSuggestion = Replace(SuggestedFileName, "{ALT}", " (Alt)")
+                                If FileName = FirstSuggestion OrElse FileName = SecondSuggestion Then
                                     FileNameMatch = True
                                     Exit For
                                 End If
@@ -246,8 +249,9 @@ Namespace Filters
                                 Debug.Print("File Name: " & FileName)
                                 For Each TitleData In TitleFindResult.Matches
                                     Dim SuggestedFileName = TitleData.GetSuggestedFileName
-                                    Debug.Print("Suggested File Name: " & SuggestedFileName)
+                                    Debug.Print("Suggested: " & SuggestedFileName)
                                 Next
+                                Debug.Print("MD5: " & Disk.Image.GetMD5Hash)
                             End If
                         End If
                     End If

DiskImageTool/Modules/FloppyDB/FloppyDB.vb

@@ -29,12 +29,6 @@ Namespace FloppyDB
             End Get
         End Property
 
-        Public ReadOnly Property RegionNameCache As Dictionary(Of String, String)
-            Get
-                Return _RegionNameCache
-            End Get
-        End Property
-
         Public ReadOnly Property Languages As IReadOnlyList(Of KeyValuePair(Of String, String))
             Get
                 Return _Languages
@@ -53,6 +47,12 @@ Namespace FloppyDB
             End Get
         End Property
 
+        Public ReadOnly Property RegionNameCache As Dictionary(Of String, String)
+            Get
+                Return _RegionNameCache
+            End Get
+        End Property
+
         Public ReadOnly Property Regions As IReadOnlyList(Of KeyValuePair(Of String, String))
             Get
                 Return _Regions
@@ -179,7 +179,7 @@ Namespace FloppyDB
         Public Function IsVerifiedImage(Disk As Disk) As Boolean
             Dim Result = TitleFind(Disk)
             If Result.Primary IsNot Nothing Then
-                If Result.Primary.GetStatus = FloppyDBStatus.Verified Then
+                If Result.Primary.Status = FloppyDBStatus.Verified Then
                     Return True
                 End If
             End If
@@ -269,6 +269,7 @@ Namespace FloppyDB
         Public Function SortLanguageCodes(codesCsv As String) As String
             Return SortCodes(codesCsv, _Languages)
         End Function
+
         Public Function SortRegionCodes(codesCsv As String) As String
             Return SortCodes(codesCsv, _Regions)
         End Function
@@ -303,14 +304,6 @@ Namespace FloppyDB
             Return Nothing
         End Function
 
-        Private Shared Function GetAttr(node As Xml.XmlElement, name As String) As String
-            If node.HasAttribute(name) Then
-                Return node.GetAttribute(name)
-            End If
-
-            Return Nothing
-        End Function
-
         Private Shared Sub ParseLookupList(XMLDoc As Xml.XmlDocument, XPath As String, Target As List(Of KeyValuePair(Of String, String)))
             Dim Nodes = XMLDoc.SelectNodes(XPath)
             If Nodes Is Nothing Then Return
@@ -436,46 +429,6 @@ Namespace FloppyDB
             Return Data
         End Function
 
-        Private Function GetTitleData(Node As Xml.XmlElement, Parent As FloppyData) As FloppyData
-            Dim TitleData As New FloppyData With {
-            .Owner = Me,
-            .Parent = Parent,
-            .Name = GetAttr(Node, "name"),
-            .Variation = GetAttr(Node, "variation"),
-            .Compilation = GetAttr(Node, "compilation"),
-            .Year = GetAttr(Node, "year"),
-            .Version = GetAttr(Node, "version"),
-            .Int = GetAttr(Node, "int"),
-            .Serial = GetAttr(Node, "serial"),
-            .Disk = GetAttr(Node, "disk"),
-            .Publisher = GetAttr(Node, "publisher"),
-            .Region = GetAttr(Node, "region"),
-            .Language = GetAttr(Node, "language"),
-            .CopyProtection = GetAttr(Node, "cp"),
-            .OperatingSystem = GetAttr(Node, "os"),
-            .MobyGamesId = GetAttr(Node, "mobyGamesId")
-        }
-
-            If Node.HasAttribute("media") Then
-                TitleData.MediaString = Node.GetAttribute("media")
-                TitleData.Media = FloppyDiskFormatGet(TitleData.MediaString)
-            End If
-
-            If Node.HasAttribute("status") Then
-                TitleData.Status = GetFloppyDBStatus(Node.GetAttribute("status"))
-            End If
-
-            If Node.HasAttribute("tdc") Then
-                TitleData.IsTDC = (Node.GetAttribute("tdc") = "1")
-            End If
-
-            If Node.HasAttribute("fixed") Then
-                TitleData.Fixed = (Node.GetAttribute("fixed") = "1")
-            End If
-
-            Return TitleData
-        End Function
-
         Private Function GetVersion(XMLDoc As Xml.XmlDocument) As String
             Return If(XMLDoc.SelectSingleNode("/root/@version")?.Value, "")
         End Function
@@ -573,41 +526,33 @@ Namespace FloppyDB
             ParseLookupList(XMLDoc, "/root/regions/region", _Regions)
         End Sub
 
-        Private Function ParseNode(Node As Xml.XmlNode, ParentData As FloppyData) As Integer
+        Private Function ParseNode(Node As Xml.XmlNode, Inherited As FloppyData) As Integer
             Dim Elem = TryCast(Node, Xml.XmlElement)
 
             If Elem Is Nothing Then
                 Return 0
             End If
 
             Dim Count As Integer = 0
-            Dim FloppyData = GetTitleData(Elem, ParentData)
-
-            If Elem.Name = "media" Then
-                Dim mediaDiskCount As Integer = 0
-                For Each ChildNode As Xml.XmlNode In Elem.ChildNodes
-                    Dim childElem = TryCast(ChildNode, Xml.XmlElement)
-                    If childElem IsNot Nothing AndAlso childElem.Name = "disk" Then
-                        mediaDiskCount += 1
-                    End If
-                Next
-                FloppyData.DiskCount = mediaDiskCount
+            Dim Merged As New FloppyData(Me, Inherited, Elem)
 
-            ElseIf Elem.Name = "disk" Then
+            If Elem.Name = "disk" Then
                 Dim md5 = Elem.GetAttribute("md5")
                 If md5 <> "" Then
-                    AddMd5Mapping(md5, FloppyData)
+                    AddMd5Mapping(md5, Merged)
                     Count += 1
                 End If
 
                 Dim md5Alt = Elem.GetAttribute("md5_alt")
                 If md5Alt <> "" Then
-                    AddMd5Mapping(md5Alt, FloppyData)
+                    AddMd5Mapping(md5Alt, Merged)
                 End If
+
+                Return Count
             End If
 
             For Each ChildNode As Xml.XmlNode In Elem.ChildNodes
-                Count += ParseNode(ChildNode, FloppyData)
+                Count += ParseNode(ChildNode, Merged)
             Next
 
             Return Count