Merge pull request #23 from Rohansi/fix-windows-searchpattern

Remove SearchPattern special case for Windows

Author: xoofx

src/Zio.Tests/TestSearchPattern.cs

@@ -49,7 +49,7 @@ public class TestSearchPattern
         [InlineData("/a/b/c", "x*.txt", "xyoyo.txt", true)]
         [InlineData("/a/b/c", "x*.txt", "x.txt", true)]
         [InlineData("/a/b/c", "*.txt", "x.txt", true)]
-        [InlineData("/a/b/c", "*.txt", "x.txt1", true)]
+        [InlineData("/a/b/c", "*.txt", "x.txt1", false)] // No 8.3 truncating
         [InlineData("/a/b/c", "*.i", "x.i", true)]
         [InlineData("/a/b/c", "*.i", "x.i1", false)]
         [InlineData("/a/b/c", "x*.txt", "x_txt", false)]

src/Zio/FileSystems/PhysicalFileSystem.cs

@@ -476,20 +476,34 @@ protected override IEnumerable<UPath> EnumeratePathsImpl(UPath path, string sear
                 }
             }
 
+            IEnumerable<string> results;
             switch (searchTarget)
             {
                 case SearchTarget.File:
-                    foreach (var subPath in Directory.EnumerateFiles(ConvertPathToInternal(path), searchPattern, searchOption))
-                        yield return ConvertPathFromInternal(subPath);
+                    results = Directory.EnumerateFiles(ConvertPathToInternal(path), searchPattern, searchOption);
                     break;
+
                 case SearchTarget.Directory:
-                    foreach (var subPath in Directory.EnumerateDirectories(ConvertPathToInternal(path), searchPattern, searchOption))
-                        yield return ConvertPathFromInternal(subPath);
+                    results = Directory.EnumerateDirectories(ConvertPathToInternal(path), searchPattern, searchOption);
                     break;
+
                 case SearchTarget.Both:
-                    foreach (var subPath in Directory.EnumerateFileSystemEntries(ConvertPathToInternal(path), searchPattern, searchOption))
-                        yield return ConvertPathFromInternal(subPath);
+                    results = Directory.EnumerateFileSystemEntries(ConvertPathToInternal(path), searchPattern, searchOption);
                     break;
+                
+                default:
+                    yield break;
+            }
+
+            foreach (var subPath in results)
+            {
+                // Windows will truncate the search pattern's extension to three characters if the filesystem
+                // has 8.3 paths enabled. This means searching for *.docx will list *.doc as well which is
+                // not what we want. Check against the search pattern again to filter out those false results.
+                if (!IsOnWindows || search.Match(Path.GetFileName(subPath)))
+                {
+                    yield return ConvertPathFromInternal(subPath);
+                }
             }
         }
 

src/Zio/SearchPattern.cs

@@ -104,7 +104,6 @@ private SearchPattern(ref UPath path, ref string searchPattern)
                 }
             }
 
-            bool appendSpecialCaseForExt3Chars = false;
             var startIndex = 0;
             int nextIndex;
             StringBuilder builder = null;
@@ -129,16 +128,6 @@ private SearchPattern(ref UPath path, ref string searchPattern)
                     var regexPatternPart = c == '*' ? "[^/]*" : "[^/]";
                     builder.Append(regexPatternPart);
 
-                    // If the specified extension is exactly three characters long, 
-                    // the method returns files with extensions that begin with the specified extension. 
-                    // For example, "*.xls" returns both "book.xls" and "book.xlsx".
-                    // 012345
-                    // *.txt
-                    if (c == '*' && nextIndex + 5 == searchPattern.Length && searchPattern[nextIndex + 1] == '.' && searchPattern.IndexOf('.', nextIndex + 2) < 0)
-                    {
-                        appendSpecialCaseForExt3Chars = true;
-                    }
-
                     startIndex = nextIndex + 1;
                 }
                 if (builder == null)
@@ -154,11 +143,6 @@ private SearchPattern(ref UPath path, ref string searchPattern)
                         builder.Append(toEscape);
                     }
 
-                    if (appendSpecialCaseForExt3Chars)
-                    {
-                        builder.Append("[^/]*");
-                    }
-
                     builder.Append("$");
 
                     var regexPattern = builder.ToString();
@@ -174,4 +158,4 @@ private SearchPattern(ref UPath path, ref string searchPattern)
             }
         }
     }
-}
+}