Dir: Apply Include_Hidden option also to directories

+ Handle Include_Dirs and Include_Files options on Unix

Signed-off-by: Maxime Gervais <gervais.maxime@gmail.com>

Author: g-maxime

Source/ZenLib/Dir.cpp

@@ -298,6 +298,22 @@ ZtringList Dir::GetAllFileNames(const Ztring &Dir_Name_, dirlist_t Options)
                     #endif //UNICODE
                     if (File_Name!=__T(".") && File_Name!=__T("..")) //Avoid . an ..
                     {
+                        if (!(Options&Include_Hidden) && ((!File_Name.empty() && File_Name[0]==__T('.')) ||
+                        #ifdef UNICODE
+                            (FindFileDataW.dwFileAttributes&FILE_ATTRIBUTE_HIDDEN)
+                        #else
+                            (FindFileData.dwFileAttributes&FILE_ATTRIBUTE_HIDDEN)
+                        #endif //UNICODE
+                        ))
+                        {
+                            #ifdef UNICODE
+                            ReturnValue=FindNextFileW(hFind, &FindFileDataW);
+                            #else
+                            ReturnValue=FindNextFile(hFind, &FindFileData);
+                            #endif //UNICODE
+                            continue;
+                        }
+
                         Ztring File_Name_Complete=Path+__T("\\")+File_Name;
                         if (Exists(File_Name_Complete))
                         {
@@ -306,13 +322,7 @@ ZtringList Dir::GetAllFileNames(const Ztring &Dir_Name_, dirlist_t Options)
                             if (Options&Parse_SubDirs)
                                 ToReturn+=GetAllFileNames(File_Name_Complete, Options); //A SubDir
                         }
-                        else if ((Options&Include_Files) && ((Options&Include_Hidden) || ((!File_Name.empty() && File_Name[0]!=__T('.')) &&
-                                #ifdef UNICODE
-                                    (FindFileDataW.dwFileAttributes&FILE_ATTRIBUTE_HIDDEN)==0
-                                #else
-                                    (FindFileData.dwFileAttributes&FILE_ATTRIBUTE_HIDDEN)==0
-                                #endif //UNICODE
-                        )))
+                        else if (Options&Include_Files)
                             ToReturn.push_back(File_Name_Complete); //A file
                     }
                     #ifdef UNICODE
@@ -358,15 +368,20 @@ ZtringList Dir::GetAllFileNames(const Ztring &Dir_Name_, dirlist_t Options)
                 {
                     //A file
                     Ztring File_Name(DirEnt->d_name);
+                    if (!(Options&Include_Hidden) && (!File_Name.empty() && File_Name[0]==__T('.')))
+                        continue;
+
                     if (File_Name!=__T(".") && File_Name!=__T("..")) //Avoid . an ..
                     {
                         Ztring File_Name_Complete=Dir_Name+File_Name;
                         if (Exists(File_Name_Complete))
                         {
+                            if (Options&Include_Dirs)
+                                ToReturn.push_back(File_Name_Complete); //A dir
                             if (Options&Parse_SubDirs)
                                 ToReturn+=GetAllFileNames(File_Name_Complete, Options); //A SubDir
                         }
-                        else if ((Options&Include_Hidden) || (!File_Name.empty() && File_Name[0]!=__T('.')))
+                        else if (Options&Include_Files)
                             ToReturn.push_back(File_Name_Complete); //A file
                     }
                 }