Merging changes from v1 branch

Staffan Gustafsson · Staffan Gustafsson · commit ae483a0bbd23 · 2016-01-14T00:37:16.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -186,4 +186,6 @@ FakesAssemblies/
 # LightSwitch generated files
 GeneratedArtifacts/
 _Pvt_Extensions/
-ModelManifest.xml
+ModelManifest.xml
+/.vscode/*
+/.vs/*
diff --git a/PSEverything/Everything.cs b/PSEverything/Everything.cs
@@ -1,27 +1,31 @@
 ﻿using System;
-using System.Collections.Generic;
 using System.Text;
+using static PSEverything.Status;
 
 namespace PSEverything
 {
+
+    public enum Status
+    {
+        Ok = 0,
+        ErrorMemory = 1,
+        ErrorIpc = 2,
+        ErrorRegisterclassex = 3,
+        ErrorCreatewindow = 4,
+        ErrorCreatethread = 5,
+        ErrorInvalidindex = 6,
+        ErrorInvalidcall = 7,
+    }
+
     public static class Everything
     {
-        public const int EVERYTHING_OK = 0;
-        public const int EVERYTHING_ERROR_MEMORY = 1;
-        public const int EVERYTHING_ERROR_IPC = 2;
-        public const int EVERYTHING_ERROR_REGISTERCLASSEX = 3;
-        public const int EVERYTHING_ERROR_CREATEWINDOW = 4;
-        public const int EVERYTHING_ERROR_CREATETHREAD = 5;
-        public const int EVERYTHING_ERROR_INVALIDINDEX = 6;
-        public const int EVERYTHING_ERROR_INVALIDCALL = 7;
-        static bool Is64Bit {
-            get { return Environment.Is64BitProcess; }
-        }
+
+        static bool Is64Bit => Environment.Is64BitProcess;
 
         public static void SetSearch(string text)
         {
             int res = Is64Bit ? NativeMethods64.Everything_SetSearchW(text) : NativeMethods32.Everything_SetSearchW(text);
-            if (res != EVERYTHING_OK)
+            if (res != (int) Ok)
             {
                 Throw(res);
             }
@@ -136,21 +140,21 @@ public static string[] GetAllResults(int count)
 
         static void Throw(int errorCode)
         {
-            switch (errorCode)
+            switch ((Status)errorCode)
             {
-                case EVERYTHING_ERROR_MEMORY:
+                case ErrorMemory:
                     throw new Exception("Memory Error");
-                case EVERYTHING_ERROR_REGISTERCLASSEX:
+                case ErrorRegisterclassex:
                     throw new Exception("Class registration error");
-                case EVERYTHING_ERROR_IPC:
+                case ErrorIpc:
                     throw new Exception("IPC error");
-                case EVERYTHING_ERROR_CREATEWINDOW:
+                case ErrorCreatewindow:
                     throw new Exception("create window error");
-                case EVERYTHING_ERROR_CREATETHREAD:
+                case ErrorCreatethread:
                     throw new Exception("Thread creation error");
-                case EVERYTHING_ERROR_INVALIDINDEX:
+                case ErrorInvalidindex:
                     throw new Exception("Invalid index error");
-                case EVERYTHING_ERROR_INVALIDCALL:
+                case ErrorInvalidcall:
                     throw new Exception("Invalid call error");
             }
         }
diff --git a/PSEverything/NativeMethods32.cs b/PSEverything/NativeMethods32.cs
@@ -6,15 +6,6 @@ namespace PSEverything
 {
     internal class NativeMethods32
     {
-        public const int EVERYTHING_OK = 0;
-        public const int EVERYTHING_ERROR_MEMORY = 1;
-        public const int EVERYTHING_ERROR_IPC = 2;
-        public const int EVERYTHING_ERROR_REGISTERCLASSEX = 3;
-        public const int EVERYTHING_ERROR_CREATEWINDOW = 4;
-        public const int EVERYTHING_ERROR_CREATETHREAD = 5;
-        public const int EVERYTHING_ERROR_INVALIDINDEX = 6;
-        public const int EVERYTHING_ERROR_INVALIDCALL = 7;
-
         [DllImport("Everything32.dll", CharSet = CharSet.Unicode)]
         public static extern int Everything_SetSearchW(string lpSearchString);
 
diff --git a/PSEverything/NativeMethods64.cs b/PSEverything/NativeMethods64.cs
@@ -6,8 +6,6 @@ namespace PSEverything
 {
     internal class NativeMethods64
     {
-
-
         [DllImport("Everything64.dll", CharSet = CharSet.Unicode)]
         public static extern int Everything_SetSearchW(string lpSearchString);
 
diff --git a/PSEverything/PSEverything.psd1 b/PSEverything/PSEverything.psd1
diff --git a/PSEverything/SearchEverythingCommand.cs b/PSEverything/SearchEverythingCommand.cs
@@ -7,7 +7,7 @@ namespace PSEverything
     [Cmdlet(VerbsCommon.Search, "Everything", SupportsPaging = true, DefaultParameterSetName = "default")]
     [OutputType(typeof(string))]
 	[OutputType(typeof(string[]))]
-	[Alias("se")]
+    [Alias("se")]
     public class SearchEverythingCommand : PSCmdlet
     {
         [Parameter(ParameterSetName = "default")]        
@@ -52,8 +52,8 @@ public class SearchEverythingCommand : PSCmdlet
         [ValidateCount(1,2)]
         [Parameter(ParameterSetName = "default")]        
         public string[] Size { get; set; }
-		
-		[Parameter(ParameterSetName = "regex")]
+        
+        [Parameter(ParameterSetName = "regex")]
         public string RegularExpression { get; set; }
         
         [Parameter]
@@ -64,11 +64,11 @@ public class SearchEverythingCommand : PSCmdlet
 
         [Parameter(ParameterSetName = "default")]        
         public SwitchParameter MatchWholeWord { get; set; }
-
+        
 		[Parameter()]
 		public SwitchParameter AsArray { get; set; }
 
-		private string GetSearchString()
+        private string GetSearchString()
         {
             if (ParameterSetName == "regex") { return RegularExpression; }
 
@@ -87,13 +87,28 @@ private string GetSearchString()
 
         private void AddPatternFilter(StringBuilder searchBuilder)
         {
-            if (!String.IsNullOrEmpty(Filter))
+            if (!string.IsNullOrEmpty(Filter))
             {
                 searchBuilder.Append(' ');
                 searchBuilder.Append(Filter);
             }
         }
 
+	    private static void AddPath(StringBuilder searchBuilder, string path)
+	    {
+		    if (path.IndexOf(' ') == -1)
+		    {
+			    searchBuilder.Append(path);
+		    }
+		    else
+		    {
+			    searchBuilder.Append('"');
+			    searchBuilder.Append(path);
+				searchBuilder.Append('"');
+			}
+	    }
+
+
         private static void AddListFilter(StringBuilder searchBuilder, string filterName, string[] include, string[] exclude = null, char separator = ' ')
         {
             if (include == null && exclude == null) return;
@@ -103,7 +118,7 @@ private static void AddListFilter(StringBuilder searchBuilder, string filterName
                 foreach (var item in include)
                 {                    
                     searchBuilder.Append(filterName);
-                    searchBuilder.Append(item);
+                    AddPath(searchBuilder, item);
                     searchBuilder.Append(separator);
                 }                
                 
@@ -114,7 +129,7 @@ private static void AddListFilter(StringBuilder searchBuilder, string filterName
                 {
                     searchBuilder.Append(filterName);
                     searchBuilder.Append('!');
-                    searchBuilder.Append(item);
+					AddPath(searchBuilder, item);					
                     searchBuilder.Append(separator);
                 }
             }
@@ -127,10 +142,12 @@ private void AddPathFilter(StringBuilder searchBuilder)
             if (!Global)
             {
                 searchBuilder.Append(" path:");
-                searchBuilder.Append(SessionState.Path.CurrentFileSystemLocation.ProviderPath);
+                AddPath(searchBuilder, SessionState.Path.CurrentFileSystemLocation.ProviderPath);
+				if(!SessionState.Path.CurrentFileSystemLocation.ProviderPath.EndsWith("\\")) {
                 searchBuilder.Append('\\');
             }        
         }
+        }
 
         void AddFileFilter(StringBuilder searchBuilder)
         {
@@ -166,7 +183,7 @@ void AddParentCountFilter(StringBuilder searchBuilder)
 
         void AddChildFilter(StringBuilder searchBuilder)
         {
-            if (!String.IsNullOrEmpty(ChildFileName))
+            if (!string.IsNullOrEmpty(ChildFileName))
             {
                 searchBuilder.Append(" child:");
                 searchBuilder.Append(ChildFileName);
@@ -219,7 +236,7 @@ protected override void ProcessRecord()
 			Everything.SortResultsByPath();	        
                         
             ulong skip = PagingParameters.Skip;            
-            if (skip > Int32.MaxValue)
+            if (skip > int.MaxValue)
             {
                 ThrowTerminatingError(new ErrorRecord(new ParameterBindingException("Cannot skip that many results"),"SkipToLarge", ErrorCategory.InvalidArgument, skip));
             }            
@@ -228,9 +245,9 @@ protected override void ProcessRecord()
 
             if (first == ulong.MaxValue)
             {
-                first = Int32.MaxValue;
+                first = int.MaxValue;
             }
-            if (first > Int32.MaxValue)
+            if (first > int.MaxValue)
             {
                 ThrowTerminatingError(new ErrorRecord(new ParameterBindingException("Cannot take that many results"), "FirstToLarge", ErrorCategory.InvalidArgument, first));
             }
@@ -241,7 +258,7 @@ protected override void ProcessRecord()
 	        if (skip > 0)
 	        {
 		        Everything.SetOffset((int)skip);
-	        }
+            }                        
 
 
             var searchPattern = GetSearchString();

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@ namespace PSEverything`
`6`	`6`	`{`
`7`	`7`	`internal class NativeMethods64`
`8`	`8`	`{`
`9`		`-`
`10`		`-`
`11`	`9`	`[DllImport("Everything64.dll", CharSet = CharSet.Unicode)]`
`12`	`10`	`public static extern int Everything_SetSearchW(string lpSearchString);`
`13`	`11`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace PSEverything`
`7`	`7`	`[Cmdlet(VerbsCommon.Search, "Everything", SupportsPaging = true, DefaultParameterSetName = "default")]`
`8`	`8`	`[OutputType(typeof(string))]`
`9`	`9`	`[OutputType(typeof(string[]))]`
`10`		`- [Alias("se")]`
	`10`	`+ [Alias("se")]`
`11`	`11`	`public class SearchEverythingCommand : PSCmdlet`
`12`	`12`	`{`
`13`	`13`	`[Parameter(ParameterSetName = "default")]`
`@@ -52,8 +52,8 @@ public class SearchEverythingCommand : PSCmdlet`
`52`	`52`	`[ValidateCount(1,2)]`
`53`	`53`	`[Parameter(ParameterSetName = "default")]`
`54`	`54`	`public string[] Size { get; set; }`
`55`		`-`
`56`		`- [Parameter(ParameterSetName = "regex")]`
	`55`	`+`
	`56`	`+ [Parameter(ParameterSetName = "regex")]`
`57`	`57`	`public string RegularExpression { get; set; }`
`58`	`58`
`59`	`59`	`[Parameter]`
`@@ -64,11 +64,11 @@ public class SearchEverythingCommand : PSCmdlet`
`64`	`64`
`65`	`65`	`[Parameter(ParameterSetName = "default")]`
`66`	`66`	`public SwitchParameter MatchWholeWord { get; set; }`
`67`		`-`
	`67`	`+`
`68`	`68`	`[Parameter()]`
`69`	`69`	`public SwitchParameter AsArray { get; set; }`
`70`	`70`
`71`		`- private string GetSearchString()`
	`71`	`+ private string GetSearchString()`
`72`	`72`	`{`
`73`	`73`	`if (ParameterSetName == "regex") { return RegularExpression; }`
`74`	`74`
`@@ -87,13 +87,28 @@ private string GetSearchString()`
`87`	`87`
`88`	`88`	`private void AddPatternFilter(StringBuilder searchBuilder)`
`89`	`89`	`{`
`90`		`- if (!String.IsNullOrEmpty(Filter))`
	`90`	`+ if (!string.IsNullOrEmpty(Filter))`
`91`	`91`	`{`
`92`	`92`	`searchBuilder.Append(' ');`
`93`	`93`	`searchBuilder.Append(Filter);`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
	`97`	`+ private static void AddPath(StringBuilder searchBuilder, string path)`
	`98`	`+ {`
	`99`	`+ if (path.IndexOf(' ') == -1)`
	`100`	`+ {`
	`101`	`+ searchBuilder.Append(path);`
	`102`	`+ }`
	`103`	`+ else`
	`104`	`+ {`
	`105`	`+ searchBuilder.Append('"');`
	`106`	`+ searchBuilder.Append(path);`
	`107`	`+ searchBuilder.Append('"');`
	`108`	`+ }`
	`109`	`+ }`
	`110`	`+`
	`111`	`+`
`97`	`112`	`private static void AddListFilter(StringBuilder searchBuilder, string filterName, string[] include, string[] exclude = null, char separator = ' ')`
`98`	`113`	`{`
`99`	`114`	`if (include == null && exclude == null) return;`
`@@ -103,7 +118,7 @@ private static void AddListFilter(StringBuilder searchBuilder, string filterName`
`103`	`118`	`foreach (var item in include)`
`104`	`119`	`{`
`105`	`120`	`searchBuilder.Append(filterName);`
`106`		`- searchBuilder.Append(item);`
	`121`	`+ AddPath(searchBuilder, item);`
`107`	`122`	`searchBuilder.Append(separator);`
`108`	`123`	`}`
`109`	`124`
`@@ -114,7 +129,7 @@ private static void AddListFilter(StringBuilder searchBuilder, string filterName`
`114`	`129`	`{`
`115`	`130`	`searchBuilder.Append(filterName);`
`116`	`131`	`searchBuilder.Append('!');`
`117`		`- searchBuilder.Append(item);`
	`132`	`+ AddPath(searchBuilder, item);`
`118`	`133`	`searchBuilder.Append(separator);`
`119`	`134`	`}`
`120`	`135`	`}`
`@@ -127,10 +142,12 @@ private void AddPathFilter(StringBuilder searchBuilder)`
`127`	`142`	`if (!Global)`
`128`	`143`	`{`
`129`	`144`	`searchBuilder.Append(" path:");`
`130`		`- searchBuilder.Append(SessionState.Path.CurrentFileSystemLocation.ProviderPath);`
	`145`	`+ AddPath(searchBuilder, SessionState.Path.CurrentFileSystemLocation.ProviderPath);`
	`146`	`+ if(!SessionState.Path.CurrentFileSystemLocation.ProviderPath.EndsWith("\\")) {`
`131`	`147`	`searchBuilder.Append('\\');`
`132`	`148`	`}`
`133`	`149`	`}`
	`150`	`+ }`
`134`	`151`
`135`	`152`	`void AddFileFilter(StringBuilder searchBuilder)`
`136`	`153`	`{`
`@@ -166,7 +183,7 @@ void AddParentCountFilter(StringBuilder searchBuilder)`
`166`	`183`
`167`	`184`	`void AddChildFilter(StringBuilder searchBuilder)`
`168`	`185`	`{`
`169`		`- if (!String.IsNullOrEmpty(ChildFileName))`
	`186`	`+ if (!string.IsNullOrEmpty(ChildFileName))`
`170`	`187`	`{`
`171`	`188`	`searchBuilder.Append(" child:");`
`172`	`189`	`searchBuilder.Append(ChildFileName);`
`@@ -219,7 +236,7 @@ protected override void ProcessRecord()`
`219`	`236`	`Everything.SortResultsByPath();`
`220`	`237`
`221`	`238`	`ulong skip = PagingParameters.Skip;`
`222`		`- if (skip > Int32.MaxValue)`
	`239`	`+ if (skip > int.MaxValue)`
`223`	`240`	`{`
`224`	`241`	`ThrowTerminatingError(new ErrorRecord(new ParameterBindingException("Cannot skip that many results"),"SkipToLarge", ErrorCategory.InvalidArgument, skip));`
`225`	`242`	`}`
`@@ -228,9 +245,9 @@ protected override void ProcessRecord()`
`228`	`245`
`229`	`246`	`if (first == ulong.MaxValue)`
`230`	`247`	`{`
`231`		`- first = Int32.MaxValue;`
	`248`	`+ first = int.MaxValue;`
`232`	`249`	`}`
`233`		`- if (first > Int32.MaxValue)`
	`250`	`+ if (first > int.MaxValue)`
`234`	`251`	`{`
`235`	`252`	`ThrowTerminatingError(new ErrorRecord(new ParameterBindingException("Cannot take that many results"), "FirstToLarge", ErrorCategory.InvalidArgument, first));`
`236`	`253`	`}`
`@@ -241,7 +258,7 @@ protected override void ProcessRecord()`
`241`	`258`	`if (skip > 0)`
`242`	`259`	`{`
`243`	`260`	`Everything.SetOffset((int)skip);`
`244`		`- }`
	`261`	`+ }`
`245`	`262`
`246`	`263`
`247`	`264`	`var searchPattern = GetSearchString();`