Revize 7a998d66

Re #8691. Big refactor + config file added + working on providing methods for Parser.

Server/ServerApp/Program.cs

@@ -1 @@
-using Connection;
+using ServerApp.Connection;
+using ServerApp.DataDownload;
 using ServerApp.Parser.Parsers;
 using ServerApp.Predictor;
 using System;
 using System.Collections.Generic;
+using System.IO;
 
 namespace ServerApp
 {
+
+	class Config // TBD where this should go
+	{
+		public string DataWebsite { get; set; }
+		public string DownloadedFilesNaming { get; set; }
+		public string DataRootDir { get; set; }
+		public string Port { get; set; }
+	}
+
     class Program
     {
+
+
+
         static void Main(string[] args)
         {
-            DataParser p = new DataParser("data/");
 
-            //p.Parse();
+            Config config = FillConfigInfo(args);
+			if (config == null)
+			{
+				Console.ReadLine();
+				return;
+			}
+
+
+
+			//DataParser p = new DataParser("data/");
+
+			//p.Parse();
+
+
+			// 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 Date(1, 2017), new Date(12, 2020)));
+			savedFiles.AddRange(dd.DownloadData(DataType.STROJE, DataFormat.CSV, new Date(1, 2017), new Date(12, 2020)));
+			savedFiles.AddRange(dd.DownloadData(DataType.POCASI, DataFormat.CSV, new Date(1, 2017), new Date(12, 2020)));
+
 
 
-            // test scenario - data download:
-            //DataDownloader dd = new DataDownloader();
-            //         List<string> savedFiles = new List<string>();
-            //         savedFiles.AddRange(dd.DownloadData(DataType.JIS, DataFormat.CSV, 2017, 2021, 0, 13));
-            //         savedFiles.AddRange(dd.DownloadData(DataType.POCASI, DataFormat.CSV, 2017, 2021, 0, 13));
-            //         savedFiles.AddRange(dd.DownloadData(DataType.STROJE, DataFormat.CSV, 2017, 2021, 0, 13));
+			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);
+			}
 
-            //         Console.WriteLine("Saved files: ");
-            //         foreach(string s in savedFiles)
-            //{
-            //             Console.WriteLine(s);
-            //}
 
 
+			// date testing
+			//Date d1 = new Date(2, 2020);
+			//Date d2 = new Date(1, 2019);
 
-            // test - connection:
-            AsynchronousSocketListener asl = new AsynchronousSocketListener();
-            asl.StartListening();
-           
+			//Console.WriteLine("equals" + d1.Equals(d2));
+			//Console.WriteLine("==" + (d1 == d2));
+			//Console.WriteLine("!=" + (d1 != d2));
+			//Console.WriteLine(">" + (d1 > d2));
+			//Console.WriteLine("<" + (d1 < d2));
+			//Console.WriteLine(">=" + (d1 >= d2));
+			//Console.WriteLine("<=" + (d1 <= d2));
 
-            NaiveBayesClassifier naiveBayesClassifier = new NaiveBayesClassifier();
-            IEnumerable<ModelInput> modelInput = naiveBayesClassifier.ExtractModelInput(p.weatherList, p.jisList);
-            naiveBayesClassifier.Fit(modelInput);
-            List<ModelInput> dataList = new List<ModelInput>()
-            {
-                new ModelInput()
-                {
-                    Temp = -40,
-                }
-            };
-            var result = naiveBayesClassifier.Predict(dataList);
 
-            Console.WriteLine($"Predictions: ");
-            foreach(var item in result)
-            {
-                Console.WriteLine(item.ToString());
-            }
 
-            Console.ReadLine();
+
+			// test - connection:
+			//AsynchronousSocketListener asl = new AsynchronousSocketListener();
+			//         asl.StartListening();
+
+
+			//NaiveBayesClassifier naiveBayesClassifier = new NaiveBayesClassifier();
+			//IEnumerable<ModelInput> modelInput = naiveBayesClassifier.ExtractModelInput(p.weatherList, p.jisList);
+			//naiveBayesClassifier.Fit(modelInput);
+			//List<ModelInput> dataList = new List<ModelInput>()
+			//{
+			//    new ModelInput()
+			//    {
+			//        Temp = -40,
+			//    }
+			//};
+			//var result = naiveBayesClassifier.Predict(dataList);
+
+			//Console.WriteLine($"Predictions: ");
+			//foreach(var item in result)
+			//{
+			//    Console.WriteLine(item.ToString());
+			//}
+
+			Console.ReadLine();
         }
+
+
+        private static Config FillConfigInfo(string[] args)
+		{
+
+			Config extractedConfigInfo = new Config();
+
+			Console.WriteLine(Directory.GetCurrentDirectory());
+			
+			if (args.Length != 1)
+				Console.WriteLine("Wrong usage of parameters, pass the path to a config file."); // todo better explanation?
+
+			string fullPathConfig = Path.GetFullPath(args[0]);
+			string[] lines = null;
+			try {
+				lines = File.ReadAllLines(fullPathConfig);
+			}
+			catch(Exception ex)
+			{
+				Console.WriteLine("Could not open " + fullPathConfig);
+				return null;
+			}
+			
+			for (var i = 0; i < lines.Length; i += 1)
+			{
+				string line = lines[i];
+				Console.WriteLine(line);
+				if (line.Length == 0 || line == null || line.StartsWith("#"))
+					continue;
+
+				switch (line)
+				{
+					case "!site!":
+						extractedConfigInfo.DataWebsite = lines[++i].Trim();
+						break;
+					case "!naming_convention!":
+						extractedConfigInfo.DownloadedFilesNaming = lines[++i].Trim();
+						break;
+					case "!data_root_dir!":
+						string dirWithConfig = Path.GetDirectoryName(fullPathConfig);
+						string rootPath = dirWithConfig + Path.DirectorySeparatorChar + lines[++i].Trim();
+						extractedConfigInfo.DataRootDir = rootPath;
+						
+						break;
+					case "!port!":
+						extractedConfigInfo.Port = lines[++i].Trim();
+						break;
+					default: break;
+				}
+			}
+
+			return extractedConfigInfo;
+		}
     }
 }