Revize 4129ce12

Re #8838. Started refining commands accepting + modified GetData in DataDownloader.

Server/ServerApp/Connection/ConnectionListener.cs

@@ -4 +4 @@
 
 using ServerApp.Connection.XMLProtocolHandler;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using System.Net.Sockets;
@@ -291 +292 @@
     //  }
 
 
-    class ClientRequest
+    class ClientService
 	{
-        HttpListenerContext context;
-        string request;
+        int id;
+        Request request;
+        Response response;
     }
 
     public class ConnectionListener
     {
         private readonly int PORT;
+        private Dictionary<int, ClientService> allRequests;
+        private Queue<Request> waitingRequests;
+
 
         public ConnectionListener(int port)
         {

Server/ServerApp/DataDownload/DataDownloader.cs

@@ -385 +385 @@
 		/// <returns></returns>
 		public List<string> GetData(string subDirectory, Date startDate, Date endDate)
 		{
+			if (startDate == null || endDate == null)
+				return GetData(subDirectory);
+
+
 			string[] files = Directory.GetFiles(subDirectory);
 			List<string> found00Files = new List<string>();
 			List<string> relevantFiles = new List<string>();
@@ -455 +459 @@
 			return relevantFiles;
 		}
 
+		/// <summary>
+		/// Returns all file paths in a given directory
+		/// </summary>
+		/// <param name="subDirectory"></param>
+		/// <returns></returns>
+		private List<string> GetData(string subDirectory)
+		{
+			string[] files = Directory.GetFiles(subDirectory);
+			List<string> relevantFiles = new List<string>(files.Length);
+
+			for (int i = 0; i < files.Length; i++)
+				relevantFiles.Add(files[i]);
+
+			return relevantFiles;
+		}
+
 
 		#region UNUSED
 		//public string GetDirectoryListingRegexForUrl(string url)

Server/ServerApp/Program.cs

@@ -48 +48 @@
 			//p.Parse();
 
 			#region UNCOMMENT
-			//test scenario -data download:
-			DataDownloader dd = new DataDownloader(config.DataRootDir, config.DataWebsite, config.DownloadedFilesNaming);
-			dd.OverwriteExisting = false;
-			List<string> savedFiles = new List<string>();
-			savedFiles.AddRange(dd.DownloadData(DataType.JIS, DataFormat.CSV, new DataDownload.Date(1, 2019), new DataDownload.Date(12, 2020)));
-			savedFiles.AddRange(dd.DownloadData(DataType.STROJE, DataFormat.CSV, new DataDownload.Date(1, 2017), new DataDownload.Date(12, 2020)));
-			savedFiles.AddRange(dd.DownloadData(DataType.POCASI, DataFormat.CSV, new DataDownload.Date(1, 2017), new DataDownload.Date(12, 2020)));
-
-
-
-			Console.WriteLine("Saved files: ");
-			foreach (string s in savedFiles)
-			{
-				Console.WriteLine(s);
-			}
-
-			Console.WriteLine("subdirectories: ");
-			foreach (KeyValuePair<DataType, string> kvp in dd.DataSubDirectories)
-			{
-				Console.WriteLine("Key = {0}, Value = {1}", kvp.Key, kvp.Value);
-			}
-
-			List<string> retrievedData = dd.GetData(dd.DataSubDirectories[DataType.JIS], new DataDownload.Date(10, 2019), new DataDownload.Date(12, 2020));
-			Console.WriteLine("Retrieved data: ");
-			foreach (string s in retrievedData)
-			{
-				Console.WriteLine(s);
-			}
-
-			// test - connection:
-			ConnectionListener cl = new ConnectionListener(int.Parse(config.Port));
-			cl.StartListening();
+			////test scenario -data download:
+			//DataDownloader dd = new DataDownloader(config.DataRootDir, config.DataWebsite, config.DownloadedFilesNaming);
+			//dd.OverwriteExisting = false;
+			//List<string> savedFiles = new List<string>();
+			//savedFiles.AddRange(dd.DownloadData(DataType.JIS, DataFormat.CSV, new DataDownload.Date(1, 2019), new DataDownload.Date(12, 2020)));
+			//savedFiles.AddRange(dd.DownloadData(DataType.STROJE, DataFormat.CSV, new DataDownload.Date(1, 2017), new DataDownload.Date(12, 2020)));
+			//savedFiles.AddRange(dd.DownloadData(DataType.POCASI, DataFormat.CSV, new DataDownload.Date(1, 2017), new DataDownload.Date(12, 2020)));
+
+
+
+			//Console.WriteLine("Saved files: ");
+			//foreach (string s in savedFiles)
+			//{
+			//	Console.WriteLine(s);
+			//}
+
+			//Console.WriteLine("subdirectories: ");
+			//foreach (KeyValuePair<DataType, string> kvp in dd.DataSubDirectories)
+			//{
+			//	Console.WriteLine("Key = {0}, Value = {1}", kvp.Key, kvp.Value);
+			//}
+
+			//List<string> retrievedData = dd.GetData(dd.DataSubDirectories[DataType.JIS], new DataDownload.Date(10, 2019), new DataDownload.Date(12, 2020));
+			//Console.WriteLine("Retrieved data: ");
+			//foreach (string s in retrievedData)
+			//{
+			//	Console.WriteLine(s);
+			//}
+			//Console.WriteLine("all from directory:");
+			//retrievedData = dd.GetData(dd.DataSubDirectories[DataType.JIS], null, null);
+			//foreach (string s in retrievedData)
+			//{
+			//	Console.WriteLine(s);
+			//}
+			//// test - connection:
+			////ConnectionListener cl = new ConnectionListener(int.Parse(config.Port));
+			////cl.StartListening();
 			#endregion
 
 			#region XML_TEST

Server/ServerApp/ServerApp.csproj

@@ -165 +165 @@
     <Compile Include="Predictor\NaiveBayesClassifier.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="User\Command.cs" />
     <Compile Include="User\CommandsAcceptor.cs" />
   </ItemGroup>
   <ItemGroup>

Server/ServerApp/User/Command.cs

@@ +1 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ServerApp.User
+{
+	public enum Commands
+	{
+		RETRAIN, ROLLBACK, DATA_LIST, NEW_DATA, HELP
+	}
+
+	public class Command
+	{
+		public string MainCommand { get; set; }
+		public Dictionary<string, List<string>> FlagsAndData { get; }
+		private string lastFlag;
+
+		public Command()
+		{
+			MainCommand = "";
+			FlagsAndData = new Dictionary<string, List<string>>();
+			lastFlag = "";
+		}
+
+		public void AddFlag(string flag)
+		{
+			FlagsAndData.Add(flag, new List<string>());
+			lastFlag = flag;
+		}
+
+		public void AddData(string data)
+		{
+			FlagsAndData[lastFlag].Add(data);
+		}
+	}
+}

Server/ServerApp/User/CommandsAcceptor.cs

@@ -6 +6 @@
 
 namespace ServerApp.User
 {
+	
+
 	public class CommandsAcceptor
 	{
 
@@ -13 +15 @@
 		{
 			while (true) {
 				string command = Console.ReadLine();
+				Command c = ParseString(command);
+				CheckCommand(c);
 				Program.NotifyUserMessage(command);
 			}
 		}
+
+		private static Command ParseString(string str)
+		{
+			string[] splits = str.Split(' ');
+			Command command = new Command();
+
+			command.MainCommand = splits[0];
+
+			for(int i = 1; i < splits.Length; i++)
+			{
+
+				string current = splits[i];
+				if (current.StartsWith("-"))
+				{
+					command.AddFlag(current.Substring(1));
+				}
+				else
+				{
+					command.AddData(current);
+				}
+			}
+
+			return command;
+		}
+
+		private static void CheckCommand(Command c)
+		{
+			Console.WriteLine(c);
+
+			switch (c.MainCommand)
+			{
+				case "data": break;
+				case "model": break;
+				case "help": break;
+			}
+		}
+
+		private void PrintUsage()
+		{
+
+		}
 	}
 }