Revize 085453be

Re #8691. Working on retrieving data in time span from a directory.

Server/ServerApp/DataDownload/DataDownloader.cs

@@ -185 +185 @@
 			return nameZip;
 		}
 
+
+		private void ExtractDateFromFileName(string fileName, ref int month, ref int year)
+		{
+
+		}
+
 		/// <summary>
 		/// Downloads a specific archive.
 		/// </summary>
@@ -222 +228 @@
 				foreach (ZipArchiveEntry entry in zipArchive.Entries)
 				{
 					// get the relative path to the file:
-					string extractedFile = nameFolder + entry.Name;
+					string newFileName = $"{month}-{year}.{format}";
+					string extractedFile = nameFolder + newFileName; //+ entry.Name;
 
 					// add full path to the list:
 					extractedFiles.Add(Path.GetFullPath(extractedFile));
@@ -236 +243 @@
 					else
 					{
 						// if overwrite is not desired, check if the file exists first:
-						if(File.Exists(nameFolder + entry.Name))
+						if(File.Exists(extractedFile/*nameFolder + entry.Name*/))
 						{
 							continue;
 						}
@@ -335 +342 @@
 			throw new NotImplementedException();
 		}
 
+
+
 		public List<string> GetData(string subDirectory, Date startDate, Date endDate)
 		{
 			string[] files = Directory.GetFiles(subDirectory);
 			for(int i = 0; i < files.Length; i++)
 			{
+				string currFileName = Path.GetFileName(files[i]);
+				Console.WriteLine("curr file: " + currFileName);
+				string[] splits = currFileName.Split(new char[] { '-', '.' });
+
+				int month = int.Parse(splits[0]);
+				int year = int.Parse(splits[1]);
+
+
+				Date d = new Date((uint)month, (uint)year);
+
 
 			}
 

Server/ServerApp/Program.cs

@@ -52 +52 @@
 			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)));
+			savedFiles.AddRange(dd.DownloadData(DataType.JIS, DataFormat.CSV, new Date(1, 2019), 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)));
 
 
 
@@ -70 +70 @@
 				Console.WriteLine("Key = {0}, Value = {1}", kvp.Key, kvp.Value);
 			}
 
+			dd.GetData(dd.DataSubDirectories[DataType.JIS], new Date(1, 2019), new Date(12, 2020));
+
+
+
+
 
 
 			// date testing