Add the option to show the port in the Pool column

nwoolls · Jan 20, 2018 · 0cd941e · 0cd941e
1 parent e2ee0e8
commit 0cd941e
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 2 deletions.
diff --git a/MultiMiner.UX.Tests/StringExtensionsTests.cs b/MultiMiner.UX.Tests/StringExtensionsTests.cs
@@ -138,5 +138,31 @@ public void ParseHostAndPort_H_Succeeds()
             Assert.AreEqual(81, port);
             Assert.IsTrue(result);
         }
+
+        [TestMethod]
+        public void PortFromHost_WithPort_ReturnsPort()
+        {
+            // arrange
+            var hostAndPort = "stratum+tcp://stratum.kano.is:81/#xnsub/#skipcbcheck";
+
+            // act
+            int? port = hostAndPort.PortFromHost();
+
+            // assert
+            Assert.AreEqual(81, port);
+        }
+
+        [TestMethod]
+        public void PortFromHost_WithoutPort_ReturnsNull()
+        {
+            // arrange
+            var hostAndPort = "stratum+tcp://stratum.kano.is/#xnsub/#skipcbcheck";
+
+            // act
+            int? port = hostAndPort.PortFromHost();
+
+            // assert
+            Assert.IsFalse(port.HasValue);
+        }
     }
 }
diff --git a/MultiMiner.UX/Data/Configuration/Application.cs b/MultiMiner.UX/Data/Configuration/Application.cs
@@ -67,6 +67,7 @@ public Application()
         public bool AllowMultipleInstances { get; set; }
         public string SubmittedStatsVersion { get; set; }
         public bool ShowWorkUtility { get; set; }
+        public bool ShowPoolPort { get; set; }
         public bool NetworkDeviceDetection { get; set; }
         public bool NetworkDeviceScanClassB { get; set; }
         public bool NetworkDeviceScanClassA { get; set; }

diff --git a/MultiMiner.UX/Extensions/StringExtensions.cs b/MultiMiner.UX/Extensions/StringExtensions.cs
@@ -29,7 +29,7 @@ public static string DomainFromHost(this string host)
 
             string domainName = host.Trim();
 
-            if (!host.Contains(":"))
+            if (!host.Contains("://"))
                 host = "http://" + host;
 
             try
@@ -63,6 +63,38 @@ public static string DomainFromHost(this string host)
             return domainName;
         }
 
+        private readonly static Dictionary<string, int> hostPorts = new Dictionary<string, int>();
+
+        public static int? PortFromHost(this string host)
+        {
+            if (String.IsNullOrEmpty(host))
+                return null;
+
+            if (hostPorts.ContainsKey(host))
+                return hostPorts[host];
+
+            int? port = null;
+
+            if (!host.Contains("://"))
+                host = "http://" + host;
+
+            try
+            {
+                Uri uri = new Uri(host);
+                if (uri.Port >= 0)
+                {
+                    port = uri.Port;
+                }
+            }
+            catch (UriFormatException)
+            {
+                // System.UriFormatException: Invalid URI: The hostname could not be parsed.
+                // don't crash - fall back on domainName = host (initialized above)
+            }
+
+            return port;
+        }
+
         public static string ShortHostFromHost(this string host)
         {
             return host.Replace("http://", "").Replace("stratum+tcp://", "").TrimEnd('/');

diff --git a/MultiMiner.Win/Forms/MinerForm.cs b/MultiMiner.Win/Forms/MinerForm.cs
@@ -559,11 +559,25 @@ private void RefreshListViewItemForDeviceViewModel(ListViewItem listViewItem, De
             listViewItem.SubItems["Fan"].Text = deviceViewModel.FanPercent > 0 ? deviceViewModel.FanPercent + "%" : String.Empty;
             listViewItem.SubItems["Intensity"].Text = deviceViewModel.Intensity;
 
-            listViewItem.SubItems["Pool"].Text = deviceViewModel.Pool.DomainFromHost();
+            RefreshPoolColumnForDeviceViewModel(listViewItem, deviceViewModel);
 
             PopulateIncomeForListViewItem(listViewItem, deviceViewModel);
         }
 
+        private void RefreshPoolColumnForDeviceViewModel(ListViewItem listViewItem, DeviceViewModel deviceViewModel)
+        {
+            var pool = deviceViewModel.Pool.DomainFromHost();
+            if (app.ApplicationConfiguration.ShowPoolPort)
+            {
+                var port = deviceViewModel.Pool.PortFromHost();
+                if (port.HasValue)
+                {
+                    pool = String.Format("{0}:{1}", pool, port.Value);
+                }
+            }
+            listViewItem.SubItems["Pool"].Text = pool;
+        }
+
         private void RefreshDetailsAreaIfVisible()
         {
             if (!detailsAreaContainer.Panel2Collapsed)
@@ -1559,6 +1573,14 @@ private void deviceListView_ColumnClick(object sender, ColumnClickEventArgs e)
                 AutoSizeListViewColumns();
                 RefreshDetailsAreaIfVisible();
             }
+            else if (e.Column == poolColumnHeader.Index)
+            {
+                app.ApplicationConfiguration.ShowPoolPort = !app.ApplicationConfiguration.ShowPoolPort;
+                app.ApplicationConfiguration.SaveApplicationConfiguration();
+
+                app.RefreshAllDeviceStats();
+                AutoSizeListViewColumns();
+            }
         }
 
         private void columnHeaderMenu_Opening(object sender, CancelEventArgs e)