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/DataDownload/DataDownloader.cs

@@ -31 +31 @@
 	/// <summary>
 	/// This class takes care of downloading of data. Download happens from http://openstore.zcu.cz/.
 	/// </summary>
-	public class DataDownloader
+	public class DataDownloader : IDataDownloader
 	{
 		/// <summary>
 		/// The root directory containing all downloaded data
@@ -332 +332 @@
 		/// <param name="format">The data format</param>
 		/// <param name="startDate">The start date</param>
 		/// <param name="endDate">The end date</param>
-		/// <returns></returns>
-		public List<string> DownloadData(DataType type, DataFormat format, Date startDate, Date endDate/*int startYear, int endYear, int startMonth, int endMonth*/)
+		/// <returns>A list of full paths to all saved files</returns>
+		public List<string> DownloadData(DataType type, DataFormat format, Date startDate, Date endDate)
 		{
 			if (startDate > endDate)
 				throw new ArgumentException("startDate must be the same as or before the endDate.");
@@ -394 +394 @@
 		/// <summary>
 		/// Retrieves all data files with dates falling within the specified range. If not all data for the specified range is found
 		/// then returns also file/s with month 0 if exists.
+		/// If startDate and/or endDate are null, then returns all files from the given subdirectory.
 		/// </summary>
 		/// <param name="subDirectory">The subdirectory to search</param>
 		/// <param name="startDate">The start date</param>
 		/// <param name="endDate">The end date</param>
-		/// <returns></returns>
+		/// <returns>A list of all retrieved data files from the requested time span</returns>
 		public List<string> GetData(string subDirectory, Date startDate, Date endDate)
 		{
 			if (startDate == null || endDate == null)
@@ -489 +490 @@
 
 			return relevantFiles;
 		}
-
-
-		#region UNUSED
-		//public string GetDirectoryListingRegexForUrl(string url)
-		//{
-		//	if (url.Equals(site))
-		//	{
-		//		//return "\\\"([^\"]*)\\\"";
-		//		return @"\bOD_ZCU_\w*\b";
-		//		//return @"\A[OD_ZCU_]";
-		//	}
-		//	else return null;
-		//}
-		//public void ListDirectory()
-		//{
-		//	string url = site;
-		//	HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
-		//	using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
-		//	{
-		//		using (StreamReader reader = new StreamReader(response.GetResponseStream()))
-		//		{
-		//			string html = reader.ReadToEnd();
-
-
-
-		//			Regex regex = new Regex(GetDirectoryListingRegexForUrl(url));
-		//			MatchCollection matches = regex.Matches(html);
-		//			Console.WriteLine(matches.Count);
-
-		//			if (matches.Count > 0)
-		//			{
-		//				foreach (Match match in matches)
-		//				{
-		//					//if (match.Success)
-		//					//{
-		//						Console.WriteLine(match.ToString());
-		//					//}
-		//				}
-		//			}
-		//		}
-		//		Console.ReadLine();
-		//	}
-		//}
-
-		#endregion
 	}
 }