Fixed UpdateService which was erroneously using the local update manager instead of the GitHub update manager for several parts of the update process

* Bumped version to 1.0.0-beta3

Filtration.ObjectModel/BlockItemTypes/BackgroundColorBlockItem.cs

@@ -7,6 +7,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
     {
         public BackgroundColorBlockItem()
         {
+            Color = new Color { A = 240, R = 0, G = 0, B = 0 };
         }
 
         public BackgroundColorBlockItem(Color color) : base(color)

Filtration.ObjectModel/BlockItemTypes/BorderColorBlockItem.cs

@@ -7,6 +7,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
     {
         public BorderColorBlockItem()
         {
+            Color = new Color {A = 240, R = 0, G = 0, B = 0};
         }
 
         public BorderColorBlockItem(Color color) : base(color)

Filtration.ObjectModel/BlockItemTypes/TextColorBlockItem.cs

@@ -1,5 +1,6 @@
 using System.Windows.Media;
 using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.ObjectModel.Enums;
 
 namespace Filtration.ObjectModel.BlockItemTypes
 {
@@ -7,6 +8,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
     {
         public TextColorBlockItem()
         {
+            Color = PathOfExileNamedColors.Colors[PathOfExileNamedColor.WhiteItem];
         }
 
         public TextColorBlockItem(Color color) : base(color)

Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs

@@ -1308,6 +1308,86 @@ namespace Filtration.Parser.Tests.Services
             Assert.AreEqual(ItemRarity.Magic, (ItemRarity)rarityBlockItem.FilterPredicate.PredicateOperand);
         }
 
+        [Test]
+        public void TranslateStringToItemFilterBlock_CustomSoundDocumentsFile()
+        {
+            // Arrange
+            var inputString = @"Show" + Environment.NewLine +
+                              "CustomAlertSound \"test.mp3\"";
+
+            // Act
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
+
+            // Assert
+            Assert.AreEqual(1, result.BlockItems.Count(b => b is CustomSoundBlockItem));
+            var customSoundBlockItem = result.BlockItems.OfType<CustomSoundBlockItem>().First();
+            Assert.AreEqual("test.mp3", customSoundBlockItem.Value);
+        }
+
+        [Test]
+        public void TranslateStringToItemFilterBlock_CustomSoundDocumentsRelativeFile()
+        {
+            // Arrange
+            var inputString = @"Show" + Environment.NewLine +
+                              "CustomAlertSound \"Sounds\test.mp3\"";
+
+            // Act
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
+
+            // Assert
+            Assert.AreEqual(1, result.BlockItems.Count(b => b is CustomSoundBlockItem));
+            var customSoundBlockItem = result.BlockItems.OfType<CustomSoundBlockItem>().First();
+            Assert.AreEqual("Sounds\test.mp3", customSoundBlockItem.Value);
+        }
+
+        [Test]
+        public void TranslateStringToItemFilterBlock_CustomSoundFullBackSlashPath()
+        {
+            // Arrange
+            var inputString = @"Show" + Environment.NewLine +
+                              "CustomAlertSound \"C:\\Sounds\\test.mp3\"";
+
+            // Act
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
+
+            // Assert
+            Assert.AreEqual(1, result.BlockItems.Count(b => b is CustomSoundBlockItem));
+            var customSoundBlockItem = result.BlockItems.OfType<CustomSoundBlockItem>().First();
+            Assert.AreEqual("C:\\Sounds\\test.mp3", customSoundBlockItem.Value);
+        }
+
+        [Test]
+        public void TranslateStringToItemFilterBlock_CustomSoundFullForwardSlashPath()
+        {
+            // Arrange
+            var inputString = @"Show" + Environment.NewLine +
+                              "CustomAlertSound \"C:/Sounds/test.mp3\"";
+
+            //Act
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
+
+            // Assert
+            Assert.AreEqual(1, result.BlockItems.Count(b => b is CustomSoundBlockItem));
+            var customSoundBlockItem = result.BlockItems.OfType<CustomSoundBlockItem>().First();
+            Assert.AreEqual("C:/Sounds/test.mp3", customSoundBlockItem.Value);
+        }
+
+        [Test]
+        public void TranslateStringToItemFilterBlock_CustomSoundFullMixedPath()
+        {
+            // Arrange
+            var inputString = @"Show" + Environment.NewLine +
+                              "CustomAlertSound \"C:\\Sounds/test.mp3\"";
+
+            // Act
+            var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
+
+            // Assert
+            Assert.AreEqual(1, result.BlockItems.Count(b => b is CustomSoundBlockItem));
+            var customSoundBlockItem = result.BlockItems.OfType<CustomSoundBlockItem>().First();
+            Assert.AreEqual("C:\\Sounds/test.mp3", customSoundBlockItem.Value);
+        }
+
         [Test]
         public void TranslateItemFilterBlockToString_NothingPopulated_ReturnsCorrectString()
         {

Filtration.Parser/Services/ItemFilterBlockTranslator.cs

@@ -382,7 +382,7 @@ namespace Filtration.Parser.Services
                         RemoveExistingBlockItemsOfType<SoundBlockItem>(block);
                         RemoveExistingBlockItemsOfType<PositionalSoundBlockItem>(block);
 
-                        var match = Regex.Match(trimmedLine, @"\S+\s+""(\S+)""");
+                        var match = Regex.Match(trimmedLine, @"\S+\s+""([^\*\<\>\?|]+)""");
                         
                         if (match.Success)
                         {

Filtration/Enums/UpdateSource.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Filtration.Enums
+{
+    internal enum  UpdateSource
+    {
+        GitHub,
+        Local
+    }
+}

Filtration/Filtration.csproj

@@ -203,6 +203,7 @@
     <Compile Include="Converters\HashSignRemovalConverter.cs" />
     <Compile Include="Converters\ItemRarityConverter.cs" />
     <Compile Include="Converters\TreeViewMarginConverter.cs" />
+    <Compile Include="Enums\UpdateSource.cs" />
     <Compile Include="Models\UpdateData.cs" />
     <Compile Include="Properties\Annotations.cs" />
     <Compile Include="Repositories\ItemFilterScriptRepository.cs" />

Filtration/Properties/AssemblyInfo.cs

@@ -11,7 +11,7 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyCulture("")]
 
 [assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0-beta2")]
+[assembly: AssemblyInformationalVersion("1.0.0-beta3")]
 
 [assembly: InternalsVisibleTo("Filtration.Tests")]
 [assembly: InternalsVisibleTo("Filtration.ItemFilterPreview.Tests")]

Filtration/Services/Bootstrapper.cs

@@ -39,7 +39,7 @@ namespace Filtration.Services
 
             _mainWindow.Show();
 
-            await _updateService.CheckForUpdates();
+            await _updateService.CheckForUpdatesAsync();
         }
 
         private void CurrentDomainOnUnhandledException(object sender, UnhandledExceptionEventArgs e)

Filtration/Services/UpdateService.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using Filtration.Enums;
 using Filtration.Properties;
 using NLog;
 using Squirrel;
@@ -52,7 +53,7 @@ namespace Filtration.Services
 
         string LatestReleaseVersion { get; }
 
-        Task CheckForUpdates();
+        Task CheckForUpdatesAsync();
 
         Task DownloadUpdatesAsync();
 
@@ -63,13 +64,16 @@ namespace Filtration.Services
 
     internal class UpdateService : IUpdateService
     {
-        private readonly ISettingsService _settingsService;
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         private const string _localUpdatePath = @"C:\Repos\Filtration\Releases";
+
+        private readonly ISettingsService _settingsService;
+        private readonly UpdateSource _updateSource = UpdateSource.GitHub;
+
         private ReleaseEntry _latestRelease;
         private UpdateInfo _updates;
-
+        private bool _downloadPrereleaseUpdates;
         private UpdateStatus _updateStatus;
 
         public UpdateService(ISettingsService settingsService)
@@ -96,35 +100,42 @@ namespace Filtration.Services
 
         public string LatestReleaseVersion { get; private set; }
 
-        public async Task CheckForUpdates()
+        public async Task CheckForUpdatesAsync()
         {
             if (UpdateStatus != UpdateStatus.NoUpdateAvailable)
             {
                 throw new InvalidOperationException();
             }
 
-
             Logger.Debug("Checking for update...");
             UpdateStatus = UpdateStatus.CheckingForUpdate;
 
             try
             {
-                bool downloadPrereleaseUpdates;
-                downloadPrereleaseUpdates = Settings.Default.DownloadPrereleaseUpdates;
+                _downloadPrereleaseUpdates = Settings.Default.DownloadPrereleaseUpdates;
 #if DEBUG
-                downloadPrereleaseUpdates = true;
+                _downloadPrereleaseUpdates = true;
 #endif
-                using (var mgr = await UpdateManager.GitHubUpdateManager("https://github.com/ben-wallis/Filtration", prerelease: downloadPrereleaseUpdates))
+
+                async Task CheckForUpdatesAsync(IUpdateManager updateManager)
                 {
-                    _updates = await mgr.CheckForUpdate(progress: progress => UpdateProgressChanged?.Invoke(this, new UpdateProgressChangedEventArgs(progress)));
+                    _updates = await updateManager.CheckForUpdate(progress: progress => UpdateProgressChanged?.Invoke(this, new UpdateProgressChangedEventArgs(progress)));
                 }
 
-                // Local file update source for testing
-                //using (var mgr = new UpdateManager(_localUpdatePath))
-                //{
-
-                //    _updates = await mgr.CheckForUpdate(progress: progress => UpdateProgressChanged?.Invoke(this, new UpdateProgressChangedEventArgs(progress)));
-                //}
+                if (_updateSource == UpdateSource.GitHub)
+                {
+                    using (var updateManager = await UpdateManager.GitHubUpdateManager("https://github.com/ben-wallis/Filtration", prerelease: _downloadPrereleaseUpdates))
+                    {
+                        await CheckForUpdatesAsync(updateManager);
+                    }
+                }
+                else
+                {
+                    using (var updateManager = new UpdateManager(_localUpdatePath))
+                    {
+                        await CheckForUpdatesAsync(updateManager);
+                    }
+                }
             }
             catch (Exception e)
             {
@@ -133,25 +144,12 @@ namespace Filtration.Services
                 return;
             }
 
-
             if (_updates.ReleasesToApply.Any())
             {
                 _latestRelease = _updates.ReleasesToApply.OrderBy(x => x.Version).Last();
                 LatestReleaseVersion = _latestRelease.Version.ToString();
 
-                Logger.Debug($"Update found ({LatestReleaseVersion}), fetching release notes...");
-
-                try
-                {
-                    var releaseNotes = _latestRelease.GetReleaseNotes(_localUpdatePath);
-                    LatestReleaseNotes = ProcessReleaseNotes(releaseNotes);
-                }
-                catch (Exception e)
-                {
-                    Logger.Error(e);
-                    UpdateStatus = UpdateStatus.Error;
-                    return;
-                }
+                Logger.Debug($"Update found ({LatestReleaseVersion})");
                 
                 UpdateStatus = UpdateStatus.UpdateAvailable;
             }
@@ -162,7 +160,7 @@ namespace Filtration.Services
             }
         }
 
-        private string ProcessReleaseNotes(string rawReleaseNotes)
+        private static string ProcessReleaseNotes(string rawReleaseNotes)
         {
             var regex = new Regex(@"<!\[CDATA\[(.*)]]>", RegexOptions.Singleline);
             var matches = regex.Match(rawReleaseNotes);
@@ -184,11 +182,31 @@ namespace Filtration.Services
 
             UpdateStatus = UpdateStatus.Downloading;
 
+            async Task DownloadUpdatesAsync(IUpdateManager updateManager)
+            {
+                Logger.Debug("Downloading update...");
+                await updateManager.DownloadReleases(_updates.ReleasesToApply, OnProgressChanged);
+
+                Logger.Debug("Fetching release notes...");
+                var releaseNotes = _updates.FetchReleaseNotes();
+                LatestReleaseNotes = ProcessReleaseNotes(releaseNotes[_latestRelease]);
+            }
+
             try
+            {
+                if (_updateSource == UpdateSource.GitHub)
+                {
+                    using (var updateManager = await UpdateManager.GitHubUpdateManager("https://github.com/ben-wallis/Filtration", prerelease: _downloadPrereleaseUpdates))
+                    {
+                        await DownloadUpdatesAsync(updateManager);
+                    }
+                }
+                else
                 {
                     using (var updateManager = new UpdateManager(_localUpdatePath))
                     {
-                    await updateManager.DownloadReleases(_updates.ReleasesToApply, OnProgressChanged);
+                        await DownloadUpdatesAsync(updateManager);
+                    }
                 }
             }
             catch (Exception e)
@@ -215,13 +233,24 @@ namespace Filtration.Services
             // wipes out user settings due to the application directory changing with each update
             _settingsService.BackupSettings();
 
+            Logger.Debug("Applying update...");
             try
+            {
+                if (_updateSource == UpdateSource.GitHub)
+                {
+                    using (var mgr = await UpdateManager.GitHubUpdateManager("https://github.com/ben-wallis/Filtration", prerelease: _downloadPrereleaseUpdates))
+                    {
+                        await mgr.ApplyReleases(_updates, OnProgressChanged);
+                    }
+                }
+                else
                 {
                     using (var updateManager = new UpdateManager(_localUpdatePath))
                     {
                         await updateManager.ApplyReleases(_updates, OnProgressChanged);
                     }
                 }
+            }
             catch (Exception e)
             {
                 Logger.Error(e);
@@ -229,6 +258,7 @@ namespace Filtration.Services
                 return;
             }
 
+            Logger.Debug("Update complete");
             UpdateStatus = UpdateStatus.UpdateComplete;
         }
 

Filtration/ViewModels/ItemFilterBlockViewModel.cs

@@ -15,6 +15,7 @@ using GalaSoft.MvvmLight.CommandWpf;
 using GalaSoft.MvvmLight.Messaging;
 using Microsoft.Win32;
 using Xceed.Wpf.Toolkit;
+using static System.Int32;
 
 namespace Filtration.ViewModels
 {
@@ -59,8 +60,7 @@ namespace Filtration.ViewModels
 
         public override void Initialise(IItemFilterBlockBase itemFilterBlockBase, IItemFilterScriptViewModel parentScriptViewModel)
         {
-            var itemFilterBlock = itemFilterBlockBase as IItemFilterBlock;
-            if (itemFilterBlock == null || parentScriptViewModel == null)
+            if (!(itemFilterBlockBase is IItemFilterBlock itemFilterBlock) || parentScriptViewModel == null)
             {
                 throw new ArgumentNullException(nameof(itemFilterBlock));
             }
@@ -136,7 +136,7 @@ namespace Filtration.ViewModels
 
         public bool AudioVisualBlockItemsGridVisible
         {
-            get { return _audioVisualBlockItemsGridVisible; }
+            get => _audioVisualBlockItemsGridVisible;
             set
             {
                 _audioVisualBlockItemsGridVisible = value;
@@ -150,7 +150,7 @@ namespace Filtration.ViewModels
 
         public bool DisplaySettingsPopupOpen
         {
-            get { return _displaySettingsPopupOpen; }
+            get => _displaySettingsPopupOpen;
             set
             {
                 _displaySettingsPopupOpen = value;
@@ -205,7 +205,7 @@ namespace Filtration.ViewModels
 
         public bool BlockEnabled
         {
-            get { return Block.Enabled; }
+            get => Block.Enabled;
             set
             {
                 if (Block.Enabled != value)
@@ -219,10 +219,7 @@ namespace Filtration.ViewModels
 
         public string BlockDescription
         {
-            get
-            {
-                return Block.Description;
-            }
+            get => Block.Description;
             set
             {
                 if (Block.Description != value)
@@ -269,8 +266,7 @@ namespace Filtration.ViewModels
 
             newBlockItem.PropertyChanged += OnBlockItemChanged;
 
-            var customSoundBlockItem = newBlockItem as CustomSoundBlockItem;
-            if(customSoundBlockItem != null && _parentScriptViewModel.CustomSoundsAvailable.Count > 0)
+            if(newBlockItem is CustomSoundBlockItem customSoundBlockItem && _parentScriptViewModel.CustomSoundsAvailable.Count > 0)
             {
                 customSoundBlockItem.Value = _parentScriptViewModel.CustomSoundsAvailable[0];
             }
@@ -364,17 +360,15 @@ namespace Filtration.ViewModels
 
         private string ComputeFilePartFromNumber(string identifier)
         {
-            if (Int32.TryParse(identifier, out int x))
+            if (TryParse(identifier, out int x))
             {
                 if (x <= 9)
                 {
                     return "AlertSound_0" + x + ".mp3";
                 }
-                else
-                {
+
                 return "AlertSound_" + x + ".mp3";
             }
-            }
 
             return "";
         }
@@ -431,12 +425,10 @@ namespace Filtration.ViewModels
             {
                 return;
             }
-            else
-            {
+
             _mediaPlayer.Open(new Uri(prefix + filePart, UriKind.Relative));
             _mediaPlayer.Play();
         }
-        }
 
         private void OnPlayPositionalSoundCommand()
         {
@@ -448,12 +440,10 @@ namespace Filtration.ViewModels
             {
                 return;
             }
-            else
-            {
+
             _mediaPlayer.Open(new Uri(prefix + filePart, UriKind.Relative));
             _mediaPlayer.Play();
         }
-        }
 
         private void OnBlockEnabledStatusChanged(object sender, EventArgs e)
         {
@@ -462,13 +452,12 @@ namespace Filtration.ViewModels
 
         private void OnBlockItemChanged(object sender, EventArgs e)
         {
-            var itemFilterBlockItem = sender as IItemFilterBlockItem;
-            if ( itemFilterBlockItem != null && itemFilterBlockItem.IsDirty)
+            if (sender is IItemFilterBlockItem itemFilterBlockItem && itemFilterBlockItem.IsDirty)
             {
                 IsDirty = true;
             }
-            var customSoundBlockItem = sender as CustomSoundBlockItem;
-            if (customSoundBlockItem != null)
+
+            if (sender is CustomSoundBlockItem customSoundBlockItem)
             {
                 if (!string.IsNullOrWhiteSpace(customSoundBlockItem.Value) && _parentScriptViewModel.CustomSoundsAvailable.IndexOf(customSoundBlockItem.Value) < 0)
                 {
@@ -507,12 +496,11 @@ namespace Filtration.ViewModels
 
         private void OnCustomSoundFileDialog()
         {
-            OpenFileDialog fileDialog = new OpenFileDialog();
-            fileDialog.DefaultExt = ".mp3";
-            var poePath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments).ToString() + @"\My Games\Path of Exile\";
+            OpenFileDialog fileDialog = new OpenFileDialog {DefaultExt = ".mp3"};
+            var poePath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\My Games\Path of Exile\";
             fileDialog.InitialDirectory = poePath;
 
-            Nullable<bool> result = fileDialog.ShowDialog();
+            bool? result = fileDialog.ShowDialog();
             if (result == true)
             {
                 var fileName = fileDialog.FileName;
@@ -533,7 +521,7 @@ namespace Filtration.ViewModels
 
         private void OnPlayCustomSoundCommand()
         {
-            var poePath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments).ToString() + @"\My Games\Path of Exile\";
+            var poePath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\My Games\Path of Exile\";
             var identifier = BlockItems.OfType<CustomSoundBlockItem>().First().Value;
 
             if(!Path.IsPathRooted(identifier))
@@ -569,9 +557,11 @@ namespace Filtration.ViewModels
                 var newGroup = new ItemFilterBlockGroup(BlockGroupSearch, null, AdvancedBlockGroup, false);
                 if (baseBlock.BlockGroup == null)
                 {
-                    baseBlock.BlockGroup = new ItemFilterBlockGroup("", null, false, true);
-                    baseBlock.BlockGroup.IsShowChecked = baseBlock.Action == BlockAction.Show;
-                    baseBlock.BlockGroup.IsEnableChecked = BlockEnabled;
+                    baseBlock.BlockGroup = new ItemFilterBlockGroup("", null, false, true)
+                    {
+                        IsShowChecked = baseBlock.Action == BlockAction.Show,
+                        IsEnableChecked = BlockEnabled
+                    };
                 }
                 newGroup.AddOrJoinBlockGroup(baseBlock.BlockGroup);
                 blockToAdd.AddOrJoinBlockGroup(newGroup);
@@ -611,8 +601,7 @@ namespace Filtration.ViewModels
 
         private void UpdateBlockGroups()
         {
-            var baseBlock = Block as ItemFilterBlock;
-            if (baseBlock == null)
+            if (!(Block is ItemFilterBlock baseBlock))
                 return;
 
             var currentGroup = baseBlock.BlockGroup;

Filtration/ViewModels/UpdateViewModel.cs

@@ -144,7 +144,6 @@ namespace Filtration.ViewModels
                 {
                     Visible = true;
                     NextStepButtonText = "Download";
-                    RaisePropertyChanged(nameof(ReleaseNotes));
                     RaisePropertyChanged(nameof(Version));
                     break;
                 }
@@ -156,6 +155,7 @@ namespace Filtration.ViewModels
                 }
                 case UpdateStatus.ReadyToApplyUpdate:
                 {
+                    RaisePropertyChanged(nameof(ReleaseNotes));
                     NextStepButtonText = "Update Ready";
                     break;
                 }

README.md

@@ -2,10 +2,10 @@
 
 Filtration is an editor for Path of Exile item filter scripts.
 
-## Current Release (Released 2018-08-30)
-<b>Installer</b> <a href="https://github.com/ben-wallis/Filtration/releases/download/0.19/filtration_0.19_setup.exe">filtration_0.19_setup.exe</a>
+## Current Release (Released 2018-09-01)
+<b>Installer</b> <a href="https://github.com/ben-wallis/Filtration/releases/download/0.20/filtration_0.20_setup.exe">filtration_0.20_setup.exe</a>
 
-<b>Zip File</b> <a href="https://github.com/ben-wallis/Filtration/releases/download/0.19/filtration_0.19.zip">filtration_0.19.zip</a>
+<b>Zip File</b> <a href="https://github.com/ben-wallis/Filtration/releases/download/0.20/filtration_0.20.zip">filtration_0.20.zip</a>
 
 ## System Requirements
 Filtration requires .NET Framework 4.6.1 installed.