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

Automatically extract packages. Fix ra.

Browse Source
This commit is contained in:
Paul Chote
2011-01-20 15:49:58 +13:00
parent 5ce5d48b04
commit 792c82c2d4
6 changed files with 87 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Game/Game.cs
View File

@@ -100,6 +100,10 @@ namespace OpenRA
return Widget.OpenWindow(widget, new Dictionary<string,object>{{ "world", world }, { "orderManager", orderManager }, { "worldRenderer", worldRenderer }});
}
static object syncroot = new object();
static Action tickActions = () => {};
public static void RunAfterTick(Action a) { lock(syncroot) tickActions += a; }
static void Tick( OrderManager orderManager, Viewport viewPort )
{
if (orderManager.Connection.ConnectionState != lastConnectionState)
@@ -123,6 +127,9 @@ namespace OpenRA
PerfHistory.items["batches"].Tick();
MasterServerQuery.Tick();
Action a;
lock(syncroot) { a = tickActions; tickActions = () => {}; }
a();
}
private static void Tick( OrderManager orderManager )

139
OpenRA.Mods.RA/Widgets/Delegates/GameInitDelegate.cs
View File

@@ -32,6 +32,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
public GameInitDelegate([ObjectCreator.Param] Widget widget)
{
Info = (widget as GameInitInfoWidget);
Game.ConnectionStateChanged += orderManager =>
{
Widget.CloseWindow();
@@ -72,7 +73,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
window.GetWidget("DOWNLOAD").OnMouseUp = mi => { ShowDownloadDialog(); return true; };
window.GetWidget("FROMCD").OnMouseUp = mi =>
{
SelectDisk(path => System.Console.WriteLine(path));
PromptFilepathAsync("Select CD", "Select the {0} CD".F(Info.GameTitle), true, path => System.Console.WriteLine(path));
return true;
};
@@ -84,29 +85,10 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
window = Widget.OpenWindow("INIT_DOWNLOAD");
var status = window.GetWidget<LabelWidget>("STATUS");
status.GetText = () => "Initializing...";
var progress = window.GetWidget<ProgressBarWidget>("PROGRESS");
// TODO: Download to a temp location or the support dir
var file = Info.PackageName;
var progress = window.GetWidget<ProgressBarWidget>("PROGRESS");
window.GetWidget<ButtonWidget>("EXTRACT").OnMouseUp = mi =>
{
if (ExtractZip(file, Info.PackagePath))
ContinueLoading(Info);
return true;
};
if (File.Exists(file))
{
window.GetWidget<ButtonWidget>("EXTRACT").IsVisible = () => true;
status.GetText = () => "Download Cached";
progress.Percentage = 100;
}
else
{
var dl = DownloadUrl(Info.PackageURL, file,
(_,i) => {
@@ -119,19 +101,28 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
ShowDownloadError(i.Error.Message);
}
else
status.GetText = () => "Download Complete";
window.GetWidget<ButtonWidget>("EXTRACT").IsVisible = () => true;
window.GetWidget("CANCEL").IsVisible = () => false;
{
// Automatically extract
status.GetText = () => "Extracting...";
var error = false;
Game.RunAfterTick(() => ExtractZip(file, Info.PackagePath,
s =>
{
if (s.Substring(0,5) == "Error")
{
error = true;
ShowDownloadError(s);
}
if (s.Substring(0,6) == "Status")
window.GetWidget<LabelWidget>("STATUS").GetText = () => s.Substring(7).Trim();
},
() => {if (!error) Game.RunAfterTick(() => ContinueLoading(Info));}));
}
}
window.GetWidget("CANCEL").IsVisible = () => true;
window.GetWidget("RETRY").IsVisible = () => true;
);
window.GetWidget("CANCEL").OnMouseUp = mi => { dl.CancelAsync(); ShowInstallMethodDialog(); return true; };
window.GetWidget("RETRY").OnMouseUp = mi => { dl.CancelAsync(); ShowDownloadDialog(); return true; };
}
}
void ShowDownloadError(string e)
@@ -140,62 +131,6 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
window.GetWidget<ButtonWidget>("RETRY").IsVisible = () => true;
window.GetWidget<ButtonWidget>("CANCEL").IsVisible = () => true;
}
// TODO: This needs to live on a different process if we want to run it as root
public bool ExtractZip(string zipFile, string path)
{
if (!File.Exists(zipFile)) { ShowDownloadError("Download Corrupted"); return false; }
List<string> extracted = new List<string>();
try
{
ZipEntry entry;
var z = new ZipInputStream(File.OpenRead(zipFile));
while ((entry = z.GetNextEntry()) != null)
{
if (!entry.IsFile) continue;
if (!Directory.Exists(Path.Combine(path, Path.GetDirectoryName(entry.Name))))
Directory.CreateDirectory(Path.Combine(path, Path.GetDirectoryName(entry.Name)));
window.GetWidget<LabelWidget>("STATUS").GetText = () => "Status: Extracting {0}".F(entry.Name);
var destPath = path + Path.DirectorySeparatorChar + entry.Name;
Console.WriteLine("Extracting to {0}",destPath);
extracted.Add(path);
using (var f = File.Create(destPath))
{
int bufSize = 2048;
byte[] buf = new byte[bufSize];
while ((bufSize = z.Read(buf, 0, buf.Length)) > 0)
f.Write(buf, 0, bufSize);
}
}
z.Close();
}
catch (SharpZipBaseException)
{
foreach(var f in extracted)
File.Delete(f);
ShowDownloadError("Download Corrupted");
return false;
}
return true;
}
void SelectDisk(Action<string> withPath)
{
Process p = new Process();
p.StartInfo.FileName = "OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA";
p.StartInfo.Arguments = "--filepicker --title \"Select CD\" --message \"Select the {0} CD\" --require-directory --button-text \"Select\"".F(Info.GameTitle);
p.StartInfo.UseShellExecute = false;
p.StartInfo.CreateNoWindow = true;
p.EnableRaisingEvents = true;
p.Exited += (_,e) =>
{
withPath(p.StandardOutput.ReadToEnd());
};
p.Start();
}
void ContinueLoading(Widget widget)
{
@@ -215,5 +150,43 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
wc.DownloadFileAsync(new Uri(url), path);
Game.OnQuit += () => wc.CancelAsync();
return wc;
}
public static void ExtractZip(string zipFile, string path, Action<string> parseOutput, Action onComplete)
{
Process p = new Process();
p.StartInfo.FileName = "OpenRA.Utility.exe";
p.StartInfo.Arguments = "\"--extract-zip={0},{1}\"".F(zipFile, path);
p.StartInfo.UseShellExecute = false;
p.StartInfo.CreateNoWindow = true;
p.StartInfo.RedirectStandardOutput = true;
p.Start();
using (var reader = p.StandardOutput)
{
// This is wrong, chrisf knows why
while (!p.HasExited)
{
string s = reader.ReadLine();
if (string.IsNullOrEmpty(s)) continue;
parseOutput(s);
}
}
onComplete();
}
public static void PromptFilepathAsync(string title, string message, bool directory, Action<string> withPath)
{
Process p = new Process();
p.StartInfo.FileName = "OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA";
p.StartInfo.Arguments = "--filepicker --title \"{0}\" --message \"{1}\" {2} --button-text \"Select\"".F(title, message, directory ? "--require-directory" : "");
p.StartInfo.UseShellExecute = false;
p.StartInfo.CreateNoWindow = true;
p.EnableRaisingEvents = true;
p.Exited += (_,e) =>
{
withPath(p.StandardOutput.ReadToEnd());
};
p.Start();
}
}

2
OpenRA.Mods.RA/Widgets/GameInitInfoWidget.cs
View File

@@ -9,6 +9,8 @@
#endregion
using OpenRA.Widgets;
using System;
using OpenRA.Mods.RA.Widgets.Delegates;
namespace OpenRA.Mods.RA.Widgets
{

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

@@ -2,10 +2,9 @@ GameInitInfo@INIT_SETUP:
Id:INIT_SETUP
TestFile: conquer.mix
GameTitle: Command & Conquer
# PackageURL:http://open-ra.org/get-dependency.php?file=cnc-packages
PackageURL:http://localhost/~paul/cnc-packages.zip
PackageURL:http://open-ra.org/get-dependency.php?file=cnc-packages
PackageName:cnc-packages.zip
PackagePath:mods/cnc/packages
PackagePath:cnc/packages/
Delegate:GameInitDelegate
Background@INIT_CHOOSEINSTALL:
@@ -105,7 +104,6 @@ Background@INIT_DOWNLOAD:
Y:PARENT_BOTTOM - 45
Width:120
Height:25
Visible: false
Text:Cancel
Bold:True
Button@EXTRACT:

46
mods/ra/chrome/mainmenu.yaml
View File

@@ -1,49 +1,3 @@
Background@MAINMENU_INIT:
Id:MAINMENU_INIT
X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - HEIGHT)/2
Width:250
Height:330
Visible:true
Delegate:GameInitDelegate
Children:
GameInitInfo:
Id:INFO
TestFile: fakefile.mix
GameTitle: Red Alert
Label@MAINMENU_LABEL_TITLE:
Id:MAINMENU_LABEL_TITLE
X:0
Y:20
Width:250
Height:25
Text:Install Game Content
Align:Center
Bold:True
Button@INIT_DOWNLOAD:
Id:INIT_DOWNLOAD
X:45
Y:70
Width:160
Height:25
Text:Download
Bold:True
Button@INIT_FROMCD:
Id:INIT_FROMCD
X:45
Y:110
Width:160
Height:25
Text:From CD
Bold:True
Button@INIT_QUIT:
Id:INIT_QUIT
X:45
Y:150
Width:160
Height:25
Text:Quit
Bold:True
Background@MAINMENU_BG:
Id:MAINMENU_BG
X:(WINDOW_RIGHT - WIDTH)/2

1
mods/ra/mod.yaml
View File

@@ -51,6 +51,7 @@ Assemblies:
mods/ra/OpenRA.Mods.RA.dll
ChromeLayout:
mods/ra/chrome/gameinit.yaml
mods/ra/chrome/ingame.yaml
mods/ra/chrome/mainmenu.yaml
mods/ra/chrome/videoplayer.yaml