Ignore unix like hidden dir entries

polserver · Dec 28, 2021 · 3f884e8 · 3f884e8
1 parent b4cf95f
commit 3f884e8
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 3 deletions.
diff --git a/pol-core/ecompile/ECompileMain.cpp b/pol-core/ecompile/ECompileMain.cpp
@@ -582,7 +582,9 @@ void recurse_compile( const fs::path& basedir, std::vector<std::string>* files )
   {
     if ( Clib::exit_signalled )
       return;
-    if ( dir_entry.is_directory() )
+    if ( auto fn = dir_entry.path().filename().u8string(); !fn.empty() && *fn.begin() == '.' )
+      continue;
+    else if ( dir_entry.is_directory() )
       recurse_compile( dir_entry.path(), files );
     else if ( !dir_entry.is_regular_file() )
       continue;
@@ -644,7 +646,9 @@ void recurse_compile_inc( const fs::path& basedir, std::vector<std::string>* fil
   {
     if ( Clib::exit_signalled )
       return;
-    if ( dir_entry.is_directory() )
+    if ( auto fn = dir_entry.path().filename().u8string(); !fn.empty() && *fn.begin() == '.' )
+      continue;
+    else if ( dir_entry.is_directory() )
       recurse_compile_inc( dir_entry.path(), files );
     else if ( !dir_entry.is_regular_file() )
       continue;

diff --git a/pol-core/plib/pkg.cpp b/pol-core/plib/pkg.cpp
@@ -316,7 +316,8 @@ void load_packages( const std::string& basedir, bool quiet )
   {
     if ( !dir_entry.is_directory() )
       continue;
-    if ( dir_entry.path().stem() == "template" )
+    if ( auto fn = dir_entry.path().filename().u8string();
+         !fn.empty() && ( *fn.begin() == '.' || fn == "template" ) )
       continue;
     const auto pkg_dir = dir_entry.path();
     const auto pkg_cfg = pkg_dir / "pkg.cfg";

diff --git a/pol-core/pol/cmdlevel.cpp b/pol-core/pol/cmdlevel.cpp
@@ -153,6 +153,8 @@ std::unique_ptr<Bscript::ObjArray> ListCommandsInPackageAtCmdlevel( Plib::Packag
     {
       if ( !dir_entry.is_regular_file() )
         continue;
+      if ( auto fn = dir_entry.path().filename().u8string(); !fn.empty() && *fn.begin() == '.' )
+        continue;
 
       const auto ext = dir_entry.path().extension();
       if ( !ext.compare( ".ecl" ) )

diff --git a/pol-core/pol/module/filemod.cpp b/pol-core/pol/module/filemod.cpp
@@ -635,6 +635,8 @@ Bscript::BObjectImp* FileAccessExecutorModule::mf_ListDirectory()
   std::error_code ec;
   for ( const auto& dir_entry : fs::directory_iterator( path, ec ) )
   {
+    if ( auto fn = dir_entry.path().filename().u8string(); !fn.empty() && *fn.begin() == '.' )
+      continue;
     if ( dir_entry.is_directory() )
     {
       if ( listdirs == 0 )

diff --git a/pol-core/pol/realms/realms.cpp b/pol-core/pol/realms/realms.cpp
@@ -38,6 +38,8 @@ bool load_realms()
   {
     if ( !dir_entry.is_directory() )
       continue;
+    if ( auto fn = dir_entry.path().filename().u8string(); !fn.empty() && *fn.begin() == '.' )
+      continue;
     const auto realm_name = dir_entry.path().stem().u8string();
 
     passert_r( gamestate.Realms.size() < MAX_NUMER_REALMS,

diff --git a/pol-core/pol/tiplstwn.cpp b/pol-core/pol/tiplstwn.cpp
@@ -23,6 +23,8 @@ void load_tips()
   {
     if ( !dir_entry.is_regular_file() )
       continue;
+    if ( auto fn = dir_entry.path().filename().u8string(); !fn.empty() && *fn.begin() == '.' )
+      continue;
     const auto path = dir_entry.path();
     if ( !path.extension().compare( ".txt" ) )
     {