From f080e69e82dc6b8a9a050ca03482042fd7c4c561 Mon Sep 17 00:00:00 2001
From: Michael Ushakov <um.nix.user@gmail.com>
Date: Sun, 5 Nov 2017 00:00:12 +0400
Subject: [PATCH 1/7] Design small update

---
 .../View/Forms/MainForm.Designer.cs           | 87 ++++++++++++++-----
 1 file changed, 66 insertions(+), 21 deletions(-)

diff --git a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.Designer.cs b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.Designer.cs
index 90eadae..d2155da 100644
--- a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.Designer.cs
+++ b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.Designer.cs
@@ -40,12 +40,16 @@ private void InitializeComponent()
             this._serverParametersBox = new System.Windows.Forms.GroupBox();
             this._serverParametersView = new System.Windows.Forms.ListView();
             this._applyButton = new System.Windows.Forms.Button();
-            this._serverTypeComboBox = new System.Windows.Forms.ComboBox();
             this._portTextBox = new System.Windows.Forms.TextBox();
             this._ipAddressComboBox = new System.Windows.Forms.ComboBox();
-            this._serverTypeLabel = new System.Windows.Forms.Label();
+            this._serverSettingsLabel = new System.Windows.Forms.Label();
             this._portLabel = new System.Windows.Forms.Label();
             this._ipAddressLabel = new System.Windows.Forms.Label();
+            this._serverSettingsBox = new System.Windows.Forms.TextBox();
+            this._serverSettingsButton = new System.Windows.Forms.Button();
+            this._serverScriptLabel = new System.Windows.Forms.Label();
+            this._serverScriptBox = new System.Windows.Forms.TextBox();
+            this._serverScriptButton = new System.Windows.Forms.Button();
             this._logsGroupBox.SuspendLayout();
             this._serverSettingsGroup.SuspendLayout();
             this._serverParametersBox.SuspendLayout();
@@ -107,14 +111,18 @@ private void InitializeComponent()
             // 
             // _serverSettingsGroup
             // 
+            this._serverSettingsGroup.Controls.Add(this._serverScriptButton);
+            this._serverSettingsGroup.Controls.Add(this._serverScriptBox);
+            this._serverSettingsGroup.Controls.Add(this._serverScriptLabel);
+            this._serverSettingsGroup.Controls.Add(this._serverSettingsButton);
+            this._serverSettingsGroup.Controls.Add(this._serverSettingsBox);
             this._serverSettingsGroup.Controls.Add(this._logLevelComboBox);
             this._serverSettingsGroup.Controls.Add(this._logLevelLabel);
             this._serverSettingsGroup.Controls.Add(this._serverParametersBox);
             this._serverSettingsGroup.Controls.Add(this._applyButton);
-            this._serverSettingsGroup.Controls.Add(this._serverTypeComboBox);
             this._serverSettingsGroup.Controls.Add(this._portTextBox);
             this._serverSettingsGroup.Controls.Add(this._ipAddressComboBox);
-            this._serverSettingsGroup.Controls.Add(this._serverTypeLabel);
+            this._serverSettingsGroup.Controls.Add(this._serverSettingsLabel);
             this._serverSettingsGroup.Controls.Add(this._portLabel);
             this._serverSettingsGroup.Controls.Add(this._ipAddressLabel);
             this._serverSettingsGroup.Location = new System.Drawing.Point(12, 12);
@@ -169,14 +177,6 @@ private void InitializeComponent()
             this._applyButton.Text = "Apply";
             this._applyButton.UseVisualStyleBackColor = true;
             // 
-            // _serverTypeComboBox
-            // 
-            this._serverTypeComboBox.FormattingEnabled = true;
-            this._serverTypeComboBox.Location = new System.Drawing.Point(97, 94);
-            this._serverTypeComboBox.Name = "_serverTypeComboBox";
-            this._serverTypeComboBox.Size = new System.Drawing.Size(121, 21);
-            this._serverTypeComboBox.TabIndex = 5;
-            // 
             // _portTextBox
             // 
             this._portTextBox.Location = new System.Drawing.Point(97, 58);
@@ -192,14 +192,14 @@ private void InitializeComponent()
             this._ipAddressComboBox.Size = new System.Drawing.Size(121, 21);
             this._ipAddressComboBox.TabIndex = 3;
             // 
-            // _serverTypeLabel
+            // _serverSettingsLabel
             // 
-            this._serverTypeLabel.AutoSize = true;
-            this._serverTypeLabel.Location = new System.Drawing.Point(16, 97);
-            this._serverTypeLabel.Name = "_serverTypeLabel";
-            this._serverTypeLabel.Size = new System.Drawing.Size(68, 13);
-            this._serverTypeLabel.TabIndex = 2;
-            this._serverTypeLabel.Text = "Server Type:";
+            this._serverSettingsLabel.AutoSize = true;
+            this._serverSettingsLabel.Location = new System.Drawing.Point(16, 97);
+            this._serverSettingsLabel.Name = "_serverSettingsLabel";
+            this._serverSettingsLabel.Size = new System.Drawing.Size(82, 13);
+            this._serverSettingsLabel.TabIndex = 2;
+            this._serverSettingsLabel.Text = "Server Settings:";
             // 
             // _portLabel
             // 
@@ -219,6 +219,47 @@ private void InitializeComponent()
             this._ipAddressLabel.TabIndex = 0;
             this._ipAddressLabel.Text = "IP Address:";
             // 
+            // _serverSettingsBox
+            // 
+            this._serverSettingsBox.Location = new System.Drawing.Point(97, 94);
+            this._serverSettingsBox.Name = "_serverSettingsBox";
+            this._serverSettingsBox.Size = new System.Drawing.Size(97, 20);
+            this._serverSettingsBox.TabIndex = 10;
+            // 
+            // _serverSettingsButton
+            // 
+            this._serverSettingsButton.Location = new System.Drawing.Point(194, 92);
+            this._serverSettingsButton.Name = "_serverSettingsButton";
+            this._serverSettingsButton.Size = new System.Drawing.Size(24, 22);
+            this._serverSettingsButton.TabIndex = 11;
+            this._serverSettingsButton.Text = "...";
+            this._serverSettingsButton.UseVisualStyleBackColor = true;
+            // 
+            // _serverScriptLabel
+            // 
+            this._serverScriptLabel.AutoSize = true;
+            this._serverScriptLabel.Location = new System.Drawing.Point(16, 133);
+            this._serverScriptLabel.Name = "_serverScriptLabel";
+            this._serverScriptLabel.Size = new System.Drawing.Size(71, 13);
+            this._serverScriptLabel.TabIndex = 12;
+            this._serverScriptLabel.Text = "Server Script:";
+            // 
+            // _serverScriptBox
+            // 
+            this._serverScriptBox.Location = new System.Drawing.Point(96, 130);
+            this._serverScriptBox.Name = "_serverScriptBox";
+            this._serverScriptBox.Size = new System.Drawing.Size(98, 20);
+            this._serverScriptBox.TabIndex = 13;
+            // 
+            // _serverScriptButton
+            // 
+            this._serverScriptButton.Location = new System.Drawing.Point(194, 128);
+            this._serverScriptButton.Name = "_serverScriptButton";
+            this._serverScriptButton.Size = new System.Drawing.Size(24, 22);
+            this._serverScriptButton.TabIndex = 14;
+            this._serverScriptButton.Text = "...";
+            this._serverScriptButton.UseVisualStyleBackColor = true;
+            // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -248,18 +289,22 @@ private void InitializeComponent()
         private System.Windows.Forms.GroupBox _logsGroupBox;
         private System.Windows.Forms.ListBox _clientsListBox;
         private System.Windows.Forms.GroupBox _serverSettingsGroup;
-        private System.Windows.Forms.Label _serverTypeLabel;
+        private System.Windows.Forms.Label _serverSettingsLabel;
         private System.Windows.Forms.Label _portLabel;
         private System.Windows.Forms.Label _ipAddressLabel;
         private System.Windows.Forms.ComboBox _ipAddressComboBox;
         private System.Windows.Forms.TextBox _portTextBox;
-        private System.Windows.Forms.ComboBox _serverTypeComboBox;
         private System.Windows.Forms.Button _applyButton;
         private System.Windows.Forms.RichTextBox _logsTextBox;
         private System.Windows.Forms.GroupBox _serverParametersBox;
         private System.Windows.Forms.ListView _serverParametersView;
         private System.Windows.Forms.ComboBox _logLevelComboBox;
         private System.Windows.Forms.Label _logLevelLabel;
+        private System.Windows.Forms.Button _serverScriptButton;
+        private System.Windows.Forms.TextBox _serverScriptBox;
+        private System.Windows.Forms.Label _serverScriptLabel;
+        private System.Windows.Forms.Button _serverSettingsButton;
+        private System.Windows.Forms.TextBox _serverSettingsBox;
     }
 }
 

From 135e352d4188accab95d07b86788ae8966b7578e Mon Sep 17 00:00:00 2001
From: Michael Ushakov <um.nix.user@gmail.com>
Date: Sun, 5 Nov 2017 20:36:58 +0400
Subject: [PATCH 2/7] Script selection

---
 .../View/Forms/MainForm.cs                    | 44 ++++++++++++-------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs
index 658249e..af4e175 100644
--- a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs
+++ b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs
@@ -27,6 +27,7 @@ public MainForm()
             _startButton.Click += (sender, args) => Start();
             _stopButton.Click += (sender, args) => Stop();
             _restartButton.Click += (sender, args) => Restart();
+            _serverScriptButton.Click += OnChooseScriptFileButtonClick;
             _logLevelComboBox.SelectedIndexChanged += (sender, args) => ApplyLogLevel();
         }
 
@@ -54,9 +55,9 @@ private void FillControls()
             }
 
             // add server type
-            foreach (KeyValuePair<ServerType, String> server in _servers)
-                _serverTypeComboBox.Items.Add(server.Value);
-            _serverTypeComboBox.SelectedIndex = 0;
+            //foreach (KeyValuePair<ServerType, String> server in _servers)
+                //_serverTypeComboBox.Items.Add(server.Value);
+            //_serverTypeComboBox.SelectedIndex = 0;
 
             // init logger + fill log level
             XmlConfigurator.Configure();
@@ -87,14 +88,8 @@ private void ApplySettings(IDictionary<String, String> options)
 
         private void Start()
         {
-            // getting server type
-            if (_serverTypeComboBox.SelectedIndex < 0)
-            {
-                // log
-                return;
-            }
             ServerType serverType = ServerType.Scripting;
-            foreach (KeyValuePair<ServerType, String> server in _servers)
+/*            foreach (KeyValuePair<ServerType, String> server in _servers)
             {
                 if (String.Equals(_serverTypeComboBox.Items[_serverTypeComboBox.SelectedIndex].ToString(), server.Value))
                     serverType = server.Key;
@@ -110,7 +105,7 @@ private void Start()
                 System.Threading.Timer periodicalUpdater = new System.Threading.Timer(StateUpdater, null, 500, 500);
                 _timers[0] = periodicalUpdater;
             }
-            else _timers[0].Change(500, 500);
+            else _timers[0].Change(500, 500);*/
         }
 
         public void Stop()
@@ -129,6 +124,19 @@ public void Restart()
             Start();
         }
 
+        public void OnChooseScriptFileButtonClick(Object sender, EventArgs args)
+        {
+            OpenFileDialog openScriptFile = new OpenFileDialog();
+            openScriptFile.RestoreDirectory = true;
+            openScriptFile.Title = @"Choose C# script file";
+            openScriptFile.Filter = @" CSharp files (*.cs)|*.cs";
+            if (openScriptFile.ShowDialog() == DialogResult.OK)
+            {
+                _scriptFile = openScriptFile.SafeFileName;
+                _serverScriptBox.Text = Path.GetFileName(_scriptFile);
+            }
+        }
+
         void UpdateControlsState()
         {
             if (_server == null)
@@ -174,18 +182,24 @@ void ApplyLogLevel()
         private const String TotalClientsTemplate = "Total connected clients: {0}";
         private const String ClientInfoTemplate = "Client {0}, ip: {1}";
 
-        private readonly IDictionary<ServerType, String> _servers = new Dictionary<ServerType, String>()
+/*        private readonly IDictionary<ServerType, String> _servers = new Dictionary<ServerType, String>()
         {
             {ServerType.Echo, "Echo server"},
             {ServerType.Time, "Time server"},
-        };
+        };*/
 
         private readonly IDictionary<Level, String> _logLevels = new Dictionary<Level, String>()
         {
-            {Level.Alert, "Alert"}, {Level.Critical, "Critical"}, {Level.Debug, "Debug"},
-            {Level.Emergency, "Emergency"}, {Level.Error, "Error"}, {Level.Info, "Info"}, {Level.Warn, "Warn"}
+            {Level.Alert, "Alert"}, 
+            {Level.Critical, "Critical"}, 
+            {Level.Debug, "Debug"},
+            {Level.Emergency, "Emergency"}, 
+            {Level.Error, "Error"}, 
+            {Level.Info, "Info"}, 
+            {Level.Warn, "Warn"}
         };
 
+        private String _scriptFile;
         private ILog _logger;
         private RichTextBoxAppender _richTextBoxAppender;
         private readonly TcpServerConfig _serverConfig = new TcpServerConfig();

From 2fe56b64872108ee22be2d035828235b4b4f9db6 Mon Sep 17 00:00:00 2001
From: Michael Ushakov <um.nix.user@gmail.com>
Date: Sun, 5 Nov 2017 20:44:54 +0400
Subject: [PATCH 3/7] Gui update, server usage from nuget

---
 .../Data/ServerType.cs                        |  12 ----------
 .../Factories/ServerFactory.cs                |  14 ++++++++++++
 .../MossbauerLab.TinyTcpServer.MnGUI.csproj   |  17 +++++++-------
 .../View/Forms/Factories/ServerFactory.cs     |  21 ------------------
 .../View/Forms/MainForm.cs                    |   3 +--
 .../packages.config                           |   5 +++++
 .../lib/MossbauerLab.SimpleExtensions.dll     | Bin 6656 -> 0 bytes
 .../lib/MossbauerLab.TinyTcpServer.Core.dll   | Bin 23552 -> 0 bytes
 8 files changed, 28 insertions(+), 44 deletions(-)
 delete mode 100644 GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/Data/ServerType.cs
 create mode 100644 GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/Factories/ServerFactory.cs
 delete mode 100644 GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/Factories/ServerFactory.cs
 create mode 100644 GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/packages.config
 delete mode 100644 GUI/MossbauerLab.TinyTcpServer.MnGUI/lib/MossbauerLab.SimpleExtensions.dll
 delete mode 100644 GUI/MossbauerLab.TinyTcpServer.MnGUI/lib/MossbauerLab.TinyTcpServer.Core.dll

diff --git a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/Data/ServerType.cs b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/Data/ServerType.cs
deleted file mode 100644
index c5798c9..0000000
--- a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/Data/ServerType.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace MossbauerLab.TinyTcpServer.MnGUI.Data
-{
-    [Flags]
-    public enum ServerType
-    {
-        Echo,
-        Time,
-        Scripting     // this option is for Server specifying with script
-    }
-}
diff --git a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/Factories/ServerFactory.cs b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/Factories/ServerFactory.cs
new file mode 100644
index 0000000..f99f8f1
--- /dev/null
+++ b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/Factories/ServerFactory.cs
@@ -0,0 +1,14 @@
+using System;
+using log4net;
+using MossbauerLab.TinyTcpServer.Core.Server;
+
+namespace MossbauerLab.TinyTcpServer.MnGUI.Factories
+{
+    public static class ServerFactory
+    {
+        public static ITcpServer Create(String ipAddress, UInt16 port, String serverScriptFile, ILog logger = null, TcpServerConfig config = null)
+        {
+            return new FlexibleTcpServer(serverScriptFile, ipAddress, port, logger, false, config);
+        }
+    }
+}
diff --git a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI.csproj b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI.csproj
index cf0cc1e..f0d394c 100644
--- a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI.csproj
+++ b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI.csproj
@@ -32,14 +32,13 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net">
-      <HintPath>..\lib\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="MossbauerLab.SimpleExtensions">
-      <HintPath>..\lib\MossbauerLab.SimpleExtensions.dll</HintPath>
-    </Reference>
-    <Reference Include="MossbauerLab.TinyTcpServer.Core">
-      <HintPath>..\lib\MossbauerLab.TinyTcpServer.Core.dll</HintPath>
+    <Reference Include="MossbauerLab.TinyTcpServer.Core, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MossbauerLab.TinyTcpServer.Core.1.2.0\lib\net40\MossbauerLab.TinyTcpServer.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -53,9 +52,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Data\ServerType.cs" />
     <Compile Include="LogUtils\RichTextBoxAppender.cs" />
-    <Compile Include="View\Forms\Factories\ServerFactory.cs" />
+    <Compile Include="Factories\ServerFactory.cs" />
     <Compile Include="View\Helpers\ServerConfigInfoHelper.cs" />
     <Compile Include="View\Forms\MainForm.cs">
       <SubType>Form</SubType>
@@ -78,6 +76,7 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <None Include="App.config" />
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/Factories/ServerFactory.cs b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/Factories/ServerFactory.cs
deleted file mode 100644
index 6deba98..0000000
--- a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/Factories/ServerFactory.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using log4net;
-using MossbauerLab.SimpleExtensions.Echo;
-using MossbauerLab.SimpleExtensions.Time;
-using MossbauerLab.TinyTcpServer.Core.Server;
-using MossbauerLab.TinyTcpServer.MnGUI.Data;
-
-namespace MossbauerLab.TinyTcpServer.MnGUI.Factories
-{
-    public static class ServerFactory
-    {
-        public static ITcpServer Create(ServerType type, String ipAddress, UInt16 port, ILog logger = null, TcpServerConfig config = null)
-        {
-            if(type == ServerType.Echo)
-                return new EchoTcpServer(ipAddress, port, logger, false, config);
-            if(type == ServerType.Time)
-                return new TimeTcpServer(ipAddress, port, logger, false, config);
-            throw new NotImplementedException("Other types were not implemented");
-        }
-    }
-}
diff --git a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs
index af4e175..5e80779 100644
--- a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs
+++ b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs
@@ -11,7 +11,6 @@
 using log4net.Repository.Hierarchy;
 using MossbauerLab.TinyTcpServer.Core.Client;
 using MossbauerLab.TinyTcpServer.Core.Server;
-using MossbauerLab.TinyTcpServer.MnGUI.Data;
 using MossbauerLab.TinyTcpServer.MnGUI.Factories;
 using MossbauerLab.TinyTcpServer.MnGUI.LogUtils;
 using MossbauerLab.TinyTcpServer.MnGUI.View.Helpers;
@@ -88,7 +87,7 @@ private void ApplySettings(IDictionary<String, String> options)
 
         private void Start()
         {
-            ServerType serverType = ServerType.Scripting;
+            //ServerType serverType = ServerType.Scripting;
 /*            foreach (KeyValuePair<ServerType, String> server in _servers)
             {
                 if (String.Equals(_serverTypeComboBox.Items[_serverTypeComboBox.SelectedIndex].ToString(), server.Value))
diff --git a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/packages.config b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/packages.config
new file mode 100644
index 0000000..0d6e450
--- /dev/null
+++ b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.3" targetFramework="net40" />
+  <package id="MossbauerLab.TinyTcpServer.Core" version="1.2.0" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/GUI/MossbauerLab.TinyTcpServer.MnGUI/lib/MossbauerLab.SimpleExtensions.dll b/GUI/MossbauerLab.TinyTcpServer.MnGUI/lib/MossbauerLab.SimpleExtensions.dll
deleted file mode 100644
index 7bab19abf40728d2587fe065a7f1ed12f9653c9f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6656
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
S^*`fG{ek=LtH8TD<9`7c9VnOp

diff --git a/GUI/MossbauerLab.TinyTcpServer.MnGUI/lib/MossbauerLab.TinyTcpServer.Core.dll b/GUI/MossbauerLab.TinyTcpServer.MnGUI/lib/MossbauerLab.TinyTcpServer.Core.dll
deleted file mode 100644
index f8edbe989240e52cfb52f6b2ee2875f91799b46e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 23552
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%0AuhU|98
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
V-vguS?^*qX6WbrJ|L;8TzW{<g3_<_^


From 7e6e9ff14fa9d1200d892a971bfb7410a60ff0f4 Mon Sep 17 00:00:00 2001
From: Michael Ushakov <um.nix.user@gmail.com>
Date: Sun, 5 Nov 2017 21:21:15 +0400
Subject: [PATCH 4/7] Added util class, ssome fixes in controls position

---
 .../MossbauerLab.TinyTcpServer.MnGUI.csproj   |  1 +
 .../View/Forms/MainForm.Designer.cs           | 92 +++++++++----------
 .../View/Forms/MainForm.cs                    | 59 +++++++-----
 .../View/Utils/OpenDialogRunner.cs            | 24 +++++
 4 files changed, 107 insertions(+), 69 deletions(-)
 create mode 100644 GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Utils/OpenDialogRunner.cs

diff --git a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI.csproj b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI.csproj
index f0d394c..89ab39f 100644
--- a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI.csproj
+++ b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI.csproj
@@ -63,6 +63,7 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="View\Utils\OpenDialogRunner.cs" />
     <EmbeddedResource Include="View\Forms\MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.Designer.cs b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.Designer.cs
index d2155da..b1d36b4 100644
--- a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.Designer.cs
+++ b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.Designer.cs
@@ -35,6 +35,11 @@ private void InitializeComponent()
             this._logsTextBox = new System.Windows.Forms.RichTextBox();
             this._clientsListBox = new System.Windows.Forms.ListBox();
             this._serverSettingsGroup = new System.Windows.Forms.GroupBox();
+            this._serverScriptButton = new System.Windows.Forms.Button();
+            this._serverScriptBox = new System.Windows.Forms.TextBox();
+            this._serverScriptLabel = new System.Windows.Forms.Label();
+            this._serverSettingsButton = new System.Windows.Forms.Button();
+            this._serverSettingsBox = new System.Windows.Forms.TextBox();
             this._logLevelComboBox = new System.Windows.Forms.ComboBox();
             this._logLevelLabel = new System.Windows.Forms.Label();
             this._serverParametersBox = new System.Windows.Forms.GroupBox();
@@ -45,11 +50,6 @@ private void InitializeComponent()
             this._serverSettingsLabel = new System.Windows.Forms.Label();
             this._portLabel = new System.Windows.Forms.Label();
             this._ipAddressLabel = new System.Windows.Forms.Label();
-            this._serverSettingsBox = new System.Windows.Forms.TextBox();
-            this._serverSettingsButton = new System.Windows.Forms.Button();
-            this._serverScriptLabel = new System.Windows.Forms.Label();
-            this._serverScriptBox = new System.Windows.Forms.TextBox();
-            this._serverScriptButton = new System.Windows.Forms.Button();
             this._logsGroupBox.SuspendLayout();
             this._serverSettingsGroup.SuspendLayout();
             this._serverParametersBox.SuspendLayout();
@@ -132,6 +132,47 @@ private void InitializeComponent()
             this._serverSettingsGroup.TabStop = false;
             this._serverSettingsGroup.Text = "Server settings";
             // 
+            // _serverScriptButton
+            // 
+            this._serverScriptButton.Location = new System.Drawing.Point(194, 130);
+            this._serverScriptButton.Name = "_serverScriptButton";
+            this._serverScriptButton.Size = new System.Drawing.Size(24, 20);
+            this._serverScriptButton.TabIndex = 14;
+            this._serverScriptButton.Text = "...";
+            this._serverScriptButton.UseVisualStyleBackColor = true;
+            // 
+            // _serverScriptBox
+            // 
+            this._serverScriptBox.Location = new System.Drawing.Point(96, 130);
+            this._serverScriptBox.Name = "_serverScriptBox";
+            this._serverScriptBox.Size = new System.Drawing.Size(98, 20);
+            this._serverScriptBox.TabIndex = 13;
+            // 
+            // _serverScriptLabel
+            // 
+            this._serverScriptLabel.AutoSize = true;
+            this._serverScriptLabel.Location = new System.Drawing.Point(16, 133);
+            this._serverScriptLabel.Name = "_serverScriptLabel";
+            this._serverScriptLabel.Size = new System.Drawing.Size(71, 13);
+            this._serverScriptLabel.TabIndex = 12;
+            this._serverScriptLabel.Text = "Server Script:";
+            // 
+            // _serverSettingsButton
+            // 
+            this._serverSettingsButton.Location = new System.Drawing.Point(194, 94);
+            this._serverSettingsButton.Name = "_serverSettingsButton";
+            this._serverSettingsButton.Size = new System.Drawing.Size(24, 20);
+            this._serverSettingsButton.TabIndex = 11;
+            this._serverSettingsButton.Text = "...";
+            this._serverSettingsButton.UseVisualStyleBackColor = true;
+            // 
+            // _serverSettingsBox
+            // 
+            this._serverSettingsBox.Location = new System.Drawing.Point(97, 94);
+            this._serverSettingsBox.Name = "_serverSettingsBox";
+            this._serverSettingsBox.Size = new System.Drawing.Size(97, 20);
+            this._serverSettingsBox.TabIndex = 10;
+            // 
             // _logLevelComboBox
             // 
             this._logLevelComboBox.FormattingEnabled = true;
@@ -219,47 +260,6 @@ private void InitializeComponent()
             this._ipAddressLabel.TabIndex = 0;
             this._ipAddressLabel.Text = "IP Address:";
             // 
-            // _serverSettingsBox
-            // 
-            this._serverSettingsBox.Location = new System.Drawing.Point(97, 94);
-            this._serverSettingsBox.Name = "_serverSettingsBox";
-            this._serverSettingsBox.Size = new System.Drawing.Size(97, 20);
-            this._serverSettingsBox.TabIndex = 10;
-            // 
-            // _serverSettingsButton
-            // 
-            this._serverSettingsButton.Location = new System.Drawing.Point(194, 92);
-            this._serverSettingsButton.Name = "_serverSettingsButton";
-            this._serverSettingsButton.Size = new System.Drawing.Size(24, 22);
-            this._serverSettingsButton.TabIndex = 11;
-            this._serverSettingsButton.Text = "...";
-            this._serverSettingsButton.UseVisualStyleBackColor = true;
-            // 
-            // _serverScriptLabel
-            // 
-            this._serverScriptLabel.AutoSize = true;
-            this._serverScriptLabel.Location = new System.Drawing.Point(16, 133);
-            this._serverScriptLabel.Name = "_serverScriptLabel";
-            this._serverScriptLabel.Size = new System.Drawing.Size(71, 13);
-            this._serverScriptLabel.TabIndex = 12;
-            this._serverScriptLabel.Text = "Server Script:";
-            // 
-            // _serverScriptBox
-            // 
-            this._serverScriptBox.Location = new System.Drawing.Point(96, 130);
-            this._serverScriptBox.Name = "_serverScriptBox";
-            this._serverScriptBox.Size = new System.Drawing.Size(98, 20);
-            this._serverScriptBox.TabIndex = 13;
-            // 
-            // _serverScriptButton
-            // 
-            this._serverScriptButton.Location = new System.Drawing.Point(194, 128);
-            this._serverScriptButton.Name = "_serverScriptButton";
-            this._serverScriptButton.Size = new System.Drawing.Size(24, 22);
-            this._serverScriptButton.TabIndex = 14;
-            this._serverScriptButton.Text = "...";
-            this._serverScriptButton.UseVisualStyleBackColor = true;
-            // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
diff --git a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs
index 5e80779..0477f9b 100644
--- a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs
+++ b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs
@@ -14,6 +14,7 @@
 using MossbauerLab.TinyTcpServer.MnGUI.Factories;
 using MossbauerLab.TinyTcpServer.MnGUI.LogUtils;
 using MossbauerLab.TinyTcpServer.MnGUI.View.Helpers;
+using MossbauerLab.TinyTcpServer.MnGUI.View.Utils;
 
 namespace MossbauerLab.TinyTcpServer.MnGUI.View.Forms
 {
@@ -27,6 +28,7 @@ public MainForm()
             _stopButton.Click += (sender, args) => Stop();
             _restartButton.Click += (sender, args) => Restart();
             _serverScriptButton.Click += OnChooseScriptFileButtonClick;
+            _serverSettingsButton.Click += OnChooseSettingsFileButtonClick;
             _logLevelComboBox.SelectedIndexChanged += (sender, args) => ApplyLogLevel();
         }
 
@@ -53,10 +55,6 @@ private void FillControls()
                 _portTextBox.Text = DefaultTcpPort.ToString();
             }
 
-            // add server type
-            //foreach (KeyValuePair<ServerType, String> server in _servers)
-                //_serverTypeComboBox.Items.Add(server.Value);
-            //_serverTypeComboBox.SelectedIndex = 0;
 
             // init logger + fill log level
             XmlConfigurator.Configure();
@@ -71,6 +69,8 @@ private void FillControls()
             IList<String> configStrings = ServerConfigInfoHelper.GetConfigStrings(_serverConfig);
             foreach (String configString in configStrings)
                 _serverParametersView.Items.Add(configString);
+            // update controls state
+            UpdateControlsState();
         }
 
         private IDictionary<String, String> GetOptions(String[] lines)
@@ -123,23 +123,39 @@ public void Restart()
             Start();
         }
 
-        public void OnChooseScriptFileButtonClick(Object sender, EventArgs args)
+        private void OnChooseScriptFileButtonClick(Object sender, EventArgs args)
         {
             OpenFileDialog openScriptFile = new OpenFileDialog();
-            openScriptFile.RestoreDirectory = true;
-            openScriptFile.Title = @"Choose C# script file";
-            openScriptFile.Filter = @" CSharp files (*.cs)|*.cs";
-            if (openScriptFile.ShowDialog() == DialogResult.OK)
+            String file = openScriptFile.Run(@" CSharp files (*.cs)|*.cs", Path.GetFullPath("."), @"Choose C# script file", 0);
+            if (file != String.Empty)
             {
-                _scriptFile = openScriptFile.SafeFileName;
+                _scriptFile = file;
                 _serverScriptBox.Text = Path.GetFileName(_scriptFile);
             }
         }
 
-        void UpdateControlsState()
+        private void OnChooseSettingsFileButtonClick(Object sender, EventArgs args)
+        {
+            OpenFileDialog openScriptFile = new OpenFileDialog();
+            String file = openScriptFile.Run(@" Text files (*.txt)|*.txt | Config files (*.conf) |*.conf | Config files (*.cfg) |*.cfg | Any file (*.*)|*.*", 
+                                             Path.GetFullPath("."), @"Choose Server settings file", 0);
+            if (file != String.Empty)
+            {
+                _settingsFile = file;
+                _serverSettingsBox.Text = Path.GetFileName(_settingsFile);
+            }
+        }
+
+        private void UpdateControlsState()
         {
             if (_server == null)
+            {
+                _startButton.Enabled = true;
+                _restartButton.Enabled = false;
+                _stopButton.Enabled = false;
                 return;
+            }
+            
             _startButton.Enabled = !_server.IsReady;
             _restartButton.Enabled = _server.IsReady;
             _stopButton.Enabled = _server.IsReady;
@@ -149,7 +165,7 @@ void UpdateControlsState()
             _portTextBox.Enabled = !_server.IsReady;
         }
 
-        void PopulateClients()
+        private void PopulateClients()
         {
             _clientsListBox.Items.Clear();
             IList<TcpClientContext> clients = _server.Clients;
@@ -164,13 +180,13 @@ void PopulateClients()
             }
         }
 
-        void StateUpdater(Object state)
+        private void StateUpdater(Object state)
         {
             BeginInvoke((Action)(UpdateControlsState));
             BeginInvoke((Action) PopulateClients);
         }
 
-        void ApplyLogLevel()
+        private void ApplyLogLevel()
         {
             Hierarchy hierarchy = (Hierarchy)LogManager.GetRepository();
             hierarchy.Threshold =_logLevels.First(item => item.Value.Equals(_logLevelComboBox.Items[_logLevelComboBox.SelectedIndex].ToString())).Key;
@@ -179,13 +195,8 @@ void ApplyLogLevel()
         private const String ConfigFile = @".\settings.txt";
         private const UInt16 DefaultTcpPort = 9999;
         private const String TotalClientsTemplate = "Total connected clients: {0}";
-        private const String ClientInfoTemplate = "Client {0}, ip: {1}";
+        private const String ClientInfoTemplate = "Client {0}, ip: {1}"; // todo: umv add sctipt and settings ....
 
-/*        private readonly IDictionary<ServerType, String> _servers = new Dictionary<ServerType, String>()
-        {
-            {ServerType.Echo, "Echo server"},
-            {ServerType.Time, "Time server"},
-        };*/
 
         private readonly IDictionary<Level, String> _logLevels = new Dictionary<Level, String>()
         {
@@ -198,11 +209,13 @@ void ApplyLogLevel()
             {Level.Warn, "Warn"}
         };
 
-        private String _scriptFile;
+        
         private ILog _logger;
-        private RichTextBoxAppender _richTextBoxAppender;
-        private readonly TcpServerConfig _serverConfig = new TcpServerConfig();
         private ITcpServer _server;
+        private String _scriptFile;
+        private String _settingsFile;
+        private readonly TcpServerConfig _serverConfig = new TcpServerConfig();
+        private RichTextBoxAppender _richTextBoxAppender;
         private readonly System.Threading.Timer[] _timers = new System.Threading.Timer[1];
     }
 }
diff --git a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Utils/OpenDialogRunner.cs b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Utils/OpenDialogRunner.cs
new file mode 100644
index 0000000..b6b590c
--- /dev/null
+++ b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Utils/OpenDialogRunner.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Windows.Forms;
+
+namespace MossbauerLab.TinyTcpServer.MnGUI.View.Utils
+{
+    public static class OpenDialogRunner
+    {
+        public static String Run(this OpenFileDialog fileDlg, String filterString, String initialPath, String dialogTitle, UInt16 filterIndex)
+        {
+            fileDlg.Title = dialogTitle;
+            if (!String.IsNullOrEmpty(initialPath))
+                fileDlg.InitialDirectory = initialPath;
+            fileDlg.RestoreDirectory = true;
+            fileDlg.Filter = filterString;
+            fileDlg.FilterIndex = filterIndex;
+
+            if (fileDlg.ShowDialog() == DialogResult.OK)
+            {
+                return fileDlg.FileName;
+            }
+            return String.Empty;
+        }
+    }
+}

From 93e60669931fa436f245064cd82d4cbce50fa169 Mon Sep 17 00:00:00 2001
From: Michael Ushakov <um.nix.user@gmail.com>
Date: Sun, 5 Nov 2017 22:37:06 +0400
Subject: [PATCH 5/7] Server start restored

---
 .../View/Forms/MainForm.cs                    | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs
index 0477f9b..a8b42c2 100644
--- a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs
+++ b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs
@@ -87,24 +87,26 @@ private void ApplySettings(IDictionary<String, String> options)
 
         private void Start()
         {
-            //ServerType serverType = ServerType.Scripting;
-/*            foreach (KeyValuePair<ServerType, String> server in _servers)
-            {
-                if (String.Equals(_serverTypeComboBox.Items[_serverTypeComboBox.SelectedIndex].ToString(), server.Value))
-                    serverType = server.Key;
-            }
+            UInt16 port = Convert.ToUInt16(_portTextBox.Text);
             if (_server == null)
-            { 
-                _server = ServerFactory.Create(serverType, _ipAddressComboBox.Items[_ipAddressComboBox.SelectedIndex].ToString(), 
-                                               UInt16.Parse(_portTextBox.Text), _logger, _serverConfig);
+            {
+                if (_ipAddressComboBox.SelectedIndex >= 0 && _portTextBox.Text != null && !String.IsNullOrEmpty(_scriptFile))
+                    _server = ServerFactory.Create(_ipAddressComboBox.Items[_ipAddressComboBox.SelectedIndex].ToString(), port, _scriptFile, _logger, _serverConfig);
+                else
+                {
+                    MessageBox.Show(@"Can not start server, please select IP address, port and server script");
+                    return;
+                }
+                _server.Start();
             }
-            _server.Start();
+            else  _server.Start(_ipAddressComboBox.Items[_ipAddressComboBox.SelectedIndex].ToString(), port);
+
             if (_timers[0] == null)
             {
                 System.Threading.Timer periodicalUpdater = new System.Threading.Timer(StateUpdater, null, 500, 500);
                 _timers[0] = periodicalUpdater;
             }
-            else _timers[0].Change(500, 500);*/
+            else _timers[0].Change(500, 500);
         }
 
         public void Stop()

From 9e5ac5fdcbb7e1ef37ef9783511b2416d38d8de3 Mon Sep 17 00:00:00 2001
From: Michael Ushakov <um.nix.user@gmail.com>
Date: Sun, 5 Nov 2017 23:12:17 +0400
Subject: [PATCH 6/7] Was copied TcpServerConfigBuilder from console project,
 read config

---
 .../Helpers/TcpServerConfigBuilder.cs         | 88 +++++++++++++++++++
 .../MossbauerLab.TinyTcpServer.MnGUI.csproj   |  1 +
 .../View/Forms/MainForm.Designer.cs           | 36 ++++----
 .../View/Forms/MainForm.cs                    | 60 ++++++-------
 4 files changed, 135 insertions(+), 50 deletions(-)
 create mode 100644 GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/Helpers/TcpServerConfigBuilder.cs

diff --git a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/Helpers/TcpServerConfigBuilder.cs b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/Helpers/TcpServerConfigBuilder.cs
new file mode 100644
index 0000000..fd7b124
--- /dev/null
+++ b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/Helpers/TcpServerConfigBuilder.cs
@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using MossbauerLab.TinyTcpServer.Core.Server;
+
+namespace MossbauerLab.TinyTcpServer.MnGUI.Helpers
+{
+    public static class TcpServerConfigBuilder
+    {
+        public static TcpServerConfig Build(String serverConfig)
+        {
+            if(String.IsNullOrEmpty(serverConfig))
+                throw new ArgumentNullException("serverConfig");
+            if(!File.Exists(serverConfig))
+                throw new ApplicationException("Config file does not exists");
+            IList<String> content = File.ReadAllLines(serverConfig).Select(line=>line.Trim().ToLower())
+                                                                   .Where(line => !String.IsNullOrEmpty(line))
+                                                                   .Where(line => !line.StartsWith(CommentarySymbol))
+                                                                   .ToList();
+            TcpServerConfig config = new TcpServerConfig();
+            Int32 value = GetConfigurationValue(content, ParallelTaskKey);
+            if (value != -1)                     // otherwise we using default value
+                config.ParallelTask = value;
+            value = GetConfigurationValue(content, ClientBufferSizeKey);
+            if (value != -1)                     // otherwise we using default value
+                config.ClientBufferSize = value;
+            value = GetConfigurationValue(content, ChunkSizeKey);
+            if (value != -1)                     // otherwise we using default value
+                config.ChunkSize = value;
+            value = GetConfigurationValue(content, ClientConnectAttemptsKey);
+            if (value != -1)                     // otherwise we using default value
+                config.ClientConnectAttempts = value;
+            value = GetConfigurationValue(content, ClientConnectTimeoutKey);
+            if (value != -1)                     // otherwise we using default value
+                config.ClientConnectTimeout = value;
+            value = GetConfigurationValue(content, ClientInactivityTimeKey);
+            if (value != -1)                     // otherwise we using default value
+                config.ClientInactivityTime = value;
+            value = GetConfigurationValue(content, ReadTimeoutKey);
+            if (value != -1)                     // otherwise we using default value
+                config.ReadTimeout = value;
+            value = GetConfigurationValue(content, WriteTimeoutKey);
+            if (value != -1)                     // otherwise we using default value
+                config.WriteTimeout = value;
+            value = GetConfigurationValue(content, ClientReadAttemptsKey);
+            if (value != -1)                     // otherwise we using default value
+                config.ClientReadAttempts= value;
+            value = GetConfigurationValue(content, ServerCloseTimeoutKey);
+            if (value != -1)                     // otherwise we using default value
+                config.ServerCloseTimeout = value;
+            return config;
+        }
+
+        private static Int32 GetConfigurationValue(IList<String> fileContent, String key)
+        {
+            try
+            {
+                String configLine = fileContent.FirstOrDefault(line => line.ToLower().StartsWith(key.ToLower()));
+                if (configLine == null)
+                    return -1;
+                Int32 index = configLine.IndexOf(KeyValueSeparator, StringComparison.InvariantCulture);
+                if (index <= 0)
+                    return -1;
+                String value = configLine.Substring(index + 1);
+                return Int32.Parse(value);
+            }
+            catch (Exception)
+            {
+                return -1;
+            }
+        }
+
+        private const String KeyValueSeparator = "=";
+        private const String CommentarySymbol = "#";
+
+        private const String ParallelTaskKey = "ParallelTask";
+        private const String ClientBufferSizeKey = "ClientBufferSize";
+        private const String ChunkSizeKey = "ChunkSize";
+        private const String ClientConnectAttemptsKey = "ClientConnectAttempts";
+        private const String ClientInactivityTimeKey = "ClientInactivityTime";
+        private const String ClientConnectTimeoutKey = "ClientConnectTimeout";
+        private const String ClientReadAttemptsKey = "ClientReadAttempts";
+        private const String ReadTimeoutKey = "ReadTimeout";
+        private const String ServerCloseTimeoutKey = "ServerCloseTimeout";
+        private const String WriteTimeoutKey = "WriteTimeout";
+    }
+}
diff --git a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI.csproj b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI.csproj
index 89ab39f..42b08cc 100644
--- a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI.csproj
+++ b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI.csproj
@@ -52,6 +52,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Helpers\TcpServerConfigBuilder.cs" />
     <Compile Include="LogUtils\RichTextBoxAppender.cs" />
     <Compile Include="Factories\ServerFactory.cs" />
     <Compile Include="View\Helpers\ServerConfigInfoHelper.cs" />
diff --git a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.Designer.cs b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.Designer.cs
index b1d36b4..56ddb6b 100644
--- a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.Designer.cs
+++ b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.Designer.cs
@@ -38,8 +38,8 @@ private void InitializeComponent()
             this._serverScriptButton = new System.Windows.Forms.Button();
             this._serverScriptBox = new System.Windows.Forms.TextBox();
             this._serverScriptLabel = new System.Windows.Forms.Label();
-            this._serverSettingsButton = new System.Windows.Forms.Button();
-            this._serverSettingsBox = new System.Windows.Forms.TextBox();
+            this._serverConfigButton = new System.Windows.Forms.Button();
+            this._serverConfigBox = new System.Windows.Forms.TextBox();
             this._logLevelComboBox = new System.Windows.Forms.ComboBox();
             this._logLevelLabel = new System.Windows.Forms.Label();
             this._serverParametersBox = new System.Windows.Forms.GroupBox();
@@ -114,8 +114,8 @@ private void InitializeComponent()
             this._serverSettingsGroup.Controls.Add(this._serverScriptButton);
             this._serverSettingsGroup.Controls.Add(this._serverScriptBox);
             this._serverSettingsGroup.Controls.Add(this._serverScriptLabel);
-            this._serverSettingsGroup.Controls.Add(this._serverSettingsButton);
-            this._serverSettingsGroup.Controls.Add(this._serverSettingsBox);
+            this._serverSettingsGroup.Controls.Add(this._serverConfigButton);
+            this._serverSettingsGroup.Controls.Add(this._serverConfigBox);
             this._serverSettingsGroup.Controls.Add(this._logLevelComboBox);
             this._serverSettingsGroup.Controls.Add(this._logLevelLabel);
             this._serverSettingsGroup.Controls.Add(this._serverParametersBox);
@@ -157,21 +157,21 @@ private void InitializeComponent()
             this._serverScriptLabel.TabIndex = 12;
             this._serverScriptLabel.Text = "Server Script:";
             // 
-            // _serverSettingsButton
+            // _serverConfigButton
             // 
-            this._serverSettingsButton.Location = new System.Drawing.Point(194, 94);
-            this._serverSettingsButton.Name = "_serverSettingsButton";
-            this._serverSettingsButton.Size = new System.Drawing.Size(24, 20);
-            this._serverSettingsButton.TabIndex = 11;
-            this._serverSettingsButton.Text = "...";
-            this._serverSettingsButton.UseVisualStyleBackColor = true;
+            this._serverConfigButton.Location = new System.Drawing.Point(194, 94);
+            this._serverConfigButton.Name = "_serverConfigButton";
+            this._serverConfigButton.Size = new System.Drawing.Size(24, 20);
+            this._serverConfigButton.TabIndex = 11;
+            this._serverConfigButton.Text = "...";
+            this._serverConfigButton.UseVisualStyleBackColor = true;
             // 
-            // _serverSettingsBox
+            // _serverConfigBox
             // 
-            this._serverSettingsBox.Location = new System.Drawing.Point(97, 94);
-            this._serverSettingsBox.Name = "_serverSettingsBox";
-            this._serverSettingsBox.Size = new System.Drawing.Size(97, 20);
-            this._serverSettingsBox.TabIndex = 10;
+            this._serverConfigBox.Location = new System.Drawing.Point(97, 94);
+            this._serverConfigBox.Name = "_serverConfigBox";
+            this._serverConfigBox.Size = new System.Drawing.Size(97, 20);
+            this._serverConfigBox.TabIndex = 10;
             // 
             // _logLevelComboBox
             // 
@@ -303,8 +303,8 @@ private void InitializeComponent()
         private System.Windows.Forms.Button _serverScriptButton;
         private System.Windows.Forms.TextBox _serverScriptBox;
         private System.Windows.Forms.Label _serverScriptLabel;
-        private System.Windows.Forms.Button _serverSettingsButton;
-        private System.Windows.Forms.TextBox _serverSettingsBox;
+        private System.Windows.Forms.Button _serverConfigButton;
+        private System.Windows.Forms.TextBox _serverConfigBox;
     }
 }
 
diff --git a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs
index a8b42c2..2dad1fc 100644
--- a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs
+++ b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs
@@ -12,8 +12,8 @@
 using MossbauerLab.TinyTcpServer.Core.Client;
 using MossbauerLab.TinyTcpServer.Core.Server;
 using MossbauerLab.TinyTcpServer.MnGUI.Factories;
+using MossbauerLab.TinyTcpServer.MnGUI.Helpers;
 using MossbauerLab.TinyTcpServer.MnGUI.LogUtils;
-using MossbauerLab.TinyTcpServer.MnGUI.View.Helpers;
 using MossbauerLab.TinyTcpServer.MnGUI.View.Utils;
 
 namespace MossbauerLab.TinyTcpServer.MnGUI.View.Forms
@@ -28,7 +28,7 @@ public MainForm()
             _stopButton.Click += (sender, args) => Stop();
             _restartButton.Click += (sender, args) => Restart();
             _serverScriptButton.Click += OnChooseScriptFileButtonClick;
-            _serverSettingsButton.Click += OnChooseSettingsFileButtonClick;
+            _serverConfigButton.Click += OnChooseConfigFileButtonClick;
             _logLevelComboBox.SelectedIndexChanged += (sender, args) => ApplyLogLevel();
         }
 
@@ -45,16 +45,13 @@ private void FillControls()
             // load last IP address and TCP Port settings
             if (File.Exists(ConfigFile))
             {
-                String[] filelines = File.ReadAllLines(ConfigFile);
-                ApplySettings(GetOptions(filelines));
-            }
-            else
-            {
-                if (_ipAddressComboBox.Items.Count > 0)
-                    _ipAddressComboBox.SelectedIndex = 0;
-                _portTextBox.Text = DefaultTcpPort.ToString();
+                _configFile = ConfigFile;
+                DisplayConfig();
             }
 
+            if (_ipAddressComboBox.Items.Count > 0)
+                _ipAddressComboBox.SelectedIndex = 0;
+                _portTextBox.Text = DefaultTcpPort.ToString();
 
             // init logger + fill log level
             XmlConfigurator.Configure();
@@ -65,31 +62,26 @@ private void FillControls()
                 _logLevelComboBox.Items.Add(level.Value);
             _logLevelComboBox.SelectedIndex = 5;
 
-            // fill server config
-            IList<String> configStrings = ServerConfigInfoHelper.GetConfigStrings(_serverConfig);
-            foreach (String configString in configStrings)
-                _serverParametersView.Items.Add(configString);
-            // update controls state
             UpdateControlsState();
         }
 
-        private IDictionary<String, String> GetOptions(String[] lines)
+        private void DisplayConfig()
         {
-            IDictionary<String, String> options = new Dictionary<String, String>();
-            // todo: parse options ....
-            return options;
+            String[] lines = File.ReadAllLines(_configFile).Where(line => !line.Trim().StartsWith("#")).ToArray();
+            _serverParametersView.Items.Clear();
+            foreach (String line in lines)
+                _serverParametersView.Items.Add(line);
+            _serverConfigBox.Text = Path.GetFileName(_configFile);
         }
 
-        private void ApplySettings(IDictionary<String, String> options)
-        {
-
-        }
 
         private void Start()
         {
             UInt16 port = Convert.ToUInt16(_portTextBox.Text);
             if (_server == null)
             {
+                if (!String.IsNullOrEmpty(_configFile))
+                    _serverConfig = TcpServerConfigBuilder.Build(_configFile);
                 if (_ipAddressComboBox.SelectedIndex >= 0 && _portTextBox.Text != null && !String.IsNullOrEmpty(_scriptFile))
                     _server = ServerFactory.Create(_ipAddressComboBox.Items[_ipAddressComboBox.SelectedIndex].ToString(), port, _scriptFile, _logger, _serverConfig);
                 else
@@ -99,7 +91,11 @@ private void Start()
                 }
                 _server.Start();
             }
-            else  _server.Start(_ipAddressComboBox.Items[_ipAddressComboBox.SelectedIndex].ToString(), port);
+            else
+            {
+                // todo umv: if server config changed => re-create server
+                _server.Start(_ipAddressComboBox.Items[_ipAddressComboBox.SelectedIndex].ToString(), port);
+            }
 
             if (_timers[0] == null)
             {
@@ -109,7 +105,7 @@ private void Start()
             else _timers[0].Change(500, 500);
         }
 
-        public void Stop()
+        private void Stop()
         {
             _server.Stop(false);
             if (_timers[0] != null)
@@ -119,7 +115,7 @@ public void Stop()
             UpdateControlsState();
         }
 
-        public void Restart()
+        private void Restart()
         {
             Stop();
             Start();
@@ -136,15 +132,15 @@ private void OnChooseScriptFileButtonClick(Object sender, EventArgs args)
             }
         }
 
-        private void OnChooseSettingsFileButtonClick(Object sender, EventArgs args)
+        private void OnChooseConfigFileButtonClick(Object sender, EventArgs args)
         {
             OpenFileDialog openScriptFile = new OpenFileDialog();
-            String file = openScriptFile.Run(@" Text files (*.txt)|*.txt | Config files (*.conf) |*.conf | Config files (*.cfg) |*.cfg | Any file (*.*)|*.*", 
+            String file = openScriptFile.Run(@" Text files (*.txt)|*.txt|Config files (*.conf)|*.conf|Config files (*.cfg)|*.cfg|Any file (*.*)|*.*", 
                                              Path.GetFullPath("."), @"Choose Server settings file", 0);
             if (file != String.Empty)
             {
-                _settingsFile = file;
-                _serverSettingsBox.Text = Path.GetFileName(_settingsFile);
+                _configFile = file;
+                DisplayConfig();
             }
         }
 
@@ -215,8 +211,8 @@ private void ApplyLogLevel()
         private ILog _logger;
         private ITcpServer _server;
         private String _scriptFile;
-        private String _settingsFile;
-        private readonly TcpServerConfig _serverConfig = new TcpServerConfig();
+        private String _configFile;
+        private TcpServerConfig _serverConfig = new TcpServerConfig();
         private RichTextBoxAppender _richTextBoxAppender;
         private readonly System.Threading.Timer[] _timers = new System.Threading.Timer[1];
     }

From 4f8c7e6e0ebb8b5e77940b26b4d38b02b735812e Mon Sep 17 00:00:00 2001
From: Michael Ushakov <um.nix.user@gmail.com>
Date: Sun, 5 Nov 2017 23:18:51 +0400
Subject: [PATCH 7/7] If config file was changed, it setting will applied on
 next run

---
 .../MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs
index 2dad1fc..de90df3 100644
--- a/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs
+++ b/GUI/MossbauerLab.TinyTcpServer.MnGUI/MossbauerLab.TinyTcpServer.MnGUI/View/Forms/MainForm.cs
@@ -93,7 +93,8 @@ private void Start()
             }
             else
             {
-                // todo umv: if server config changed => re-create server
+                if(_configChanged)
+                    _server = ServerFactory.Create(_ipAddressComboBox.Items[_ipAddressComboBox.SelectedIndex].ToString(), port, _scriptFile, _logger, _serverConfig);
                 _server.Start(_ipAddressComboBox.Items[_ipAddressComboBox.SelectedIndex].ToString(), port);
             }
 
@@ -141,6 +142,7 @@ private void OnChooseConfigFileButtonClick(Object sender, EventArgs args)
             {
                 _configFile = file;
                 DisplayConfig();
+                _configChanged = true;
             }
         }
 
@@ -213,6 +215,7 @@ private void ApplyLogLevel()
         private String _scriptFile;
         private String _configFile;
         private TcpServerConfig _serverConfig = new TcpServerConfig();
+        private Boolean _configChanged = false;
         private RichTextBoxAppender _richTextBoxAppender;
         private readonly System.Threading.Timer[] _timers = new System.Threading.Timer[1];
     }