Zip writer refactor

PKZip/PKZip.rbbas

@@ -1,7 +1,7 @@
 #tag Module
 Protected Module PKZip
 	#tag Method, Flags = &h21
-		Private Sub CollapseTree(Root As Dictionary, ByRef Paths() As String, ByRef Lengths() As UInt32, ByRef ModTimes() As Date, ByRef Sources() As Readable, ByRef Comments() As String, ByRef Extras() As MemoryBlock, ByRef DirectoryStatus() As Boolean, ByRef Levels() As UInt32, ByRef Methods() As UInt32)
+		Private Sub CollapseTree(Root As Dictionary, ByRef Paths() As String, ByRef Lengths() As UInt32, ByRef ModTimes() As Date, ByRef Sources() As Variant, ByRef Comments() As String, ByRef Extras() As MemoryBlock, ByRef DirectoryStatus() As Boolean, ByRef Levels() As UInt32, ByRef Methods() As UInt32)
 		  For Each key As Variant In Root.Keys
 		    If Root.Value(key) IsA Dictionary Then
 		      Dim item As Dictionary = Root.Value(key)

PKZip/ZipWriter.rbbas

@@ -1,5 +1,24 @@
 #tag Class
 Protected Class ZipWriter
+	#tag Method, Flags = &h1
+		Protected Sub Append(Path As String, Data As Variant, Length As UInt32, ModifyDate As Date = Nil)
+		  If Path.Len > MAX_PATH_SIZE Then Raise New ZipException(ERR_PATH_TOO_LONG)
+		  Dim d As Dictionary = TraverseTree(mEntries, Path, True)
+		  If d = Nil Then Raise New ZipException(ERR_INVALID_NAME)
+		  d.Value(META_STREAM) = Data
+		  d.Value(META_LENGTH) = Length
+		  If ModifyDate = Nil Then ModifyDate = New Date
+		  d.Value(META_MODTIME) = ModifyDate
+		  If d.Value(META_DIR) = True Then
+		    d.Value(META_LEVEL) = 0
+		    d.Value(META_METHOD) = 0
+		  Else
+		    d.Value(META_LEVEL) = CompressionLevel
+		    d.Value(META_METHOD) = CompressionMethod
+		  End If
+		End Sub
+	#tag EndMethod
+
 	#tag Method, Flags = &h0
 		Sub AppendDirectory(Entry As FolderItem, RelativeRoot As FolderItem = Nil)
 		  If Not Entry.Directory Then
@@ -21,13 +40,8 @@ Protected Class ZipWriter
 		Function AppendEntry(Entry As FolderItem, Optional RelativeRoot As FolderItem) As String
 		  If Entry.Length > &hFFFFFFFF Then Raise New ZipException(ERR_TOO_LARGE)
 		  Dim path As String = GetRelativePath(RelativeRoot, Entry)
-		  Dim bs As BinaryStream
-		  If Not Entry.Directory Then
-		    bs = BinaryStream.Open(Entry)
-		  Else
-		    path = path + "/"
-		  End If
-		  AppendEntry(path, bs, Entry.Length, Entry.ModificationDate)
+		  If Entry.Directory Then path = path + "/"
+		  Append(path, Entry, Entry.Length, Entry.ModificationDate)
 		  Return path
 		End Function
 	#tag EndMethod
@@ -45,20 +59,7 @@ Protected Class ZipWriter
 
 	#tag Method, Flags = &h0
 		Sub AppendEntry(Path As String, Data As Readable, Length As UInt32, ModifyDate As Date = Nil)
-		  If Path.Len > MAX_PATH_SIZE Then Raise New ZipException(ERR_PATH_TOO_LONG)
-		  Dim d As Dictionary = TraverseTree(mEntries, Path, True)
-		  If d = Nil Then Raise New ZipException(ERR_INVALID_NAME)
-		  d.Value(META_STREAM) = Data
-		  d.Value(META_LENGTH) = Length
-		  If ModifyDate = Nil Then ModifyDate = New Date
-		  d.Value(META_MODTIME) = ModifyDate
-		  If d.Value(META_DIR) = True Then
-		    d.Value(META_LEVEL) = 0
-		    d.Value(META_METHOD) = 0
-		  Else
-		    d.Value(META_LEVEL) = CompressionLevel
-		    d.Value(META_METHOD) = CompressionMethod
-		  End If
+		  Append(Path, Data, Length, ModifyDate)
 		End Sub
 	#tag EndMethod
 
@@ -67,7 +68,7 @@ Protected Class ZipWriter
 		  WriteTo.LittleEndian = True
 		  Dim paths(), comments() As String
 		  Dim lengths(), levels(), methods() As UInt32
-		  Dim sources() As Readable
+		  Dim sources() As Variant
 		  Dim modtimes() As Date
 		  Dim extras() As MemoryBlock
 		  Dim dirstatus() As Boolean
@@ -79,13 +80,28 @@ Protected Class ZipWriter
 		  If c >= 65535 And ArchiveComment = "" Then ArchiveComment = "Warning: This archive contains more than 65,535 entries."
 		  For i As Integer = 0 To c
 		    Dim path As String = paths(i)
-		    Dim source As Readable = sources(i)
+		    Dim source As Readable
+		    Dim closeable As Boolean
+		    Select Case sources(i)
+		    Case IsA Readable
+		      source = sources(i)
+		    Case IsA FolderItem
+		      Dim f As FolderItem = sources(i)
+		      If Not f.Directory Then
+		        source = BinaryStream.Open(f)
+		        closeable = True
+		      End If
+		    End Select
 		    path = ConvertEncoding(path, Encodings.UTF8)
 		    If dirstatus(i) And Right(path, 1) <> "/" Then path = path + "/"
 		    Dim dirheader As ZipDirectoryHeader
 		    WriteEntryHeader(WriteTo, path, lengths(i), source, modtimes(i), dirheader, extras(i), levels(i), methods(i))
 		    directory.Append(dirheader)
-		    If source IsA BinaryStream Then BinaryStream(source).Position = 0 ' be kind, rewind
+		    If closeable Then
+		      BinaryStream(source).Close
+		    ElseIf source IsA BinaryStream Then
+		      BinaryStream(source).Position = 0 ' be kind, rewind
+		    End If
 		  Next
 
 		  WriteDirectory(WriteTo, directory, paths, comments, extras, ArchiveComment)
@@ -397,6 +413,7 @@ Protected Class ZipWriter
 			Name="ArchiveComment"
 			Group="Behavior"
 			Type="String"
+			EditorType="MultiLineEditor"
 		#tag EndViewProperty
 		#tag ViewProperty
 			Name="CompressionLevel"

USTAR/TarWriter.rbbas

@@ -1,5 +1,17 @@
 #tag Class
 Protected Class TarWriter
+	#tag Method, Flags = &h1
+		Protected Sub Append(Path As String, Data As Variant, Length As UInt32, ModifyDate As Date = Nil, Mode As Permissions = Nil)
+		  Dim d As Dictionary = TraverseTree(mEntries, Path, True)
+		  If d = Nil Then Raise New TARException(ERR_INVALID_NAME)
+		  d.Value("$r") = Data
+		  d.Value("$s") = Length
+		  If ModifyDate = Nil Then ModifyDate = New Date
+		  d.Value("$t") = ModifyDate
+		  d.Value("$m") = Mode
+		End Sub
+	#tag EndMethod
+
 	#tag Method, Flags = &h0
 		Sub AppendDirectory(Entry As FolderItem, RelativeRoot As FolderItem = Nil)
 		  If Not Entry.Directory Then
@@ -20,14 +32,9 @@ Protected Class TarWriter
 	#tag Method, Flags = &h0
 		Function AppendEntry(Entry As FolderItem, Optional RelativeRoot As FolderItem) As String
 		  Dim path As String = GetRelativePath(RelativeRoot, Entry)
-		  Dim bs As BinaryStream
-		  If Not Entry.Directory Then
-		    bs = BinaryStream.Open(Entry)
-		  Else
-		    path = path + "/"
-		  End If
+		  If Entry.Directory Then path = path + "/"
 		  Dim p As New Permissions(Entry.Permissions)
-		  AppendEntry(path, bs, Entry.Length, Entry.ModificationDate, p)
+		  Append(path, Entry, Entry.Length, Entry.ModificationDate, p)
 		  Return path
 		End Function
 	#tag EndMethod
@@ -66,7 +73,7 @@ Protected Class TarWriter
 		Sub Commit(WriteTo As Writeable)
 		  Dim paths() As String
 		  Dim lengths() As UInt32
-		  Dim sources() As Readable
+		  Dim sources() As Variant
 		  Dim modtimes() As Date
 		  Dim dirstatus() As Boolean
 		  Dim modes() As Permissions
@@ -77,7 +84,13 @@ Protected Class TarWriter
 		    Dim length As UInt32 = lengths(i)
 		    Dim path As String = paths(i)
 		    path = ConvertEncoding(path, Encodings.UTF8)
-		    Dim source As Readable = sources(i)
+		    Dim source As Readable
+		    If sources(i) IsA Readable Then
+		      source = sources(i)
+		    ElseIf sources(i) IsA FolderItem Then
+		      Dim f As FolderItem = sources(i)
+		      If Not f.Directory Then source = BinaryStream.Open(f)
+		    End If
 		    Dim modtime As Date = modtimes(i)
 		    Dim mode As Permissions = modes(i)
 		    If dirstatus(i) And Right(path, 1) <> "/" Then path = path + "/"

USTAR/USTAR.rbbas

@@ -1,7 +1,7 @@
 #tag Module
 Protected Module USTAR
 	#tag Method, Flags = &h21
-		Private Sub CollapseTree(Root As Dictionary, ByRef Paths() As String, ByRef Lengths() As UInt32, ByRef ModTimes() As Date, ByRef Sources() As Readable, ByRef DirectoryStatus() As Boolean, ByRef Modes() As Permissions)
+		Private Sub CollapseTree(Root As Dictionary, ByRef Paths() As String, ByRef Lengths() As UInt32, ByRef ModTimes() As Date, ByRef Sources() As Variant, ByRef DirectoryStatus() As Boolean, ByRef Modes() As Permissions)
 		  For Each key As Variant In Root.Keys
 		    If Root.Value(key) IsA Dictionary Then
 		      Dim item As Dictionary = Root.Value(key)