Refine Proxy config

- Move to seperate model

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>

shadowsocks-csharp/Controller/Service/TCPRelay.cs

@@ -412,10 +412,10 @@ namespace Shadowsocks.Controller
                 // Setting up proxy
                 IProxy remote;
                 EndPoint proxyEP;
-                if (_config.useProxy)
+                if (_config.proxy.useProxy)
                 {
                     remote = new Socks5Proxy();
-                    proxyEP = SocketUtil.GetEndPoint(_config.proxyServer, _config.proxyPort);
+                    proxyEP = SocketUtil.GetEndPoint(_config.proxy.proxyServer, _config.proxy.proxyPort);
                 }
                 else
                 {

shadowsocks-csharp/Controller/ShadowsocksController.cs

@@ -217,15 +217,15 @@ namespace Shadowsocks.Controller
 
         public void DisableProxy()
         {
-            _config.useProxy = false;
+            _config.proxy.useProxy = false;
             SaveConfig(_config);
         }
 
         public void EnableProxy(string proxy, int port)
         {
-            _config.useProxy = true;
-            _config.proxyServer = proxy;
-            _config.proxyPort = port;
+            _config.proxy.useProxy = true;
+            _config.proxy.proxyServer = proxy;
+            _config.proxy.proxyPort = port;
             SaveConfig(_config);
         }
 
@@ -356,6 +356,12 @@ namespace Shadowsocks.Controller
             Configuration.Save(_config);
         }
 
+        public void SaveProxyConfig(ProxyConfig newConfig)
+        {
+            _config.proxy = newConfig;
+            Configuration.Save(_config);
+        }
+
         public void UpdateLatency(Server server, TimeSpan latency)
         {
             if (_config.availabilityStatistics)

shadowsocks-csharp/Model/Configuration.cs

@@ -26,9 +26,7 @@ namespace Shadowsocks.Model
         public bool autoCheckUpdate;
         public bool isVerboseLogging;
         public LogViewerConfig logViewer;
-        public bool useProxy;
-        public string proxyServer;
-        public int proxyPort;
+        public ProxyConfig proxy;
 
         private static string CONFIG_FILE = "gui-config.json";
 

shadowsocks-csharp/Model/ProxyConfig.cs

@@ -0,0 +1,22 @@
+using Shadowsocks.View;
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace Shadowsocks.Model
+{
+    [Serializable]
+    public class ProxyConfig
+    {
+        public bool useProxy;
+        public string proxyServer;
+        public int proxyPort;
+
+        public ProxyConfig()
+        {
+            useProxy = false;
+            proxyServer = "";
+            proxyPort = 0;
+        }
+    }
+}

shadowsocks-csharp/View/ProxyForm.cs

@@ -1,116 +1,129 @@
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-using Shadowsocks.Controller;
-using Shadowsocks.Model;
-using Shadowsocks.Properties;
-
-namespace Shadowsocks.View
-{
-    public partial class ProxyForm : Form
-    {
-        private ShadowsocksController controller;
-
-        // this is a copy of configuration that we are working on
-        private Configuration _modifiedConfiguration;
-
-        public ProxyForm(ShadowsocksController controller)
-        {
-            this.Font = System.Drawing.SystemFonts.MessageBoxFont;
-            InitializeComponent();
-
-            UpdateTexts();
-            this.Icon = Icon.FromHandle(Resources.ssw128.GetHicon());
-
-            this.controller = controller;
-            controller.ConfigChanged += controller_ConfigChanged;
-
-            UpdateEnabled();
-            LoadCurrentConfiguration();
-        }
-
-        private void UpdateTexts()
-        {
-            UseProxyCheckBox.Text = I18N.GetString("Use Proxy");
-            ProxyAddrLabel.Text = I18N.GetString("Proxy Addr");
-            ProxyPortLable.Text = I18N.GetString("Proxy Port");
-            OKButton.Text = I18N.GetString("OK");
-            MyCancelButton.Text = I18N.GetString("Cancel");
-            this.Text = I18N.GetString("Edit Proxy");
-        }
-
-        private void controller_ConfigChanged(object sender, EventArgs e)
-        {
-            LoadCurrentConfiguration();
-        }
-
-        private void LoadCurrentConfiguration()
-        {
-            _modifiedConfiguration = controller.GetConfigurationCopy();
-
-            UseProxyCheckBox.Checked = _modifiedConfiguration.useProxy;
-            ProxyServerTextBox.Text = _modifiedConfiguration.proxyServer;
-            ProxyPortTextBox.Text = _modifiedConfiguration.proxyPort.ToString();
-        }
-
-        private void OKButton_Click(object sender, EventArgs e)
-        {
-            if (UseProxyCheckBox.Checked)
-            {
-                try
-                {
-                    var proxy = ProxyServerTextBox.Text;
-                    var port = int.Parse(ProxyPortTextBox.Text);
-                    Configuration.CheckServer(proxy);
-                    Configuration.CheckPort(port);
-
-                    controller.EnableProxy(proxy, port);
-                }
-                catch (FormatException)
-                {
-                    MessageBox.Show(I18N.GetString("Illegal port number format"));
-                    return;
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show(ex.Message);
-                    return;
-                }
-            }
-            else
-            {
-                controller.DisableProxy();
-            }
-            this.Close();
-        }
-
-        private void CancelButton_Click(object sender, EventArgs e)
-        {
-            this.Close();
-        }
-
-        private void ProxyForm_FormClosed(object sender, FormClosedEventArgs e)
-        {
-            controller.ConfigChanged -= controller_ConfigChanged;
-        }
-
-        private void UseProxyCheckBox_CheckedChanged(object sender, EventArgs e)
-        {
-            UpdateEnabled();
-        }
-
-        private void UpdateEnabled()
-        {
-            if (UseProxyCheckBox.Checked)
-            {
-                ProxyServerTextBox.Enabled = true;
-                ProxyPortTextBox.Enabled = true;
-            }
-            else
-            {
-                ProxyServerTextBox.Enabled = false;
-                ProxyPortTextBox.Enabled = false;
-            }
-        }
-    }
-}
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using Shadowsocks.Controller;
+using Shadowsocks.Model;
+using Shadowsocks.Properties;
+
+namespace Shadowsocks.View
+{
+    public partial class ProxyForm : Form
+    {
+        private ShadowsocksController controller;
+
+        // this is a copy of configuration that we are working on
+        private ProxyConfig _modifiedConfiguration;
+
+        public ProxyForm(ShadowsocksController controller)
+        {
+            this.Font = System.Drawing.SystemFonts.MessageBoxFont;
+            InitializeComponent();
+
+            UpdateTexts();
+            this.Icon = Icon.FromHandle(Resources.ssw128.GetHicon());
+
+            this.controller = controller;
+            controller.ConfigChanged += controller_ConfigChanged;
+
+            UpdateEnabled();
+            LoadCurrentConfiguration();
+        }
+
+        private void UpdateTexts()
+        {
+            UseProxyCheckBox.Text = I18N.GetString("Use Proxy");
+            ProxyAddrLabel.Text = I18N.GetString("Proxy Addr");
+            ProxyPortLable.Text = I18N.GetString("Proxy Port");
+            OKButton.Text = I18N.GetString("OK");
+            MyCancelButton.Text = I18N.GetString("Cancel");
+            this.Text = I18N.GetString("Edit Proxy");
+        }
+
+        private void controller_ConfigChanged(object sender, EventArgs e)
+        {
+            LoadCurrentConfiguration();
+        }
+
+        private void LoadCurrentConfiguration()
+        {
+            _modifiedConfiguration = controller.GetConfigurationCopy().proxy;
+            if(_modifiedConfiguration == null)
+                _modifiedConfiguration = new ProxyConfig();
+            UseProxyCheckBox.Checked = _modifiedConfiguration.useProxy;
+            ProxyServerTextBox.Text = _modifiedConfiguration.proxyServer;
+            ProxyPortTextBox.Text = _modifiedConfiguration.proxyPort.ToString();
+        }
+
+        private void OKButton_Click(object sender, EventArgs e)
+        {
+            if (UseProxyCheckBox.Checked)
+            {
+                try
+                {
+                    var proxy = ProxyServerTextBox.Text;
+                    var port = int.Parse(ProxyPortTextBox.Text);
+                    Configuration.CheckServer(proxy);
+                    Configuration.CheckPort(port);
+
+                    controller.EnableProxy(proxy, port);
+                }
+                catch (FormatException)
+                {
+                    MessageBox.Show(I18N.GetString("Illegal port number format"));
+                    return;
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(ex.Message);
+                    return;
+                }
+            }
+            else
+            {
+                controller.DisableProxy();
+            }
+            this.Close();
+        }
+
+        private void CancelButton_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        private void ProxyForm_FormClosed(object sender, FormClosedEventArgs e)
+        {
+            controller.ConfigChanged -= controller_ConfigChanged;
+            var conf = controller.GetConfigurationCopy().proxy;
+            if (conf == null)
+                conf = new ProxyConfig();
+            conf.useProxy = UseProxyCheckBox.Checked;
+            conf.proxyServer = ProxyServerTextBox.Text;
+            int tmpProxyPort;
+            int.TryParse(ProxyPortTextBox.Text, out tmpProxyPort);
+            conf.proxyPort = tmpProxyPort;
+            controller.SaveProxyConfig(conf);
+
+        }
+
+        private void UseProxyCheckBox_CheckedChanged(object sender, EventArgs e)
+        {
+            UpdateEnabled();
+        }
+
+        private void UpdateEnabled()
+        {
+            if (UseProxyCheckBox.Checked)
+            {
+                ProxyServerTextBox.Enabled = true;
+                ProxyPortTextBox.Enabled = true;
+            }
+            else
+            {
+                ProxyServerTextBox.Text = string.Empty;
+                ProxyPortTextBox.Text = string.Empty;
+                ProxyServerTextBox.Enabled = false;
+                ProxyPortTextBox.Enabled = false;
+            }
+        }
+    }
+}

shadowsocks-csharp/shadowsocks-csharp.csproj

@@ -139,6 +139,7 @@
     <Compile Include="3rd\zxing\ResultPoint.cs" />
     <Compile Include="3rd\zxing\ResultPointCallback.cs" />
     <Compile Include="3rd\zxing\WriterException.cs" />
+    <Compile Include="Model\ProxyConfig.cs" />
     <Compile Include="Proxy\DirectConnect.cs" />
     <Compile Include="Proxy\IProxy.cs" />
     <Compile Include="Controller\Service\AvailabilityStatistics.cs" />