added SynchronizingObject property to FileWatcherEx

d2phap · Aug 1, 2018 · aa1c853 · aa1c853
1 parent d7ef116
commit aa1c853
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/Source/DemoApp/Form1.Designer.cs b/Source/DemoApp/Form1.Designer.cs
diff --git a/Source/DemoApp/Form1.cs b/Source/DemoApp/Form1.cs
@@ -121,10 +121,19 @@ private void btnSelectFolder_Click(object sender, EventArgs e)
             FolderBrowserDialog f = new FolderBrowserDialog();
 
 
-            if(f.ShowDialog() == DialogResult.OK)
+            if (f.ShowDialog() == DialogResult.OK)
             {
                 txtPath.Text = f.SelectedPath;
+
+                this._fw.Stop();
+                this._fw.Dispose();
             }
         }
+
+        private void Form1_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            this._fw.Stop();
+            this._fw.Dispose();
+        }
     }
 }
diff --git a/Source/FileWatcherEx/FileWatcherEx.cs b/Source/FileWatcherEx/FileWatcherEx.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Concurrent;
+using System.ComponentModel;
 using System.IO;
 using System.Threading;
 
@@ -14,9 +15,9 @@ public class FileWatcherEx : IDisposable
         private Thread _thread;
         private EventProcessor _processor;
         private BlockingCollection<FileChangedEvent> _fileEventQueue = new BlockingCollection<FileChangedEvent>();
-        
-        private FileWatcher _watcher;
-        private FileSystemWatcher _fsw;
+
+        private FileWatcher _watcher = new FileWatcher();
+        private FileSystemWatcher _fsw = new FileSystemWatcher();
 
         #endregion
 
@@ -46,7 +47,12 @@ public class FileWatcherEx : IDisposable
         /// Gets or sets a value indicating whether subdirectories within the specified path should be monitored.
         /// </summary>
         public bool IncludeSubdirectories { get; set; } = false;
-
+
+
+        /// <summary>
+        /// Gets or sets the object used to marshal the event handler calls issued as a result of a directory change.
+        /// </summary>
+        public ISynchronizeInvoke SynchronizingObject { get; set; } = null;
 
         #endregion
 
@@ -160,6 +166,7 @@ void onError(ErrorEventArgs e)
             this._fsw.Filter = this.Filter;
             this._fsw.NotifyFilter = this.NotifyFilter;
             this._fsw.IncludeSubdirectories = this.IncludeSubdirectories;
+            this._fsw.SynchronizingObject = this.SynchronizingObject;
 
             // Start watching
             this._fsw.EnableRaisingEvents = true;

diff --git a/Source/FileWatcherEx/Properties/AssemblyInfo.cs b/Source/FileWatcherEx/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]