Revize 26ecc756

re #8962 Adding reading of file to string to CsvDataLoader

Server/ServerApp/DataDownload/DataDownloader.cs

@@ -95 +95 @@
 
 			DateTime now = DateTime.Now;
 			WebClient webClient = new WebClient();
-			string data = webClient.DownloadString(predictionSite);
+			webClient.DownloadFile(predictionSite, $"data/{now.Year}{now.Month}{now.Day}.json");
 
-			return data;
+			return $"data/{now.Year}{now.Month}{now.Day}.json";
 		}
 
 		/// <summary>

Server/ServerApp/Parser/InputData/CsvDataLoader.cs

@@ -18 +18 @@
         /// <summary> Culture info for parsing numbers </summary>
         static CultureInfo cultureInfo = new CultureInfo("de-DE");
 
+        /// <summary>
+        /// Load file into string
+        /// </summary>
+        /// <param name="path">Paht to file</param>
+        /// <returns>Null if file does not exist, or file in string</returns>
+        public string LoadPredictionFile(string path)
+        {
+            if (path == null || !File.Exists(path))
+                return null;
+
+            return File.ReadAllText(path);
+        }
+
         /// <summary>
         /// Load csv file into array
         /// </summary>

Server/ServerApp/Parser/InputData/IDataLoader.cs

@@ -32 +32 @@
         /// <returns></returns>
         List<WeatherInstance> LoadWeatherFile(string pathToFile);
 
+        /// <summary>
+        /// Load file into string
+        /// </summary>
+        /// <param name="path">Paht to file</param>
+        /// <returns>Null if file does not exist, or file in string</returns>
+        string LoadPredictionFile(string path);
+
+
     }
 }

Server/ServerApp/Program.cs

@@ -1 +1 @@
 using ServerApp.Connection;
 using ServerApp.Connection.XMLProtocolHandler;
 using ServerApp.DataDownload;
+using ServerApp.Parser.InputData;
 using ServerApp.Parser.OutputInfo;
 using ServerApp.Parser.Parsers;
 using ServerApp.Predictor;
@@ -131 +132 @@
 
             // PARSE DATA
 
-            JsonParser jsonP = new JsonParser(dd);
+            JsonParser jsonP = new JsonParser(dd, new CsvDataLoader());
 			jsonP.ParsePrediction();
 
 			var res = jsonP.GetPredictionForTime(jsonP.Predictions[5].startTime, jsonP.Predictions[20].startTime);

Server/ServerApp/WeatherPredictionParser/JsonParser.cs

@@ -3 +3 @@
 //
 
 using ServerApp.DataDownload;
+using ServerApp.Parser.InputData;
 using ServerApp.Parser.OutputInfo;
 using System;
 using System.Collections.Generic;
@@ -20 +21 @@
     /// <author>A. Konig</author>
     public class JsonParser : IJsonParser
     {
+        /// <summary> Data downloader </summary>
+        DataDownloader downloader;
         /// <summary> Data loader </summary>
-        DataDownloader loader;
+        IDataLoader loader;
         /// <summary> Currently parsed day </summary>
         DateTime currParsedDay;
         /// <summary> Sunrise time of currently parsed day </summary>
@@ -32 +35 @@
         /// <summary>
         /// Constructor
         /// </summary>
-        /// <param name="loader"></param>
-        public JsonParser(DataDownloader loader)
+        /// <param name="downloader"></param>
+        public JsonParser(DataDownloader downloader, IDataLoader loader)
         {
+            this.downloader = downloader;
             this.loader = loader;
         }
 
@@ -107 +111 @@
             sunsetTime = new List<DateTime>();
 
             // get file
-            string data = loader.DownloadWeatherPrediction();
+            string file = downloader.DownloadWeatherPrediction();
+            string data = loader.LoadPredictionFile(file);
+
+            if (data == null)
+                return;
+
             DateTime now = DateTime.Now;
 
             Current = new WeatherInfo();

Server/TestProject/ParserTests/TestingParser.cs

@@ -1268 +1268 @@
             string data = SetBasicData();
 
             Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
 
-            JsonParser target = new JsonParser(dl.Object);
+            Mock<IDataLoader> l = new Mock<IDataLoader>();
+            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
+
+            JsonParser target = new JsonParser(dl.Object, l.Object);
 
             target.ParsePrediction();
             WeatherInfo current = target.Current;
@@ -1284 +1287 @@
             string data = SetBasicData();
 
             Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
+
+            Mock<IDataLoader> l = new Mock<IDataLoader>();
+            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
 
-            JsonParser target = new JsonParser(dl.Object);
+            JsonParser target = new JsonParser(dl.Object, l.Object);
 
             target.ParsePrediction();
             List<WeatherInfo> retVal = target.Predictions;
@@ -1306 +1312 @@
             string data = SetAstronomyData();
 
             Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
 
-            JsonParser target = new JsonParser(dl.Object);
+            Mock<IDataLoader> l = new Mock<IDataLoader>();
+            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
+
+            JsonParser target = new JsonParser(dl.Object, l.Object);
 
             target.ParsePrediction();
             List<WeatherInfo> retVal = target.Predictions;
@@ -1333 +1342 @@
         {
             string data = "";
             Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
+
+            Mock<IDataLoader> l = new Mock<IDataLoader>();
+            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
 
-            JsonParser target = new JsonParser(dl.Object);
+            JsonParser target = new JsonParser(dl.Object, l.Object);
 
             List<WeatherInfo> pred = new List<WeatherInfo>();
             pred.Add(new WeatherInfo(new DateTime(2000, 1, 1, 0, 0, 0), 8, 1, 2, 60_000, 3));
@@ -1367 +1379 @@
         {
             string data = "";
             Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
 
-            JsonParser target = new JsonParser(dl.Object);
+            Mock<IDataLoader> l = new Mock<IDataLoader>();
+            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
+
+            JsonParser target = new JsonParser(dl.Object, l.Object);
 
             List<WeatherInfo> pred = new List<WeatherInfo>();
             pred.Add(new WeatherInfo(new DateTime(2000, 1, 1, 0, 0, 0), 8, 1, 2, 60_000, 3));
@@ -1394 +1409 @@
         {
             string data = "";
             Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
+
+            Mock<IDataLoader> l = new Mock<IDataLoader>();
+            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
 
-            JsonParser target = new JsonParser(dl.Object);
+            JsonParser target = new JsonParser(dl.Object, l.Object);
 
             List<WeatherInfo> pred = new List<WeatherInfo>();
             pred.Add(new WeatherInfo(new DateTime(2000, 1, 1, 0, 0, 0), 8, 1, 2, 60_000, 3));
@@ -1426 +1444 @@
         {
             string data = "";
             Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
 
-            JsonParser target = new JsonParser(dl.Object);
+            Mock<IDataLoader> l = new Mock<IDataLoader>();
+            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
+
+            JsonParser target = new JsonParser(dl.Object, l.Object);
 
             List<WeatherInfo> pred = new List<WeatherInfo>();
             pred.Add(new WeatherInfo(new DateTime(2000, 1, 1, 0, 0, 0), 8, 1, 2, 60_000, 3));
@@ -1455 +1476 @@
             // TODO make an input file
             string data = "";
             Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
+
+            Mock<IDataLoader> l = new Mock<IDataLoader>();
+            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
 
-            JsonParser target = new JsonParser(dl.Object);
+            JsonParser target = new JsonParser(dl.Object, l.Object);
 
             List<WeatherInfo> pred = new List<WeatherInfo>();
             pred.Add(new WeatherInfo(new DateTime(2000, 1, 1, 0, 0, 0), 8, 1, 2, 60_000, 3));