Wire up source for logging where possible

SabreTools.Library/DatFiles/DatFile.cs

@@ -50,7 +50,7 @@ namespace SabreTools.Library.DatFiles
         /// Logging object
         /// </summary>
         [JsonIgnore, XmlIgnore]
-        protected Logger logger = new Logger();
+        protected Logger logger;
 
         #endregion
 
@@ -62,6 +62,7 @@ namespace SabreTools.Library.DatFiles
         /// <param name="datFile">DatFile to get the values from</param>
         public DatFile(DatFile datFile)
         {
+            logger = new Logger(this);
             if (datFile != null)
             {
                 Header = datFile.Header;

SabreTools.Library/DatFiles/ItemDictionary.cs

@@ -49,7 +49,12 @@ namespace SabreTools.Library.DatFiles
         /// <summary>
         /// Logging object
         /// </summary>
-        private readonly static Logger logger = new Logger();
+        private Logger logger;
+
+        /// <summary>
+        /// Static logger for static methods
+        /// </summary>
+        private static Logger staticLogger = new Logger();
 
         #endregion
 
@@ -952,6 +957,7 @@ namespace SabreTools.Library.DatFiles
             bucketedBy = Field.NULL;
             mergedBy = DedupeType.None;
             items = new ConcurrentDictionary<string, List<DatItem>>();
+            logger = new Logger(this);
         }
 
         #endregion
@@ -1417,13 +1423,13 @@ namespace SabreTools.Library.DatFiles
                     dirStats.ResetStatistics();
                 }
 
-                logger.Verbose($"Beginning stat collection for '{file.CurrentPath}'");
+                staticLogger.Verbose($"Beginning stat collection for '{file.CurrentPath}'");
                 List<string> games = new List<string>();
                 DatFile datdata = DatFile.CreateAndParse(file.CurrentPath);
                 datdata.Items.BucketBy(Field.Machine_Name, DedupeType.None, norename: true);
 
                 // Output single DAT stats (if asked)
-                logger.User($"Adding stats for file '{file.CurrentPath}'\n");
+                staticLogger.User($"Adding stats for file '{file.CurrentPath}'\n");
                 if (single)
                 {
                     reports.ForEach(report => report.ReplaceStatistics(datdata.Header.FileName, datdata.Items.Keys.Count, datdata.Items));
@@ -1467,7 +1473,7 @@ namespace SabreTools.Library.DatFiles
             // Output footer if needed
             reports.ForEach(report => report.WriteFooter());
 
-            logger.User($"{Environment.NewLine}Please check the log folder if the stats scrolled offscreen");
+            staticLogger.User($"{Environment.NewLine}Please check the log folder if the stats scrolled offscreen");
         }
 
         /// <summary>

SabreTools.Library/DatItems/DatItem.cs

@@ -380,7 +380,13 @@ namespace SabreTools.Library.DatItems
         /// Logging object
         /// </summary>
         [JsonIgnore, XmlIgnore]
-        protected static Logger logger = new Logger();
+        protected Logger logger;
+
+        /// <summary>
+        /// Static logger for static methods
+        /// </summary>
+        [JsonIgnore, XmlIgnore]
+        protected static Logger staticLogger = new Logger();
 
         #endregion
 
@@ -414,6 +420,14 @@ namespace SabreTools.Library.DatItems
 
         #region Constructors
 
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public DatItem()
+        {
+            logger = new Logger(this);
+        }
+
         /// <summary>
         /// Create a specific type of DatItem to be used based on an ItemType
         /// </summary>
@@ -1027,14 +1041,14 @@ namespace SabreTools.Library.DatItems
                 // If the current item exactly matches the last item, then we don't add it
                 if (datItem.GetDuplicateStatus(lastItem).HasFlag(DupeType.All))
                 {
-                    logger.Verbose($"Exact duplicate found for '{datItemName}'");
+                    staticLogger.Verbose($"Exact duplicate found for '{datItemName}'");
                     continue;
                 }
 
                 // If the current name matches the previous name, rename the current item
                 else if (datItemName == lastItemName)
                 {
-                    logger.Verbose($"Name duplicate found for '{datItemName}'");
+                    staticLogger.Verbose($"Name duplicate found for '{datItemName}'");
 
                     if (datItem.ItemType == ItemType.Disk || datItem.ItemType == ItemType.Media || datItem.ItemType == ItemType.Rom)
                     {

SabreTools.Library/FileTypes/BaseArchive.cs

@@ -63,7 +63,7 @@ namespace SabreTools.Library.FileTypes
                 return archive;
 
             // Create the archive based on the type
-            logger.Verbose($"Found archive of type: {at}");
+            staticLogger.Verbose($"Found archive of type: {at}");
             switch (at)
             {
                 case FileType.GZipArchive:

SabreTools.Library/FileTypes/Folder.cs

@@ -22,7 +22,12 @@ namespace SabreTools.Library.FileTypes
         /// <summary>
         /// Logging object
         /// </summary>
-        protected static Logger logger = new Logger();
+        protected Logger logger;
+
+        /// <summary>
+        /// Static logger for static methods
+        /// </summary>
+        protected static Logger staticLogger = new Logger();
 
         /// <summary>
         /// Flag specific to Folder to omit Machine name from output path
@@ -42,6 +47,7 @@ namespace SabreTools.Library.FileTypes
         {
             this.Type = FileType.Folder;
             this.writeToParent = writeToParent;
+            logger = new Logger(this);
         }
 
         /// <summary>
@@ -54,6 +60,7 @@ namespace SabreTools.Library.FileTypes
             : base(filename, getHashes)
         {
             this.Type = FileType.Folder;
+            logger = new Logger(this);
         }
 
         /// <summary>

SabreTools.Library/Filtering/ExtraIni.cs

@@ -21,7 +21,19 @@ namespace SabreTools.Library.Filtering
         /// <summary>
         /// Logging object
         /// </summary>
-        private readonly Logger logger = new Logger();
+        private readonly Logger logger;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public ExtraIni()
+        {
+            logger = new Logger(this);
+        }
 
         #endregion
 

SabreTools.Library/Filtering/Filter.cs

@@ -291,12 +291,24 @@ namespace SabreTools.Library.Filtering
         /// <summary>
         /// Logging object
         /// </summary>
-        private readonly Logger logger = new Logger();
+        private readonly Logger logger;
 
         #endregion
 
         #region Instance methods
 
+        #region Constructors
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public Filter()
+        {
+            logger = new Logger(this);
+        }
+
+        #endregion
+
         #region Filter Population
 
         /// <summary>

SabreTools.Library/Help/TopLevel.cs

@@ -11,17 +11,38 @@ namespace SabreTools.Library.Help
     /// </summary>
     public abstract class TopLevel : Feature
     {
+        #region Fields
+
+        /// <summary>
+        /// List of files, directories, and potential wildcard paths
+        /// </summary>
         public List<string> Inputs = new List<string>();
 
+        #endregion
+
         #region Logging
 
         /// <summary>
         /// Logging object
         /// </summary>
-        private readonly Logger logger = new Logger();
+        private readonly Logger logger;
 
         #endregion
 
+        #region Constructors
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public TopLevel()
+        {
+            logger = new Logger(this);
+        }
+
+        #endregion
+
+        #region Processing
+
         /// <summary>
         /// Process args list based on current feature
         /// </summary>
@@ -63,6 +84,8 @@ namespace SabreTools.Library.Help
         /// </summary>
         public virtual void ProcessFeatures(Dictionary<string, Feature> features) { }
 
+        #endregion
+
         #region Generic Extraction
 
         /// <summary>

SabreTools.Library/Skippers/SkipperRule.cs

@@ -43,7 +43,19 @@ namespace SabreTools.Library.Skippers
         /// <summary>
         /// Logging object
         /// </summary>
-        private readonly Logger logger = new Logger();
+        private readonly Logger logger;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public SkipperRule()
+        {
+            logger = new Logger(this);
+        }
 
         #endregion
 

SabreTools.Library/Tools/InternalStopwatch.cs

@@ -11,7 +11,7 @@ namespace SabreTools.Library.Tools
     {
         private string _subject;
         private DateTime _startTime;
-        private readonly Logger _logger = new Logger();
+        private readonly Logger _logger;
 
         /// <summary>
         /// Constructor that initalizes the stopwatch
@@ -19,6 +19,7 @@ namespace SabreTools.Library.Tools
         public InternalStopwatch()
         {
             _subject = string.Empty;
+            _logger = new Logger(this);
         }
 
         /// <summary>
@@ -28,6 +29,7 @@ namespace SabreTools.Library.Tools
         public InternalStopwatch(string subject)
         {
             _subject = subject;
+            _logger = new Logger(this);
             Start();
         }