epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make our IFolder zip support actually work.

Browse Source
This commit is contained in:
Paul Chote
2010-11-21 11:36:59 +13:00
parent e79d039aa0
commit d7e8388600
7 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.FileFormats/Filesystem/FileSystem.cs
View File

@@ -41,7 +41,7 @@ namespace OpenRA.FileFormats
if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
return new MixFile(filename, order++);
else if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
return new CompressedPackage(filename, order++);
return new ZipFile(filename, order++);
else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
return new InstallShieldPackage(filename, order++);
else

27
OpenRA.FileFormats/Filesystem/CompressedPackage.cs → OpenRA.FileFormats/Filesystem/ZipFile.cs
View File

@@ -11,40 +11,39 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.IO.Packaging;
using ICSharpCode.SharpZipLib.Zip;
using SZipFile = ICSharpCode.SharpZipLib.Zip.ZipFile;
using System.Linq;
namespace OpenRA.FileFormats
{
public class CompressedPackage : IFolder
public class ZipFile : IFolder
{
readonly uint[] hashes;
readonly Stream s;
readonly ZipPackage pkg;
readonly SZipFile pkg;
int priority;
public CompressedPackage(string filename, int priority)
public ZipFile(string filename, int priority)
{
this.priority = priority;
s = FileSystem.Open(filename);
pkg = (ZipPackage)ZipPackage.Open(s, FileMode.Open);
hashes = pkg.GetParts()
.Select(p => PackageEntry.HashFilename(p.Uri.LocalPath)).ToArray();
pkg = new SZipFile(File.OpenRead(filename));
}
public Stream GetContent(string filename)
{
return pkg.GetPart(new Uri(filename)).GetStream(FileMode.Open);
return pkg.GetInputStream(pkg.GetEntry(filename));
}
public IEnumerable<uint> AllFileHashes() { return hashes; }
public IEnumerable<uint> AllFileHashes()
{
foreach(ZipEntry entry in pkg)
yield return PackageEntry.HashFilename(entry.Name);
}
public bool Exists(string filename)
{
return hashes.Contains(PackageEntry.HashFilename(filename));
return pkg.GetEntry(filename) != null;
}
public int Priority
{
get { return 500 + priority; }