shiftos-archive/ShiftOS_TheReturn
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactoring a few server-related things

Browse source
This commit is contained in:
RogueAI42 2017-06-25 15:35:03 +10:00
parent 4c63e5e41c
commit 255ad0993d
4 changed files with 44 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ShiftOS.Objects/UserConfig.cs
View file

@ -14,24 +14,27 @@ namespace ShiftOS.Objects
public string DigitalSocietyAddress { get; set; }
public int DigitalSocietyPort { get; set; }
public static UserConfig Get()
{
var conf = new UserConfig
private static UserConfig def = new UserConfig
{
Language = "english",
DigitalSocietyAddress = "michaeltheshifter.me",
DigitalSocietyPort = 13370
};
if (!File.Exists("servers.json"))
{
File.WriteAllText("servers.json", JsonConvert.SerializeObject(conf, Formatting.Indented));
}
public static UserConfig current = null;
public static UserConfig Get()
{
if (current != null)
return current;
if (File.Exists("servers.json"))
current = JsonConvert.DeserializeObject<UserConfig>(File.ReadAllText("servers.json"));
else
{
conf = JsonConvert.DeserializeObject<UserConfig>(File.ReadAllText("servers.json"));
File.WriteAllText("servers.json", JsonConvert.SerializeObject(def, Formatting.Indented));
current = def;
}
return conf;
return current;
}
}
}

2
ShiftOS.WinForms/Program.cs
View file

@ -71,7 +71,7 @@ namespace ShiftOS.WinForms
Action completed = null;
completed = () =>
{
SaveSystem.Ready = true;
SaveSystem.Ready.Set();
Engine.AudioManager.PlayCompleted -= completed;
AudioManager.StartAmbientLoop();
};

84
ShiftOS_TheReturn/SaveSystem.cs
View file

@ -66,7 +66,7 @@ namespace ShiftOS.Engine
/// <summary>
/// Boolean representing whether the save system is ready to be used.
/// </summary>
public static bool Ready = false;
public static AutoResetEvent Ready = new AutoResetEvent(false);
public static bool IsSandbox = false;
/// <summary>
@ -154,25 +154,17 @@ namespace ShiftOS.Engine
{
Console.WriteLine("{MISC_CONNECTINGTONETWORK}");
Ready = false;
Ready.Reset();
if (PreDigitalSocietyConnection != null)
{
PreDigitalSocietyConnection?.Invoke();
while (!Ready)
{
Thread.Sleep(10);
}
Ready.WaitOne();
}
bool guidReceived = false;
ServerManager.GUIDReceived += (str) =>
{
//Connection successful! Stop waiting!
guidReceived = true;
Console.WriteLine("{MISC_CONNECTIONSUCCESSFUL}");
Thread.Sleep(100);
Console.WriteLine("{LOADINGMSG2_" + loadingJoke2 + "}");
@ -184,37 +176,25 @@ namespace ShiftOS.Engine
if (ServerManager.ServerOnline)
{
ServerManager.Initiate(UserConfig.Get().DigitalSocietyAddress, UserConfig.Get().DigitalSocietyPort);
//This haults the client until the connection is successful.
while (ServerManager.thisGuid == new Guid())
{
Thread.Sleep(10);
}
// This halts the client until the connection is successful.
ServerManager.guidReceiveARE.WaitOne();
Console.WriteLine("{MISC_DHCPHANDSHAKEFINISHED}");
FinishBootstrap();
}
else
{
Console.WriteLine("{MISC_NONETWORK}");
Console.WriteLine("{LOADINGMSG2_" + loadingJoke2 + "}");
FinishBootstrap();
}
FinishBootstrap();
}
catch (Exception ex)
{
//No errors, this never gets called.
// "No errors, this never gets called."
Console.WriteLine("[inetd] SEVERE: " + ex.Message);
string dest = "Startup Exception " + DateTime.Now.ToString() + ".txt";
System.IO.File.WriteAllText(dest, ex.ToString());
Console.WriteLine("[inetd] Full exception details have been saved to: " + dest);
Thread.Sleep(3000);
Console.WriteLine("[sys] SEVERE: Cannot connect to server. Shutting down in 5...");
Thread.Sleep(1000);
Console.WriteLine("[sys] 4...");
Thread.Sleep(1000);
Console.WriteLine("[sys] 3...");
Thread.Sleep(1000);
Console.WriteLine("[sys] 2...");
Thread.Sleep(1000);
Console.WriteLine("[sys] 1...");
Thread.Sleep(1000);
Console.WriteLine("[sys] Bye bye.");
System.Diagnostics.Process.GetCurrentProcess().Kill();
}
@ -571,8 +551,6 @@ namespace ShiftOS.Engine
/// <param name="amount">The amount of Codepoints to deduct.</param>
public static void TransferCodepointsToVoid(ulong amount)
{
if (amount < 0)
throw new ArgumentOutOfRangeException("We see what you did there. Trying to pull Codepoints from the void? That won't work.");
CurrentSave.Codepoints -= amount;
NotificationDaemon.AddNotification(NotificationType.CodepointsSent, amount);
}
@ -591,36 +569,35 @@ namespace ShiftOS.Engine
/// </summary>
public static void ReadSave()
{
string path;
path = "C:\\ShiftOS2\\";
//Migrate old saves.
if (System.IO.Directory.Exists("C:\\ShiftOS2"))
if (System.IO.Directory.Exists(path) && !System.IO.File.Exists(path + "havemigrated"))
{
Console.WriteLine("Old save detected. Migrating filesystem to MFS...");
foreach (string file in System.IO.Directory.EnumerateDirectories("C:\\ShiftOS2")
.Select(d => new DirectoryInfo(d).FullName))
foreach (string file in System.IO.Directory.EnumerateFileSystemEntries(path))
{
if (!Utils.DirectoryExists(file.Replace("C:\\ShiftOS2\\", "0:/").Replace("\\", "/")))
Utils.CreateDirectory(file.Replace("C:\\ShiftOS2\\", "0:/").Replace("\\", "/"));
string dest = file.Replace(path, "0:/").Replace("\\", "/");
if (System.IO.File.GetAttributes(file).HasFlag(FileAttributes.Directory))
if (!Utils.DirectoryExists(dest))
Utils.CreateDirectory(dest);
else
{
string rfile = Path.GetFileName(file);
Utils.WriteAllBytes(dest, System.IO.File.ReadAllBytes(file));
Console.WriteLine("Exported file " + file);
}
}
foreach (string file in System.IO.Directory.EnumerateFiles("C:\\ShiftOS2"))
{
string rfile = Path.GetFileName(file);
Utils.WriteAllBytes(file.Replace("C:\\ShiftOS2\\", "0:/").Replace("\\", "/"), System.IO.File.ReadAllBytes(file));
Console.WriteLine("Exported file " + file);
}
System.IO.File.WriteAllText(path + "havemigrated", "1.0 BETA");
}
string path = Path.Combine(Paths.SaveDirectory, "autosave.save");
path = Path.Combine(Paths.SaveDirectory, "autosave.save");
if (System.IO.File.Exists(Path.Combine(Paths.SaveDirectory, "autosave.save")))
{
if (System.IO.File.Exists(path))
CurrentSave = JsonConvert.DeserializeObject<Save>(System.IO.File.ReadAllText(path));
}
else
{
NewSave();
}
}
@ -667,11 +644,8 @@ namespace ShiftOS.Engine
})
{ IsBackground = false }.Start();
if (!System.IO.Directory.Exists(Paths.SaveDirectory))
{
System.IO.Directory.CreateDirectory(Paths.SaveDirectory);
}
System.IO.File.WriteAllText(Path.Combine(Paths.SaveDirectory, "autosave.save"), serialisedSaveFile);
}
if (!Shiftorium.Silent)
@ -688,8 +662,6 @@ namespace ShiftOS.Engine
/// <param name="amount">The amount of Codepoints.</param>
public static void TransferCodepointsFrom(string who, ulong amount)
{
if (amount < 0)
throw new ArgumentOutOfRangeException("We see what you did there... You can't just give a fake character Codepoints like that. It's better if you transfer them to the void.");
NotificationDaemon.AddNotification(NotificationType.CodepointsReceived, amount);
CurrentSave.Codepoints += amount;
}

3
ShiftOS_TheReturn/ServerManager.cs
View file

@ -89,6 +89,8 @@ Ping: {ServerManager.DigitalSocietyPing} ms
/// </summary>
public static Guid thisGuid { get; private set; }
public static AutoResetEvent guidReceiveARE = new AutoResetEvent(false);
/// <summary>
/// Gets the underlying NetSockets client for this connection.
/// </summary>
@ -241,6 +243,7 @@ Ping: {ServerManager.DigitalSocietyPing} ms
{
thisGuid = new Guid(msg.Contents);
GUIDReceived?.Invoke(msg.Contents);
guidReceiveARE.Set();
TerminalBackend.PrefixEnabled = true;
TerminalBackend.PrintPrompt();
}