Removal of boiler plate code put into static helper.

1 files changed, 16 insertions, 6 deletions

diff --git a/Duplicati/Library/Common/IO/SystemIOWindows.cs b/Duplicati/Library/Common/IO/SystemIOWindows.cs
index f9bcefb68..84398407d 100644
--- a/Duplicati/Library/Common/IO/SystemIOWindows.cs
+++ b/Duplicati/Library/Common/IO/SystemIOWindows.cs
@@ -288,18 +288,28 @@ namespace Duplicati.Library.Common.IO
             return null;

         }

 

-        public IEnumerable<string> EnumerateFileSystemEntries(string path)

+        private static T TryNativeFirst<T>(Func<string, T> nativeIOFunc, Func<string, T> alternativeIOFunc, string path)

         {

             if (!IsPathTooLong(path))

-                try { return System.IO.Directory.EnumerateFileSystemEntries(path); }

+                try { return nativeIOFunc(path); }

                 catch (System.IO.PathTooLongException) { }

                 catch (System.ArgumentException) { }

 

-            var r = Alphaleonis.Win32.Filesystem.Directory.GetFileSystemEntries(PrefixWithUNC(path));

-            for (var i = 0; i < r.Length; i++)

-                r[i] = StripUNCPrefix(r[i]);

+            return alternativeIOFunc(path);

+        }

 

-            return r;

+        public IEnumerable<string> EnumerateFileSystemEntries(string path)

+        {

+            IEnumerable<string> alphaFS(string _path)

+            {

+                var r = Alphaleonis.Win32.Filesystem.Directory.GetFileSystemEntries(PrefixWithUNC(_path));

+                for (var i = 0; i < r.Length; i++)

+                    r[i] = StripUNCPrefix(r[i]);

+

+                return r;

+            }

+

+            return TryNativeFirst(System.IO.Directory.EnumerateFileSystemEntries, alphaFS, path);

         }

 

         public IEnumerable<string> EnumerateFiles(string path)