Fix crash when reading files from unautorized folder

DSPaul · Feb 1, 2025 · d98a667 · d98a667
1 parent 6bc80b9
commit d98a667
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 15 deletions.
diff --git a/src/Services/IOService.cs b/src/Services/IOService.cs
@@ -448,5 +448,27 @@ public static (string, string) GetDifferingRoot(in string path1, in string path2
 
             return (remainingPath1, remainingPath2);
         }
+
+        /// <summary>
+        /// Safe alternative of <see cref="Directory.GetFiles(string)"/> that catches all exceptions
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        public static IEnumerable<string> GetFilesInFolder(string path)
+        {
+            IEnumerable<string> files = Enumerable.Empty<string>();
+            if (Directory.Exists(path))
+            {
+                try
+                {
+                    files = Directory.GetFiles(path);
+                }
+                catch (Exception ex)
+                {
+                    Logger.Error($"Failed to get files of folder {path}", ex);
+                }
+            }
+            return files;
+        }
     }
 }
diff --git a/src/ViewModels/Import/ImportFolderViewModel.cs b/src/ViewModels/Import/ImportFolderViewModel.cs
@@ -116,20 +116,7 @@ private List<string> GetPathsToImport()
             List<string> toImport = new(Files);
             foreach (var folder in NonRecursiveDirectories)
             {
-                if (Directory.Exists(folder))
-                {
-                    IEnumerable<string> files;
-                    try
-                    {
-                        files = Directory.GetFiles(folder);
-                    }
-                    catch (Exception ex)
-                    {
-                        Logger.Error($"Failed to get files of folder {folder}", ex);
-                        files = Enumerable.Empty<string>();
-                    }
-                    toImport.AddRange(files);
-                }
+                toImport.AddRange(IOService.TryGetFilesInFolder(folder));
             }
 
             //3. Filter out doubles and banished paths
@@ -205,7 +192,7 @@ private List<string> LetUserFilterToImport(IList<string> toImport)
                 var checkedFolders = CheckableTreeNode<Folder>.GetCheckedItems(CheckableFolders).Flatten();
                 foreach (var folder in checkedFolders)
                 {
-                    toImportBySubFolders.AddRange(Directory.GetFiles(folder.FullPath));
+                    toImportBySubFolders.AddRange(IOService.TryGetFilesInFolder(folder.FullPath));
                 }
                 toImport = toImport.Intersect(toImportBySubFolders).ToList();
             }