Bumped version to 1.0.3

* Fixed a crash caused by null selected blocks

Filtration/Filtration.csproj

@@ -230,6 +230,7 @@
     <Compile Include="UserControls\ThemeComponentSelectionControl.xaml.cs">
       <DependentUpon>ThemeComponentSelectionControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Utility\SplatNLogAdapter.cs" />
     <Compile Include="ViewModels\DesignTime\DesignTimeSettingsPageViewModel.cs" />
     <Compile Include="Views\AttachedProperties\SelectedItemsAttachedProperty.cs" />
     <Compile Include="Utility\RoutedCommandHandler.cs" />

Filtration/Filtration.nuspec

@@ -9,29 +9,13 @@
     <description>A Path of Exile loot filter script editor</description>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>Copyright 2018</copyright>
-    <releaseNotes>### New Features
-
-* Implemented copying and pasting of multiple blocks (multiple blocks can be selected by holding the Ctrl and/or Shift keys while clicking)
-* Added Expand All, Collapse All, and Clear All Filters buttons to the Block Group Browser
-* It is now possible to add/remove Block Groups from blocks (there is a new text box and a + button on each block in the editor)
-* The Block Group browser now has an additional column of checkboxes which enables block groups to be enabled/disabled as well as shown/hidden
-* Implemented a new auto-update mechanism - previous versions of Filtration will need to be manually uninstalled
-* The state (maximised/restored) and size of the application window is now remembered
-* The visibility of the Section Browser, Block Group Browser, and Block Output Preview tool panes is now remembered
-* The last active script is now re-opened on when the application is launched
-
-### Bug Fixes / Improvements
-
-* Fixed incorrect filtering behavior in the Block Group Browser
-* Increased the maximum value of Quality block items to 30 from 20
-* Changed default opacity of colours to 240 from 255
-* MinimapIcon preview icons have been improved in appearance and now have a transparent background
-* Fixed an issue where several section-related commands didn't correctly mark the script as unsaved
-* Increased the HasExplicitMod block item limit from 1 to 8 since it is possible to use up to 8 of these blocks together to only match items that have an explicit mod from all HasExplicitMod block items within a block
-* Changed the default colours of TextColor, BorderColor and BackgroundColor block items to sensible defaults instead of 100% transparent</releaseNotes>
+    <releaseNotes>* Added missing AlertSound mp3 resources to installer
+* Fixed a crash related to performing certain commands with no blocks selected
+* Added extra logging to updater</releaseNotes>
     <dependencies />
   </metadata>
   <files>
     <file src="*.*" target="lib\net45\" exclude="*.pdb;*.nupkg;*.vshost.*;*.xml"/>
+	<file src="Resources\AlertSounds\*.mp3" target="lib\net45\Resources\AlertSounds\" />
   </files>
 </package>

Filtration/NLog.config

@@ -10,15 +10,21 @@
             layout="${longdate} ${uppercase:${level}} ${message}" />
     <target xsi:type="File" name="fDebug" fileName="${basedir}/Filtration_debug_${shortdate}.log"
             layout="${longdate} ${uppercase:${level}} ${message}" />
+    <target xsi:type="File" name="fUpdater" fileName="${basedir}/Filtration_updater_${shortdate}.log"
+            layout="${longdate} ${uppercase:${level}} ${message}" />
     <target xsi:type="Debugger" name="cDebug" layout="${longdate} ${uppercase:${level}} ${message}"/>
   </targets>
 
   <rules>
 
+    <!-- Squirrel Updater Log-->
+    <logger name="SquirrelLogger" minlevel="Trace" writeTo="fUpdater" />
+
     <!-- Uncomment the Debug line to enable Debug logging -->
     <!--<logger name="*" minlevel="Debug" writeTo="fDebug" final="true" />-->
     <logger name="*" minlevel="Error" writeTo="fErrors" />
     <logger name="*" minlevel="Trace" writeTo="cDebug" />
 
+    
   </rules>
 </nlog>

Filtration/Properties/AssemblyInfo.cs

@@ -10,8 +10,8 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0")]
+[assembly: AssemblyVersion("1.0.3")]
+[assembly: AssemblyInformationalVersion("1.0.3")]
 
 [assembly: InternalsVisibleTo("Filtration.Tests")]
 [assembly: InternalsVisibleTo("Filtration.ItemFilterPreview.Tests")]

Filtration/Services/UpdateService.cs

@@ -4,6 +4,7 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Filtration.Enums;
 using Filtration.Properties;
+using Filtration.Utility;
 using NLog;
 using Squirrel;
 
@@ -76,11 +77,14 @@ namespace Filtration.Services
         private bool _downloadPrereleaseUpdates;
         private UpdateStatus _updateStatus;
 
-        public UpdateService(ISettingsService settingsService)
+        public UpdateService(ISettingsService settingsService,
+                             ISplatNLogAdapter splatNLogAdapter)
         {
             _settingsService = settingsService;
 
             UpdateStatus = UpdateStatus.NoUpdateAvailable;
+
+            Splat.Locator.CurrentMutable.Register(() => splatNLogAdapter, typeof(Splat.ILogger));
         }
 
         public event EventHandler<UpdateStatusChangedEventArgs> UpdateStatusChanged;

Filtration/Utility/SplatNLogAdapter.cs

@@ -0,0 +1,52 @@
+using System;
+using NLog;
+using ILogger = Splat.ILogger;
+using LogLevel = Splat.LogLevel;
+
+namespace Filtration.Utility
+{
+    public interface ISplatNLogAdapter
+    {
+    }
+
+    public class SplatNLogAdapter : ILogger, ISplatNLogAdapter
+    {
+        private static readonly Logger Logger = LogManager.GetLogger("SquirrelLogger");
+
+        public void Write(string message, LogLevel logLevel)
+        {
+            switch (logLevel)
+            {
+                case LogLevel.Debug:
+                {
+                    Logger.Debug(message);
+                    break;
+                }
+                case LogLevel.Info:
+                {
+                    Logger.Info(message);
+                    break;
+                }
+                case LogLevel.Error:
+                {
+                    Logger.Error(message);
+                    break;
+                }
+                case LogLevel.Fatal:
+                {
+                    Logger.Fatal(message);
+                    break;
+                }
+                case LogLevel.Warn:
+                {
+                    Logger.Warn(message);
+                    break;
+                }
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(logLevel), logLevel, null);
+            }
+        }
+
+        public LogLevel Level { get; set; }
+    }
+}

Filtration/ViewModels/ItemFilterScriptViewModel.cs

@@ -143,6 +143,7 @@ namespace Filtration.ViewModels
             {
                 RaisePropertyChanged(nameof(SelectedBlockViewModels));
                 RaisePropertyChanged(nameof(LastSelectedBlockViewModel));
+                Messenger.Default.Send(new NotificationMessage("LastSelectedBlockChanged"));
             };
             _lastAddedBlocks = new List<IItemFilterBlockViewModelBase>();
             _showAdvanced = Settings.Default.ShowAdvanced;
@@ -378,7 +379,7 @@ namespace Filtration.ViewModels
         {
             for (var i = 0; i < SelectedBlockViewModels.Count; i++)
             {
-                if (!ViewItemFilterBlockViewModels.Contains(SelectedBlockViewModels[i]))
+                if (SelectedBlockViewModels[i] == null || !ViewItemFilterBlockViewModels.Contains(SelectedBlockViewModels[i]))
                 {
                     SelectedBlockViewModels.RemoveAt(i--);
                 }
@@ -553,6 +554,8 @@ namespace Filtration.ViewModels
 
         public bool CanModifySelectedBlocks()
         {
+            ValidateSelectedBlocks();
+
             if (SelectedBlockViewModels.Count < 1)
                 return false;
 
@@ -569,6 +572,9 @@ namespace Filtration.ViewModels
 
         public bool CanModifyBlock(IItemFilterBlockViewModelBase itemFilterBlock)
         {
+            if (itemFilterBlock == null)
+                return false;
+
             if (itemFilterBlock is IItemFilterBlockViewModel)
                 return true;
 

Filtration/ViewModels/ToolPanes/BlockOutputPreviewViewModel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Windows.Media.Imaging;
 using Filtration.Parser.Interface.Services;
 using GalaSoft.MvvmLight.Messaging;
@@ -28,19 +29,10 @@ namespace Filtration.ViewModels.ToolPanes
 
             Messenger.Default.Register<NotificationMessage>(this, message =>
             {
-                switch (message.Notification)
-                {
-                    case "LastSelectedBlockChanged":
-                    {
+                if (message.Notification == "LastSelectedBlockChanged")
                     OnLastSelectedBlockChanged(this, EventArgs.Empty);
-                        break;
-                    }
-                    case "ActiveDocumentChanged":
-                    {
+                else if (message.Notification == "ActiveDocumentChanged")
                     OnLastSelectedBlockChanged(this, EventArgs.Empty);
-                        break;
-                    }
-                }
             });
 
         }
@@ -49,7 +41,7 @@ namespace Filtration.ViewModels.ToolPanes
 
         public string PreviewText
         {
-            get { return _previewText; }
+            get => _previewText;
             private set
             {
                 _previewText = value;
@@ -64,15 +56,17 @@ namespace Filtration.ViewModels.ToolPanes
 
         private void OnLastSelectedBlockChanged(object sender, EventArgs e)
         {
-            if (AvalonDockWorkspaceViewModel.ActiveScriptViewModel?.LastSelectedBlockViewModel == null)
+            if (AvalonDockWorkspaceViewModel.ActiveScriptViewModel?.SelectedBlockViewModels == null || 
+                AvalonDockWorkspaceViewModel.ActiveScriptViewModel.SelectedBlockViewModels.Count == 0 ||
+                AvalonDockWorkspaceViewModel.ActiveScriptViewModel.SelectedBlockViewModels.FirstOrDefault() == null)
             {
                 PreviewText = string.Empty;
                 return;
             }
             
-            PreviewText =
-                _itemFilterBlockTranslator.TranslateItemFilterBlockBaseToString(
-                    AvalonDockWorkspaceViewModel.ActiveScriptViewModel.LastSelectedBlockViewModel.BaseBlock);
+            PreviewText = AvalonDockWorkspaceViewModel.ActiveScriptViewModel.SelectedBlockViewModels
+                .Select(s => _itemFilterBlockTranslator.TranslateItemFilterBlockBaseToString(s.BaseBlock))
+                .Aggregate((prev, curr) => prev + Environment.NewLine + Environment.NewLine + curr);
         }
     }
 }

Filtration/Views/ToolPanes/BlockOutputPreviewView.xaml

@@ -8,6 +8,6 @@
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
     <Grid>
-        <TextBlock Text="{Binding PreviewText}" ToolTip="{Binding PreviewText}" Margin="10" />
+        <TextBox IsReadOnly="True" Text="{Binding PreviewText, Mode=OneWay}" ToolTip="{Binding PreviewText}" Padding="5" Background="Transparent" BorderThickness="0" />
     </Grid>
 </UserControl>

Filtration/WindsorInstallers/ServicesInstaller.cs

@@ -2,6 +2,7 @@
 using Castle.MicroKernel.SubSystems.Configuration;
 using Castle.Windsor;
 using Filtration.Services;
+using Filtration.Utility;
 
 namespace Filtration.WindsorInstallers
 {
@@ -43,6 +44,11 @@ namespace Filtration.WindsorInstallers
                 Component.For<ISettingsService>()
                     .ImplementedBy<SettingsService>()
                     .LifeStyle.Singleton);
+
+            container.Register(
+                Component.For<ISplatNLogAdapter>()
+                    .ImplementedBy<SplatNLogAdapter>()
+                    .LifeStyle.Singleton);
         }
     }
 }

README.md

@@ -2,10 +2,9 @@
 
 Filtration is an editor for Path of Exile item filter scripts.
 
-## 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.20/filtration_0.20.zip">filtration_0.20.zip</a>
+## Current Release (Released 2018-09-30)
+<b>Installer</b><br>
+<a href="https://github.com/ben-wallis/Filtration/releases/download/1.0.2/Setup.exe">Setup.exe</a>
 
 ## System Requirements
 Filtration requires .NET Framework 4.6.1 installed.
@@ -25,10 +24,10 @@ If you'd like to make your script fully compatible with Filtration, please take
 ## Screenshots
 
 ##### Main Window
-<img src="http://i.imgur.com/eAsMoSo.png" />
+<img src="https://i.imgur.com/d3tKEab.png" />
 
 ##### Theme Editor
-<img src="http://i.imgur.com/FJWJknO.png" />
+<img src="https://i.imgur.com/Pi9wds1.png" />
 
 ## Contact
 You can find me on irc.freenode.net in #filtration