More utility tweaks

This commit is contained in:
Paul Chote
2010-11-25 16:43:45 +13:00
parent f108735f74
commit eff5e409c0
2 changed files with 9 additions and 5 deletions

View File

@@ -72,12 +72,14 @@ namespace OpenRA.Utility
{
new ZipInputStream(File.OpenRead(zipFile)).ExtractZip(dest, extracted);
}
catch (SharpZipBaseException e)
catch (SharpZipBaseException)
{
foreach(var f in extracted)
File.Delete(f);
Console.WriteLine("Error: Corrupted archive");
return;
}
Console.WriteLine("Status: Completed");
}
public static void DownloadUrl(string argValue)
@@ -138,9 +140,10 @@ namespace OpenRA.Utility
Console.WriteLine("Error: Could not find "+file);
return;
}
Console.WriteLine("Extracting: {0}", file);
Console.WriteLine("Status: Extracting {0}", file);
File.Copy(basePath+file,toPath+Path.GetFileName(file).ToLower(), true);
}
Console.WriteLine("Status: Completed");
}
public static void InstallCncPackages(string path)
@@ -162,9 +165,10 @@ namespace OpenRA.Utility
Console.WriteLine("Error: Could not find "+file);
return;
}
Console.WriteLine("Extracting: {0}", file);
Console.WriteLine("Status: Extracting {0}", file);
File.Copy(basePath+file,toPath+Path.GetFileName(file).ToLower(), true);
}
Console.WriteLine("Status: Completed");
}
public static void Settings(string argValue)

View File

@@ -33,7 +33,7 @@ namespace OpenRA.Utility
using (var sourceStream = FileSystem.Open(s))
using (var destStream = File.Create(destFile))
{
Console.WriteLine("Extracting: {0}", s);
Console.WriteLine("Status: Extracting {0}", s);
destStream.Write(sourceStream.ReadAllBytes());
}
}
@@ -46,7 +46,7 @@ namespace OpenRA.Utility
{
if (!entry.IsFile) continue;
Console.WriteLine("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)));
var path = destPath + Path.DirectorySeparatorChar + entry.Name;