Prep and dynamic host support

kwmx · Sep 2, 2022 · e08e16e · e08e16e
1 parent dca4914
commit e08e16e
Show file tree

Hide file tree

Showing 14 changed files with 1,441 additions and 39 deletions.
diff --git a/ZomboidRCON/ConnectionForm.Designer.cs b/ZomboidRCON/ConnectionForm.Designer.cs
diff --git a/ZomboidRCON/ConnectionForm.cs b/ZomboidRCON/ConnectionForm.cs
@@ -26,6 +26,7 @@ public ConnectionForm(Main MainForm)
 
         private void connectBtn_Click(object sender, EventArgs e)
         {
+            IPAddress? address = null;
             if (!saveBox.Checked)
             {
                 Properties.Settings.Default.ip = "";
@@ -38,15 +39,25 @@ private void connectBtn_Click(object sender, EventArgs e)
                 MessageBox.Show(this, "All fields must be filled", "ZomboidRCON");
                 return;
             }
-            if (!IPAddress.TryParse(ipTxt.Text, out IPAddress address))
+            if (!IPAddress.TryParse(ipTxt.Text, out address))
             {
-                MessageBox.Show(this, "Incorrect IP address", "ZomboidRCON");
-                return;
-
+                try
+                {
+                    ipTxt.Text = ipTxt.Text.Replace("http://", "").Replace("https://", "").Replace("/", "");
+                    address = GetAddressFromUrl(ipTxt.Text);
+                    if (address == null) {
+                        MessageBox.Show(this, "Couldn't find a valid IP for the provided URL", "ZomboidRCON");
+                        return;
+                    }
+                } catch (Exception exz) {
+                    MessageBox.Show(this, "Incorrect IP address: " + exz.Message, "ZomboidRCON");
+                    return;
+                }
             }
             if (address == null || address.AddressFamily != System.Net.Sockets.AddressFamily.InterNetwork)
             {
                 MessageBox.Show(this, "Incorrect IP please enter an IPv4 address", "ZomboidRCON");
+                return;
             }
             if (!int.TryParse(portTxt.Text, out int port))
             {
@@ -58,9 +69,9 @@ private void connectBtn_Click(object sender, EventArgs e)
             passwordTxt.Enabled = false;
             connectBtn.Enabled = false;
             saveBox.Enabled = false;
-            _ = RconConnectAsync(address, port, passwordTxt.Text);
+            _ = RconConnectAsync(address, port, passwordTxt.Text, ipTxt.Text);
         }
-        private async Task RconConnectAsync(IPAddress address, int port, string password)
+        private async Task RconConnectAsync(IPAddress address, int port, string password, string dbname)
         {
             RconClient client = RconClient.Create(address.ToString(), port);
             try
@@ -77,7 +88,7 @@ private async Task RconConnectAsync(IPAddress address, int port, string password
                         Properties.Settings.Default.Save();
                     }
 
-                    main.ResetConnection(client, address.ToString(), port);
+                    main.ResetConnection(client, address.ToString(), port, dbname);
                     main.Show();
                     ok = true;
                     Close();
@@ -99,6 +110,18 @@ private async Task RconConnectAsync(IPAddress address, int port, string password
             saveBox.Enabled = true;
 
         }
+        private IPAddress? GetAddressFromUrl(string url)
+        {
+            if (Uri.CheckHostName(url) == UriHostNameType.Unknown) throw new Exception("Invalid URL");
+            Uri uri = new Uri("http://" + url);
+            IPHostEntry ihe = Dns.GetHostEntry(uri.Host);
+            if(ihe.AddressList.Length > 0)
+                foreach(IPAddress ipa in ihe.AddressList)
+                {
+                    if (ipa.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) return ipa; 
+                }
+            return null;
+        }
         private void ConnectionForm_Load(object sender, EventArgs e)
         {
             ipTxt.Text = String.IsNullOrWhiteSpace(Properties.Settings.Default.ip) ? "" : Properties.Settings.Default.ip;
@@ -111,5 +134,10 @@ private void ConnectionForm_FormClosed(object sender, FormClosedEventArgs e)
         {
             if(!ok) Application.Exit();
         }
+
+        private void ipTxt_TextChanged(object sender, EventArgs e)
+        {
+
+        }
     }
 }
diff --git a/ZomboidRCON/Constants.cs b/ZomboidRCON/Constants.cs
@@ -10,7 +10,7 @@ namespace ZomboidRCON
     internal class Constants
     {
         public const string RepoPath = "kwmx/ZomboidRCON";
-        public const string Version = "1.0.3";
+        public const string Version = "1.0.4";
         public static string AssemblyVersionToSemver
         {
             get

diff --git a/ZomboidRCON/ItemsPack/Forms/Items Pack Creator.Designer.cs b/ZomboidRCON/ItemsPack/Forms/Items Pack Creator.Designer.cs
diff --git a/ZomboidRCON/ItemsPack/Forms/Items Pack Creator.cs b/ZomboidRCON/ItemsPack/Forms/Items Pack Creator.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ZomboidRCON.ItemsPack.Forms
+{
+    public partial class ItemsPackCreator : Form
+    {
+        public ItemsPackCreator()
+        {
+            InitializeComponent();
+        }
+
+        private void ItemsPackCreator_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}