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

Rework OpenRA.Utility

Browse Source
This commit is contained in:
Paul Chote
2011-01-22 20:26:32 +13:00
parent c93bdf73aa
commit 44d8e83773
8 changed files with 63 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/Utilities.cs
View File

@@ -25,17 +25,17 @@ namespace OpenRA
public void ExtractZipAsync(string zipFile, string path, Action<string> parseOutput, Action onComplete) public void ExtractZipAsync(string zipFile, string path, Action<string> parseOutput, Action onComplete)
{ {
ExecuteUtilityAsync("\"--extract-zip {0} {1}\"".F(zipFile, path), parseOutput, onComplete); ExecuteUtilityAsync("--extract-zip \"{0}\" \"{1}\"".F(zipFile, path), parseOutput, onComplete);
} }
public void InstallRAFilesAsync(string cdPath, Action<string> parseOutput, Action onComplete) public void InstallRAFilesAsync(string cdPath, Action<string> parseOutput, Action onComplete)
{ {
ExecuteUtilityAsync("\"--install-ra-packages {0}\"".F(cdPath), parseOutput, onComplete); ExecuteUtilityAsync("--install-ra-packages \"{0}\"".F(cdPath), parseOutput, onComplete);
} }
public void PromptFilepathAsync(string title, string message, bool directory, Action<string> withPath) public void PromptFilepathAsync(string title, string message, bool directory, Action<string> withPath)
{ {
ExecuteUtility("--display-filepicker --title \"{0}\" --message \"{1}\" {2} --button-text \"Select\"" ExecuteUtility("--display-filepicker --title \"{0}\" --message \"{1}\" \"{2}\" --button-text \"Select\""
.F(title, message, directory ? "--require-directory" : ""), .F(title, message, directory ? "--require-directory" : ""),
withPath); withPath);
} }

4
OpenRA.Launcher.Mac/Controller.h
View File

@@ -17,9 +17,9 @@
} }
- (void)launchFilePicker:(NSArray *)args; - (void)launchFilePicker:(NSArray *)args;
- (void)extractZip:(NSArray *)args; - (void)extractZip:(NSArray *)args;
- (void)installRaPackages:(NSArray *)args; - (void)installRAPackages:(NSArray *)args;
- (void)launchMod:(NSString *)mod; - (void)launchMod:(NSString *)mod;
- (BOOL)initMono; - (BOOL)initMono;
- (void)runUtilityWithArg:(NSString *)arg; - (void)runUtilityWithArgs:(NSArray *)arg;
- (void)utilityResponded:(NSNotification *)n; - (void)utilityResponded:(NSNotification *)n;
@end @end

16
OpenRA.Launcher.Mac/Controller.m
View File

@@ -48,7 +48,7 @@
// Install ra packages from cd // Install ra packages from cd
if ([args containsObject:@"--install-ra-packages"]) if ([args containsObject:@"--install-ra-packages"])
[self installRaPackages:args]; [self installRAPackages:args];
[self launchMod:@"cnc"]; [self launchMod:@"cnc"];
@@ -57,12 +57,16 @@
- (void)extractZip:(NSArray *)args - (void)extractZip:(NSArray *)args
{ {
[self runUtilityWithArg:[NSString stringWithFormat:@"--extract-zip=%@,%@",[args objectAtIndex:2],[args objectAtIndex:3]]]; // Todo: check if we can write to the requested dir, escalate priviledges if required.
NSArray *a = [NSArray arrayWithObjects:@"--extract-zip", [args objectAtIndex:2], [args objectAtIndex:3], nil];
[self runUtilityWithArgs:a];
} }
- (void)installRaPackages:(NSArray *)args - (void)installRAPackages:(NSArray *)args
{ {
[self runUtilityWithArg:[NSString stringWithFormat:@"--install-ra-packages=%@",[args objectAtIndex:2]]]; // Todo: check if we can write to the requested dir, escalate priviledges if required.
NSArray *a = [NSArray arrayWithObjects:@"--install-ra-packages", [args objectAtIndex:2], nil];
[self runUtilityWithArgs:a];
} }
- (void)launchFilePicker:(NSArray *)args - (void)launchFilePicker:(NSArray *)args
@@ -189,13 +193,13 @@
} }
- (void)runUtilityWithArg:(NSString *)arg - (void)runUtilityWithArgs:(NSArray *)args
{ {
NSTask *task = [[[NSTask alloc] init] autorelease]; NSTask *task = [[[NSTask alloc] init] autorelease];
NSPipe *pipe = [NSPipe pipe]; NSPipe *pipe = [NSPipe pipe];
NSMutableArray *taskArgs = [NSMutableArray arrayWithObject:@"OpenRA.Utility.exe"]; NSMutableArray *taskArgs = [NSMutableArray arrayWithObject:@"OpenRA.Utility.exe"];
[taskArgs addObject:arg]; [taskArgs addObjectsFromArray:args];
[task setCurrentDirectoryPath:gamePath]; [task setCurrentDirectoryPath:gamePath];
[task setLaunchPath:monoPath]; [task setLaunchPath:monoPath];

BIN
OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA
View File

Binary file not shown.

171
OpenRA.Utility/Command.cs
View File

@@ -22,81 +22,23 @@ namespace OpenRA.Utility
{ {
static class Command static class Command
{ {
public static void ListMods(string _) public static void ExtractZip(string[] args)
{ {
var mods = Mod.AllMods; if (args.Length < 3)
List<string> seen = new List<string>(mods.Where(x => x.Value.Standalone).Select(x => x.Key));
List<string> remaining = new List<string>(mods.Where(x => !x.Value.Standalone).Select(x => x.Key));
foreach(var m in seen)
Console.WriteLine(m);
int oldSeenSize = 0;
while (true)
{ {
foreach (var m in remaining) Console.WriteLine("Error: Invalid syntax");
{ return;
if (seen.Contains(m)) continue; }
if (string.IsNullOrEmpty(mods[m].Requires)) var zipFile = args[1];
{ var dest = args[2];
Console.WriteLine(m);
seen.Add(m); if (!File.Exists(zipFile))
continue; {
} Console.WriteLine("Error: Could not find {0}", zipFile);
if (seen.Contains(mods[m].Requires))
{
Console.WriteLine(m);
seen.Add(m);
}
}
if (oldSeenSize == seen.Count) break;
oldSeenSize = seen.Count;
}
foreach(var m in remaining.Where(x => !seen.Contains(x)))
Console.WriteLine(m);
}
public static void ListModInfo(string modList)
{
string[] mods = modList.Split(',');
foreach (var m in mods)
{
var mod = Mod.AllMods
.Where(x => x.Key.Equals(m))
.Select(x => x.Value)
.FirstOrDefault();
if (mod == null)
{
Console.WriteLine("Error: Mod `{0}` is not installed or could not be found.", m);
return;
}
Console.WriteLine("Mod: {0}", m);
Console.WriteLine(" Title: {0}", mod.Title);
Console.WriteLine(" Version: {0}", mod.Version);
Console.WriteLine(" Author: {0}", mod.Author);
Console.WriteLine(" Description: {0}", mod.Description);
Console.WriteLine(" Requires: {0}", mod.Requires);
Console.WriteLine(" Standalone: {0}", mod.Standalone.ToString());
}
}
public static void ExtractZip(string argValue)
{
string[] args = argValue.Split(',');
if (args.Length != 2)
{
Console.WriteLine("Error: invalid syntax");
return; return;
} }
string zipFile = args[0];
string path = args[1];
if (!File.Exists(zipFile)) { Console.WriteLine("Error: Could not find {0}", zipFile); return; }
string dest = "mods{0}{1}".F(Path.DirectorySeparatorChar,path);
List<string> extracted = new List<string>(); List<string> extracted = new List<string>();
try try
{ {
@@ -112,68 +54,15 @@ namespace OpenRA.Utility
Console.WriteLine("Status: Completed"); Console.WriteLine("Status: Completed");
} }
public static void DownloadUrl(string argValue) public static void InstallRAPackages(string[] args)
{ {
string[] args = argValue.Split(','); if (args.Length < 2)
string url = args[0];
WebClient wc = new WebClient();
wc.Proxy = null;
if (args.Length == 1)
{ {
wc.DownloadStringCompleted += DownloadStringCompleted; Console.WriteLine("Error: Invalid syntax");
wc.DownloadStringAsync(new Uri(url));
}
else if (args.Length == 2)
{
string path = args[1].Replace("~",Environment.GetFolderPath(Environment.SpecialFolder.Personal));
wc.DownloadProgressChanged += DownloadProgressChanged;
wc.DownloadFileCompleted += DownloadFileCompleted;
Console.WriteLine("Downloading {0} to {1}", url, path);
Console.WriteLine("Status: Initializing");
wc.DownloadFileAsync(new Uri(url), path);
}
else
{
Console.WriteLine("Error: invalid syntax");
return; return;
} }
while (!completed) var basePath = "{0}{1}".F(args[1], Path.DirectorySeparatorChar);
Thread.Sleep(500);
}
static bool completed = false;
static void DownloadStringCompleted(object sender, DownloadStringCompletedEventArgs e)
{
if (e.Error != null)
Console.WriteLine("Error: {0}", e.Error.Message);
else
Console.WriteLine(e.Result);
completed = true;
}
static void DownloadFileCompleted(object sender, System.ComponentModel.AsyncCompletedEventArgs e)
{
if (e.Error != null)
Console.WriteLine("Error: {0}", e.Error.Message);
else
Console.WriteLine("Status: Completed");
completed = true;
}
static void DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
{
Console.WriteLine("Status: {0}% {1}/{2} bytes", e.ProgressPercentage, e.BytesReceived, e.TotalBytesToReceive);
}
public static void InstallRAPackages(string path)
{
var basePath = "{0}{1}".F(path, Path.DirectorySeparatorChar);
var toPath = "mods{0}ra{0}packages{0}".F(Path.DirectorySeparatorChar); var toPath = "mods{0}ra{0}packages{0}".F(Path.DirectorySeparatorChar);
var directCopy = new string[] {"INSTALL/REDALERT.MIX"}; var directCopy = new string[] {"INSTALL/REDALERT.MIX"};
var extract = new string[] {"conquer.mix", "russian.mix", "allies.mix", "sounds.mix", var extract = new string[] {"conquer.mix", "russian.mix", "allies.mix", "sounds.mix",
@@ -195,9 +84,15 @@ namespace OpenRA.Utility
Console.WriteLine("Status: Completed"); Console.WriteLine("Status: Completed");
} }
public static void InstallCncPackages(string path) public static void InstallCncPackages(string[] args)
{ {
var basePath = "{0}{1}".F(path, Path.DirectorySeparatorChar); if (args.Length < 2)
{
Console.WriteLine("Error: Invalid syntax");
return;
}
var basePath = "{0}{1}".F(args[1], Path.DirectorySeparatorChar);
var toPath = "mods{0}cnc{0}packages{0}".F(Path.DirectorySeparatorChar); var toPath = "mods{0}cnc{0}packages{0}".F(Path.DirectorySeparatorChar);
var directCopy = new string[] {"CONQUER.MIX", "DESERT.MIX", "GENERAL.MIX", "SCORES.MIX", var directCopy = new string[] {"CONQUER.MIX", "DESERT.MIX", "GENERAL.MIX", "SCORES.MIX",
"SOUNDS.MIX", "TEMPERAT.MIX", "WINTER.MIX"}; "SOUNDS.MIX", "TEMPERAT.MIX", "WINTER.MIX"};
@@ -220,13 +115,15 @@ namespace OpenRA.Utility
Console.WriteLine("Status: Completed"); Console.WriteLine("Status: Completed");
} }
public static void Settings(string argValue) public static void Settings(string[] args)
{ {
string[] args = argValue.Split(','); if (args.Length < 3)
{
Console.WriteLine("Error: Invalid syntax");
return;
}
if (args.Length < 2) { return; } string expandedPath = args[1].Replace("~", Environment.GetFolderPath(Environment.SpecialFolder.Personal));
string expandedPath = args[0].Replace("~", Environment.GetFolderPath(Environment.SpecialFolder.Personal));
string settingsFile = expandedPath + Path.DirectorySeparatorChar + "settings.yaml"; string settingsFile = expandedPath + Path.DirectorySeparatorChar + "settings.yaml";
if (!File.Exists(settingsFile)) if (!File.Exists(settingsFile))
@@ -236,14 +133,14 @@ namespace OpenRA.Utility
} }
List<MiniYamlNode> settingsYaml = MiniYaml.FromFile(settingsFile); List<MiniYamlNode> settingsYaml = MiniYaml.FromFile(settingsFile);
Queue<String> settingKey = new Queue<string>(args[1].Split('.')); Queue<String> settingKey = new Queue<string>(args[2].Split('.'));
string s = settingKey.Dequeue(); string s = settingKey.Dequeue();
MiniYaml n = settingsYaml.Where(x => x.Key == s).Select(x => x.Value).FirstOrDefault(); MiniYaml n = settingsYaml.Where(x => x.Key == s).Select(x => x.Value).FirstOrDefault();
if (n == null) if (n == null)
{ {
Console.WriteLine("Error: Could not find {0} in {1}", args[1], settingsFile); Console.WriteLine("Error: Could not find {0} in {1}", args[2], settingsFile);
return; return;
} }
@@ -252,7 +149,7 @@ namespace OpenRA.Utility
s = settingKey.Dequeue(); s = settingKey.Dequeue();
if (!n.NodesDict.TryGetValue(s, out n)) if (!n.NodesDict.TryGetValue(s, out n))
{ {
Console.WriteLine("Error: Could not find {0} in {1}", args[1], settingsFile); Console.WriteLine("Error: Could not find {0} in {1}", args[2], settingsFile);
return; return;
} }
} }

38
OpenRA.Utility/Program.cs
View File

@@ -9,6 +9,7 @@
#endregion #endregion
using System; using System;
using System.Linq;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Security.Principal; using System.Security.Principal;
@@ -19,38 +20,26 @@ namespace OpenRA.Utility
{ {
class Program class Program
{ {
static KeyValuePair<string, string> SplitArgs(string arg) delegate void ArgCallback(string[] args);
{
int i = arg.IndexOf('=');
if (i < 0) return new KeyValuePair<string, string>(arg, "");
return new KeyValuePair<string, string>(arg.Substring(0, i), arg.Substring(i + 1));
}
delegate void ArgCallback(string argValue);
static Dictionary<string, ArgCallback> argCallbacks; static Dictionary<string, ArgCallback> argCallbacks;
static void Main(string[] args) static void Main(string[] args)
{ {
argCallbacks = new Dictionary<string, ArgCallback>(); argCallbacks = new Dictionary<string, ArgCallback>();
argCallbacks.Add("--list-mods", Command.ListMods);
argCallbacks.Add("-l", Command.ListMods);
argCallbacks.Add("--mod-info", Command.ListModInfo);
argCallbacks.Add("-i", Command.ListModInfo);
argCallbacks.Add("--download-url", Command.DownloadUrl);
argCallbacks.Add("--extract-zip", Command.ExtractZip); argCallbacks.Add("--extract-zip", Command.ExtractZip);
argCallbacks.Add("--install-ra-packages", Command.InstallRAPackages); argCallbacks.Add("--install-ra-packages", Command.InstallRAPackages);
argCallbacks.Add("--install-cnc-packages", Command.InstallCncPackages); argCallbacks.Add("--install-cnc-packages", Command.InstallCncPackages);
argCallbacks.Add("--settings-value", Command.Settings); argCallbacks.Add("--settings-value", Command.Settings);
if (args.Length == 0) { PrintUsage(); return; } if (args.Length == 0) { PrintUsage(); return; }
var arg = SplitArgs(args[0]);
bool piping = false; bool piping = false;
if (args.Length > 1 && SplitArgs(args[1]).Key == "--pipe") var i = Array.IndexOf(args, "--pipe");
if (args.Length > 1 && i >= 0)
{ {
piping = true; piping = true;
string pipename = SplitArgs(args[1]).Value; string pipename = args[i+1];
NamedPipeServerStream pipe; NamedPipeServerStream pipe;
var id = WindowsIdentity.GetCurrent(); var id = WindowsIdentity.GetCurrent();
var principal = new WindowsPrincipal(id); var principal = new WindowsPrincipal(id);
@@ -68,8 +57,8 @@ namespace OpenRA.Utility
} }
ArgCallback callback; ArgCallback callback;
if (argCallbacks.TryGetValue(arg.Key, out callback)) if (argCallbacks.TryGetValue(args[0], out callback))
callback(arg.Value); callback(args);
else else
PrintUsage(); PrintUsage();
@@ -79,15 +68,12 @@ namespace OpenRA.Utility
static void PrintUsage() static void PrintUsage()
{ {
Console.WriteLine("Usage: OpenRA.Utility.exe [OPTION]"); Console.WriteLine("Usage: OpenRA.Utility.exe [OPTION] [ARGS]");
Console.WriteLine(); Console.WriteLine();
Console.WriteLine(" -l,--list-mods List currently installed mods"); Console.WriteLine(" --extract-zip ZIPFILE PATH Extract the zip ZIPFILE to DEST (relative to openra dir)");
Console.WriteLine(" -i=MODS,--mod-info=MODS List metadata for MODS (comma separated list of mods)"); Console.WriteLine(" --install-ra-packages PATH Install required packages for RA from CD to PATH");
Console.WriteLine(" --download-url=URL,DEST Download a file from URL to DEST (omit DEST to print to stdout)"); Console.WriteLine(" --install-cnc-packages PATH Install required packages for C&C from CD to PATH");
Console.WriteLine(" --extract-zip=ZIPFILE,PATH Extract the zip ZIPFILE to DEST (relative to openra dir)"); Console.WriteLine(" --settings-value SUPPORTDIR KEY Get value of KEY in SUPPORTDIR/settings.yaml");
Console.WriteLine(" --install-ra-packages=PATH Install required packages for RA from CD to PATH");
Console.WriteLine(" --install-cnc-packages=PATH Install required packages for C&C from CD to PATH");
Console.WriteLine(" --settings-value=SUPPORTDIR,KEY Get value of KEY in SUPPORTDIR/settings.yaml");
} }
} }
} }

2
mods/cnc/chrome/gameinit.yaml
View File

@@ -3,7 +3,7 @@ GameInitInfo@INIT_SETUP:
TestFile: conquer.mix TestFile: conquer.mix
GameTitle: Command & Conquer GameTitle: Command & Conquer
PackageURL:http://open-ra.org/get-dependency.php?file=cnc-packages PackageURL:http://open-ra.org/get-dependency.php?file=cnc-packages
PackagePath:cnc/packages/ PackagePath:mods/cnc/packages/
InstallMode:cnc InstallMode:cnc
Delegate:GameInitDelegate Delegate:GameInitDelegate

2
mods/ra/chrome/gameinit.yaml
View File

@@ -3,7 +3,7 @@ GameInitInfo@INIT_SETUP:
TestFile: redalert.mix TestFile: redalert.mix
GameTitle: Red Alert GameTitle: Red Alert
PackageURL:http://open-ra.org/get-dependency.php?file=ra-packages PackageURL:http://open-ra.org/get-dependency.php?file=ra-packages
PackagePath:ra/packages/ PackagePath:mods/ra/packages/
InstallMode:ra InstallMode:ra
Delegate:GameInitDelegate Delegate:GameInitDelegate