Minor refactorings

levitation · levitation · commit d3c62c91f083 · 2020-09-04T17:37:19.000+03:00
diff --git a/Program.cs b/Program.cs
@@ -313,7 +313,7 @@ internal class ConsoleWatch
         public static bool DoingInitialSync = false;
 #pragma warning restore S2223
 
-        private static ConcurrentDictionary<string, DateTime> ConverterSavedFileDates = new ConcurrentDictionary<string, DateTime>();
+        private static ConcurrentDictionary<string, DateTime> BidirectionalConverterSavedFileDates = new ConcurrentDictionary<string, DateTime>();
         private static readonly AsyncLockQueueDictionary FileEventLocks = new AsyncLockQueueDictionary();
 
 
@@ -366,8 +366,10 @@ public static string GetNonFullName(string fullName)
             {
                 return fullName.Substring(Global.SyncPath.Length);
             }
-
-            throw new ArgumentException("fullName");
+            else
+            {
+                throw new ArgumentException("fullName");
+            }
         }
 
         public static string GetOtherFullName(string fullName)
@@ -376,11 +378,11 @@ public static string GetOtherFullName(string fullName)
 
             if (fullName.ToUpperInvariant().StartsWith(Global.AsyncPath.ToUpperInvariant()))
             {
-                return Global.SyncPath + nonFullName;
+                return Path.Combine(Global.SyncPath, nonFullName);
             }
             else if (fullName.ToUpperInvariant().StartsWith(Global.SyncPath.ToUpperInvariant()))
             {
-                return Global.AsyncPath + nonFullName;
+                return Path.Combine(Global.AsyncPath, nonFullName);
             }
             else
             {
@@ -427,12 +429,12 @@ public static async Task DeleteFile(string fullName, Context context)
             {
                 await WriteException(ex, context);
             }
-        }
+        }   //public static async Task DeleteFile(string fullName, Context context)
 
-        public static DateTime GetConverterSaveDate(string fullName)
+        public static DateTime GetBidirectionalConverterSaveDate(string fullName)
         {
             DateTime converterSaveDate;
-            if (!ConverterSavedFileDates.TryGetValue(fullName, out converterSaveDate))
+            if (!BidirectionalConverterSavedFileDates.TryGetValue(fullName, out converterSaveDate))
             {
                 converterSaveDate = DateTime.MinValue;
             }
@@ -445,7 +447,7 @@ public static bool NeedsUpdate(string fullName)
             if (DoingInitialSync)
                 return true;
 
-            var converterSaveDate = GetConverterSaveDate(fullName);
+            var converterSaveDate = GetBidirectionalConverterSaveDate(fullName);
             var fileTime = GetFileTime(fullName);
 
             if (
@@ -502,7 +504,7 @@ public static async Task FileUpdated(string fullName, Context context)
                     }
                 }
             }
-        }
+        }   //public static async Task FileUpdated(string fullName, Context context)
 
         private static async Task FileDeleted(string fullName, Context context)
         {
@@ -575,36 +577,36 @@ private static bool IsWatchedFile(string fullName)
 
             return false;
 
-        }   //private bool IsWatchedFile(string fullName, Context context)
+        }   //private bool IsWatchedFile(string fullName)
 
 #pragma warning disable AsyncFixer01
-        private static async Task OnRenamedAsync(IRenamedFileSystemEvent rfse, CancellationToken token)
+        private static async Task OnRenamedAsync(IRenamedFileSystemEvent fse, CancellationToken token)
         {
-            var context = new Context(rfse, token);
+            var context = new Context(fse, token);
 
             try
             {
-                if (rfse.IsFile)
+                if (fse.IsFile)
                 {
-                    if (IsWatchedFile(rfse.PreviousFileSystemInfo.FullName)
-                        || IsWatchedFile(rfse.FileSystemInfo.FullName))
+                    if (IsWatchedFile(fse.PreviousFileSystemInfo.FullName)
+                        || IsWatchedFile(fse.FileSystemInfo.FullName))
                     {
-                        await AddMessage(ConsoleColor.Cyan, $"[{(rfse.IsFile ? "F" : "D")}][R]:{rfse.PreviousFileSystemInfo.FullName} > {rfse.FileSystemInfo.FullName}", context);
+                        await AddMessage(ConsoleColor.Cyan, $"[{(fse.IsFile ? "F" : "D")}][R]:{fse.PreviousFileSystemInfo.FullName} > {fse.FileSystemInfo.FullName}", context);
 
                         //NB! if file is renamed to cs~ or resx~ then that means there will be yet another write to same file, so lets skip this event here
-                        if (!rfse.FileSystemInfo.FullName.EndsWith("~"))
+                        if (!fse.FileSystemInfo.FullName.EndsWith("~"))
                         {
                             //using (await Global.FileOperationLocks.LockAsync(rfse.FileSystemInfo.FullName, rfse.PreviousFileSystemInfo.FullName, context.Token))  //comment-out: prevent deadlock
                             {
-                                await FileUpdated(rfse.FileSystemInfo.FullName, context);
-                                await FileDeleted(rfse.PreviousFileSystemInfo.FullName, context);
+                                await FileUpdated(fse.FileSystemInfo.FullName, context);
+                                await FileDeleted(fse.PreviousFileSystemInfo.FullName, context);
                             }
                         }
                     }
                 }
                 else
                 {
-                    await AddMessage(ConsoleColor.Cyan, $"[{(rfse.IsFile ? "F" : "D")}][R]:{rfse.PreviousFileSystemInfo.FullName} > {rfse.FileSystemInfo.FullName}", context);
+                    await AddMessage(ConsoleColor.Cyan, $"[{(fse.IsFile ? "F" : "D")}][R]:{fse.PreviousFileSystemInfo.FullName} > {fse.FileSystemInfo.FullName}", context);
 
                     //TODO trigger update / delete event for all files in new folder
                 }
@@ -613,7 +615,7 @@ private static async Task OnRenamedAsync(IRenamedFileSystemEvent rfse, Cancellat
             {
                 await WriteException(ex, context);
             }
-        }
+        }   //private static async Task OnRenamedAsync(IRenamedFileSystemEvent fse, CancellationToken token)
 
         private static async Task OnRemovedAsync(IFileSystemEvent fse, CancellationToken token)
         {
@@ -766,7 +768,7 @@ public static async Task SaveFileModifications(string fullName, string fileData,
                 await FileExtensions.WriteAllTextAsync(@"\\?\" + otherFullName, fileData, context.Token);
 
                 var now = DateTime.UtcNow;  //NB! compute now after saving the file
-                ConverterSavedFileDates[otherFullName] = now;
+                BidirectionalConverterSavedFileDates[otherFullName] = now;
 
 
                 await AddMessage(ConsoleColor.Magenta, $"Synchronised updates from file {fullName}", context);
@@ -785,9 +787,9 @@ public static async Task SaveFileModifications(string fullName, string fileData,
                     await ConsoleWatch.WriteException(ex, context);
                 }
 
-                ConverterSavedFileDates[otherFullName] = now;
+                BidirectionalConverterSavedFileDates[otherFullName] = now;
             }
-        }
+        }   //public static async Task SaveFileModifications(string fullName, string fileData, string originalData, Context context)
 
         public static async Task SaveFileModifications(string fullName, byte[] fileData, byte[] originalData, Context context)
         {
@@ -813,7 +815,7 @@ public static async Task SaveFileModifications(string fullName, byte[] fileData,
                 await FileExtensions.WriteAllBytesAsync(@"\\?\" + otherFullName, fileData, context.Token);
 
                 var now = DateTime.UtcNow;  //NB! compute now after saving the file
-                ConverterSavedFileDates[otherFullName] = now;
+                BidirectionalConverterSavedFileDates[otherFullName] = now;
 
 
                 await AddMessage(ConsoleColor.Magenta, $"Synchronised updates from file {fullName}", context);
@@ -832,9 +834,9 @@ public static async Task SaveFileModifications(string fullName, byte[] fileData,
                     await ConsoleWatch.WriteException(ex, context);
                 }
 
-                ConverterSavedFileDates[otherFullName] = now;
+                BidirectionalConverterSavedFileDates[otherFullName] = now;
             }
-        }
+        }   //public static async Task SaveFileModifications(string fullName, byte[] fileData, byte[] originalData, Context context)
 
 #pragma warning restore AsyncFixer01
     }
diff --git a/appsettings.example.json b/appsettings.example.json
@@ -35,6 +35,7 @@
         ],
 
         "IgnorePathsContaining": [
+            ".localhistory\\",
             ".vshistory\\"
         ]
     }

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ internal class ConsoleWatch`
`313`	`313`	`public static bool DoingInitialSync = false;`
`314`	`314`	`#pragma warning restore S2223`
`315`	`315`
`316`		`- private static ConcurrentDictionary<string, DateTime> ConverterSavedFileDates = new ConcurrentDictionary<string, DateTime>();`
	`316`	`+ private static ConcurrentDictionary<string, DateTime> BidirectionalConverterSavedFileDates = new ConcurrentDictionary<string, DateTime>();`
`317`	`317`	`private static readonly AsyncLockQueueDictionary FileEventLocks = new AsyncLockQueueDictionary();`
`318`	`318`
`319`	`319`
`@@ -366,8 +366,10 @@ public static string GetNonFullName(string fullName)`
`366`	`366`	`{`
`367`	`367`	`return fullName.Substring(Global.SyncPath.Length);`
`368`	`368`	`}`
`369`		`-`
`370`		`- throw new ArgumentException("fullName");`
	`369`	`+ else`
	`370`	`+ {`
	`371`	`+ throw new ArgumentException("fullName");`
	`372`	`+ }`
`371`	`373`	`}`
`372`	`374`
`373`	`375`	`public static string GetOtherFullName(string fullName)`
`@@ -376,11 +378,11 @@ public static string GetOtherFullName(string fullName)`
`376`	`378`
`377`	`379`	`if (fullName.ToUpperInvariant().StartsWith(Global.AsyncPath.ToUpperInvariant()))`
`378`	`380`	`{`
`379`		`- return Global.SyncPath + nonFullName;`
	`381`	`+ return Path.Combine(Global.SyncPath, nonFullName);`
`380`	`382`	`}`
`381`	`383`	`else if (fullName.ToUpperInvariant().StartsWith(Global.SyncPath.ToUpperInvariant()))`
`382`	`384`	`{`
`383`		`- return Global.AsyncPath + nonFullName;`
	`385`	`+ return Path.Combine(Global.AsyncPath, nonFullName);`
`384`	`386`	`}`
`385`	`387`	`else`
`386`	`388`	`{`
`@@ -427,12 +429,12 @@ public static async Task DeleteFile(string fullName, Context context)`
`427`	`429`	`{`
`428`	`430`	`await WriteException(ex, context);`
`429`	`431`	`}`
`430`		`- }`
	`432`	`+ } //public static async Task DeleteFile(string fullName, Context context)`
`431`	`433`
`432`		`- public static DateTime GetConverterSaveDate(string fullName)`
	`434`	`+ public static DateTime GetBidirectionalConverterSaveDate(string fullName)`
`433`	`435`	`{`
`434`	`436`	`DateTime converterSaveDate;`
`435`		`- if (!ConverterSavedFileDates.TryGetValue(fullName, out converterSaveDate))`
	`437`	`+ if (!BidirectionalConverterSavedFileDates.TryGetValue(fullName, out converterSaveDate))`
`436`	`438`	`{`
`437`	`439`	`converterSaveDate = DateTime.MinValue;`
`438`	`440`	`}`
`@@ -445,7 +447,7 @@ public static bool NeedsUpdate(string fullName)`
`445`	`447`	`if (DoingInitialSync)`
`446`	`448`	`return true;`
`447`	`449`
`448`		`- var converterSaveDate = GetConverterSaveDate(fullName);`
	`450`	`+ var converterSaveDate = GetBidirectionalConverterSaveDate(fullName);`
`449`	`451`	`var fileTime = GetFileTime(fullName);`
`450`	`452`
`451`	`453`	`if (`
`@@ -502,7 +504,7 @@ public static async Task FileUpdated(string fullName, Context context)`
`502`	`504`	`}`
`503`	`505`	`}`
`504`	`506`	`}`
`505`		`- }`
	`507`	`+ } //public static async Task FileUpdated(string fullName, Context context)`
`506`	`508`
`507`	`509`	`private static async Task FileDeleted(string fullName, Context context)`
`508`	`510`	`{`
`@@ -575,36 +577,36 @@ private static bool IsWatchedFile(string fullName)`
`575`	`577`
`576`	`578`	`return false;`
`577`	`579`
`578`		`- } //private bool IsWatchedFile(string fullName, Context context)`
	`580`	`+ } //private bool IsWatchedFile(string fullName)`
`579`	`581`
`580`	`582`	`#pragma warning disable AsyncFixer01`
`581`		`- private static async Task OnRenamedAsync(IRenamedFileSystemEvent rfse, CancellationToken token)`
	`583`	`+ private static async Task OnRenamedAsync(IRenamedFileSystemEvent fse, CancellationToken token)`
`582`	`584`	`{`
`583`		`- var context = new Context(rfse, token);`
	`585`	`+ var context = new Context(fse, token);`
`584`	`586`
`585`	`587`	`try`
`586`	`588`	`{`
`587`		`- if (rfse.IsFile)`
	`589`	`+ if (fse.IsFile)`
`588`	`590`	`{`
`589`		`- if (IsWatchedFile(rfse.PreviousFileSystemInfo.FullName)`
`590`		`- \|\| IsWatchedFile(rfse.FileSystemInfo.FullName))`
	`591`	`+ if (IsWatchedFile(fse.PreviousFileSystemInfo.FullName)`
	`592`	`+ \|\| IsWatchedFile(fse.FileSystemInfo.FullName))`
`591`	`593`	`{`
`592`		`- await AddMessage(ConsoleColor.Cyan, $"[{(rfse.IsFile ? "F" : "D")}][R]:{rfse.PreviousFileSystemInfo.FullName} > {rfse.FileSystemInfo.FullName}", context);`
	`594`	`+ await AddMessage(ConsoleColor.Cyan, $"[{(fse.IsFile ? "F" : "D")}][R]:{fse.PreviousFileSystemInfo.FullName} > {fse.FileSystemInfo.FullName}", context);`
`593`	`595`
`594`	`596`	`//NB! if file is renamed to cs~ or resx~ then that means there will be yet another write to same file, so lets skip this event here`
`595`		`- if (!rfse.FileSystemInfo.FullName.EndsWith("~"))`
	`597`	`+ if (!fse.FileSystemInfo.FullName.EndsWith("~"))`
`596`	`598`	`{`
`597`	`599`	`//using (await Global.FileOperationLocks.LockAsync(rfse.FileSystemInfo.FullName, rfse.PreviousFileSystemInfo.FullName, context.Token)) //comment-out: prevent deadlock`
`598`	`600`	`{`
`599`		`- await FileUpdated(rfse.FileSystemInfo.FullName, context);`
`600`		`- await FileDeleted(rfse.PreviousFileSystemInfo.FullName, context);`
	`601`	`+ await FileUpdated(fse.FileSystemInfo.FullName, context);`
	`602`	`+ await FileDeleted(fse.PreviousFileSystemInfo.FullName, context);`
`601`	`603`	`}`
`602`	`604`	`}`
`603`	`605`	`}`
`604`	`606`	`}`
`605`	`607`	`else`
`606`	`608`	`{`
`607`		`- await AddMessage(ConsoleColor.Cyan, $"[{(rfse.IsFile ? "F" : "D")}][R]:{rfse.PreviousFileSystemInfo.FullName} > {rfse.FileSystemInfo.FullName}", context);`
	`609`	`+ await AddMessage(ConsoleColor.Cyan, $"[{(fse.IsFile ? "F" : "D")}][R]:{fse.PreviousFileSystemInfo.FullName} > {fse.FileSystemInfo.FullName}", context);`
`608`	`610`
`609`	`611`	`//TODO trigger update / delete event for all files in new folder`
`610`	`612`	`}`
`@@ -613,7 +615,7 @@ private static async Task OnRenamedAsync(IRenamedFileSystemEvent rfse, Cancellat`
`613`	`615`	`{`
`614`	`616`	`await WriteException(ex, context);`
`615`	`617`	`}`
`616`		`- }`
	`618`	`+ } //private static async Task OnRenamedAsync(IRenamedFileSystemEvent fse, CancellationToken token)`
`617`	`619`
`618`	`620`	`private static async Task OnRemovedAsync(IFileSystemEvent fse, CancellationToken token)`
`619`	`621`	`{`
`@@ -766,7 +768,7 @@ public static async Task SaveFileModifications(string fullName, string fileData,`
`766`	`768`	`await FileExtensions.WriteAllTextAsync(@"\\?\" + otherFullName, fileData, context.Token);`
`767`	`769`
`768`	`770`	`var now = DateTime.UtcNow; //NB! compute now after saving the file`
`769`		`- ConverterSavedFileDates[otherFullName] = now;`
	`771`	`+ BidirectionalConverterSavedFileDates[otherFullName] = now;`
`770`	`772`
`771`	`773`
`772`	`774`	`await AddMessage(ConsoleColor.Magenta, $"Synchronised updates from file {fullName}", context);`
`@@ -785,9 +787,9 @@ public static async Task SaveFileModifications(string fullName, string fileData,`
`785`	`787`	`await ConsoleWatch.WriteException(ex, context);`
`786`	`788`	`}`
`787`	`789`
`788`		`- ConverterSavedFileDates[otherFullName] = now;`
	`790`	`+ BidirectionalConverterSavedFileDates[otherFullName] = now;`
`789`	`791`	`}`
`790`		`- }`
	`792`	`+ } //public static async Task SaveFileModifications(string fullName, string fileData, string originalData, Context context)`
`791`	`793`
`792`	`794`	`public static async Task SaveFileModifications(string fullName, byte[] fileData, byte[] originalData, Context context)`
`793`	`795`	`{`
`@@ -813,7 +815,7 @@ public static async Task SaveFileModifications(string fullName, byte[] fileData,`
`813`	`815`	`await FileExtensions.WriteAllBytesAsync(@"\\?\" + otherFullName, fileData, context.Token);`
`814`	`816`
`815`	`817`	`var now = DateTime.UtcNow; //NB! compute now after saving the file`
`816`		`- ConverterSavedFileDates[otherFullName] = now;`
	`818`	`+ BidirectionalConverterSavedFileDates[otherFullName] = now;`
`817`	`819`
`818`	`820`
`819`	`821`	`await AddMessage(ConsoleColor.Magenta, $"Synchronised updates from file {fullName}", context);`
`@@ -832,9 +834,9 @@ public static async Task SaveFileModifications(string fullName, byte[] fileData,`
`832`	`834`	`await ConsoleWatch.WriteException(ex, context);`
`833`	`835`	`}`
`834`	`836`
`835`		`- ConverterSavedFileDates[otherFullName] = now;`
	`837`	`+ BidirectionalConverterSavedFileDates[otherFullName] = now;`
`836`	`838`	`}`
`837`		`- }`
	`839`	`+ } //public static async Task SaveFileModifications(string fullName, byte[] fileData, byte[] originalData, Context context)`
`838`	`840`
`839`	`841`	`#pragma warning restore AsyncFixer01`
`840`	`842`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@`
`35`	`35`	`],`
`36`	`36`
`37`	`37`	`"IgnorePathsContaining": [`
	`38`	`+ ".localhistory\\",`
`38`	`39`	`".vshistory\\"`
`39`	`40`	`]`
`40`	`41`	`}`