Bug fixes - batch color change implemented

Batch Shortcut amendment implementation started - can amend the color,
'show foreground text' and 'light/dark' for bulk shortcuts.

Bug fixes:

- Fixed crash if trying to get pinned items before creating custom
shortcuts (ProgramData folder didn't exist)
- Force deletion on items that need replacing to work
- Attribute retention in an action rather than using (not sure on best
practice here)
- ColorPanel defaults to Custom correctly
- Added more null checks in various places

TileIconifier.Core/Config.cs

@@ -70,6 +70,17 @@ public void SaveConfig()
 
         public void SaveConfig(string filePath)
         {
+            if (string.IsNullOrEmpty(filePath))
+            {
+                return;
+            }
+
+            var dirPath = Path.GetDirectoryName(filePath);
+            if (dirPath != null && !Directory.Exists(dirPath))
+            {
+                Directory.CreateDirectory(dirPath);
+            }
+
             using (var xmlFile = new FileStream(filePath, FileMode.Create))
             {
                 var xmlSerializer = new XmlSerializer(typeof (Config));

TileIconifier.Core/IconExtractor/IconExtractor.cs

@@ -48,8 +48,8 @@ public class IconExtractor
 
         // Resource types for EnumResourceNames().
 
-        private static readonly IntPtr RtIcon = (IntPtr) 3;
-        private static readonly IntPtr RtGroupIcon = (IntPtr) 14;
+        private static readonly IntPtr _rtIcon = (IntPtr) 3;
+        private static readonly IntPtr _rtGroupIcon = (IntPtr) 14;
 
         ////////////////////////////////////////////////////////////////////////
         // Fields
@@ -137,7 +137,7 @@ private void Initialize(string fileName)
 
                     // RT_GROUP_ICON resource consists of a GRPICONDIR and GRPICONDIRENTRY's.
 
-                    var dir = GetDataFromResource(hModule, RtGroupIcon, name);
+                    var dir = GetDataFromResource(hModule, _rtGroupIcon, name);
 
                     // Calculate the size of an entire .icon file.
 
@@ -159,7 +159,7 @@ private void Initialize(string fileName)
                             // Load the picture.
 
                             var id = BitConverter.ToUInt16(dir, 6 + 14*i + 12); // GRPICONDIRENTRY.nID
-                            var pic = GetDataFromResource(hModule, RtIcon, (IntPtr) id);
+                            var pic = GetDataFromResource(hModule, _rtIcon, (IntPtr) id);
 
                             // Copy GRPICONDIRENTRY to ICONDIRENTRY.
 
@@ -182,7 +182,7 @@ private void Initialize(string fileName)
 
                     return true;
                 };
-                NativeMethods.EnumResourceNames(hModule, RtGroupIcon, callback, IntPtr.Zero);
+                NativeMethods.EnumResourceNames(hModule, _rtGroupIcon, callback, IntPtr.Zero);
 
                 _iconData = tmpData.ToArray();
             }

TileIconifier.Core/IconExtractor/IconUtil.cs

@@ -36,7 +36,7 @@ namespace TileIconifier.Core.IconExtractor
 {
     public static class IconUtil
     {
-        private static readonly GetIconDataDelegate IconDataDelegate;
+        private static readonly GetIconDataDelegate _iconDataDelegate;
 
         static IconUtil()
         {
@@ -51,7 +51,7 @@ static IconUtil()
             if (fi != null) gen.Emit(OpCodes.Ldfld, fi);
             gen.Emit(OpCodes.Ret);
 
-            IconDataDelegate = (GetIconDataDelegate) dm.CreateDelegate(typeof (GetIconDataDelegate));
+            _iconDataDelegate = (GetIconDataDelegate) dm.CreateDelegate(typeof (GetIconDataDelegate));
         }
 
         /// <summary>
@@ -180,7 +180,7 @@ public static int GetBitCount(Icon icon)
 
         private static byte[] GetIconData(Icon icon)
         {
-            var data = IconDataDelegate(icon);
+            var data = _iconDataDelegate(icon);
             if (data != null)
             {
                 return data;

TileIconifier.Core/Shortcut/State/ShortcutItemState.cs

@@ -60,9 +60,9 @@ public bool Equals(ShortcutItemState other)
             if (ReferenceEquals(this, other))
                 return true;
 
-            return BackgroundColor == other.BackgroundColor
-                   && ForegroundText == other.ForegroundText
-                   && ShowNameOnSquare150X150Logo == other.ShowNameOnSquare150X150Logo
+            return BackgroundColor == other?.BackgroundColor
+                   && ForegroundText == other?.ForegroundText
+                   && ShowNameOnSquare150X150Logo == other?.ShowNameOnSquare150X150Logo
                    && MediumImage.Equals(other.MediumImage)
                    && SmallImage.Equals(other.SmallImage)
                    && UseSystemAccentColor == other.UseSystemAccentColor;

TileIconifier.Core/Shortcut/State/ShortcutItemStateController.cs

@@ -44,11 +44,13 @@ public class ShortcutItemStateController
 
         public void SaveMediumIconMetadata(string filePath)
         {
+            IoUtils.ForceDelete(filePath);
             CurrentState.MediumImage.Save(filePath);
         }
 
         public void SaveSmallIconMetadata(string filePath)
         {
+            IoUtils.ForceDelete(filePath);
             CurrentState.SmallImage.Save(filePath);
         }
 
@@ -99,15 +101,15 @@ internal void LoadParameters(bool loadFromFile, string visualElementsManifestPat
                     var parameters = from b in xmlDoc.Descendants("VisualElements")
                         select new ShortcutItemState
                         {
-                            BackgroundColor = b.Attribute("BackgroundColor").Value,
-                            ForegroundText = b.Attribute("ForegroundText").Value,
-                            ShowNameOnSquare150X150Logo = b.Attribute("ShowNameOnSquare150x150Logo").Value == "on",
+                            BackgroundColor = b.Attribute("BackgroundColor")?.Value,
+                            ForegroundText = b.Attribute("ForegroundText")?.Value,
+                            ShowNameOnSquare150X150Logo = b.Attribute("ShowNameOnSquare150x150Logo")?.Value == "on",
                             MediumImage =
                                 mediumImage ?? new ShortcutItemImage(ShortcutConstantsAndEnums.MediumShortcutOutputSize)
                                 {
                                     Bytes =
                                         ImageUtils.LoadFileToByteArray(targetFolderPath +
-                                                                       b.Attribute("Square150x150Logo").Value),
+                                                                       b.Attribute("Square150x150Logo")?.Value),
                                     X = 0,
                                     Y = 0
                                 },
@@ -116,7 +118,7 @@ internal void LoadParameters(bool loadFromFile, string visualElementsManifestPat
                                 {
                                     Bytes =
                                         ImageUtils.LoadFileToByteArray(targetFolderPath +
-                                                                       b.Attribute("Square70x70Logo").Value),
+                                                                       b.Attribute("Square70x70Logo")?.Value),
                                     X = 0,
                                     Y = 0
                                 }

TileIconifier.Core/TileIconify/TileIcon.cs

@@ -52,6 +52,7 @@ public void RunIconify()
             BuildFilesAndFolders();
             SaveMetadata();
             SaveIcons();
+            _shortcutItem.Properties.CommitChanges();
             RebuildLnkInStartMenu();
         }
 
@@ -82,10 +83,9 @@ private void BuildFilesAndFolders()
                 Directory.CreateDirectory(_shortcutItem.VisualElementsPath);
             }
 
-            using (new AttributeRetention(_shortcutItem.VisualElementManifestPath))
-            {
-                xDoc.Save(_shortcutItem.VisualElementManifestPath);
-            }
+            IoUtils.FileActionRetainingAttributes(_shortcutItem.VisualElementManifestPath,
+                () => xDoc.Save(_shortcutItem.VisualElementManifestPath));
+
         }
 
         private void DeleteFilesAndFolders()
@@ -106,14 +106,8 @@ private void DeleteFilesAndFolders()
 
         private void SaveMetadata()
         {
-            using (new AttributeRetention(_shortcutItem.MediumImageResizeMetadataPath))
-            {
-                _shortcutItem.Properties.SaveMediumIconMetadata(_shortcutItem.MediumImageResizeMetadataPath);
-            }
-            using (new AttributeRetention(_shortcutItem.SmallImageResizeMetadataPath))
-            {
-                _shortcutItem.Properties.SaveSmallIconMetadata(_shortcutItem.SmallImageResizeMetadataPath);
-            }
+            _shortcutItem.Properties.SaveMediumIconMetadata(_shortcutItem.MediumImageResizeMetadataPath);
+            _shortcutItem.Properties.SaveSmallIconMetadata(_shortcutItem.SmallImageResizeMetadataPath);
         }
 
         private void SaveIcons()

TileIconifier.Core/Utilities/IOUtils.cs

@@ -45,34 +45,24 @@ public static void ForceDelete(string filePath)
             File.SetAttributes(filePath, FileAttributes.Normal);
             File.Delete(filePath);
         }
-    }
-
-    /// <summary>
-    /// Reverts attributes to normal and restores on disposal - prevents Access Denied on readonly/hidden files
-    /// </summary>
-    internal class AttributeRetention : IDisposable
-    {
-        private readonly string _filePath;
-        private readonly FileAttributes _storedFileAttributes;
 
-        public AttributeRetention(string filePath)
+        public static void FileActionRetainingAttributes(string filePath, Action action, bool fileMustExist = false)
         {
-            _filePath = filePath;
-            if (!File.Exists(_filePath))
+            if (!File.Exists(filePath))
             {
+                if (fileMustExist)
+                {
+                    throw new FileNotFoundException();
+                }
                 return;
             }
 
-            _storedFileAttributes = File.GetAttributes(_filePath);
-            File.SetAttributes(_filePath, FileAttributes.Normal);
-        }
+            var storedFileAttributes = File.GetAttributes(filePath);
+            File.SetAttributes(filePath, FileAttributes.Normal);
 
-        public void Dispose()
-        {
-            if (File.Exists(_filePath))
-            {
-                File.SetAttributes(_filePath, _storedFileAttributes);
-            }
+            action();
+
+            File.SetAttributes(filePath, storedFileAttributes);
         }
     }
 }

TileIconifier/Controls/IconifierPanel/ColorPanel.cs

@@ -240,6 +240,7 @@ private void ColorPanel_Load(object sender, EventArgs e)
         {
             cmbColour.Items.AddRange(_dropDownColors.Select(c => c.Name.ToLower()).ToArray<object>());
             cmbColour.Items.Add("Custom");
+            cmbColour.SelectedItem = "Custom";
         }
     }
 

TileIconifier/Controls/IconifierPanel/TileIconifierPanel.cs

@@ -66,6 +66,11 @@ public TileIconifierPanel()
 
         public void UpdateControlsToShortcut()
         {
+            if (CurrentShortcutItem == null)
+            {
+                return;
+            }
+
             //disable event handlers whilst updating things programatically
             RemoveEventHandlers();
 
@@ -335,7 +340,7 @@ private void ColorPanelColorUpdate(object sender, EventArgs eventArgs)
         private void UpdateFromColorPanel(ColorPanel usedColorPanel)
         {
             var result = usedColorPanel.GetColorPanelResult();
-            if (result == null)
+            if (result == null || CurrentShortcutItem == null)
             {
                 return;
             }

TileIconifier/Forms/Main/FrmAbout.cs

@@ -28,7 +28,6 @@
 #endregion
 
 using System;
-using System.Diagnostics;
 using System.Windows.Forms;
 using TileIconifier.Core.Utilities;