Completed new file import dialog

Fixes and improvements to long filename support

Author: Digitoxin1

DiskImageTool/CopyProtection.vb

@@ -30,7 +30,7 @@ Module Copy_Protection
 
         'Softguard Superlok v2
         If Not ProtectionFound AndAlso BadSectors.Count >= 10 Then
-            If CheckBadSectors(BadSectors, {108, 109, 110, 111, 112, 113, 114, 115, 116, 117}) AndAlso Disk.RootDirectory.GetFileIndex("CPC.COM", False) > -1 Then
+            If CheckBadSectors(BadSectors, {108, 109, 110, 111, 112, 113, 114, 115, 116, 117}) AndAlso Disk.RootDirectory.FindShortFileName("CPC.COM", False) > -1 Then
                 ProtectionFound = True
                 ProtectionName = "Softguard Superlok v2"
             End If
@@ -85,14 +85,14 @@ Module Copy_Protection
         End If
 
         'Softguard Superlok v2/v3
-        If Not ProtectionFound AndAlso Disk.RootDirectory.GetFileIndex("CML0300.FCL", False) > -1 Then
+        If Not ProtectionFound AndAlso Disk.RootDirectory.FindShortFileName("CML0300.FCL", False) > -1 Then
             ProtectionFound = True
             ProtectionName = "Softguard Superlok v2/v3"
         End If
 
         'Xidex Magnetics (XEMAG) XELOK v2
         If Not ProtectionFound Then
-            Dim Fileindex = Disk.RootDirectory.GetFileIndex("XEMAG.SYS", False)
+            Dim Fileindex = Disk.RootDirectory.FindShortFileName("XEMAG.SYS", False)
             If Fileindex > -1 Then
                 Dim DirectoryEntry = Disk.RootDirectory.GetFile(Fileindex)
                 If Disk.BPB.ClusterToSector(DirectoryEntry.StartingCluster) = 162 Then
@@ -120,7 +120,7 @@ Module Copy_Protection
 
     Private Function CheckFileList(Disk As DiskImage.Disk, FileList() As String) As Boolean
         For Each File In FileList
-            If Disk.RootDirectory.GetFileIndex(File, False) > -1 Then
+            If Disk.RootDirectory.FindShortFileName(File, False) > -1 Then
                 Return True
             End If
         Next

DiskImageTool/DiskImage/AddFileOptions.vb

@@ -1,8 +1,8 @@
 Namespace DiskImage
     Public Class AddFileOptions
-        Public Property CreatedDate As Boolean
-        Public Property LastAccessedDate As Boolean
-        Public Property LFN As Boolean
-        Public Property NTExtensions As Boolean
+        Public Property UseLFN As Boolean
+        Public Property UseNTExtensions As Boolean
+        Public Property UseCreatedDate As Boolean
+        Public Property UseLastAccessedDate As Boolean
     End Class
 End Namespace

DiskImageTool/DiskImage/DirectoryBase.vb

@@ -114,7 +114,7 @@
             End If
         End Sub
 
-        Public MustOverride Function AddDirectory(DirectoryData() As Byte, Options As AddFileOptions, LFNFileName As String, Optional Index As Integer = -1) As AddDirectoryData Implements IDirectory.AddDirectory
+        Public MustOverride Function AddDirectory(EntryData() As Byte, Options As AddFileOptions, Filename As String, Optional Index As Integer = -1) As AddFileData Implements IDirectory.AddDirectory
 
         Public MustOverride Function AddFile(FilePath As String, Options As AddFileOptions, Optional Index As Integer = -1) As Integer Implements IDirectory.AddFile
 
@@ -137,6 +137,57 @@
             Return Index
         End Function
 
+        Public Function FindFileName(Filename As String, IncludeDirectories As Boolean, Optional SkipIndex As Integer = -1) As Integer Implements IDirectory.FindFileName
+            If _DirectoryData.EntryCount > 0 Then
+                For Counter As UInteger = 0 To _DirectoryData.EntryCount - 1
+                    If Counter <> SkipIndex Then
+                        Dim File = _DirectoryEntries.Item(Counter)
+                        If Not File.IsDeleted And Not File.IsVolumeName And (IncludeDirectories Or Not File.IsDirectory) Then
+                            If File.GetFullFileName = Filename Then
+                                Return Counter
+                            End If
+                        End If
+                    End If
+                Next
+            End If
+
+            Return -1
+        End Function
+
+        Public Function FindShortFileName(FileBytes() As Byte, IncludeDirectories As Boolean, Optional SkipIndex As Integer = -1) As Integer Implements IDirectory.FindShortFileName
+            If _DirectoryData.EntryCount > 0 Then
+                For Counter As UInteger = 0 To _DirectoryData.EntryCount - 1
+                    If Counter <> SkipIndex Then
+                        Dim File = _DirectoryEntries.Item(Counter)
+                        If Not File.IsDeleted And Not File.IsVolumeName And (IncludeDirectories Or Not File.IsDirectory) Then
+                            If FileBytes.CompareTo(File.FileNameWithExtension) Then
+                                Return Counter
+                            End If
+                        End If
+                    End If
+                Next
+            End If
+
+            Return -1
+        End Function
+
+        Public Function FindShortFileName(Filename As String, IncludeDirectories As Boolean, Optional SkipIndex As Integer = -1) As Integer Implements IDirectory.FindShortFileName
+            If _DirectoryData.EntryCount > 0 Then
+                For Counter As UInteger = 0 To _DirectoryData.EntryCount - 1
+                    If Counter <> SkipIndex Then
+                        Dim File = _DirectoryEntries.Item(Counter)
+                        If Not File.IsDeleted And Not File.IsVolumeName And (IncludeDirectories Or Not File.IsDirectory) Then
+                            If File.GetShortFileName = Filename Then
+                                Return Counter
+                            End If
+                        End If
+                    End If
+                Next
+            End If
+
+            Return -1
+        End Function
+
         Public Function GetAvailableEntry() As DirectoryEntry Implements IDirectory.GetAvailableEntry
             Dim Buffer(10) As Byte
 
@@ -157,7 +208,21 @@
             Return Nothing
         End Function
 
-        Public Function GetAvailableFileName(FileName As String, UseNTExtensions As Boolean, Optional CurrentIndex As Integer = -1) As String Implements IDirectory.GetAvailableFileName
+        Public Function GetAvailableFileName(FileName As String, Optional CurrentIndex As Integer = -1) As String Implements IDirectory.GetAvailableFileName
+            Dim FileParts = SplitFilename(FileName)
+
+            Dim NewFileName As String = FileName
+            Dim Index As UInteger = 1
+
+            Do While FindFileName(NewFileName, True, CurrentIndex) > -1
+                NewFileName = CombineFileParts(FileParts.Name & " (" & Index & ")", FileParts.Extension)
+                Index += 1
+            Loop
+
+            Return NewFileName
+        End Function
+
+        Public Function GetAvailableShortFileName(FileName As String, UseNTExtensions As Boolean, Optional CurrentIndex As Integer = -1) As String Implements IDirectory.GetAvailableShortFileName
             Dim FileParts = SplitFilename(FileName)
 
             Dim CleanFileName = DOSCleanFileName(FileParts.Name)
@@ -179,7 +244,7 @@
                 NewFileName = CombineFileParts(CleanFileName, CleanExtension)
             End If
 
-            Do While GetFileIndex(NewFileName, True, CurrentIndex) > -1
+            Do While FindShortFileName(NewFileName, True, CurrentIndex) > -1
                 NewFileName = TruncateFileName(CleanFileName, CleanExtension, Checksum, Index, UseNTExtensions)
                 Index += 1
             Loop
@@ -202,41 +267,6 @@
         Public Function GetFile(Index As UInteger) As DirectoryEntry Implements IDirectory.GetFile
             Return _DirectoryEntries.Item(Index)
         End Function
-
-        Public Function GetFileIndex(FileBytes() As Byte, IncludeDirectories As Boolean, Optional SkipIndex As Integer = -1) As Integer Implements IDirectory.GetFileIndex
-            If _DirectoryData.EntryCount > 0 Then
-                For Counter As UInteger = 0 To _DirectoryData.EntryCount - 1
-                    If Counter <> SkipIndex Then
-                        Dim File = _DirectoryEntries.Item(Counter)
-                        If Not File.IsDeleted And Not File.IsVolumeName And (IncludeDirectories Or Not File.IsDirectory) Then
-                            If FileBytes.CompareTo(File.FileNameWithExtension) Then
-                                Return Counter
-                            End If
-                        End If
-                    End If
-                Next
-            End If
-
-            Return -1
-        End Function
-
-        Public Function GetFileIndex(Filename As String, IncludeDirectories As Boolean, Optional SkipIndex As Integer = -1) As Integer Implements IDirectory.GetFileIndex
-            If _DirectoryData.EntryCount > 0 Then
-                For Counter As UInteger = 0 To _DirectoryData.EntryCount - 1
-                    If Counter <> SkipIndex Then
-                        Dim File = _DirectoryEntries.Item(Counter)
-                        If Not File.IsDeleted And Not File.IsVolumeName And (IncludeDirectories Or Not File.IsDirectory) Then
-                            If File.GetShortFileName = Filename Then
-                                Return Counter
-                            End If
-                        End If
-                    End If
-                Next
-            End If
-
-            Return -1
-        End Function
-
         Public Function GetIndex(DirectoryEntry As DirectoryEntry) As Integer Implements IDirectory.GetIndex
             Return _DirectoryEntries.IndexOf(DirectoryEntry)
         End Function

DiskImageTool/DiskImage/DirectoryEntry.vb

@@ -79,66 +79,6 @@
             End Get
         End Property
 
-        Public Function AddFile(FilePath As String, ShortFileName As String, UseCreationDate As Boolean, UseLastAccessDate As Boolean, Optional StartingCluster As UShort = 2) As Boolean
-            Return AddFile(FilePath, ShortFileName, UseCreationDate, UseLastAccessDate, Disk.FAT.FreeClusters, StartingCluster)
-        End Function
-
-        Public Function AddFile(FilePath As String, ShortFileName As String, UseCreationDate As Boolean, UseLastAccessDate As Boolean, ClusterList As SortedSet(Of UShort), Optional StartingCluster As UShort = 2) As Boolean
-            Dim FileInfo = New IO.FileInfo(FilePath)
-            Dim ClusterSize = Disk.BPB.BytesPerCluster
-
-            If FileInfo.Length > ClusterList.Count * ClusterSize Then
-                Return False
-            End If
-
-            Dim UseTransaction As Boolean = _Disk.BeginTransaction
-
-            Dim FirstCluster As UShort = 0
-
-            If FileInfo.Length > 0 Then
-                'Load file into buffer, padding with empty space if needed            
-                Dim FileSize = Math.Ceiling(FileInfo.Length / ClusterSize) * ClusterSize
-                Dim FileBuffer = ReadFileIntoBuffer(FileInfo, FileSize, 0)
-
-                Dim LastCluster As UShort = 0
-
-                For Counter As Integer = 0 To FileBuffer.Length - 1 Step ClusterSize
-                    Dim Cluster = Disk.FAT.GetNextFreeCluster(ClusterList, True, StartingCluster)
-                    If Cluster > 0 Then
-                        If Counter = 0 Then
-                            FirstCluster = Cluster
-                        Else
-                            Disk.FATTables.UpdateTableEntry(LastCluster, Cluster)
-                        End If
-                        Dim ClusterOffset = Disk.BPB.ClusterToOffset(Cluster)
-                        Dim Buffer = Disk.Image.GetBytes(ClusterOffset, ClusterSize)
-                        Array.Copy(FileBuffer, Counter, Buffer, 0, ClusterSize)
-                        Disk.Image.SetBytes(Buffer, ClusterOffset)
-                        LastCluster = Cluster
-                        StartingCluster = Cluster + 1
-                    End If
-                Next
-
-                If LastCluster > 0 Then
-                    Disk.FATTables.UpdateTableEntry(LastCluster, FAT12.FAT_LAST_CLUSTER_END)
-                End If
-            End If
-
-            Dim NewEntry = New DirectoryEntryBase
-            NewEntry.SetFileInfo(FileInfo, ShortFileName, UseCreationDate, UseLastAccessDate)
-            NewEntry.StartingCluster = FirstCluster
-
-            Data = NewEntry.Data
-
-            InitFatChain()
-
-            If UseTransaction Then
-                _Disk.EndTransaction()
-            End If
-
-            Return True
-        End Function
-
         Public Function CanUnDelete() As Boolean
             If FileSize = 0 Or HasInvalidFileSize() Or HasInvalidStartingCluster() Then
                 Return False

DiskImageTool/DiskImage/DirectoryEntryBase.vb

@@ -675,9 +675,7 @@ Namespace DiskImage
             Attributes = Attrib
         End Sub
 
-        Public Sub SetFileInfo(FolderInfo As DirectoryInfo, NewFileName As String, UseCreationDate As Boolean, UseLastAccessDate As Boolean)
-            SetFileName(NewFileName)
-
+        Public Sub SetFileInfo(FolderInfo As DirectoryInfo, UseCreationDate As Boolean, UseLastAccessDate As Boolean)
             FileSize = 0
 
             SetLastWriteDate(FolderInfo.LastWriteTime)

DiskImageTool/DiskImage/Interfaces/IDirectory.vb

@@ -7,16 +7,18 @@
         ReadOnly Property IsRootDirectory As Boolean
         ReadOnly Property ParentEntry As DirectoryEntry
         ReadOnly Property SectorChain As List(Of UInteger)
-        Function AddDirectory(DirectoryData() As Byte, Options As AddFileOptions, LFNFileName As String, Optional Index As Integer = -1) As AddDirectoryData
+        Function AddDirectory(EntryData() As Byte, Options As AddFileOptions, Filename As String, Optional Index As Integer = -1) As AddFileData
         Function AddFile(FilePath As String, Options As AddFileOptions, Optional Index As Integer = -1) As Integer
         Function AddFile(FileInfo As IO.FileInfo, Options As AddFileOptions, Optional Index As Integer = -1) As Integer
-        Function GetAvailableFileName(FileName As String, UseNTExtensions As Boolean, Optional CurrentIndex As Integer = -1) As String
+        Function FindFileName(Filename As String, IncludeDirectories As Boolean, Optional SkipIndex As Integer = -1) As Integer
+        Function FindShortFileName(FileBytes() As Byte, IncludeDirectories As Boolean, Optional SkipIndex As Integer = -1) As Integer
+        Function FindShortFileName(Filename As String, IncludeDirectories As Boolean, Optional SkipIndex As Integer = -1) As Integer
+        Function GetAvailableEntry() As DirectoryEntry
+        Function GetAvailableFileName(FileName As String, Optional CurrentIndex As Integer = -1) As String
+        Function GetAvailableShortFileName(FileName As String, UseNTExtensions As Boolean, Optional CurrentIndex As Integer = -1) As String
         Function GetContent() As Byte()
         Function GetFile(Index As UInteger) As DirectoryEntry
         Function GetIndex(DirectoryEntry As DirectoryEntry) As Integer
-        Function GetAvailableEntry() As DirectoryEntry
-        Function GetFileIndex(FileBytes() As Byte, IncludeDirectories As Boolean, Optional SkipIndex As Integer = -1) As Integer
-        Function GetFileIndex(Filename As String, IncludeDirectories As Boolean, Optional SkipIndex As Integer = -1) As Integer
         Function RemoveEntry(Index As UInteger) As Boolean
         Function RemoveLFN(Index As UInteger) As Boolean
         Sub UpdateEntryCounts()