refactor namespace and strcuture

d2phap · d2phap · commit e13ba9da007b · 2021-12-10T14:47:13.000+08:00
diff --git a/v2/Demo/Form1.cs b/v2/Demo/Form1.cs
@@ -1,9 +1,12 @@
 
+using FileWatcherEx;
+
 namespace Demo
 {
     public partial class Form1 : Form
     {
-        private FileWatcherEx _fw = new();
+        private FileSystemWatcherEx _fw = new();
+
         public Form1()
         {
             InitializeComponent();
@@ -13,7 +16,7 @@ public Form1()
 
         private void btnStart_Click(object sender, EventArgs e)
         {
-            _fw = new FileWatcherEx(txtPath.Text.Trim());
+            _fw = new FileSystemWatcherEx(txtPath.Text.Trim());
 
             _fw.OnRenamed += FW_OnRenamed;
             _fw.OnCreated += FW_OnCreated;
diff --git a/v2/FileWatcherEx/FileEvents.cs b/v2/FileWatcherEx/FileEvents.cs
@@ -1,4 +1,4 @@
-﻿namespace System.IO;
+﻿namespace FileWatcherEx;
 
 public enum ChangeType
 {
diff --git a/v2/FileWatcherEx/FileSystemWatcherEx.cs b/v2/FileWatcherEx/FileSystemWatcherEx.cs
@@ -2,9 +2,9 @@
 using System.Collections.Concurrent;
 using System.ComponentModel;
 
-namespace System.IO;
+namespace FileWatcherEx;
 
-public class FileWatcherEx : IDisposable
+public class FileSystemWatcherEx : IDisposable
 {
 
     #region Private Properties
@@ -78,7 +78,7 @@ public class FileWatcherEx : IDisposable
     /// Initialize new instance of FileWatcherEx
     /// </summary>
     /// <param name="folder"></param>
-    public FileWatcherEx(string folder = "")
+    public FileSystemWatcherEx(string folder = "")
     {
         FolderPath = folder;
     }
diff --git a/v2/FileWatcherEx/FileWatcherEx.csproj b/v2/FileWatcherEx/FileWatcherEx.csproj
@@ -4,6 +4,25 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <Copyright>Copyright © 2018-2022 Duong Dieu Phap</Copyright>
+    <PackageProjectUrl>https://github.com/d2phap/FileWatcherEx</PackageProjectUrl>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <RepositoryUrl>https://github.com/d2phap/FileWatcherEx</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageTags>filewatcher, filesystemwatcher, io, filesystemevent, monitor, file-watcher, file-monitoring, realtime, file-systems, file-system-events, monitor-file-system, fs, fsevents</PackageTags>
+    <Description>A file system watcher, used in ImageGlass project (https://imageglass.org). This project is based on the VSCode FileWatcher: https://github.com/Microsoft/vscode-filewatcher-windows.</Description>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <FileVersion>$(Version)</FileVersion>
+    <VersionPrefix>2.0.0</VersionPrefix>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageReleaseNotes>Supports for normalizing RENAMED events and .NET 6.0</PackageReleaseNotes>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\..\README.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/v2/FileWatcherEx/Helpers/EventProcessor.cs b/v2/FileWatcherEx/Helpers/EventProcessor.cs
@@ -2,9 +2,9 @@
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
 
-namespace System.IO;
+namespace FileWatcherEx;
 
-class EventProcessor
+internal class EventProcessor
 {
 
     /// <summary>
diff --git a/v2/FileWatcherEx/Helpers/FileWatcher.cs b/v2/FileWatcherEx/Helpers/FileWatcher.cs
@@ -2,7 +2,7 @@
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
 
-namespace System.IO;
+namespace FileWatcherEx;
 
 
 internal class FileWatcher : IDisposable

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,12 @@`
`1`	`1`
	`2`	`+using FileWatcherEx;`
	`3`	`+`
`2`	`4`	`namespace Demo`
`3`	`5`	`{`
`4`	`6`	`public partial class Form1 : Form`
`5`	`7`	`{`
`6`		`- private FileWatcherEx _fw = new();`
	`8`	`+ private FileSystemWatcherEx _fw = new();`
	`9`	`+`
`7`	`10`	`public Form1()`
`8`	`11`	`{`
`9`	`12`	`InitializeComponent();`
`@@ -13,7 +16,7 @@ public Form1()`
`13`	`16`
`14`	`17`	`private void btnStart_Click(object sender, EventArgs e)`
`15`	`18`	`{`
`16`		`- _fw = new FileWatcherEx(txtPath.Text.Trim());`
	`19`	`+ _fw = new FileSystemWatcherEx(txtPath.Text.Trim());`
`17`	`20`
`18`	`21`	`_fw.OnRenamed += FW_OnRenamed;`
`19`	`22`	`_fw.OnCreated += FW_OnCreated;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace System.IO;`
	`1`	`+namespace FileWatcherEx;`
`2`	`2`
`3`	`3`	`public enum ChangeType`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`	`using System.Collections.Concurrent;`
`3`	`3`	`using System.ComponentModel;`
`4`	`4`
`5`		`-namespace System.IO;`
	`5`	`+namespace FileWatcherEx;`
`6`	`6`
`7`		`-public class FileWatcherEx : IDisposable`
	`7`	`+public class FileSystemWatcherEx : IDisposable`
`8`	`8`	`{`
`9`	`9`
`10`	`10`	`#region Private Properties`
`@@ -78,7 +78,7 @@ public class FileWatcherEx : IDisposable`
`78`	`78`	`/// Initialize new instance of FileWatcherEx`
`79`	`79`	`/// </summary>`
`80`	`80`	`/// <param name="folder"></param>`
`81`		`- public FileWatcherEx(string folder = "")`
	`81`	`+ public FileSystemWatcherEx(string folder = "")`
`82`	`82`	`{`
`83`	`83`	`FolderPath = folder;`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`	`* Copyright (C) Microsoft Corporation. All rights reserved.`
`3`	`3`	`--------------------------------------------------------/`
`4`	`4`
`5`		`-namespace System.IO;`
	`5`	`+namespace FileWatcherEx;`
`6`	`6`
`7`		`-class EventProcessor`
	`7`	`+internal class EventProcessor`
`8`	`8`	`{`
`9`	`9`
`10`	`10`	`/// <summary>`