From f77e9575fcd440af47ca8a2b9cec4ccce431ee03 Mon Sep 17 00:00:00 2001 From: Ben Wallis Date: Tue, 30 Aug 2016 18:42:40 +0100 Subject: [PATCH] Moved Update Data Url to Settings --- Filtration/App.config | 3 +++ Filtration/Properties/Settings.Designer.cs | 9 +++++++++ Filtration/Properties/Settings.settings | 3 +++ Filtration/Services/UpdateCheckService.cs | 6 ++---- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Filtration/App.config b/Filtration/App.config index 1a74a1f..9be4e10 100644 --- a/Filtration/App.config +++ b/Filtration/App.config @@ -53,6 +53,9 @@ http://ben-wallis.github.io/Filtration/ItemClasses.txt + + http://ben-wallis.github.io/Filtration/filtration_version.xml + diff --git a/Filtration/Properties/Settings.Designer.cs b/Filtration/Properties/Settings.Designer.cs index bee0b92..0aa8b58 100644 --- a/Filtration/Properties/Settings.Designer.cs +++ b/Filtration/Properties/Settings.Designer.cs @@ -112,5 +112,14 @@ namespace Filtration.Properties { return ((string)(this["ItemClassesStaticDataUrl"])); } } + + [global::System.Configuration.ApplicationScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("http://ben-wallis.github.io/Filtration/filtration_version.xml")] + public string UpdateDataUrl { + get { + return ((string)(this["UpdateDataUrl"])); + } + } } } diff --git a/Filtration/Properties/Settings.settings b/Filtration/Properties/Settings.settings index da2ace3..79cafbc 100644 --- a/Filtration/Properties/Settings.settings +++ b/Filtration/Properties/Settings.settings @@ -26,5 +26,8 @@ http://ben-wallis.github.io/Filtration/ItemClasses.txt + + http://ben-wallis.github.io/Filtration/filtration_version.xml + \ No newline at end of file diff --git a/Filtration/Services/UpdateCheckService.cs b/Filtration/Services/UpdateCheckService.cs index 88b355c..6d4d04b 100644 --- a/Filtration/Services/UpdateCheckService.cs +++ b/Filtration/Services/UpdateCheckService.cs @@ -6,7 +6,6 @@ using System.Windows; using System.Xml.Serialization; using Filtration.Models; using Filtration.Properties; -using Filtration.Views; using NLog; namespace Filtration.Services @@ -21,8 +20,7 @@ namespace Filtration.Services private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); private readonly IHTTPService _httpService; - private const string _updateDataUrl = "http://ben-wallis.github.io/Filtration/filtration_version_dev.xml"; - + public UpdateCheckService(IHTTPService httpService) { _httpService = httpService; @@ -97,7 +95,7 @@ namespace Filtration.Services private UpdateData GetUpdateData() { - var updateXml = _httpService.GetContent(_updateDataUrl); + var updateXml = _httpService.GetContent(Settings.Default.UpdateDataUrl); return DeserializeUpdateData(updateXml); }