updated recalc

FcdAggregationLauncher/FcdAggregationLauncher/Launcher.cs

@@ -82,10 +82,13 @@ namespace FcdAggregationLauncher {
 
 			foreach (var file in files) {
 				mergingContent.Append(File.ReadAllText(file.FullName));
-				File.Delete(file.FullName);
+				//File.Delete(file.FullName);
 
 				if (++count % MERGING_MINUTES == 0) {
-					File.AppendAllText($"Output/Merged/{file.LastWriteTimeUtc.ToFileFormat()}.csv", mergingContent.ToString());
+					var path = $"Output/Merged/{file.LastWriteTimeUtc.ToFileFormat()}.csv";
+
+					File.AppendAllText(path, mergingContent.ToString());
+					FireUpAggregation(path, out string outputFilePath);
 					mergingContent.Clear();
 				}
 			}
@@ -93,11 +96,32 @@ namespace FcdAggregationLauncher {
 			return count;
 		}
 
+		public static void FireUpReprocessMergingByTimestamp(FolderWatcher settings) {
+			var directory = new DirectoryInfo(settings.DirectoryPath);
+			var searchOption = settings.WatchSubdirectories ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly;
+
+			var startTime = settings.StartTime;
+			while (startTime < settings.FinishTime) {
+				var files = from file in directory.EnumerateFiles($"*.{settings.FileType}", searchOption)
+							where IsFileFromTimeRange(file, startTime)
+							orderby file.LastWriteTimeUtc
+							select file;
+
+				foreach (var file in files) {
+					Console.WriteLine(file.Name);
+				}
+			}
+		}
+
 		public static int FireUpDbExport(string dbPassword, string filePath) {
 			var db = new Database(dbPassword);
 			var rowCount = db.ExportData(filePath, MERGING_MINUTES);
 
 			return rowCount;
 		}
+
+		private static bool IsFileFromTimeRange(FileInfo file, DateTime? startTime) {
+			return file.LastWriteTimeUtc.AddMinutes(MERGING_MINUTES * -1) > startTime && file.LastWriteTimeUtc.AddMinutes(MERGING_MINUTES * -1) <= startTime.Value.AddMinutes(MERGING_MINUTES);
+		}
 	}
 }

FcdAggregationLauncher/FcdAggregationLauncher/Settings/FolderWatcher.cs

@@ -32,7 +32,7 @@ namespace FcdAggregationLauncher.Settings {
 					 DirectoryPath = (string)element.Attribute("Path"),
 					 WatchSubdirectories = (bool)element.Attribute("WatchSubdirectories"),
 					 StartTime = String.IsNullOrEmpty((string)element.Attribute("StartTime")) ? (DateTime?)null : XmlConvert.ToDateTime((string)element.Attribute("StartTime"), "yyyy-MM-dd HH:mm"),
-					 FinishTime = String.IsNullOrEmpty((string)element.Attribute("StartTime")) ? (DateTime?)null : XmlConvert.ToDateTime((string)element.Attribute("FinishTime"), "yyyy-MM-dd HH:mm"),
+					 FinishTime = String.IsNullOrEmpty((string)element.Attribute("FinishTime")) ? (DateTime?)null : XmlConvert.ToDateTime((string)element.Attribute("FinishTime"), "yyyy-MM-dd HH:mm"),
 				 }).ToList();
 
 			return result;