remove some crap code in Util
This commit is contained in:
@@ -42,18 +42,26 @@ namespace OpenRA.Utility
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static IEnumerable<ZipEntry> GetEntries(this ZipInputStream z)
|
||||||
|
{
|
||||||
|
for (; ; )
|
||||||
|
{
|
||||||
|
var e = z.GetNextEntry();
|
||||||
|
if (e != null) yield return e; else break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static void ExtractZip(this ZipInputStream z, string destPath, List<string> extracted)
|
public static void ExtractZip(this ZipInputStream z, string destPath, List<string> extracted)
|
||||||
{
|
{
|
||||||
ZipEntry entry;
|
foreach (var entry in z.GetEntries())
|
||||||
while ((entry = z.GetNextEntry()) != null)
|
|
||||||
{
|
{
|
||||||
if (!entry.IsFile) continue;
|
if (!entry.IsFile) continue;
|
||||||
|
|
||||||
Console.WriteLine("Status: Extracting {0}", entry.Name);
|
Console.WriteLine("Status: Extracting {0}", entry.Name);
|
||||||
if (!Directory.Exists(Path.Combine(destPath, Path.GetDirectoryName(entry.Name))))
|
|
||||||
Directory.CreateDirectory(Path.Combine(destPath, Path.GetDirectoryName(entry.Name)));
|
Directory.CreateDirectory(Path.Combine(destPath, Path.GetDirectoryName(entry.Name)));
|
||||||
var path = destPath + Path.DirectorySeparatorChar + entry.Name;
|
var path = Path.Combine(destPath, entry.Name);
|
||||||
extracted.Add(path);
|
extracted.Add(path);
|
||||||
|
|
||||||
using (var f = File.Create(path))
|
using (var f = File.Create(path))
|
||||||
{
|
{
|
||||||
int bufSize = 2048;
|
int bufSize = 2048;
|
||||||
@@ -62,6 +70,7 @@ namespace OpenRA.Utility
|
|||||||
f.Write(buf, 0, bufSize);
|
f.Write(buf, 0, bufSize);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
z.Close();
|
z.Close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user