Merge pull request #16 from andreaskueffel/development

add try catch for nonexistent folders/paths

Author: andreaskueffel

FileSyncLibNet/AccessProviders/FileIoAccessProvider.cs

@@ -1,4 +1,5 @@
 using FileSyncLibNet.Commons;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -9,8 +10,10 @@ namespace FileSyncLibNet.AccessProviders
     internal class FileIoAccessProvider : IAccessProvider
     {
         public string AccessPath { get; private set; }
-        public FileIoAccessProvider()
+        private readonly ILogger logger;
+        public FileIoAccessProvider(ILogger logger)
         {
+            this.logger = logger;
         }
         public void UpdateAccessPath(string accessPath)
         {
@@ -39,14 +42,20 @@ public List<FileInfo2> GetFiles(DateTime minimumLastWriteTime, string pattern, s
             List<FileInfo2> ret_val = new List<FileInfo2>();
             foreach (var dir in (subfolders != null && subfolders.Count > 0) ? _di.GetDirectories() : new[] { _di })
             {
-                if (subfolders != null && subfolders.Count > 0 && !subfolders.Select(x => x.ToLower()).Contains(dir.Name.ToLower()))
-                    continue;
-                var _fi = dir.EnumerateFiles(
-                    searchPattern: pattern,
-                    searchOption: recursive ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly);
+                try
+                {
+                    if (subfolders != null && subfolders.Count > 0 && !subfolders.Select(x => x.ToLower()).Contains(dir.Name.ToLower()))
+                        continue;
+                    var _fi = dir.EnumerateFiles(
+                        searchPattern: pattern,
+                        searchOption: recursive ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly);
 
 
-                ret_val.AddRange(_fi.Select(x => new FileInfo2(x.FullName.Substring(AccessPath.Length + 1), x.Exists) { Length = x.Length, LastWriteTime = x.LastWriteTime }).ToList());
+                    ret_val.AddRange(_fi.Select(x => new FileInfo2(x.FullName.Substring(AccessPath.Length + 1), x.Exists) { Length = x.Length, LastWriteTime = x.LastWriteTime }).ToList());
+                }
+                catch (Exception exc) {
+                    logger?.LogError(exc, "exception in GetFiles for path {A}, dir {B}", path, dir);
+                }
             }
             return ret_val;
         }

FileSyncLibNet/AccessProviders/ScpAccessProvider.cs

@@ -1,4 +1,5 @@
 using FileSyncLibNet.Commons;
+using Microsoft.Extensions.Logging;
 using Renci.SshNet;
 using System;
 using System.Collections.Generic;
@@ -15,13 +16,14 @@ internal class ScpAccessProvider : IAccessProvider
         NetworkCredential Credentials { get; }
         SftpClient ftpClient;
         public string AccessPath { get; private set; }
-
-        public ScpAccessProvider(NetworkCredential credentials)
+        private readonly ILogger logger;
+        public ScpAccessProvider(NetworkCredential credentials, ILogger logger)
         {
+            this.logger = logger;
             Credentials = credentials;
         }
-        public void UpdateAccessPath(string accessPath) 
-        { 
+        public void UpdateAccessPath(string accessPath)
+        {
             AccessPathUri = accessPath;
             var pattern = @"scp://(?:(?<user>[^@]+)@)?(?<host>[^:/]+)(?::(?<port>\d+))?(?<path>/.*)?";
             var match = Regex.Match(AccessPathUri, pattern);
@@ -62,7 +64,7 @@ void CreateClient()
                 ftpClient = new SftpClient(host, port, Credentials.UserName, Credentials.Password);
             }
         }
-        
+
         void EnsureConnected()
         {
             if (ftpClient == null)
@@ -130,6 +132,7 @@ public bool MatchesPattern(string fileName, string pattern)
 
         public List<FileInfo2> GetFiles(DateTime minimumLastWriteTime, string pattern, string path = null, bool recursive = false, List<string> subfolders = null)
         {
+            //add try catch for non existent folders
             EnsureConnected();
             string basePath = string.IsNullOrEmpty(path) ? AccessPath : path;
             List<FileInfo2> ret_val = new List<FileInfo2>();
@@ -143,17 +146,24 @@ public List<FileInfo2> GetFiles(DateTime minimumLastWriteTime, string pattern, s
             }
             else
             {
-                var files = ftpClient.ListDirectory(basePath);
-                if (recursive)
+                try
                 {
-                    foreach (var folder in files.Where(x => x.IsDirectory && !(x.Name == ".") && !(x.Name == "..")))
+                    var files = ftpClient.ListDirectory(basePath);
+                    if (recursive)
                     {
-                        var subPath = System.IO.Path.Combine(folder.Name).Replace("\\", "/");
-                        ret_val.AddRange(GetFiles(minimumLastWriteTime, pattern, subPath, recursive));
+                        foreach (var folder in files.Where(x => x.IsDirectory && !(x.Name == ".") && !(x.Name == "..")))
+                        {
+                            var subPath = System.IO.Path.Combine(folder.Name).Replace("\\", "/");
+                            ret_val.AddRange(GetFiles(minimumLastWriteTime, pattern, subPath, recursive));
+                        }
                     }
+                    ret_val.AddRange(files.Where(x => MatchesPattern(x.Name, pattern)).Where(x => x.LastWriteTime >= minimumLastWriteTime && !x.IsDirectory).Select(x =>
+                    new FileInfo2($"{basePath.Substring(AccessPath.Length + 1)}/{x.Name}", exists: true) { LastWriteTime = x.LastWriteTime, Length = x.Length }).ToList());
+                }
+                catch (Exception exc)
+                {
+                    logger?.LogError(exc, "exception in GetFiles for path {A}, basePath {B}", path, basePath);
                 }
-                ret_val.AddRange(files.Where(x => MatchesPattern(x.Name, pattern)).Where(x => x.LastWriteTime >= minimumLastWriteTime && !x.IsDirectory).Select(x =>
-                new FileInfo2($"{basePath.Substring(AccessPath.Length + 1)}/{x.Name}", exists: true) { LastWriteTime = x.LastWriteTime, Length = x.Length }).ToList());
             }
             return ret_val;
         }

FileSyncLibNet/SyncProviders/AbstractProvider.cs

@@ -18,21 +18,20 @@ public AbstractProvider(IFileJobOptions jobOptions) : base(jobOptions)
                 throw new ArgumentException("this instance has no information about syncing files, it has type " + JobOptions.GetType().ToString());
             if (syncJobOptions.SourcePath.StartsWith("scp:"))
             {
-                SourceAccess = new ScpAccessProvider(syncJobOptions.Credentials);
-
+                SourceAccess = new ScpAccessProvider(syncJobOptions.Credentials, jobOptions.Logger);
             }
             else
             {
-                SourceAccess = new FileIoAccessProvider();
+                SourceAccess = new FileIoAccessProvider(jobOptions.Logger);
             }
             SourceAccess.UpdateAccessPath(syncJobOptions.SourcePath);
             if (syncJobOptions.DestinationPath.StartsWith("scp:"))
             {
-                DestinationAccess = new ScpAccessProvider(syncJobOptions.Credentials);
+                DestinationAccess = new ScpAccessProvider(syncJobOptions.Credentials, jobOptions.Logger);
             }
             else
             {
-                DestinationAccess = new FileIoAccessProvider();
+                DestinationAccess = new FileIoAccessProvider(jobOptions.Logger);
             }
 
         }