[fix] 修复 DefaultTableImporter错误扫描 ~._开头的被忽略文件的bug

focus-creative-games · Aug 19, 2024 · fe84ec8 · fe84ec8
1 parent 44d855c
commit fe84ec8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/Luban.Core/Utils/FileUtil.cs b/src/Luban.Core/Utils/FileUtil.cs
@@ -226,14 +226,19 @@ public static void DeleteDirectoryRecursive(string rootDir)
         Directory.Delete(rootDir, false);
     }
 
+    public static bool IsIgnoreFile(string file)
+    {
+        return file.Split('\\', '/').Any(fileName => fileName.StartsWith(".") || fileName.StartsWith("_") || fileName.StartsWith("~"));
+    }
+
     public static List<string> GetFileOrDirectory(string fileOrDirectory)
     {
         var files = new List<string>();
         if (Directory.Exists(fileOrDirectory))
         {
             foreach (var file in Directory.GetFiles(fileOrDirectory, "*", SearchOption.AllDirectories))
             {
-                if (file.Substring(fileOrDirectory.Length).Split('\\', '/').Any(fileName => fileName.StartsWith(".") || fileName.StartsWith("_") || fileName.StartsWith("~")))
+                if (IsIgnoreFile(file))
                 {
                     continue;
                 }

diff --git a/src/Luban.Schema.Builtin/DefaultTableImporter.cs b/src/Luban.Schema.Builtin/DefaultTableImporter.cs
@@ -29,6 +29,10 @@ public List<RawTable> LoadImportTables()
         var tables = new List<RawTable>();
         foreach (string file in Directory.GetFiles(dataDir, "*", SearchOption.AllDirectories))
         {
+            if (FileUtil.IsIgnoreFile(file))
+            {
+                continue;
+            }
             string fileName = Path.GetFileName(file);
             string ext = Path.GetExtension(fileName).TrimStart('.');
             if (!excelExts.Contains(ext))