Cleanup, fix imported folders not persisting folder names

Author: Sidneys1

BatchImageProcessor.CLI/Program.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Drawing;
 using System.IO;
 using System.Linq;
@@ -166,15 +165,14 @@ private static void Main(string[] args)
 			x.WatermarkOptions.WatermarkFont = new Font(fontname, fontsize);
 
 			if ((extra == null || !extra.Any()) && string.IsNullOrEmpty(manifest)) return;
-
-			Debug.Assert(extra != null, "extra != null");
-			var badfiles = extra.Where(o => !File.Exists(o)).ToList();
-			if (badfiles.Count > 0)
+			
+			var badfiles = extra?.Where(o => !File.Exists(o)).ToList();
+			if (badfiles?.Count > 0)
 			{
 				Console.WriteLine("Bad Filename(s):");
 				badfiles.ForEach(o => Console.Write("\t\"{0}\"", o));
 			}
-			if (extra.Any())
+			if (extra != null && extra.Any())
 				files.AddRange(extra);
 			else
 			{

BatchImageProcessor.Model/File.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
+using System.Collections.Generic;
 using BatchImageProcessor.Model.Interface;
 using BatchImageProcessor.Model.Types;
 using BatchImageProcessor.Model.Types.Enums;
@@ -30,16 +27,16 @@ public class File : IoObject, IFolderable, IFile
 		public bool IsValidName { get; set; }
 
 		public File(string path) : base(path)
-        {
+		{
 			Options.OutputOptions.OutputFormat = Format.Default;
-        }
+		}
 
-        #region Properties
+		#region Properties
 
-	    
-	    public int ImageNumber { get; set; }
-	    public string OutputPath { get; set; }
+		
+		public int ImageNumber { get; set; }
+		public string OutputPath { get; set; }
 
-	    #endregion
+		#endregion
 	}
 }

BatchImageProcessor.Model/IoObject.cs

@@ -9,36 +9,36 @@ namespace BatchImageProcessor.Model
 {
 	public abstract class IoObject : INotifyPropertyChanged, IDisposable, IIoObject
 	{
-        private readonly FileSystemWatcher _watcher;
-        private string _path;
+		private readonly FileSystemWatcher _watcher;
+		private string _path;
 		private string _name;
 
 		protected IoObject(string path)
-        {
-            var file = System.IO.File.Exists(path);
-            if (!(file || Directory.Exists(path)))
-                throw new FileNotFoundException($@"File/folder at ""{path}"" does not exist.");
+		{
+			var file = System.IO.File.Exists(path);
+			if (!(file || Directory.Exists(path)))
+				throw new FileNotFoundException($@"File/folder at ""{path}"" does not exist.");
 
-            IsFile = file;
-            Path = path;
+			IsFile = file;
+			Path = path;
 
-	        Name = GetName(path);
+			Name = GetName(path);
 
 
-            var directoryInfo = new FileInfo(Path).Directory;
-            if (directoryInfo != null)
-                _watcher = new FileSystemWatcher(IsFile ? directoryInfo.FullName : Path);
-            if (IsFile)
-                _watcher.Filter = System.IO.Path.GetFileName(path);
+			var directoryInfo = new FileInfo(Path).Directory;
+			if (directoryInfo != null)
+				_watcher = new FileSystemWatcher(IsFile ? directoryInfo.FullName : Path);
+			if (IsFile)
+				_watcher.Filter = System.IO.Path.GetFileName(path);
 
-            _watcher.Renamed += watcher_Renamed;
-            _watcher.Deleted += Watcher_Deleted;
-            _watcher.EnableRaisingEvents = true;
-        }
+			_watcher.Renamed += watcher_Renamed;
+			_watcher.Deleted += Watcher_Deleted;
+			_watcher.EnableRaisingEvents = true;
+		}
 
-        protected IoObject()
-        {
-        }
+		protected IoObject()
+		{
+		}
 
 		public string Name
 		{
@@ -47,33 +47,34 @@ public string Name
 		}
 
 		public string Path
-        {
-            get { return _path; }
-            set
-            {
-                _path = value;
+		{
+			get { return _path; }
+			set
+			{
+				_path = value;
+				// ReSharper disable once ExplicitCallerInfoArgument
 				PropChanged(nameof(Name));
 				PropChanged();
-            }
-        }
+			}
+		}
 
-        public bool IsFile { get; set; }
+		public bool IsFile { get; set; }
 
-        public void Dispose()
-        {
-            _watcher.Dispose();
-        }
+		public void Dispose()
+		{
+			_watcher.Dispose();
+		}
 
-        private static void Watcher_Deleted(object sender, FileSystemEventArgs e)
-        {
-        }
+		private static void Watcher_Deleted(object sender, FileSystemEventArgs e)
+		{
+		}
 
-        private void watcher_Renamed(object sender, RenamedEventArgs e)
-        {
-	        if (!IsFile) return;
-	        Path = e.FullPath;
-	        _watcher.Filter = e.Name;
-        }
+		private void watcher_Renamed(object sender, RenamedEventArgs e)
+		{
+			if (!IsFile) return;
+			Path = e.FullPath;
+			_watcher.Filter = e.Name;
+		}
 		public static string GetName(string path)
 		{
 			if (Directory.Exists(path) &&

BatchImageProcessor/BatchImageProcessor.csproj

@@ -69,7 +69,7 @@
     <StartupObject>BatchImageProcessor.EntryPoint</StartupObject>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestCertificateThumbprint>B7884CF99F3EBB4809520DFEAED585E96CEDD123</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>5FF27F20160E587AD4BF8F9CD3DA2F4E1483EE95</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestKeyFile>BatchImageProcessor_TemporaryKey.pfx</ManifestKeyFile>
@@ -214,6 +214,7 @@
       <SubType>Designer</SubType>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="BatchImageProcessor_1_TemporaryKey.pfx" />
     <None Include="BatchImageProcessor_TemporaryKey.pfx" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">

BatchImageProcessor/BatchImageProcessor_TemporaryKey.pfx

@@ -17,10 +17,11 @@ public SplitButton()
             DataContext = this;
         }
 
-        public event Action<Object, EventArgs> Click = delegate { };
+        public event Action<object, EventArgs> Click = delegate { };
 
         private void Button_Click_1(object sender, RoutedEventArgs e)
         {
+            if (ContextMenu == null) return;
             ContextMenu.IsEnabled = true;
             ContextMenu.PlacementTarget = (sender as Button);
             ContextMenu.Placement = PlacementMode.Bottom;