Revize 9547fd4a

Refs #9008, #8919. Data directory path should now be ok on linux + added interface for DataDownloader + changed time span of default downloaded data.

Server/ServerApp/Program.cs

@@ -99 +99 @@
 			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)));
+
+			// -> 12-2019 to exclude corona? But we lose a lot of data
+			savedFiles.AddRange(dd.DownloadData(DataType.JIS, DataFormat.CSV, new DataDownload.Date(1, 2017), new DataDownload.Date(12, 2019)));
+			savedFiles.AddRange(dd.DownloadData(DataType.STROJE, DataFormat.CSV, new DataDownload.Date(1, 2017), new DataDownload.Date(12, 2019)));
+			savedFiles.AddRange(dd.DownloadData(DataType.POCASI, DataFormat.CSV, new DataDownload.Date(1, 2017), new DataDownload.Date(12, 2019)));
 
 
 
@@ -205 +207 @@
 			Config extractedConfigInfo = new Config();
 
 			Console.WriteLine(Directory.GetCurrentDirectory());
+			Console.WriteLine("Parsing configuration file...");
 			
 			if (args.Length != 1)
 				Console.WriteLine("Wrong usage of parameters, pass the path to a config file."); // todo better explanation?
@@ -223 +226 @@
 			for (var i = 0; i < lines.Length; i += 1)
 			{
 				string line = lines[i];
-				Console.WriteLine(line);
+				//Console.WriteLine(line);
 				if (line.Length == 0 || line == null || line.StartsWith("#"))
 					continue;
 
@@ -236 +239 @@
 						extractedConfigInfo.DownloadedFilesNaming = lines[++i].Trim();
 						break;
 					case "!data_root_dir!":
+						//string rootDir = lines[++i];
+						//rootDir = rootDir.Replace('\\', Path.DirectorySeparatorChar);
 						string dirWithConfig = Path.GetDirectoryName(fullPathConfig);
 						string rootPath = dirWithConfig + Path.DirectorySeparatorChar + lines[++i].Trim();
+						rootPath = Path.GetFullPath(rootPath);
 						extractedConfigInfo.DataRootDir = rootPath;
-						
 						break;
 					case "!port!":
 						extractedConfigInfo.Port = lines[++i].Trim();