From c3c16c4fd8466eb8e9fe7e1c975a210d73031ae7 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sat, 5 Feb 2011 11:22:52 +1300
Subject: [PATCH] remove some duplication in Utility

---
 OpenRA.Game/Support/Arguments.cs |  6 ++-
 OpenRA.Utility/Command.cs        | 85 ++++++++++++++------------------
 2 files changed, 41 insertions(+), 50 deletions(-)

diff --git a/OpenRA.Game/Support/Arguments.cs b/OpenRA.Game/Support/Arguments.cs
index 1798470d18..6db4a90562 100644
--- a/OpenRA.Game/Support/Arguments.cs
+++ b/OpenRA.Game/Support/Arguments.cs
@@ -17,7 +17,9 @@ namespace OpenRA
 	{
 		Dictionary<string, string> args = new Dictionary<string, string>();
 
-		public Arguments(IEnumerable<string> src)
+		public static Arguments Empty { get { return new Arguments(); } }
+
+		public Arguments(params string[] src)
 		{
 			Regex regex = new Regex("([^=]+)=(.*)");
 			foreach (string s in src)
@@ -26,7 +28,7 @@ namespace OpenRA
 				if (m == null || !m.Success)
 					continue;
 
-				args.Add(m.Groups[1].Value, m.Groups[2].Value);
+				args[m.Groups[1].Value] = m.Groups[2].Value;
 			}
 		}
 
diff --git a/OpenRA.Utility/Command.cs b/OpenRA.Utility/Command.cs
index 1c90c8838c..387523e729 100644
--- a/OpenRA.Utility/Command.cs
+++ b/OpenRA.Utility/Command.cs
@@ -11,14 +11,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Net;
-using System.Threading;
 using System.Windows.Forms;
 using ICSharpCode.SharpZipLib;
 using ICSharpCode.SharpZipLib.Zip;
-using OpenRA.FileFormats;
-using OpenRA;
+using OpenRA.GameRules;
 
 namespace OpenRA.Utility
 {
@@ -55,6 +51,30 @@ namespace OpenRA.Utility
 			}
 			Console.WriteLine("Status: Completed");
 		}
+
+		static void InstallPackages(string fromPath, string toPath,
+			string[] filesToCopy, string[] filesToExtract, string packageToMount)
+		{
+			if (!Directory.Exists(toPath))
+				Directory.CreateDirectory(toPath);
+
+			Util.ExtractFromPackage(fromPath, packageToMount, filesToExtract, toPath);
+			foreach (var file in filesToCopy)
+			{
+				if (!File.Exists(Path.Combine(fromPath, file)))
+				{
+					Console.WriteLine("Error: Could not find {0}", file);
+					return;
+				}
+
+				Console.WriteLine("Status: Extracting {0}", file.ToLowerInvariant());
+				File.Copy(
+					Path.Combine(fromPath, file),
+					Path.Combine(toPath, file.ToLowerInvariant()), true);
+			}
+
+			Console.WriteLine("Status: Completed");
+		}
 		
 		public static void InstallRAPackages(string[] args)
 		{
@@ -64,26 +84,11 @@ namespace OpenRA.Utility
 				return;
 			}
 
-			var basePath = "{0}{1}".F(args[1], Path.DirectorySeparatorChar);
-			var toPath = args[2];
-			var directCopy = new string[] {"INSTALL/REDALERT.MIX"};
-			var extract = new string[] {"conquer.mix", "russian.mix", "allies.mix", "sounds.mix",
-										"scores.mix", "snow.mix", "interior.mix", "temperat.mix"};
-			if (!Directory.Exists(toPath))
-				Directory.CreateDirectory(toPath);
-			
-			Util.ExtractFromPackage(basePath, "MAIN.MIX", extract, toPath);
-			foreach (var file in directCopy)
-			{
-				if (!File.Exists(basePath+file))
-				{
-					Console.WriteLine("Error: Could not find "+file);
-					return;
-				}
-				Console.WriteLine("Status: Extracting {0}", Path.GetFileName(file).ToLower());
-				File.Copy(basePath+file,toPath+Path.GetFileName(file).ToLower(), true);
-			}
-			Console.WriteLine("Status: Completed");
+			InstallPackages(args[1], args[2],
+				new string[] { "INSTALL/REDALERT.MIX" },
+				new string[] { "conquer.mix", "russian.mix", "allies.mix", "sounds.mix",
+					"scores.mix", "snow.mix", "interior.mix", "temperat.mix" },
+				"MAIN.MIX");
 		}
 
 		public static void InstallCncPackages(string[] args)
@@ -93,28 +98,12 @@ namespace OpenRA.Utility
 				Console.WriteLine("Error: Invalid syntax");
 				return;
 			}
-			
-			var basePath = "{0}{1}".F(args[1], Path.DirectorySeparatorChar);
-			var toPath = args[2];
-			var directCopy = new string[] {"CONQUER.MIX", "DESERT.MIX", "GENERAL.MIX", "SCORES.MIX",
-											   "SOUNDS.MIX", "TEMPERAT.MIX", "WINTER.MIX"};
-			var extract = new string[] {"cclocal.mix", "speech.mix", "tempicnh.mix", "updatec.mix"};
-			
-			if (!Directory.Exists(toPath))
-				Directory.CreateDirectory(toPath);
-			
-			Util.ExtractFromPackage(basePath+"INSTALL", "SETUP.Z", extract, toPath);
-			foreach (var file in directCopy)
-			{
-				if (!File.Exists(basePath+file))
-				{
-					Console.WriteLine("Error: Could not find "+file.ToLower());
-					return;
-				}
-				Console.WriteLine("Status: Extracting {0}", Path.GetFileName(file).ToLower());
-				File.Copy(basePath+file,toPath+Path.GetFileName(file).ToLower(), true);
-			}
-			Console.WriteLine("Status: Completed");
+
+			InstallPackages(args[1], args[2],
+				new string[] { "CONQUER.MIX", "DESERT.MIX", "GENERAL.MIX", "SCORES.MIX",
+					"SOUNDS.MIX", "TEMPERAT.MIX", "WINTER.MIX" },
+				new string[] { "cclocal.mix", "speech.mix", "tempicnh.mix", "updatec.mix" },
+				"INSTALL/SETUP.Z");
 		}
 		
 		public static void DisplayFilepicker(string[] args)
@@ -142,7 +131,7 @@ namespace OpenRA.Utility
 			var section = args[2].Split('.')[0];
 			var field = args[2].Split('.')[1];
 			string expandedPath = args[1].Replace("~", Environment.GetFolderPath(Environment.SpecialFolder.Personal));
-			var settings = new OpenRA.GameRules.Settings(expandedPath + Path.DirectorySeparatorChar + "settings.yaml", new Arguments(new string[]{}));
+			var settings = new Settings(expandedPath + Path.DirectorySeparatorChar + "settings.yaml", Arguments.Empty);
 			var result = settings.Sections[section].GetType().GetField(field).GetValue(settings.Sections[section]);
 			Console.WriteLine(result);
 		}