Bug fixes and feature updates

When updating the timestamps on a directory, the current and parent directory entries are now properly updated as well.

New directories can now be added to a disk image.

Author: Digitoxin1

DiskImageTool/DiskImage/DirectoryBase.vb

@@ -114,6 +114,8 @@
             End If
         End Sub
 
+        Public MustOverride Function AddDirectory(DirectoryData() As Byte, UseLFN As Boolean, LFNFileName As String, Optional Index As Integer = -1) As Integer Implements IDirectory.AddDirectory
+
         Public MustOverride Function AddFile(FilePath As String, LFN As Boolean, Optional Index As Integer = -1) As Integer Implements IDirectory.AddFile
 
         Public Function AdjustIndexForLFN(Index As Integer) As Integer

DiskImageTool/DiskImage/DirectoryEntry.vb

@@ -325,10 +325,6 @@
             Return Not (IsDirectory() OrElse IsVolumeName() OrElse HasInvalidStartingCluster() OrElse HasInvalidFileSize()) AndAlso StartingCluster > 1
         End Function
 
-        Public Function IsValidVolumeName() As Boolean
-            Return IsVolumeName() AndAlso Not (IsHidden() OrElse IsSystem() OrElse IsDirectory() OrElse IsDeleted()) AndAlso StartingCluster = 0
-        End Function
-
         Public Function RemoveLFN() As Boolean
             Return ParentDirectory.RemoveLFN(_Index)
         End Function
@@ -454,7 +450,7 @@
             Return True
         End Function
 
-        Private Sub InitSubDirectory()
+        Public Sub InitSubDirectory()
             If IsValidDirectory() AndAlso Not IsLink() AndAlso Not IsDeleted() Then
                 _SubDirectory = New SubDirectory(_RootDirectory, Me)
             Else

DiskImageTool/DiskImage/DirectoryEntryBase.vb

@@ -6,6 +6,8 @@ Namespace DiskImage
         Public Const CHAR_DELETED As Byte = &HE5
         Public Const DIRECTORY_ENTRY_SIZE As Byte = 32
         Public Shared ReadOnly EmptyDirectoryEntry() As Byte = {&HE5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+        Public Shared ReadOnly CurrentDirectoryEntry() As Byte = {&H2E, &H20, &H20, &H20, &H20, &H20, &H20, &H20, &H20, &H20, &H20}
+        Public Shared ReadOnly ParentDirectoryEntry() As Byte = {&H2E, &H2E, &H20, &H20, &H20, &H20, &H20, &H20, &H20, &H20, &H20}
 
         Private Const CHAR_EMPTY As Byte = &H0
         Private Const CHAR_SPACE As Byte = &H20
@@ -99,6 +101,11 @@ Namespace DiskImage
             _Offset = 0
         End Sub
 
+        Sub New(Data() As Byte)
+            _FileBytes = New ByteArray(Data)
+            _Offset = 0
+        End Sub
+
         Sub New(FileBytes As IByteArray, Offset As UInteger)
             _FileBytes = FileBytes
             _Offset = Offset
@@ -190,6 +197,20 @@ Namespace DiskImage
             End Set
         End Property
 
+        Public Property FileNameWithExtension() As Byte()
+            Get
+                Return _FileBytes.GetBytes(_Offset + DirectoryEntryOffsets.FileName, DirectoryEntrySizes.FileName + DirectoryEntrySizes.Extension)
+            End Get
+            Set
+                If _FileBytes.SetBytes(Value, _Offset + DirectoryEntryOffsets.FileName, DirectoryEntrySizes.FileName + DirectoryEntrySizes.Extension, CHAR_SPACE) Then
+                    _IsBlankCache = Nothing
+                    _VolumeNameIsCached = False
+                    _FileNameIsCached = False
+                    _HasInvalidFileNameCache = Nothing
+                End If
+            End Set
+        End Property
+
         Public Property FileSize() As UInteger
             Get
                 Return _FileBytes.GetBytesInteger(_Offset + DirectoryEntryOffsets.FileSize)
@@ -326,6 +347,10 @@ Namespace DiskImage
             LastWriteTime = 0
         End Sub
 
+        Public Function Clone() As DirectoryEntryBase
+            Return New DirectoryEntryBase(Data)
+        End Function
+
         Public Function GetCreationDate() As ExpandedDate
             If Not _CreationDateIsCached Then
                 _CreationDateCache = ExpandDate(CreationDate, CreationTime, CreationMillisecond)
@@ -413,7 +438,7 @@ Namespace DiskImage
 
         Public Function GetVolumeName() As String
             If Not _VolumeNameIsCached Then
-                _VolumeNameCache = (CodePage437ToUnicode(FileName) & CodePage437ToUnicode(Extension)).TrimEnd(" ")
+                _VolumeNameCache = CodePage437ToUnicode(FileNameWithExtension).TrimEnd(" ")
                 _VolumeNameIsCached = True
             End If
 
@@ -517,6 +542,10 @@ Namespace DiskImage
             Return (Attributes And AttributeFlags.System) > 0
         End Function
 
+        Public Function IsValidVolumeName() As Boolean
+            Return IsVolumeName() AndAlso Not (IsHidden() OrElse IsSystem() OrElse IsDirectory() OrElse IsDeleted()) AndAlso StartingCluster = 0
+        End Function
+
         Public Function IsVolumeName() As Boolean
             Return (Attributes And AttributeFlags.VolumeName) > 0
         End Function

DiskImageTool/DiskImage/Interfaces/IDirectory.vb

@@ -7,6 +7,7 @@
         ReadOnly Property IsRootDirectory As Boolean
         ReadOnly Property ParentEntry As DirectoryEntry
         ReadOnly Property SectorChain As List(Of UInteger)
+        Function AddDirectory(DirectoryData() As Byte, UseLFN As Boolean, LFNFileName As String, Optional Index As Integer = -1) As Integer
         Function AddFile(FilePath As String, LFN As Boolean, Optional Index As Integer = -1) As Integer
         Function GetAvailableFileName(FileName As String, Optional CurrentIndex As Integer = -1) As String
         Function GetContent() As Byte()

DiskImageTool/DiskImage/RootDirectory.vb

@@ -52,6 +52,24 @@
             End Get
         End Property
 
+        Public Overrides Function AddDirectory(DirectoryData() As Byte, UseLFN As Boolean, LFNFileName As String, Optional Index As Integer = -1) As Integer Implements IDirectory.AddDirectory
+            Dim Data = InitializeAddDirectory(Me, UseLFN, LFNFileName, Index)
+
+            If Data.ClusterList Is Nothing Then
+                Return -1
+            End If
+
+            Dim UseTransaction As Boolean = Disk.BeginTransaction
+
+            ProcessAddDirectory(Me, DirectoryData, Data)
+
+            If UseTransaction Then
+                Disk.EndTransaction()
+            End If
+
+            Return Data.EntriesNeeded
+        End Function
+
         Public Overrides Function AddFile(FilePath As String, WindowsAdditions As Boolean, Optional Index As Integer = -1) As Integer Implements IDirectory.AddFile
             Dim Data = InitializeAddFile(Me, FilePath, WindowsAdditions, Index)
 

DiskImageTool/DiskImage/SubDirectory.vb

@@ -25,6 +25,37 @@
             End Get
         End Property
 
+        Public Overrides Function AddDirectory(DirectoryData() As Byte, UseLFN As Boolean, LFNFileName As String, Optional Index As Integer = -1) As Integer Implements IDirectory.AddDirectory
+            Dim Data = InitializeAddDirectory(Me, UseLFN, LFNFileName, Index)
+
+            If Data.ClusterList Is Nothing Then
+                Return -1
+            End If
+
+            Dim Cluster As UShort
+            If Data.RequiresExpansion Then
+                Cluster = Disk.FAT.GetNextFreeCluster(Data.ClusterList, True)
+
+                If Cluster = 0 Then
+                    Return -1
+                End If
+            End If
+
+            Dim UseTransaction As Boolean = Disk.BeginTransaction
+
+            If Data.RequiresExpansion Then
+                ExpandDirectorySize(Cluster)
+            End If
+
+            ProcessAddDirectory(Me, DirectoryData, Data)
+
+            If UseTransaction Then
+                Disk.EndTransaction()
+            End If
+
+            Return Data.EntriesNeeded
+        End Function
+
         Public Overrides Function AddFile(FilePath As String, WindowsAdditions As Boolean, Optional Index As Integer = -1) As Integer Implements IDirectory.AddFile
             Dim Data = InitializeAddFile(Me, FilePath, WindowsAdditions, Index)
 
@@ -107,6 +138,39 @@
             Return GetDataFromChain(Disk.Image.Data, SectorChain)
         End Function
 
+        Public Sub Initialize()
+            Dim ClusterSize = Disk.BPB.BytesPerCluster
+            Dim Entry As DirectoryEntryBase
+
+            For Each Cluster In ParentEntry.FATChain.Clusters
+                Dim OffsetStart As UInteger = Disk.BPB.ClusterToOffset(Cluster)
+
+                Dim Buffer = New Byte(ClusterSize - 1) {}
+                Disk.Image.SetBytes(Buffer, OffsetStart)
+            Next
+
+            Entry = New DirectoryEntryBase With {
+                .StartingCluster = ParentEntry.StartingCluster,
+                .FileNameWithExtension = DirectoryEntryBase.CurrentDirectoryEntry
+            }
+            Entry.Attributes = MyBitConverter.ToggleBit(Entry.Attributes, DirectoryEntry.AttributeFlags.Directory, True)
+            SetEntryDates(Entry)
+            DirectoryEntries.Item(0).Data = Entry.Data
+
+            Dim StartingCluster As UShort = 0
+            If ParentEntry.ParentDirectory.ParentEntry IsNot Nothing Then
+                StartingCluster = ParentEntry.ParentDirectory.ParentEntry.StartingCluster
+            End If
+
+            Entry = New DirectoryEntryBase With {
+                .StartingCluster = StartingCluster,
+                .FileNameWithExtension = DirectoryEntryBase.ParentDirectoryEntry
+            }
+            Entry.Attributes = MyBitConverter.ToggleBit(Entry.Attributes, DirectoryEntry.AttributeFlags.Directory, True)
+            SetEntryDates(Entry)
+            DirectoryEntries.Item(1).Data = Entry.Data
+        End Sub
+
         Public Function ReduceDirectorySize() As Boolean
             If ClusterChain.Count < 2 Then
                 Return False
@@ -205,6 +269,16 @@
             Return Result
         End Function
 
+        Public Sub UpdateLinkDates()
+            Dim Entry As DirectoryEntryBase
+
+            For i = 0 To 1
+                Entry = DirectoryEntries.Item(i).Clone
+                SetEntryDates(Entry)
+                DirectoryEntries.Item(i).Data = Entry.Data
+            Next i
+        End Sub
+
         Private Sub InitializeDirectoryData()
             DirectoryEntries.Clear()
 
@@ -231,5 +305,14 @@
 
             Return True
         End Function
+
+        Private Sub SetEntryDates(Entry As DirectoryEntryBase)
+            Entry.LastAccessDate = ParentEntry.LastAccessDate
+            Entry.LastWriteDate = ParentEntry.LastWriteDate
+            Entry.LastWriteTime = ParentEntry.LastWriteTime
+            Entry.CreationDate = ParentEntry.CreationDate
+            Entry.CreationTime = ParentEntry.CreationTime
+            Entry.CreationMillisecond = ParentEntry.CreationMillisecond
+        End Sub
     End Class
 End Namespace

DiskImageTool/DiskImage/Utility.vb

@@ -1,4 +1,16 @@
-Namespace DiskImage
+Imports System.IO
+
+Namespace DiskImage
+    Public Structure AddDirectoryData
+        Dim Index As Integer
+        Dim EntriesNeeded As Integer
+        Dim ShortFileName As String
+        Dim ClusterList As SortedSet(Of UShort)
+        Dim UseLFN As Boolean
+        Dim LFNEntries As List(Of Byte())
+        Dim RequiresExpansion As Boolean
+    End Structure
+
     Public Structure AddFileData
         Dim FilePath As String
         Dim WindowsAdditions As Boolean
@@ -362,6 +374,38 @@
             Return Entries
         End Function
 
+        Public Function InitializeAddDirectory(Directory As DirectoryBase, UseLFN As Boolean, LFNFileName As String, Index As Integer) As AddDirectoryData
+            Dim ClustersRequired As UShort = 1
+
+            Dim AddDirectoryData As AddDirectoryData
+
+            AddDirectoryData.Index = Index
+            AddDirectoryData.UseLFN = UseLFN
+            If UseLFN Then
+                AddDirectoryData.ShortFileName = Directory.GetAvailableFileName(LFNFileName)
+                AddDirectoryData.LFNEntries = GetLFNDirectoryEntries(LFNFileName, AddDirectoryData.ShortFileName)
+                AddDirectoryData.EntriesNeeded = AddDirectoryData.LFNEntries.Count + 1
+            Else
+                AddDirectoryData.ShortFileName = ""
+                AddDirectoryData.LFNEntries = Nothing
+                AddDirectoryData.EntriesNeeded = 1
+            End If
+
+
+            AddDirectoryData.RequiresExpansion = Directory.Data.AvailableEntryCount < AddDirectoryData.EntriesNeeded
+            If AddDirectoryData.RequiresExpansion Then
+                ClustersRequired += 1
+            End If
+
+            If AddDirectoryData.RequiresExpansion And Directory.IsRootDirectory Then
+                AddDirectoryData.ClusterList = Nothing
+            Else
+                AddDirectoryData.ClusterList = Directory.Disk.FAT.GetFreeClusters(ClustersRequired)
+            End If
+
+            Return AddDirectoryData
+        End Function
+
         Public Function InitializeAddFile(Directory As DirectoryBase, FilePath As String, WindowsAdditions As Boolean, Index As Integer) As AddFileData
             Dim FileInfo = New IO.FileInfo(FilePath)
             Dim ClustersRequired As UShort = Math.Ceiling(FileInfo.Length / Directory.Disk.BPB.BytesPerCluster)
@@ -415,6 +459,42 @@
             Return UpdateLFNData
         End Function
 
+        Public Sub ProcessAddDirectory(Directory As DirectoryBase, DirectoryData() As Byte, Data As AddDirectoryData)
+            Dim EntryCount = Directory.DirectoryEntries.Count - Directory.Data.AvailableEntryCount
+            Dim Entries As List(Of DirectoryEntry)
+
+            If Data.Index > -1 Then
+                Data.Index = Directory.AdjustIndexForLFN(Data.Index)
+                Directory.ShiftEntries(Data.Index, EntryCount, Data.EntriesNeeded)
+                Entries = Directory.GetEntries(Data.Index, Data.EntriesNeeded)
+            Else
+                Entries = Directory.GetEntries(EntryCount, Data.EntriesNeeded)
+            End If
+
+            Dim Cluster = Directory.Disk.FAT.GetNextFreeCluster(Data.ClusterList, True)
+            Directory.Disk.FATTables.UpdateTableEntry(Cluster, FAT12.FAT_LAST_CLUSTER_END)
+
+            Dim Entry = New DirectoryEntryBase(DirectoryData) With {
+                .StartingCluster = Cluster
+            }
+            If Data.UseLFN Then
+                Entry.SetFileName(Data.ShortFileName)
+            End If
+
+            Dim DirectoryEntry = Entries(Entries.Count - 1)
+            DirectoryEntry.Data = Entry.Data
+            DirectoryEntry.InitFatChain()
+            DirectoryEntry.InitSubDirectory()
+
+            If Data.UseLFN Then
+                ProcessLFNEntries(Entries, Data.LFNEntries)
+            End If
+
+            Directory.UpdateEntryCounts()
+
+            DirectoryEntry.SubDirectory.Initialize()
+        End Sub
+
         Public Sub ProcessAddFile(Directory As DirectoryBase, Data As AddFileData)
             Dim EntryCount = Directory.DirectoryEntries.Count - Directory.Data.AvailableEntryCount
             Dim Entries As List(Of DirectoryEntry)

DiskImageTool/DiskImageTool.vbproj

@@ -31,7 +31,7 @@
     <ProductName>DiskImageTool</ProductName>
     <PublisherName>Digitoxin</PublisherName>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>2.0.0.%2a</ApplicationVersion>
+    <ApplicationVersion>2.01.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>