Fixed FileNotFoundException during backup when there is a symlink in …

…data folder
Bounz · Jun 24, 2018 · 6ff9aa7 · 6ff9aa7
1 parent bbfaa9e
commit 6ff9aa7
Showing 1 changed file with 21 additions and 1 deletion.
diff --git a/HomeGenie/Utils/ArchiveHelper.cs b/HomeGenie/Utils/ArchiveHelper.cs
@@ -84,7 +84,7 @@ internal static void AddFolderToZip(string zipFilename, string folderPath)
 
                 using (var archive = ZipArchive.Create())
                 {
-                    archive.AddAllFromDirectory(folderPath);
+                    archive.SafeAddAllFromDirectory(folderPath);
                     archive.SaveTo(zipFilename, CompressionType.Deflate);
                 }
             }
@@ -94,5 +94,25 @@ internal static void AddFolderToZip(string zipFilename, string folderPath)
                 throw;
             }
         }
+
+        private static void SafeAddAllFromDirectory(
+            this IWritableArchive writableArchive,
+            string filePath, string searchPattern = "*.*", SearchOption searchOption = SearchOption.AllDirectories)
+        {
+            foreach (var path in Directory.EnumerateFiles(filePath, searchPattern, searchOption))
+            {
+                // On Unix we can get FileNotFoundException when getting FileInfo on symlink
+                try
+                {
+                    var fileInfo = new FileInfo(path);
+                    writableArchive.AddEntry(path.Substring(filePath.Length), fileInfo.OpenRead(), true, fileInfo.Length,
+                        fileInfo.LastWriteTime);
+                }
+                catch (Exception e)
+                {
+                    Log.Warn("Can't access file at " + path, e);
+                }
+            }
+        }
     }
 }