Enhance metadata handling, error reporting, and file I/O

- Add FileIO module for robust, centralized file operations with error handling
- Improve image preview: safer file reads, better error messages, always dispose dialogs
- FloppyDB: support multiple entries per MD5, new fields (serial, int, fixed), improved XML parsing, and new helper methods for displaying lists
- Summary panel: show all matching names/publishers/years, wrap language field
- Localize and clarify error messages for preview/format detection
- Refactor and simplify save logic in MainForm
- Fix MD5 bug in image preview and typo in AddTitle
- Remove unused temp file image functions
- General code cleanup and style improvements

Author: Digitoxin1

DiskImageTool/DiskImageTool.vbproj

@@ -198,6 +198,7 @@
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Modules\Dialogs.vb" />
+    <Compile Include="Modules\FileIO.vb" />
     <Compile Include="Scanners\FilterScanner.vb" />
     <Compile Include="Filters\Enums.vb" />
     <Compile Include="Filters\FilterCounts.vb" />

DiskImageTool/Extensions/ListViewExtensions.vb

@@ -75,7 +75,7 @@ Module ListViewExtensions
             Else
                 CalcWidth = listViewControl.Columns.Item(1).Width - 6
             End If
-            If TextRenderer.MeasureText(Value, listViewControl.Font).Width > CalcWidth Then
+            If TextRenderer.MeasureText(Value, listViewControl.Font).Width > CalcWidth OrElse Value.Contains(vbNewLine) Then
                 StringList = Value.WordWrap(CalcWidth, listViewControl.Font)
                 AddTags = True
             End If

DiskImageTool/Extensions/StringExtensions.vb

@@ -3,35 +3,45 @@
 Module StringExtensions
     <Extension()>
     Public Function WordWrap(Text As String, Width As Integer, Font As Font) As List(Of String)
-        Dim StringList As New List(Of String)
-        Dim Size = TextRenderer.MeasureText(Text, Font)
+        Dim Result As New List(Of String)
 
-        If String.IsNullOrEmpty(Text) OrElse Width = 0 OrElse Width >= Size.Width Then
-            StringList.Add(Text)
-            Return StringList
+        If String.IsNullOrEmpty(Text) OrElse Width <= 0 Then
+            Result.Add(Text)
+            Return Result
         End If
 
-        Dim Words = Text.Split(" ")
-        Dim Line As String = ""
-        For Each Word In Words
-            Dim NewLine = Line
-            If NewLine <> "" Then
-                NewLine &= " "
+        ' Normalize newlines and split into logical lines
+        Dim Lines = Text.Replace(vbCrLf, vbLf).Replace(vbCr, vbLf).Split(vbLf)
+
+        For Each LogicalLine In Lines
+            ' Preserve blank lines
+            If LogicalLine = "" Then
+                Result.Add("")
+                Continue For
             End If
-            NewLine &= Word
-            Size = TextRenderer.MeasureText(NewLine, Font)
-
-            If Size.Width <= Width Then
-                Line = NewLine
-            Else
-                StringList.Add(Line)
-                Line = Word
+
+            Dim Words = LogicalLine.Split(" ")
+            Dim Line As String = ""
+
+            For Each Word In Words
+                Dim NewLine = If(Line = "", Word, Line & " " & Word)
+                Dim Size = TextRenderer.MeasureText(NewLine, Font)
+
+                If Size.Width <= Width Then
+                    Line = NewLine
+                Else
+                    If Line <> "" Then
+                        Result.Add(Line)
+                    End If
+                    Line = Word
+                End If
+            Next
+
+            If Line <> "" Then
+                Result.Add(Line)
             End If
         Next
-        If Line <> "" Then
-            StringList.Add(Line)
-        End If
 
-        Return StringList
+        Return Result
     End Function
 End Module

DiskImageTool/Filters/ImageFilters.vb

@@ -206,22 +206,23 @@ Namespace Filters
 
                 If _TitleDB.TitleCount > 0 Then
                     TitleFindResult = _TitleDB.TitleFind(Disk)
-                    If TitleFindResult.TitleData IsNot Nothing Then
+                    Dim TitleData = TitleFindResult.Primary
+                    If TitleData IsNot Nothing Then
                         Image_NotInDatabase = False
                         Image_InDatabase = True
-                        If TitleFindResult.TitleData.GetStatus = FloppyDB.FloppyDBStatus.Verified Then
+                        If TitleData.GetStatus = FloppyDB.FloppyDBStatus.Verified Then
                             Image_Verified = True
                         Else
                             Image_Unverified = True
                         End If
                         If App.Globals.AppSettings.Debug Then
-                            If TitleFindResult.TitleData.GetIsTDC Then
+                            If TitleData.GetIsTDC Then
                                 Image_InTDC = True
                             Else
                                 Image_NotInTDC = True
                             End If
                             FileData = New FloppyDB.FileNameData(ImageData.FileName)
-                            If TitleFindResult.TitleData.GetStatus <> FileData.Status Then
+                            If TitleData.GetStatus <> FileData.Status Then
                                 Database_MismatchedStatus = True
                             End If
                         End If
@@ -272,7 +273,7 @@ Namespace Filters
                             FileData = New FloppyDB.FileNameData(ImageData.FileName)
                         End If
                         Dim Media = FloppyDiskFormatGetName(Disk.BPB, True)
-                        _TitleDB.AddTile(FileData, Media, TitleFindResult.MD5)
+                        _TitleDB.AddTitle(FileData, Media, TitleFindResult.MD5)
                     End If
                 End If
             End If

DiskImageTool/Flux/Forms/ConvertImageForm.vb

@@ -1104,17 +1104,15 @@ Namespace Flux
                 Exit Sub
             End If
 
+            Dim Caption As String = TextBoxFileName.Text
+
             Dim HasSelectedOutputFile As Boolean = _OutputImages.Images.ContainsKey(_SelectedDevice.Device)
 
             If HasSelectedOutputFile Then
                 Dim ImageInfo = _OutputImages.Images(_SelectedDevice.Device)
                 Dim ImageData = New ImageData(ImageInfo.FilePath)
 
-                Dim Caption As String = TextBoxFileName.Text
-
-                If Not ImagePreview.Display(ImageData, Caption, Me) Then
-                    MsgBox(My.Resources.Dialog_ImagePreviewFail, MsgBoxStyle.Exclamation)
-                End If
+                ImagePreview.Display(ImageData, Caption, Me)
             Else
                 If Not _SelectedDevice.SupportsPreview Then
                     Exit Sub
@@ -1130,12 +1128,8 @@ Namespace Flux
 
                 If Not Response.Result Then
                     MsgBox(My.Resources.Dialog_ImagePreviewFail, MsgBoxStyle.Exclamation)
-                End If
-
-                Dim Caption As String = TextBoxFileName.Text
-
-                If Not ImagePreview.Display(Response.Filename, DiskParams.Value, Caption, Me) Then
-                    MsgBox(My.Resources.Dialog_ImagePreviewFail, MsgBoxStyle.Exclamation)
+                Else
+                    ImagePreview.Display(Response.Filename, DiskParams.Value, Caption, Me)
                 End If
 
                 DeleteTempFileIfExists(Response.Filename)

DiskImageTool/Flux/Greaseweazle/Forms/ReadDiskForm.vb

@@ -771,17 +771,15 @@ Namespace Flux.Greaseweazle
         End Sub
 
         Private Sub PreviewImage()
+            Dim Caption As String = TextBoxFileName.Text
+
             Dim HasOutputfile As Boolean = Not String.IsNullOrEmpty(_OutputFilePath)
             Dim IsFluxOutput = CheckIsFluxOutput()
 
             If HasOutputfile AndAlso Not IsFluxOutput Then
                 Dim ImageData = New ImageData(_OutputFilePath)
 
-                Dim Caption As String = TextBoxFileName.Text
-
-                If Not ImagePreview.Display(ImageData, Caption, Me) Then
-                    MsgBox(My.Resources.Dialog_ImagePreviewFail, MsgBoxStyle.Exclamation)
-                End If
+                ImagePreview.Display(ImageData, Caption, Me)
             Else
                 Dim DiskParams = SelectedDiskParams()
                 Dim Opt As DriveOption = _SelectedOption
@@ -794,12 +792,8 @@ Namespace Flux.Greaseweazle
 
                 If Not Response.Result Then
                     MsgBox(My.Resources.Dialog_ImagePreviewFail, MsgBoxStyle.Exclamation)
-                End If
-
-                Dim Caption As String = TextBoxFileName.Text
-
-                If Not ImagePreview.Display(Response.FileName, DiskParams.Value, Caption, Me) Then
-                    MsgBox(My.Resources.Dialog_ImagePreviewFail, MsgBoxStyle.Exclamation)
+                Else
+                    ImagePreview.Display(Response.FileName, DiskParams.Value, Caption, Me)
                 End If
 
                 DeleteTempFileIfExists(Response.FileName)

DiskImageTool/Flux/Greaseweazle/GreaseweazleLib.vb

@@ -194,11 +194,11 @@ Namespace Flux.Greaseweazle
             End If
 
             Dim Builder As New CommandLineBuilder(CommandLineBuilder.CommandAction.convert) With {
-            .InFile = FilePath,
-            .OutFile = FileName,
-            .Format = Format,
-            .Heads = If(BothSides, TrackHeads.both, TrackHeads.head0)
-        }
+                .InFile = FilePath,
+                .OutFile = FileName,
+                .Format = Format,
+                .Heads = If(BothSides, TrackHeads.both, TrackHeads.head0)
+            }
             Builder.AddCylinder(0)
 
             ConsoleProcessRunner.RunProcess(Settings.AppPath, Builder.Arguments)
@@ -330,12 +330,12 @@ Namespace Flux.Greaseweazle
             End If
 
             Dim Builder As New CommandLineBuilder(CommandLineBuilder.CommandAction.read) With {
-            .Device = Settings.ComPort,
-            .Drive = DriveId,
-            .File = FileName,
-            .Format = Format,
-            .Heads = If(BothSides, TrackHeads.both, TrackHeads.head0)
-        }
+                .Device = Settings.ComPort,
+                .Drive = DriveId,
+                .File = FileName,
+                .Format = Format,
+                .Heads = If(BothSides, TrackHeads.both, TrackHeads.head0)
+            }
             Builder.AddCylinder(0)
 
             Dim Result = ConsoleProcessRunner.RunProcess(Settings.AppPath, Builder.Arguments)

DiskImageTool/Flux/SharedLib.vb

@@ -150,19 +150,25 @@ Namespace Flux
             Dim Length As Integer = 513
             Dim DetectedFormat As FloppyDiskFormat
 
-            Using fs As New IO.FileStream(FileName, IO.FileMode.Open, IO.FileAccess.Read, IO.FileShare.Read)
-                Using br As New IO.BinaryReader(fs, System.Text.Encoding.ASCII, leaveOpen:=False)
-                    Buffer = br.ReadBytes(Length)
-                    DetectedFormat = FloppyDiskFormatGet(Buffer)
-                    If DetectedFormat = FloppyDiskFormat.FloppyXDFMicro Then
-                        If fs.Length >= SecondOffset + Length Then
-                            fs.Seek(SecondOffset, IO.SeekOrigin.Begin)
-                            Buffer = br.ReadBytes(513)
-                            DetectedFormat = FloppyDiskFormatGet(Buffer)
+            Try
+                Using fs As New IO.FileStream(FileName, IO.FileMode.Open, IO.FileAccess.Read, IO.FileShare.Read)
+                    Using br As New IO.BinaryReader(fs, System.Text.Encoding.ASCII, leaveOpen:=False)
+                        Buffer = br.ReadBytes(Length)
+                        DetectedFormat = FloppyDiskFormatGet(Buffer)
+                        If DetectedFormat = FloppyDiskFormat.FloppyXDFMicro Then
+                            If fs.Length >= SecondOffset + Length Then
+                                fs.Seek(SecondOffset, IO.SeekOrigin.Begin)
+                                Buffer = br.ReadBytes(513)
+                                DetectedFormat = FloppyDiskFormatGet(Buffer)
+                            End If
                         End If
-                    End If
+                    End Using
                 End Using
-            End Using
+            Catch ex As Exception
+                Dim Msg = My.Resources.Dialog_DetectFormatError & vbNewLine & vbNewLine & ex.Message
+                MsgBox(Msg, MsgBoxStyle.Critical)
+                DetectedFormat = FloppyDiskFormat.FloppyUnknown
+            End Try
 
             If DeleteWhenDone Then
                 DeleteTempFileIfExists(FileName)

DiskImageTool/Forms/ImagePreview.vb

@@ -21,7 +21,7 @@
 
         Dim MD5 As String = ""
         If FullDisplay Then
-            MD5 = CurrentImage.Disk.Image.GetMD5Hash
+            MD5 = _Disk.Image.GetMD5Hash
         Else
             Me.Width = Me.MinimumSize.Width
         End If
@@ -33,12 +33,21 @@
 
         _SummaryPanel.Populate(CurrentImage, App.BootstrapDB, App.TitleDB, MD5, Not FullDisplay)
         If FullDisplay Then
-            HashPanel1.Populate(Disk, MD5)
+            HashPanel1.Populate(_Disk, MD5)
         End If
         FilePanelMain.Load(CurrentImage, False, FullDisplay)
     End Sub
 
     Public Shared Function Display(FileName As String, ImageParams As DiskImage.FloppyDiskParams, Caption As String, owner As IWin32Window) As Boolean
+        Dim OpenResponse = FileOpenBinary(FileName)
+
+        If Not OpenResponse.Result Then
+            Dim Msg = My.Resources.Dialog_ImagePreviewFail & vbNewLine & vbNewLine & OpenResponse.ErrorMsg
+            MsgBox(Msg, MsgBoxStyle.Exclamation)
+
+            Return False
+        End If
+
         Try
             Dim Size = ImageParams.BPBParams.SizeInBytes
 
@@ -48,37 +57,38 @@
                 Buffer(i) = &HF6
             Next
 
-            Dim FileBytes = IO.File.ReadAllBytes(FileName)
-
-            Dim ToCopy As Integer = Math.Min(FileBytes.Length, Buffer.Length)
-            Array.Copy(FileBytes, 0, Buffer, 0, ToCopy)
+            Dim ToCopy As Integer = Math.Min(OpenResponse.Data.Length, Buffer.Length)
+            Array.Copy(OpenResponse.Data, 0, Buffer, 0, ToCopy)
 
             Dim FloppyImage As New DiskImage.BasicSectorImage(Buffer)
             Dim Disk As New DiskImage.Disk(FloppyImage, 0)
 
             Display(Disk, False, Caption, owner)
         Catch ex As Exception
+            MsgBox(My.Resources.Dialog_ImagePreviewFail, MsgBoxStyle.Exclamation)
+
             Return False
         End Try
 
         Return True
     End Function
 
     Public Shared Function Display(ImageData As ImageData, Caption As String, owner As IWin32Window) As Boolean
-        Try
-            Dim Disk = DiskImageLoadFromImageData(ImageData)
+        Dim Disk = DiskImageLoadFromImageData(ImageData)
 
-            Display(Disk, True, Caption, owner)
-        Catch ex As Exception
+        If Disk Is Nothing Then
+            MsgBox(My.Resources.Dialog_ImagePreviewFail, MsgBoxStyle.Exclamation)
             Return False
-        End Try
+        End If
+
+        Display(Disk, True, Caption, owner)
 
         Return True
     End Function
 
     Public Shared Sub Display(Disk As DiskImage.Disk, FullDisplay As Boolean, Caption As String, owner As IWin32Window)
-        With New ImagePreview(Disk, FullDisplay, Caption)
-            .ShowDialog(owner)
-        End With
+        Using Dialog As New ImagePreview(Disk, FullDisplay, Caption)
+            Dialog.ShowDialog(owner)
+        End Using
     End Sub
 End Class