claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FileTools] Get more TZIP stuff there

Browse Source
This commit is contained in:
Matt Nadareski
2016-09-14 18:10:09 -07:00
parent 8eb7953a70
commit f2b71c9df2
3 changed files with 79 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
SabreTools.Helper/Objects/ZipArchiveEntryExtension.cs Normal file
View File

@@ -0,0 +1,18 @@
using SabreTools.Helper;
namespace System.IO.Compression
{
public class ZipArchiveEntry
{
public ArchiveVersion VersionMadeBy;
public ArchiveVersion VersionNeeded;
public GeneralPurposeBitFlag GeneralPurposeBitFlag;
public CompressionMethod CompressionMethod;
public uint CRC;
public byte[] ExtraField;
public byte[] Comment;
public InternalFileAttributes InternalFileAttributes;
public int ExternalFileAttributes;
public int RelativeOffset;
}
}

1
SabreTools.Helper/SabreTools.Helper.csproj
View File

@@ -94,6 +94,7 @@
<Compile Include="Objects\Import.cs" /> <Compile Include="Objects\Import.cs" />
<Compile Include="Objects\ImportTwo.cs" /> <Compile Include="Objects\ImportTwo.cs" />
<Compile Include="Objects\SimpleSort.cs" /> <Compile Include="Objects\SimpleSort.cs" />
<Compile Include="Objects\ZipArchiveEntryExtension.cs" />
<Compile Include="Resources\Resources.de-DE.Designer.cs"> <Compile Include="Resources\Resources.de-DE.Designer.cs">
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
<DesignTime>True</DesignTime> <DesignTime>True</DesignTime>

154
SabreTools.Helper/Tools/FileTools.cs
View File

@@ -183,12 +183,11 @@ namespace SabreTools.Helper
/// <summary> /// <summary>
/// Write an existing zip archive construct to a torrent zip file /// Write an existing zip archive construct to a torrent zip file
/// </summary> /// </summary>
/// <param name="zae">ZipArchiveStruct representing the zipfile</param> /// <param name="zae">ZipArchiveStruct representing the zipfile with compressed data</param>
/// <param name="output">Name of the file to write out to</param> /// <param name="output">Name of the file to write out to</param>
/// <param name="logger">Logger object for file and console output</param> /// <param name="logger">Logger object for file and console output</param>
/// <remarks> /// <remarks>
/// Things that need to be done: /// Things that need to be done:
/// Compress data instead of just writing it
/// Get rid of redundant directories (ones that are implied by files inside them) /// Get rid of redundant directories (ones that are implied by files inside them)
/// </remarks> /// </remarks>
public static void WriteTorrentZip(ZipArchiveStruct zae, string output, Logger logger) public static void WriteTorrentZip(ZipArchiveStruct zae, string output, Logger logger)
@@ -534,93 +533,72 @@ namespace SabreTools.Helper
} }
ZipArchiveStruct zas = GetZipFileInfo(inputArchive, logger); ZipArchiveStruct zas = GetZipFileInfo(inputArchive, logger);
Console.WriteLine("Archive Filename: " + zas.FileName);
Console.WriteLine("Archive Comment: " + zas.Comment.Length + " " + zas.Comment); for (int i = 0; i < zas.Entries.Count; i++)
Console.WriteLine("Archive Central Directory CRC: " + zas.CentralDirectoryCRC.ToString("X8"));
Console.WriteLine();
Console.WriteLine("Entries:");
foreach (ZipArchiveEntryStruct zaes in zas.Entries)
{ {
Console.WriteLine("Entry Filename: " + zaes.FileName.Length + " " + Style.ConvertHex(BitConverter.ToString(zaes.FileName))); zas.Entries[i] = PopulateEntry(zas.Entries[i], inputArchive);
Console.WriteLine("Entry Comment: " + zaes.Comment.Length + " " + Style.ConvertHex(BitConverter.ToString(zaes.Comment))); zas.Entries[i] = DecompressEntry(zas.Entries[i], inputArchive);
Console.WriteLine("Entry Compressed Size: " + zaes.CompressedSize); zas.Entries[i] = CompressEntry(zas.Entries[i]);
Console.WriteLine("Entry Compression Method: " + zaes.CompressionMethod);
Console.WriteLine("Entry CRC: " + zaes.CRC.ToString("X8"));
Console.WriteLine("Entry External File Attributes: " + zaes.ExternalFileAttributes);
Console.WriteLine("Entry Extra Field: " + zaes.ExtraField.Length + " " + Style.ConvertHex(BitConverter.ToString(zaes.ExtraField)));
Console.WriteLine("Entry General Purpose Flag: " + zaes.GeneralPurposeBitFlag);
Console.WriteLine("Entry Internal File Attributes: " + zaes.InternalFileAttributes);
Console.WriteLine("Entry Last Modification File Date: " + zaes.LastModFileDate);
Console.WriteLine("Entry Last Modification File Time: " + zaes.LastModFileTime);
Console.WriteLine("Entry Relative Offset: " + zaes.RelativeOffset);
Console.WriteLine("Entry Uncompressed Size: " + zaes.UncompressedSize);
Console.WriteLine("Entry Version Made By: " + zaes.VersionMadeBy);
Console.WriteLine("Entry Version Needed: " + zaes.VersionNeeded);
Console.WriteLine();
} }
WriteTorrentZip(zas, inputArchive + ".new", logger); WriteTorrentZip(zas, inputArchive + ".new", logger);
Console.ReadLine(); Console.ReadLine();
/*
ZipArchive outarchive = null;
try
{
// If the archive doesn't exist, create it
if (!File.Exists(inputArchive))
{
outarchive = ZipFile.Open(inputArchive, ZipArchiveMode.Create);
outarchive.Dispose();
}
// Open the archive for sorting
Dictionary<string, string> entries = new Dictionary<string, string>();
using (outarchive = ZipFile.Open(inputArchive, ZipArchiveMode.Update))
{
// Get and sort the entries
foreach (ZipArchiveEntry entry in outarchive.Entries)
{
entries.Add(entry.Name.ToLowerInvariant(), entry.Name);
}
}
// Now write out the entries by name
List<string> keys = entries.Keys.ToList();
keys.Sort(Style.CompareNumeric);
foreach (string key in keys)
{
Rom temp = new Rom
{
Machine = new Machine
{
Name = Path.GetFileNameWithoutExtension(inputArchive) + ".new",
},
Name = entries[key],
Date = "12/24/1996 11:32 PM",
};
CopyFileBetweenArchives(inputArchive, Path.GetDirectoryName(inputArchive), entries[key], temp, logger);
}
string newfile = Path.Combine(Path.GetDirectoryName(inputArchive), Path.GetFileNameWithoutExtension(inputArchive) + ".new.zip");
File.Delete(inputArchive);
File.Move(newfile, inputArchive);
success = true;
}
catch (Exception ex)
{
Console.WriteLine(ex);
success = false;
}
finally
{
outarchive?.Dispose();
}
*/
return success; return success;
} }
/// <summary>
/// Convert uncompressed data in entry to compressed data
/// </summary>
/// <remarks>Does not seem to create TZIP compatible streams</remarks>
private static ZipArchiveEntryStruct CompressEntry(ZipArchiveEntryStruct zaes)
{
byte[] uncompressedData = zaes.Data;
using (MemoryStream cms = new MemoryStream())
using (MemoryStream ums = new MemoryStream(uncompressedData))
using (DeflateStream ds = new DeflateStream(cms, CompressionMode.Compress))
{
ums.CopyTo(ds);
ds.Flush();
zaes.Data = cms.ToArray();
}
return zaes;
}
/// <summary>
/// Populate an archive entry struct with uncompressed data from an input zip archive
/// </summary>
private static ZipArchiveEntryStruct DecompressEntry(ZipArchiveEntryStruct zaes, string input)
{
using (BinaryReader br = new BinaryReader(File.OpenRead(input)))
{
br.BaseStream.Seek(zaes.RelativeOffset + 30 + zaes.FileName.Length, SeekOrigin.Begin);
byte[] compressedData = br.ReadBytes((int)zaes.CompressedSize);
using (MemoryStream ums = new MemoryStream())
using (MemoryStream cms = new MemoryStream(compressedData))
using (DeflateStream ds = new DeflateStream(cms, CompressionMode.Decompress))
{
ds.CopyTo(ums);
ums.Flush();
zaes.Data = ums.ToArray();
}
}
return zaes;
}
/// <summary>
/// Populate an archive entry struct with data from an input zip archive
/// </summary>
private static ZipArchiveEntryStruct PopulateEntry(ZipArchiveEntryStruct zaes, string input)
{
using (BinaryReader br = new BinaryReader(File.OpenRead(input)))
{
br.BaseStream.Seek(zaes.RelativeOffset + 30 + zaes.FileName.Length, SeekOrigin.Begin);
zaes.Data = br.ReadBytes((int)zaes.CompressedSize);
}
return zaes;
}
#endregion #endregion
#region File Information #region File Information
@@ -999,7 +977,7 @@ namespace SabreTools.Helper
} }
/// <summary> /// <summary>
/// Read the information from an input zip file /// Read the information from an input zip file and does not populate data
/// </summary> /// </summary>
/// <param name="input">Name of the input file to check</param> /// <param name="input">Name of the input file to check</param>
/// <param name="logger">Logger object for file and console output</param> /// <param name="logger">Logger object for file and console output</param>
@@ -1097,18 +1075,6 @@ namespace SabreTools.Helper
} }
} }
// Next, use the entries, if any, to get the uncompressed data
using (BinaryReader br = new BinaryReader(File.OpenRead(input)))
{
for (int i = 0; i < zas.Entries.Count; i++)
{
ZipArchiveEntryStruct zaes = zas.Entries[i];
br.BaseStream.Seek(zaes.RelativeOffset + 30 + zaes.FileName.Length, SeekOrigin.Begin);
zaes.Data = br.ReadBytes((int)zaes.CompressedSize);
zas.Entries[i] = zaes;
}
}
// Finally, get a hash of the entire central directory (between SOCD and EOCD) // Finally, get a hash of the entire central directory (between SOCD and EOCD)
if (zas.SOCDOffset > 0 && zas.EOCDOffset > 0) if (zas.SOCDOffset > 0 && zas.EOCDOffset > 0)
{ {