Revize 40f56e57

Re #8942. Implemented data and help commands.

Server/ServerApp/User/CommandsAcceptor.cs

@@ -1 @@
-using ServerApp.DataDownload;
+//
+//	Author: Eliska Mourycova
+//
+
+using ServerApp.DataDownload;
 using ServerApp.Predictor;
 using System;
 using System.Collections.Generic;
@@ -91 +95 @@
 			if(c.WholeCommand.Equals("data -list"))
 			{
 				Console.WriteLine("Listing all downloaded data files...");
-				
+
+				var subdirs = dd.DataSubDirectories.Values.ToArray();
+
+				foreach (string sub in subdirs)
+				{
+					List<string> files = dd.GetData(sub, null, null);
+					foreach (string f in files)
+					{
+						Console.WriteLine(f);
+					}
+				}
 			}
 			else if (c.FlagsAndData.ContainsKey("dl"))
 			{
@@ -107 +121 @@
 
 				if (start == null || end == null)
 				{
-					Console.WriteLine("Date parsing was not successful. Please ensure you enter the dates in the following format: 1-2020. Month must be greater than zero.");
+					Console.WriteLine("Date parsing was not successful. Please ensure you enter the dates in the following format: [month]-[year] (e.g. 1-2020). Month must be greater than zero.");
 					return;
 				}
 
-				Console.WriteLine("Downloading data from " + start.ToString() + " to " + end.ToString());
+				Console.WriteLine("Downloading jis, login and weather data from " + start.ToString() + " to " + end.ToString() + "...");
+
+				try
+				{
+					List<string> files = dd.DownloadData(DataType.JIS, DataFormat.CSV, start, end);
+					files.AddRange(dd.DownloadData(DataType.STROJE, DataFormat.CSV, start, end));
+					files.AddRange(dd.DownloadData(DataType.POCASI, DataFormat.CSV, start, end));
+
+					Console.WriteLine("Data download complete, saved files: ");
+					foreach (string f in files)
+						Console.WriteLine(f);
+
+				}
+				catch(Exception ex)
+				{
+					Console.WriteLine("Data download failed, please ensure the start date is before or same as end date.");
+					return;
+				}
+				
+				
 			}
 		}
 
 		private void HandleModelCommand(Command c)
 		{
+			// TODO:
 			// model -files
 			// model -retrain
 			// model -rollback
@@ -124 +158 @@
 
 		private void HandleHelpCommand(Command c)
 		{
-			Console.WriteLine("help.");
+			Console.WriteLine("List of available commands and their description: ");
+			Console.WriteLine("--------------------------------------------------");
+			// data
+			Console.WriteLine("data [OPTION] [DATE]...");
+			Console.WriteLine("   Description: Capable of showing saved data files and downloading new ones.");
+			Console.WriteLine("   -list: Lists currently saved data files. This list does not have to match the files which any of the predictors is trained on!");
+			Console.WriteLine("      Example: data -list");
+			Console.WriteLine("   -dl [startDate] [endDate]: Downloads jis, login and weather files from a specified time span. Both [startDate] and [endDate] are inclusive. Date format must be entered as [month]-[year].");
+			Console.WriteLine("      Example: data -dl 1-2019 12-2020");
+			Console.WriteLine("");
+
+			// model
+			Console.WriteLine("model [OPTION]");
+			Console.WriteLine("   Description: Capable of retraining the prediction model, going back to the previous version and listing files on which the predictor was trained. ");
+			Console.WriteLine("   -files: Lists the data files on which the currently used model was trained.");
+			Console.WriteLine("      Example: model -files");
+			Console.WriteLine("   -retrain: Retrains the model using the files currently saved in the data directory.");
+			Console.WriteLine("      Example: model -retrain");
+			Console.WriteLine("   -rollback: Switches the model back to the previous version.");
+			Console.WriteLine("      Example: model -rollback");
 		}
 
 		private void PrintUsage(Command c)