PSForever/GameLauncher
1
0
Fork 0
mirror of https://github.com/psforever/GameLauncher.git synced 2026-01-19 18:24:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add more process logging and fix clear err msg

Browse source
This commit is contained in:
Chord 2016-06-21 18:35:52 -04:00
parent 9f280093c2
commit 4320354a35
1 changed files with 49 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
PSLauncher/LauncherForm.cs
View file

@ -151,6 +151,8 @@ namespace PSLauncher
return;
}
setErrorMessage("");
if (Settings.Default.ClearOutputOnLaunch)
{
this.ps_consoleOutput.Clear();
@ -174,7 +176,14 @@ namespace PSLauncher
if (skipLauncher.Checked)
{
// magic string to login to planetside from the actual game
startPlanetSide(psExe, Path.GetDirectoryName(psExe), "/K:StagingTest " + Settings.Default.ExtraArgs);
if(!startPlanetSide(psExe, Path.GetDirectoryName(psExe), "/K:StagingTest " + Settings.Default.ExtraArgs))
{
gameStopped();
}
else
{
gameRunning();
}
}
else
{
@ -182,7 +191,14 @@ namespace PSLauncher
Task.Factory.StartNew(() =>
{
this.doLogin();
if(!this.doLogin())
{
gameStopped();
}
else
{
gameRunning();
}
});
}
}
@ -200,7 +216,7 @@ namespace PSLauncher
return req.GetResponse() as HttpWebResponse;
}
void doLogin()
bool doLogin()
{
long ts = (long)(DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1))).TotalSeconds;
@ -222,12 +238,10 @@ namespace PSLauncher
}
catch (WebException x)
{
addLine("Failed to gather initial session: " + x.Message);
if (x.Status != WebExceptionStatus.TrustFailure)
{
stopLaunching();
return;
addLine("Failed to gather initial session: " + x.Message);
return false;
}
DialogResult res = MessageBox.Show("DBG's HTTPS certificate has failed to verify. This means that their certificate has expired " +
@ -236,8 +250,7 @@ namespace PSLauncher
if (res != DialogResult.Yes)
{
stopLaunching();
return;
return false;
}
// WARNING: once we hit yes, all further SSL errors will be ignored
@ -252,8 +265,7 @@ namespace PSLauncher
catch (WebException x2)
{
addLine("Failed to gather initial session: " + x2.Message);
stopLaunching();
return;
return false;
}
}
@ -316,7 +328,7 @@ namespace PSLauncher
{
txt = "";
addLine("Login failed: " + x.Message);
return;
return false;
}
}
@ -352,8 +364,7 @@ namespace PSLauncher
addLine(txt);
}
stopLaunching();
return;
return false;
}
if (!r.GetResponseStream().CanRead)
@ -361,8 +372,8 @@ namespace PSLauncher
setErrorMessage("Unknown error - see output window");
addLine("No login response received");
addLine("Status: " + r.StatusCode);
stopLaunching();
return;
return false;
}
StreamReader reader = new StreamReader(r.GetResponseStream());
@ -391,8 +402,8 @@ namespace PSLauncher
addLine("Bad login response: " + result);
addLine("Status: " + r.StatusCode);
addLine(text);
stopLaunching();
return;
return false;
}
@ -455,8 +466,8 @@ namespace PSLauncher
addLine("Get token failure: " + x.Status);
addLine("Error: " + errorDetail);
addLine(txt);
stopLaunching();
return;
return false;
}
if (!r.GetResponseStream().CanRead)
@ -464,8 +475,8 @@ namespace PSLauncher
setErrorMessage("Unknown error - see output window");
addLine("No login response received");
addLine("Status: " + r.StatusCode);
stopLaunching();
return;
return false;
}
reader = new StreamReader(r.GetResponseStream());
@ -495,8 +506,8 @@ namespace PSLauncher
addLine("Bad token response: " + result);
addLine("Status: " + r.StatusCode);
addLine(text);
stopLaunching();
return;
return false;
}
addLine("PSWeb: got launch args " + token);
@ -507,12 +518,10 @@ namespace PSLauncher
if (ExtraLaunchArgs != String.Empty)
launch_args += " " + ExtraLaunchArgs;
startPlanetSide(psExe, path, launch_args);
return;
return startPlanetSide(psExe, path, launch_args);
}
void startPlanetSide(string exe, string workingDir, string args)
bool startPlanetSide(string exe, string workingDir, string args)
{
psProcess = new Process();
@ -527,12 +536,19 @@ namespace PSLauncher
psProcess.EnableRaisingEvents = true;
addLine("ProcessStart: \"" + exe + "\" " + args);
psProcess.Start();
if (!psProcess.Start())
{
addLine("ProcessStart: failed to start the planetside process! Make sure your planetside folder path is correct.");
return false;
}
addLine(String.Format("ProcessStart: planetside running as PID {0}", psProcess.Id));
psProcess.BeginErrorReadLine();
psProcess.BeginOutputReadLine();
gameRunning();
return true;
}
void ps_OutputDataReceived(object sender, DataReceivedEventArgs e)