kerboul/perun
1
0
Fork 0
mirror of https://github.com/DaKerboul/perun.git synced 2026-08-09 19:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Szymon Porwolik
2021-02-17 21:11:56 +01:00
parent 54bf6686eb
commit 2bc1af827d
7 changed files with 79 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
02_Windows_App/Perun_v1/01_Classes/Globals.cs
View File

@@ -60,6 +60,8 @@ internal class Globals
public static int AppInstanceID = 0; // Kepp the instance ID public static int AppInstanceID = 0; // Kepp the instance ID
public static bool AppForceIconReload = true; // Force main window icons reload public static bool AppForceIconReload = true; // Force main window icons reload
public static string[] DatabaseSendBuffer = new string[50]; // MySQL send buffer
public static bool StatusDatabase = false; // Historic db connection status public static bool StatusDatabase = false; // Historic db connection status
public static bool StatusSRS = false; // Historic srs connection status public static bool StatusSRS = false; // Historic srs connection status
public static bool StatusLotATC = false; // Historic lotatc connection status public static bool StatusLotATC = false; // Historic lotatc connection status
@@ -79,5 +81,8 @@ internal class Globals
public static CurrentMissionClass CurrentMission = new CurrentMissionClass(); // Actual mission information single ton public static CurrentMissionClass CurrentMission = new CurrentMissionClass(); // Actual mission information single ton
public static HardwareMonitorClass HardwareMonitor = new HardwareMonitorClass(); // Hardware monitor singleton public static HardwareMonitorClass HardwareMonitor = new HardwareMonitorClass(); // Hardware monitor singleton
public static DatabaseController DatabaseConnection = new DatabaseController(); // Main MySQL controller
public static TCPController TCPServer = new TCPController(); // Main TCP controller
} }

7
02_Windows_App/Perun_v1/01_Classes/PerunHelper.cs
View File

@@ -96,10 +96,13 @@ internal class PerunHelper
} }
// Gets build version // Gets build version
public static string GetAppVersion(string strBeginning) public static string GetAppVersion(string strBeginning, string strEnding = "")
{ {
Globals.VersionPerun = Assembly.GetExecutingAssembly().GetName().Version.ToString(); Globals.VersionPerun = Assembly.GetExecutingAssembly().GetName().Version.ToString();
return strBeginning + "v" + Globals.VersionPerun; #if DEBUG
Globals.VersionPerun = Globals.VersionPerun + "(d)";
#endif
return strBeginning + "v" + Globals.VersionPerun + strEnding;
} }
public static int CheckVersions() public static int CheckVersions()

2
02_Windows_App/Perun_v1/02_Forms/form_Main.Designer.cs generated
View File

@@ -828,7 +828,7 @@
this.MaximizeBox = false; this.MaximizeBox = false;
this.Name = "form_Main"; this.Name = "form_Main";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Perun for DCS"; this.Text = "Perun for DCS World";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.form_Main_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.form_Main_FormClosing);
this.Load += new System.EventHandler(this.form_Main_Load); this.Load += new System.EventHandler(this.form_Main_Load);
this.Resize += new System.EventHandler(this.form_Main_Resize); this.Resize += new System.EventHandler(this.form_Main_Resize);

108
02_Windows_App/Perun_v1/02_Forms/form_Main.cs
View File

@@ -11,21 +11,19 @@ namespace Perun_v1
public partial class form_Main : Form public partial class form_Main : Form
{ {
// Variable definitions // Variable definitions
public string[] DatabaseSendBuffer = new string[50]; // MySQL send buffer
public bool AppCanClose = false; // Helper to handle system tray - true needed to quit the app public bool AppCanClose = false; // Helper to handle system tray - true needed to quit the app
public DatabaseController DatabaseConnection = new DatabaseController(); // Main MySQL controller
public TCPController TCPServer = new TCPController(); // Main TCP controller
public bool ExtSRSStatus; // True if to use empty/default SRS status public bool ExtSRSStatus; // True if to use empty/default SRS status
public bool ExtLotATCStatus; // True if to use empty/default LotATC status public bool ExtLotATCStatus; // True if to use empty/default LotATC status
// ################################ Main ################################ // ################################ Main ################################
private void form_Main_Load(object sender, EventArgs e) private void form_Main_Load(object sender, EventArgs e)
{ {
// Load settings from registry
form_Main_LoadSettings();
// Form loaded // Form loaded
Globals.AppLogHistory[0] = DateTime.Now.ToString("HH:mm:ss") + " > " + "Perun started"; // Add information to the log control PerunHelper.LogInfo(ref Globals.AppLogHistory, PerunHelper.GetAppVersion("Perun started - "));
form_Main_LoadSettings(); // Load settings from registry
// Display build version in title bar // Display build version in title bar
Globals.AppTitle = PerunHelper.GetAppVersion(this.Text + " - "); Globals.AppTitle = PerunHelper.GetAppVersion(this.Text + " - ");
@@ -103,14 +101,7 @@ namespace Perun_v1
con_img_lotATC.Image = (Image)Properties.Resources.ResourceManager.GetObject("status_disconnected"); con_img_lotATC.Image = (Image)Properties.Resources.ResourceManager.GetObject("status_disconnected");
con_img_srs.Image = (Image)Properties.Resources.ResourceManager.GetObject("status_disconnected"); con_img_srs.Image = (Image)Properties.Resources.ResourceManager.GetObject("status_disconnected");
this.form_Main_SetControlsInit(); this.form_Main_SetBlankMissionInfo();
// Display information that we are runing debug build
#if !DEBUG
#else
label13.Text = label13.Text + " (Debug)";
#endif
} }
public form_Main() public form_Main()
@@ -134,8 +125,8 @@ namespace Perun_v1
con_check_3rd_srs.Checked = Properties.Settings.Default.OTHER_SRS_USE; con_check_3rd_srs.Checked = Properties.Settings.Default.OTHER_SRS_USE;
con_txt_dcs_server_port.Text = Properties.Settings.Default.DCS_Server_Port.ToString(); con_txt_dcs_server_port.Text = Properties.Settings.Default.DCS_Server_Port.ToString();
con_txt_dcs_instance.Text = Properties.Settings.Default.DCS_Instance.ToString(); con_txt_dcs_instance.Text = Properties.Settings.Default.DCS_Instance.ToString();
con_com_loglevel.SelectedIndex = Properties.Settings.Default.LOG_LEVEL; con_com_loglevel.SelectedIndex = Properties.Settings.Default.OTHER_Log_Level;
con_check_minimize_to_tray.Checked = Properties.Settings.Default.CLOSE_TO_TRAY; con_check_minimize_to_tray.Checked = Properties.Settings.Default.OTHER_Minimize_to_Tray;
} }
private void form_Main_SaveSettings() private void form_Main_SaveSettings()
@@ -154,8 +145,8 @@ namespace Perun_v1
Properties.Settings.Default.OTHER_SRS_USE = con_check_3rd_srs.Checked; Properties.Settings.Default.OTHER_SRS_USE = con_check_3rd_srs.Checked;
Properties.Settings.Default.DCS_Server_Port = Int32.Parse(con_txt_dcs_server_port.Text); Properties.Settings.Default.DCS_Server_Port = Int32.Parse(con_txt_dcs_server_port.Text);
Properties.Settings.Default.DCS_Instance = Int32.Parse(con_txt_dcs_instance.Text); Properties.Settings.Default.DCS_Instance = Int32.Parse(con_txt_dcs_instance.Text);
Properties.Settings.Default.LOG_LEVEL = con_com_loglevel.SelectedIndex; Properties.Settings.Default.OTHER_Log_Level = con_com_loglevel.SelectedIndex;
Properties.Settings.Default.CLOSE_TO_TRAY = con_check_minimize_to_tray.Checked; Properties.Settings.Default.OTHER_Minimize_to_Tray = con_check_minimize_to_tray.Checked;
Properties.Settings.Default.Save(); Properties.Settings.Default.Save();
} }
@@ -203,10 +194,10 @@ namespace Perun_v1
con_txt_dcs_instance.Enabled = true; con_txt_dcs_instance.Enabled = true;
con_com_loglevel.Enabled = true; con_com_loglevel.Enabled = true;
this.form_Main_SetControlsInit(); this.form_Main_SetBlankMissionInfo();
} }
private void form_Main_SetControlsInit() private void form_Main_SetBlankMissionInfo()
{ {
// Init values for the controls // Init values for the controls
@@ -217,6 +208,7 @@ namespace Perun_v1
label19.Text = "?"; label19.Text = "?";
label21.Text = "[unknown]"; label21.Text = "[unknown]";
} }
// ################################ User input ################################ // ################################ User input ################################
private void con_Button_Listen_ON_Click(object sender, EventArgs e) private void con_Button_Listen_ON_Click(object sender, EventArgs e)
{ {
@@ -233,18 +225,18 @@ namespace Perun_v1
// Prepare GUI // Prepare GUI
form_Main_SetControlsToConnected(); form_Main_SetControlsToConnected();
form_Main_SaveSettings(); form_Main_SaveSettings();
this.Text = "[#" + con_txt_dcs_instance.Text + "] " + Globals.AppTitle; // Set title bar this.Text = $"[#{con_txt_dcs_instance.Text}] {Globals.AppTitle}"; // Set title bar
trayIconMain.Text = this.Text; // Set notification icon text trayIconMain.Text = this.Text; // Set notification icon text
// Prepare MySQL connection string // Prepare MySQL connection string
DatabaseConnection.DatabaseConnectionString = "server=" + con_txt_mysql_server.Text + ";user=" + con_txt_mysql_username.Text + ";database=" + con_txt_mysql_database.Text + ";port=" + con_txt_mysql_port.Text + ";password=" + con_txt_mysql_password.Text; Globals.DatabaseConnection.DatabaseConnectionString = $"server={con_txt_mysql_server.Text};user={con_txt_mysql_username.Text};database={con_txt_mysql_database.Text};port={con_txt_mysql_port.Text};password={con_txt_mysql_password.Text}";
// Start listening // Start listening
PerunHelper.LogInfo(ref Globals.AppLogHistory, "Opening connections", 0, 1); PerunHelper.LogInfo(ref Globals.AppLogHistory, "Opening connections", 0, 1);
TCPServer.Create(Int32.Parse(con_txt_dcs_server_port.Text), ref Globals.AppLogHistory, ref DatabaseSendBuffer); Globals.TCPServer.Create(Int32.Parse(con_txt_dcs_server_port.Text), ref Globals.AppLogHistory, ref Globals.DatabaseSendBuffer);
TCPServer.thrTCPListener = new Thread(TCPServer.StartListen); Globals.TCPServer.thrTCPListener = new Thread(Globals.TCPServer.StartListen);
TCPServer.thrTCPListener.Start(); Globals.TCPServer.thrTCPListener.Start();
TCPServer.thrTCPListener.Name = "TCPThread"; Globals.TCPServer.thrTCPListener.Name = "TCPThread";
// Start timmers // Start timmers
tim_MySQL.Enabled = true; tim_MySQL.Enabled = true;
@@ -275,7 +267,7 @@ namespace Perun_v1
try try
{ {
// Stop the server // Stop the server
TCPServer.StopListen(); Globals.TCPServer.StopListen();
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -283,7 +275,7 @@ namespace Perun_v1
Console.WriteLine(ex.ToString()); Console.WriteLine(ex.ToString());
} }
while (TCPServer.thrTCPListener.IsAlive) while (Globals.TCPServer.thrTCPListener.IsAlive)
{ {
// Wait untill TCP server closed connection // Wait untill TCP server closed connection
Thread.Sleep(200); //ms Thread.Sleep(200); //ms
@@ -360,7 +352,7 @@ namespace Perun_v1
private void con_check_minimize_to_tray_Validated(object sender, EventArgs e) private void con_check_minimize_to_tray_Validated(object sender, EventArgs e)
{ {
// Changed close to try state // Changed close to try state
Properties.Settings.Default.CLOSE_TO_TRAY = con_check_minimize_to_tray.Checked; Properties.Settings.Default.OTHER_Minimize_to_Tray = con_check_minimize_to_tray.Checked;
} }
private void con_Button_Reset_Flags_Click(object sender, EventArgs e) private void con_Button_Reset_Flags_Click(object sender, EventArgs e)
@@ -432,12 +424,10 @@ namespace Perun_v1
{ {
WindowState = FormWindowState.Normal; WindowState = FormWindowState.Normal;
} }
// get our current "TopMost" value (ours will always be false though)
bool top = TopMost; bool top = TopMost; // Get our current "TopMost" value (ours will always be false though)
// make our form jump to the top of everything TopMost = true; // Make our form jump to the top of everything
TopMost = true; TopMost = top; // Set it back to whatever it was
// set it back to whatever it was
TopMost = top;
} }
private void form_Main_FormClosing(object sender, FormClosingEventArgs e) private void form_Main_FormClosing(object sender, FormClosingEventArgs e)
@@ -461,7 +451,7 @@ namespace Perun_v1
// Form was minimised to try // Form was minimised to try
if (WindowState == FormWindowState.Minimized) if (WindowState == FormWindowState.Minimized)
{ {
if (con_check_minimize_to_tray.Checked) if (con_check_minimize_to_tray.Checked) // Check if user wants to minimize to tray icon
{ {
form_Main_SendToTray(); form_Main_SendToTray();
} }
@@ -508,13 +498,13 @@ namespace Perun_v1
} }
else else
{ {
this.form_Main_SetControlsInit(); this.form_Main_SetBlankMissionInfo();
} }
// Update status icons at main form - MySQL // Update status icons at main form - MySQL
if ((DatabaseConnection.DatabaseStatus != Globals.StatusDatabase) || Globals.AppForceIconReload) if ((Globals.DatabaseConnection.DatabaseStatus != Globals.StatusDatabase) || Globals.AppForceIconReload)
{ {
if (DatabaseConnection.DatabaseStatus) if (Globals.DatabaseConnection.DatabaseStatus)
{ {
if (Globals.ErrorsDatabase == 0) if (Globals.ErrorsDatabase == 0)
{ {
@@ -529,7 +519,7 @@ namespace Perun_v1
{ {
con_img_db.Image = (Image)Properties.Resources.ResourceManager.GetObject("status_disconnected_error"); con_img_db.Image = (Image)Properties.Resources.ResourceManager.GetObject("status_disconnected_error");
} }
Globals.StatusDatabase = DatabaseConnection.DatabaseStatus; Globals.StatusDatabase = Globals.DatabaseConnection.DatabaseStatus;
} }
// Update status icons at main form - DCS // Update status icons at main form - DCS
if ((Globals.StatusConnection != Globals.StatusHistoryConnection) || Globals.AppForceIconReload || Globals.ErrorsGame != Globals.ErrorsHistoryGame) if ((Globals.StatusConnection != Globals.StatusHistoryConnection) || Globals.AppForceIconReload || Globals.ErrorsGame != Globals.ErrorsHistoryGame)
@@ -598,13 +588,13 @@ namespace Perun_v1
private void Tim_MySQL_Tick(object sender, EventArgs e) private void Tim_MySQL_Tick(object sender, EventArgs e)
{ {
// Send buffer to MySQL // Send buffer to MySQL
for (int i = 0; i < DatabaseSendBuffer.Length - 1; i++) for (int i = 0; i < Globals.DatabaseSendBuffer.Length - 1; i++)
{ {
if (DatabaseSendBuffer[i] != null) if (Globals.DatabaseSendBuffer[i] != null)
{ {
if (DatabaseConnection.SendToMySql(DatabaseSendBuffer[i]) > 0) if (Globals.DatabaseConnection.SendToMySql(Globals.DatabaseSendBuffer[i]) > 0)
{ {
DatabaseSendBuffer[i] = null; // If packet was send then delete it from send buffer Globals.DatabaseSendBuffer[i] = null; // If packet was send then delete it from send buffer
} }
} }
} }
@@ -615,7 +605,7 @@ namespace Perun_v1
// Main timer to check MySQL connection and send JSON files to MySQL // Main timer to check MySQL connection and send JSON files to MySQL
// Send ping to check for possible connection issues // Send ping to check for possible connection issues
DatabaseConnection.SendToMySql("", true); Globals.DatabaseConnection.SendToMySql("", true);
if (PerunHelper.CheckVersions() == 0) if (PerunHelper.CheckVersions() == 0)
{ {
@@ -639,35 +629,35 @@ namespace Perun_v1
try try
{ {
ExtSRSJson = System.IO.File.ReadAllText(con_txt_3rd_srs.Text); ExtSRSJson = System.IO.File.ReadAllText(con_txt_3rd_srs.Text);
dynamic raw_lotatc = JsonConvert.DeserializeObject(ExtSRSJson); dynamic raw_dcssrs = JsonConvert.DeserializeObject(ExtSRSJson);
for (int i = 0; i < raw_lotatc.Clients.Count; i++) for (int i = 0; i < raw_dcssrs.Clients.Count; i++)
{ {
if (raw_lotatc.Clients[i].RadioInfo != null) if (raw_dcssrs.Clients[i].RadioInfo != null)
{ {
int temp = raw_lotatc.Clients[i].RadioInfo.radios.Count - 1; int temp = raw_dcssrs.Clients[i].RadioInfo.radios.Count - 1;
for (int j = temp; j >= 0; j--) for (int j = temp; j >= 0; j--)
{ {
if (raw_dcssrs.Clients[i].RadioInfo.radios[j].name == "No Radio")
if (raw_lotatc.Clients[i].RadioInfo.radios[j].name == "No Radio")
{ {
raw_lotatc.Clients[i].RadioInfo.radios[j].Remove(); raw_dcssrs.Clients[i].RadioInfo.radios[j].Remove();
} }
} }
} }
if (raw_lotatc.Clients[i].Name != null) if (raw_dcssrs.Clients[i].Name != null)
{ {
ClientName = raw_lotatc.Clients[i].Name; // Clean the user names from non alphanumeric characters
ClientName = raw_dcssrs.Clients[i].Name;
Regex rgx = new Regex("[^a-zA-Z0-9 -]"); Regex rgx = new Regex("[^a-zA-Z0-9 -]");
ClientName = rgx.Replace(ClientName, ""); ClientName = rgx.Replace(ClientName, "");
raw_lotatc.Clients[i].Name = ClientName; raw_dcssrs.Clients[i].Name = ClientName;
} }
} }
ExtSRSJson = JsonConvert.SerializeObject(raw_lotatc); ExtSRSJson = JsonConvert.SerializeObject(raw_dcssrs);
ExtSRSJson = "{'type':'100','instance':'" + Int32.Parse(con_txt_dcs_instance.Text) + "','payload':'" + ExtSRSJson + "'}"; ExtSRSJson = "{'type':'100','instance':'" + Int32.Parse(con_txt_dcs_instance.Text) + "','payload':'" + ExtSRSJson + "'}";
ExtSRSUseDefault = false; ExtSRSUseDefault = false;
@@ -689,7 +679,7 @@ namespace Perun_v1
} }
if (ExtSRSStatus) if (ExtSRSStatus)
{ {
DatabaseConnection.SendToMySql(ExtSRSJson); Globals.DatabaseConnection.SendToMySql(ExtSRSJson);
} }
} }
@@ -723,7 +713,7 @@ namespace Perun_v1
} }
if (ExtLotATCStatus) if (ExtLotATCStatus)
{ {
DatabaseConnection.SendToMySql(ExtLotATCJson); Globals.DatabaseConnection.SendToMySql(ExtLotATCJson);
} }
} }

20
02_Windows_App/Perun_v1/Properties/Settings.Designer.cs generated
View File

@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // Ten kod został wygenerowany przez narzędzie.
// Runtime Version:4.0.30319.42000 // Wersja wykonawcza:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Zmiany w tym pliku mogą spowodować nieprawidłowe zachowanie i zostaną utracone, jeśli
// the code is regenerated. // kod zostanie ponownie wygenerowany.
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@@ -158,24 +158,24 @@ namespace Perun_v1.Properties {
[global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("1")] [global::System.Configuration.DefaultSettingValueAttribute("1")]
public int LOG_LEVEL { public int OTHER_Log_Level {
get { get {
return ((int)(this["LOG_LEVEL"])); return ((int)(this["OTHER_Log_Level"]));
} }
set { set {
this["LOG_LEVEL"] = value; this["OTHER_Log_Level"] = value;
} }
} }
[global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")] [global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool CLOSE_TO_TRAY { public bool OTHER_Minimize_to_Tray {
get { get {
return ((bool)(this["CLOSE_TO_TRAY"])); return ((bool)(this["OTHER_Minimize_to_Tray"]));
} }
set { set {
this["CLOSE_TO_TRAY"] = value; this["OTHER_Minimize_to_Tray"] = value;
} }
} }
} }

4
02_Windows_App/Perun_v1/Properties/Settings.settings
View File

@@ -35,10 +35,10 @@
<Setting Name="DCS_Instance" Type="System.Int32" Scope="User"> <Setting Name="DCS_Instance" Type="System.Int32" Scope="User">
<Value Profile="(Default)">1</Value> <Value Profile="(Default)">1</Value>
</Setting> </Setting>
<Setting Name="LOG_LEVEL" Type="System.Int32" Scope="User"> <Setting Name="OTHER_Log_Level" Type="System.Int32" Scope="User">
<Value Profile="(Default)">1</Value> <Value Profile="(Default)">1</Value>
</Setting> </Setting>
<Setting Name="CLOSE_TO_TRAY" Type="System.Boolean" Scope="User"> <Setting Name="OTHER_Minimize_to_Tray" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value> <Value Profile="(Default)">True</Value>
</Setting> </Setting>
</Settings> </Settings>

4
02_Windows_App/Perun_v1/app.config
View File

@@ -40,10 +40,10 @@
<setting name="DCS_Instance" serializeAs="String"> <setting name="DCS_Instance" serializeAs="String">
<value>1</value> <value>1</value>
</setting> </setting>
<setting name="LOG_LEVEL" serializeAs="String"> <setting name="OTHER_Log_Level" serializeAs="String">
<value>1</value> <value>1</value>
</setting> </setting>
<setting name="CLOSE_TO_TRAY" serializeAs="String"> <setting name="OTHER_Minimize_to_Tray" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>
</Perun_v1.Properties.Settings> </Perun_v1.Properties.Settings>