Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed the unused code to write entries in Zip Headers #212

Merged
merged 2 commits into from
May 30, 2017
Merged

Removed the unused code to write entries in Zip Headers #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba12019
Removed the unused code to write entries in Zip Headers
kenkendk Mar 11, 2017
264aa6d
Merge branch 'master' into remove_unused_code
adamhathcock May 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions src/SharpCompress/Common/Zip/Headers/DirectoryEndHeader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,6 @@ internal override void Read(BinaryReader reader)
Comment = reader.ReadBytes(CommentLength);
}

internal override void Write(BinaryWriter writer)
{
writer.Write(VolumeNumber);
writer.Write(FirstVolumeWithDirectory);
writer.Write(TotalNumberOfEntriesInDisk);
writer.Write(TotalNumberOfEntries);
writer.Write(DirectorySize);
writer.Write(DirectoryStartOffsetRelativeToDisk);
writer.Write(CommentLength);
writer.Write(Comment);
}

public ushort VolumeNumber { get; private set; }

public ushort FirstVolumeWithDirectory { get; private set; }
Expand Down
50 changes: 0 additions & 50 deletions src/SharpCompress/Common/Zip/Headers/DirectoryEntryHeader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,56 +61,6 @@ internal override void Read(BinaryReader reader)
}
}

internal override void Write(BinaryWriter writer)
{
var zip64 = CompressedSize >= uint.MaxValue || UncompressedSize >= uint.MaxValue || RelativeOffsetOfEntryHeader >= uint.MaxValue;
if (zip64)
Version = (ushort)(Version > 45 ? Version : 45);

writer.Write(Version);
writer.Write(VersionNeededToExtract);
writer.Write((ushort)Flags);
writer.Write((ushort)CompressionMethod);
writer.Write(LastModifiedTime);
writer.Write(LastModifiedDate);
writer.Write(Crc);
writer.Write(zip64 ? uint.MaxValue : CompressedSize);
writer.Write(zip64 ? uint.MaxValue : UncompressedSize);

byte[] nameBytes = EncodeString(Name);
writer.Write((ushort)nameBytes.Length);

if (zip64)
{
writer.Write((ushort)(2 + 2 + 8 + 8 + 8 + 4));
}
else
{
//writer.Write((ushort)Extra.Length);
writer.Write((ushort)0);
}
writer.Write((ushort)Comment.Length);

writer.Write(DiskNumberStart);
writer.Write(InternalFileAttributes);
writer.Write(ExternalFileAttributes);
writer.Write(zip64 ? uint.MaxValue : RelativeOffsetOfEntryHeader);

writer.Write(nameBytes);

if (zip64)
{
writer.Write((ushort)0x0001);
writer.Write((ushort)((8 + 8 + 8 + 4)));

writer.Write((ulong)UncompressedSize);
writer.Write((ulong)CompressedSize);
writer.Write((ulong)RelativeOffsetOfEntryHeader);
writer.Write((uint)0); // VolumeNumber = 0
}
writer.Write(Comment);
}

internal ushort Version { get; private set; }

public ushort VersionNeededToExtract { get; set; }
Expand Down
5 changes: 0 additions & 5 deletions src/SharpCompress/Common/Zip/Headers/IgnoreHeader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,5 @@ public IgnoreHeader(ZipHeaderType type)
internal override void Read(BinaryReader reader)
{
}

internal override void Write(BinaryWriter writer)
{
throw new NotImplementedException();
}
}
}
50 changes: 0 additions & 50 deletions src/SharpCompress/Common/Zip/Headers/LocalEntryHeader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,56 +47,6 @@ internal override void Read(BinaryReader reader)
}
}

internal override void Write(BinaryWriter writer)
{
if (IsZip64)
Version = (ushort)(Version > 45 ? Version : 45);

writer.Write(Version);

writer.Write((ushort)Flags);
writer.Write((ushort)CompressionMethod);
writer.Write(LastModifiedTime);
writer.Write(LastModifiedDate);
writer.Write(Crc);

if (IsZip64)
{
writer.Write(uint.MaxValue);
writer.Write(uint.MaxValue);
}
else
{
writer.Write(CompressedSize);
writer.Write(UncompressedSize);
}

byte[] nameBytes = EncodeString(Name);

writer.Write((ushort)nameBytes.Length);
if (IsZip64)
{
writer.Write((ushort)(2 + 2 + (2 * 8)));
}
else
{
writer.Write((ushort)0);
}

//if (Extra != null)
//{
// writer.Write(Extra);
//}
writer.Write(nameBytes);
if (IsZip64)
{
writer.Write((ushort)0x0001);
writer.Write((ushort)(2 * 8));
writer.Write((ulong)CompressedSize);
writer.Write((ulong)UncompressedSize);
}
}

internal ushort Version { get; private set; }
}
}
5 changes: 0 additions & 5 deletions src/SharpCompress/Common/Zip/Headers/SplitHeader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,5 @@ internal override void Read(BinaryReader reader)
{
throw new NotImplementedException();
}

internal override void Write(BinaryWriter writer)
{
throw new NotImplementedException();
}
}
}
5 changes: 0 additions & 5 deletions src/SharpCompress/Common/Zip/Headers/Zip64DirectoryEndHeader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ internal override void Read(BinaryReader reader)

const int SizeOfFixedHeaderDataExceptSignatureAndSizeFields = 44;

internal override void Write(BinaryWriter writer)
{
throw new NotImplementedException();
}

public long SizeOfDirectoryEndRecord { get; private set; }

public ushort VersionMadeBy { get; private set; }
Expand Down
5 changes: 0 additions & 5 deletions src/SharpCompress/Common/Zip/Headers/Zip64DirectoryEndLocatorHeader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ internal override void Read(BinaryReader reader)
TotalNumberOfVolumes = reader.ReadUInt32();
}

internal override void Write(BinaryWriter writer)
{
throw new System.NotImplementedException();
}

public uint FirstVolumeWithDirectory { get; private set; }

public long RelativeOffsetOfTheEndOfDirectoryRecord { get; private set; }
Expand Down
2 changes: 0 additions & 2 deletions src/SharpCompress/Common/Zip/Headers/ZipHeader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ protected ZipHeader(ZipHeaderType type)

internal abstract void Read(BinaryReader reader);

internal abstract void Write(BinaryWriter writer);

internal bool HasData { get; set; }
}
}