Ignoring more or less gracefully node_modules

Philippe Elsass · Philippe Elsass · commit ec3431eab50c · 2015-07-05T22:15:02.000+01:00
diff --git a/External/Plugins/ProjectManager/Controls/OpenResourceForm.cs b/External/Plugins/ProjectManager/Controls/OpenResourceForm.cs
@@ -392,12 +392,14 @@ public List<String> GetProjectFolders()
         }
 
         /// <summary>
-        /// Quick filter of hidden/VCS directories
+        /// Filter out hidden/VCS directories
         /// </summary>
         private bool isFolderHidden(string folder)
         {
             String name = Path.GetFileName(folder);
             if (name.Length == 0 || !Char.IsLetterOrDigit(name[0])) return true;
+            foreach (string dir in PluginMain.Settings.ExcludedDirectories)
+                if (dir == name) return true;
             FileInfo info = new FileInfo(folder);
             return (info.Attributes & FileAttributes.Hidden) > 0;
         }
diff --git a/External/Plugins/ProjectManager/Controls/TreeView/WatcherNode.cs b/External/Plugins/ProjectManager/Controls/TreeView/WatcherNode.cs
@@ -86,60 +86,73 @@ public void UpdateLater()
             updateTimer.Enabled = true;
         }
 
-        private void AppendPath(FileSystemEventArgs e)
+        private bool AppendPath(FileSystemEventArgs e)
         {
             lock (this.changedPaths)
             {
-                String fullPath = e.FullPath.TrimEnd('\\');
-                String path = Path.GetDirectoryName(fullPath);
-                if (this.excludedDirs != null) // filter ignored paths
+                try
                 {
-                    Char separator = Path.DirectorySeparatorChar;
-                    foreach (String excludedDir in this.excludedDirs)
-                    {
-                        if (path.IndexOf(separator + excludedDir + separator) > 0) return;
-                    }
+                    String fullPath = e.FullPath.TrimEnd('\\');
+                    String path = Path.GetDirectoryName(fullPath);
+                    return AppendToChangedPaths(fullPath, path, e.ChangeType);
                 }
-                if (this.excludedFiles != null && File.Exists(fullPath)) // filter ignored filetypes
+                catch 
                 {
-                    String extension = Path.GetExtension(fullPath);
-                    foreach (String excludedFile in this.excludedFiles)
-                    {
-                        if (extension == excludedFile) return;
-                    }
+                    return false;
                 }
-                if (e.ChangeType != WatcherChangeTypes.Created && e.ChangeType != WatcherChangeTypes.Renamed
-                    && Directory.Exists(fullPath))
+            }
+        }
+
+        private bool AppendToChangedPaths(string fullPath, string path, WatcherChangeTypes changeType)
+        {
+            if (this.excludedDirs != null) // filter ignored paths
+            {
+                Char separator = Path.DirectorySeparatorChar;
+                foreach (String excludedDir in this.excludedDirs)
                 {
-                    if (!this.changedPaths.Contains(fullPath))
-                        this.changedPaths.Add(fullPath);
+                    if (path.IndexOf(separator + excludedDir + separator) > 0) return false;
                 }
-                else if (!this.changedPaths.Contains(path) && Directory.Exists(path))
+            }
+            if (this.excludedFiles != null && File.Exists(fullPath)) // filter ignored filetypes
+            {
+                String extension = Path.GetExtension(fullPath);
+                foreach (String excludedFile in this.excludedFiles)
                 {
-                    this.changedPaths.Add(path);
+                    if (extension == excludedFile) return false;
                 }
             }
+            if (changeType != WatcherChangeTypes.Created && changeType != WatcherChangeTypes.Renamed
+                && Directory.Exists(fullPath))
+            {
+                if (!this.changedPaths.Contains(fullPath))
+                    this.changedPaths.Add(fullPath);
+            }
+            else if (!this.changedPaths.Contains(path) && Directory.Exists(path))
+            {
+                this.changedPaths.Add(path);
+            }
+            return true;
         }
 
         private void watcher_Changed(object sender, FileSystemEventArgs e)
         {
-            AppendPath(e);
-            Changed();
+            if (AppendPath(e))
+                Changed();
         }
         private void watcher_Created(object sender, FileSystemEventArgs e) 
         {
-            AppendPath(e);
-            Changed(); 
+            if (AppendPath(e))
+                Changed(); 
         }
         private void watcher_Deleted(object sender, FileSystemEventArgs e) 
         {
-            AppendPath(e);
-            Changed(); 
+            if (AppendPath(e))
+                Changed(); 
         }
         private void watcher_Renamed(object sender, RenamedEventArgs e) 
         {
-            AppendPath(e);
-            Changed();
+            if (AppendPath(e))
+                Changed();
         }
 
         private void Changed()
diff --git a/External/Plugins/ProjectManager/PluginMain.cs b/External/Plugins/ProjectManager/PluginMain.cs
@@ -137,12 +137,11 @@ private void PatchSettings()
                 this.SaveSettings();
             }
             // add new filtered types if user has old settings
-            if (Array.IndexOf<string>(Settings.FilteredDirectoryNames, "git") < 0)
+            if (Array.IndexOf<string>(Settings.ExcludedDirectories, "node_modules") < 0)
             {
-                List<String> fdn = new List<string>(Settings.FilteredDirectoryNames);
-                fdn.Add("git");
-                fdn.Add("hg");
-                Settings.FilteredDirectoryNames = fdn.ToArray();
+                List<String> list = new List<string>(Settings.ExcludedDirectories);
+                list.Add("node_modules");
+                Settings.ExcludedDirectories = list.ToArray();
                 this.SaveSettings();
             }
         }
diff --git a/External/Plugins/ProjectManager/Settings.cs b/External/Plugins/ProjectManager/Settings.cs
@@ -34,7 +34,7 @@ public class ProjectManagerSettings
 
         // These are string arrays because they are only edited by the propertygrid (which deals with them nicely)
         string[] excludedFileTypes = new string[] { ".p", ".abc", ".bak", ".tmp" };
-        string[] excludedDirectories = new string[] { ".svn", "_svn", ".cvs", "_cvs", "cvs", "_sgbak", ".git", ".hg" };
+        string[] excludedDirectories = new string[] { ".svn", "_svn", ".cvs", "_cvs", "cvs", "_sgbak", ".git", ".hg", "node_modules" };
         string[] executableFileTypes = new string[] { ".exe", ".lnk", ".fla", ".flump", ".doc", ".pps", ".psd", ".png", ".jpg", ".gif", ".xls", ".docproj", ".ttf", ".otf", ".wav", ".mp3", ".ppt", ".pptx", ".docx", ".xlsx", ".ai", ".pdf", ".zip", ".rar" };
         string[] filteredDirectoryNames = new string[] { "src", "source", "sources", "as", "as2", "as3", "actionscript", "flash", "classes", "trunk", "svn", "git", "hg", "..", "." };
 
diff --git a/PluginCore/PluginCore/Utilities/PathWalker.cs b/PluginCore/PluginCore/Utilities/PathWalker.cs
@@ -66,7 +66,11 @@ void bg_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
 
         void bg_DoWork(object sender, DoWorkEventArgs e)
         {
-            this.ExploreFolder(basePath);
+            try
+            {
+                this.ExploreFolder(basePath);
+            }
+            catch { }
         }
         
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -392,12 +392,14 @@ public List<String> GetProjectFolders()`
`392`	`392`	`}`
`393`	`393`
`394`	`394`	`/// <summary>`
`395`		`- /// Quick filter of hidden/VCS directories`
	`395`	`+ /// Filter out hidden/VCS directories`
`396`	`396`	`/// </summary>`
`397`	`397`	`private bool isFolderHidden(string folder)`
`398`	`398`	`{`
`399`	`399`	`String name = Path.GetFileName(folder);`
`400`	`400`	`if (name.Length == 0 \|\| !Char.IsLetterOrDigit(name[0])) return true;`
	`401`	`+ foreach (string dir in PluginMain.Settings.ExcludedDirectories)`
	`402`	`+ if (dir == name) return true;`
`401`	`403`	`FileInfo info = new FileInfo(folder);`
`402`	`404`	`return (info.Attributes & FileAttributes.Hidden) > 0;`
`403`	`405`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,60 +86,73 @@ public void UpdateLater()`
`86`	`86`	`updateTimer.Enabled = true;`
`87`	`87`	`}`
`88`	`88`
`89`		`- private void AppendPath(FileSystemEventArgs e)`
	`89`	`+ private bool AppendPath(FileSystemEventArgs e)`
`90`	`90`	`{`
`91`	`91`	`lock (this.changedPaths)`
`92`	`92`	`{`
`93`		`- String fullPath = e.FullPath.TrimEnd('\\');`
`94`		`- String path = Path.GetDirectoryName(fullPath);`
`95`		`- if (this.excludedDirs != null) // filter ignored paths`
	`93`	`+ try`
`96`	`94`	`{`
`97`		`- Char separator = Path.DirectorySeparatorChar;`
`98`		`- foreach (String excludedDir in this.excludedDirs)`
`99`		`- {`
`100`		`- if (path.IndexOf(separator + excludedDir + separator) > 0) return;`
`101`		`- }`
	`95`	`+ String fullPath = e.FullPath.TrimEnd('\\');`
	`96`	`+ String path = Path.GetDirectoryName(fullPath);`
	`97`	`+ return AppendToChangedPaths(fullPath, path, e.ChangeType);`
`102`	`98`	`}`
`103`		`- if (this.excludedFiles != null && File.Exists(fullPath)) // filter ignored filetypes`
	`99`	`+ catch`
`104`	`100`	`{`
`105`		`- String extension = Path.GetExtension(fullPath);`
`106`		`- foreach (String excludedFile in this.excludedFiles)`
`107`		`- {`
`108`		`- if (extension == excludedFile) return;`
`109`		`- }`
	`101`	`+ return false;`
`110`	`102`	`}`
`111`		`- if (e.ChangeType != WatcherChangeTypes.Created && e.ChangeType != WatcherChangeTypes.Renamed`
`112`		`- && Directory.Exists(fullPath))`
	`103`	`+ }`
	`104`	`+ }`
	`105`	`+`
	`106`	`+ private bool AppendToChangedPaths(string fullPath, string path, WatcherChangeTypes changeType)`
	`107`	`+ {`
	`108`	`+ if (this.excludedDirs != null) // filter ignored paths`
	`109`	`+ {`
	`110`	`+ Char separator = Path.DirectorySeparatorChar;`
	`111`	`+ foreach (String excludedDir in this.excludedDirs)`
`113`	`112`	`{`
`114`		`- if (!this.changedPaths.Contains(fullPath))`
`115`		`- this.changedPaths.Add(fullPath);`
	`113`	`+ if (path.IndexOf(separator + excludedDir + separator) > 0) return false;`
`116`	`114`	`}`
`117`		`- else if (!this.changedPaths.Contains(path) && Directory.Exists(path))`
	`115`	`+ }`
	`116`	`+ if (this.excludedFiles != null && File.Exists(fullPath)) // filter ignored filetypes`
	`117`	`+ {`
	`118`	`+ String extension = Path.GetExtension(fullPath);`
	`119`	`+ foreach (String excludedFile in this.excludedFiles)`
`118`	`120`	`{`
`119`		`- this.changedPaths.Add(path);`
	`121`	`+ if (extension == excludedFile) return false;`
`120`	`122`	`}`
`121`	`123`	`}`
	`124`	`+ if (changeType != WatcherChangeTypes.Created && changeType != WatcherChangeTypes.Renamed`
	`125`	`+ && Directory.Exists(fullPath))`
	`126`	`+ {`
	`127`	`+ if (!this.changedPaths.Contains(fullPath))`
	`128`	`+ this.changedPaths.Add(fullPath);`
	`129`	`+ }`
	`130`	`+ else if (!this.changedPaths.Contains(path) && Directory.Exists(path))`
	`131`	`+ {`
	`132`	`+ this.changedPaths.Add(path);`
	`133`	`+ }`
	`134`	`+ return true;`
`122`	`135`	`}`
`123`	`136`
`124`	`137`	`private void watcher_Changed(object sender, FileSystemEventArgs e)`
`125`	`138`	`{`
`126`		`- AppendPath(e);`
`127`		`- Changed();`
	`139`	`+ if (AppendPath(e))`
	`140`	`+ Changed();`
`128`	`141`	`}`
`129`	`142`	`private void watcher_Created(object sender, FileSystemEventArgs e)`
`130`	`143`	`{`
`131`		`- AppendPath(e);`
`132`		`- Changed();`
	`144`	`+ if (AppendPath(e))`
	`145`	`+ Changed();`
`133`	`146`	`}`
`134`	`147`	`private void watcher_Deleted(object sender, FileSystemEventArgs e)`
`135`	`148`	`{`
`136`		`- AppendPath(e);`
`137`		`- Changed();`
	`149`	`+ if (AppendPath(e))`
	`150`	`+ Changed();`
`138`	`151`	`}`
`139`	`152`	`private void watcher_Renamed(object sender, RenamedEventArgs e)`
`140`	`153`	`{`
`141`		`- AppendPath(e);`
`142`		`- Changed();`
	`154`	`+ if (AppendPath(e))`
	`155`	`+ Changed();`
`143`	`156`	`}`
`144`	`157`
`145`	`158`	`private void Changed()`
Original file line number	Diff line number	Diff line change
`@@ -137,12 +137,11 @@ private void PatchSettings()`
`137`	`137`	`this.SaveSettings();`
`138`	`138`	`}`
`139`	`139`	`// add new filtered types if user has old settings`
`140`		`- if (Array.IndexOf<string>(Settings.FilteredDirectoryNames, "git") < 0)`
	`140`	`+ if (Array.IndexOf<string>(Settings.ExcludedDirectories, "node_modules") < 0)`
`141`	`141`	`{`
`142`		`- List<String> fdn = new List<string>(Settings.FilteredDirectoryNames);`
`143`		`- fdn.Add("git");`
`144`		`- fdn.Add("hg");`
`145`		`- Settings.FilteredDirectoryNames = fdn.ToArray();`
	`142`	`+ List<String> list = new List<string>(Settings.ExcludedDirectories);`
	`143`	`+ list.Add("node_modules");`
	`144`	`+ Settings.ExcludedDirectories = list.ToArray();`
`146`	`145`	`this.SaveSettings();`
`147`	`146`	`}`
`148`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,11 @@ void bg_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)`
`66`	`66`
`67`	`67`	`void bg_DoWork(object sender, DoWorkEventArgs e)`
`68`	`68`	`{`
`69`		`- this.ExploreFolder(basePath);`
	`69`	`+ try`
	`70`	`+ {`
	`71`	`+ this.ExploreFolder(basePath);`
	`72`	`+ }`
	`73`	`+ catch { }`
`70`	`74`	`}`
`71`	`75`
`72`	`76`	`/// <summary>`