Revize 4a417b8b

Re #8691. Url config improvements + thread for commands accepting prepared.

Server/ServerApp/DataDownload/DataDownloader.cs

@@ -28 +28 @@
 		XML, JSON, CSV
 	}
 
-	public enum TimeSpan
-	{
-
-	}
-
 	/// <summary>
 	/// This class takes care of downloading of data. Download happens from http://openstore.zcu.cz/.
 	/// </summary>
@@ -65 +60 @@
 		// a shortcut to writing Path.DirectorySeparatorChar
 		private char sep = Path.DirectorySeparatorChar;
 
-		public DataDownloader(string rootDataDir, string website, string namingConvention) // todo take naming conventons specifiaction into account
+		private List<string> separatedFileName;
+		private List<string> variablesInsertions;
+		private List<char> nameTurns;
+
+		public DataDownloader(string rootDataDir, string website, string namingConvention) // todo: take naming conventons specifiaction into account
 		{
 			// initialize all needed variables:
 
 			DataSubDirectories = new Dictionary<DataType, string>();
-
-			Console.WriteLine(Directory.GetCurrentDirectory());
+			
+			//Console.WriteLine(Directory.GetCurrentDirectory());
 			site = website;//"http://openstore.zcu.cz/";
+
+			ParseNaming(namingConvention);
 			dataStr = "OD_ZCU_";
 
 			RootDataDirectory = rootDataDir;//$"..{sep}..{sep}..{sep}data{sep}auto";
@@ -81 +82 @@
 			webClient = new WebClient();
 		}
 
+		private void ParseNaming(string namingConvention)
+		{
+			separatedFileName = new List<string>();
+			variablesInsertions = new List<string>();
+			nameTurns = new List<char>();
+
+			string currPart = "";
+			string currVar = "";
+			bool readingNormal = true;
+			foreach (char c in namingConvention)
+			{
+				if (c == '{')
+				{
+					AddToNameParts(currPart);
+					readingNormal = false;
+					currPart = "";
+				}
+				else if (c == '}')
+				{
+					AddToVariables(currVar);
+					readingNormal = true;
+					currVar = "";
+				}
+				else
+				{
+					// normal char
+					if (readingNormal)
+						currPart += c;
+					else
+						currVar += c;
+				}
+			}
+
+			// add the rest if there is any:
+			if (readingNormal)
+				AddToNameParts(currPart);
+			else
+				AddToVariables(currVar);
+
+			Console.WriteLine();
+		}
+
+		private void AddToNameParts(string s)
+		{
+			if (s.Length > 0)
+			{
+				separatedFileName.Add(s);
+				nameTurns.Add('n');
+			}
+				
+		}
+
+		private void AddToVariables(string s)
+		{
+			if (s.Length > 0)
+			{
+				variablesInsertions.Add(s);
+				nameTurns.Add('v');
+			}
+				
+		}
+
+
+		private string BuildDownloadedName(DataType type, DataFormat format, int year, int month)
+		{
+			string nameZip = "";
+
+			int partInd = 0;
+			int varInd = 0;
+			for(int i = 0; i < nameTurns.Count; i++)
+			{
+				if (nameTurns[i] == 'n')
+				{
+					nameZip += separatedFileName[partInd];
+					partInd++;
+				}
+				else if(nameTurns[i] == 'v')
+				{
+					string add = "";
+					switch (variablesInsertions[varInd])
+					{
+						case "type":
+							add = "" + type;
+							break;
+						case "month": 
+							add = month < 10 ? "0" + month : "" + month;
+							break;
+						case "year":
+							add = "" + year;
+							break;
+						case "format":
+							add = "" + format;
+							break;
+						default: throw new Exception("Config file error - naming conventions can only contain variables with following names: type, month, year, format");
+					}
+					nameZip += add;
+					varInd++;
+				}
+			}
+
+			return nameZip;
+		}
+
 		/// <summary>
 		/// Downloads a specific archive.
 		/// </summary>
@@ -97 +201 @@
 			// Prepare the url string to be downloaded from:
 			string monthStr = month < 10 ? "0" + month : "" + month;
 			string yearStr = "" + year;
-
 			string monthYr = monthStr + "_" + yearStr;
-			string url = site + "/" + dataStr + monthYr + "/" + dataStr + type + "_" + monthYr + "_" + format + ".zip";
-			string nameZip = dataStr + type + "_" + monthYr + "_" + format + ".zip";
+
+
+			string nameZip = BuildDownloadedName(type, format, year, month);//dataStr + type + "_" + monthYr + "_" + format + ".zip";
+			string url = site + "/" + dataStr + monthYr + "/" + nameZip;//+ dataStr + type + "_" + monthYr + "_" + format + ".zip";
+			
 			string nameFolder = RootDataDirectory + sep + type + sep; //+ dataStr + type + "_" + monthYr + "_" + format;
 
 			try
@@ -208 +314 @@
 				currentDate = nextDate;
 
 
-			} while (currentDate != endDate);
+			} while (currentDate <= endDate);
 
 
 			
@@ -229 +335 @@
 			throw new NotImplementedException();
 		}
 
-		public List<string> GetData(string subDirectory, int startYear, int endYear, int startMonth, int endMonth)
+		public List<string> GetData(string subDirectory, Date startDate, Date endDate)
 		{
+			string[] files = Directory.GetFiles(subDirectory);
+			for(int i = 0; i < files.Length; i++)
+			{
+
+			}
+
 			throw new NotImplementedException();
 		}
 

Server/ServerApp/Program.cs

@@ -2 +2 @@
 using ServerApp.DataDownload;
 using ServerApp.Parser.Parsers;
 using ServerApp.Predictor;
+using ServerApp.User;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading;
 
 namespace ServerApp
 {
@@ -17 +19 @@
 		public string Port { get; set; }
 	}
 
-    class Program
+    public class Program
     {
 
-
+		public static void NotifyUserMessage(string message)
+		{
+			Console.WriteLine("Received user message: " + message);
+		}
 
         static void Main(string[] args)
         {
@@ -32 +37 @@
 				return;
 			}
 
+			// create a thread for commands accepting:
+			//Thread inputThread = new Thread(CommandsAcceptor.AcceptCommand);
+			//inputThread.Start();
+
 
 
 			//DataParser p = new DataParser("data/");
@@ -80 +89 @@
 
 			// test - connection:
 			//AsynchronousSocketListener asl = new AsynchronousSocketListener();
-			//         asl.StartListening();
+			//asl.StartListening();
 
 
 			//NaiveBayesClassifier naiveBayesClassifier = new NaiveBayesClassifier();

Server/ServerApp/ServerApp.csproj

@@ -158 +158 @@
     <Compile Include="Predictor\NaiveBayesClassifier.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="User\CommandsAcceptor.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />

Server/ServerApp/User/CommandsAcceptor.cs

@@ +1 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ServerApp.User
+{
+	public class CommandsAcceptor
+	{
+
+		public static void AcceptCommand()
+		{
+			while (true) {
+				string command = Console.ReadLine();
+				Program.NotifyUserMessage(command);
+			}
+		}
+	}
+}

Server/ServerApp/server_config

@@ -1 @@
-
 #
+# Tri Musketyri, ASWI 2021
 # This is the server configuration file. See [wiki_site] for detailed information about its structure.
 # Pass this file as an argument to the server program when launching it.
 #
@@ -11 +11 @@
 http://openstore.zcu.cz/
 
 # the naming convention for files stored at the site to download from:
+# variables in this string must keep their name, cannot be excluded and others cannot be added. They must be enclosed in {} brackets
+# {} characters are treated as special characters and cannot be used as a part of the name
 !naming_convention!
 OD_ZCU_{type}_{month}_{year}_{format}.zip