From 2ad2bd8491361bbfa024a0885f7c5322979ced1f Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Wed, 12 Mar 2014 19:49:03 +0100 Subject: [PATCH] Add flag to enable getFilesInDir to get hidden files (dotfiles). --- file/file_util.cpp | 4 ++-- file/file_util.h | 6 +++++- native.vcxproj | 9 ++++++++- native.vcxproj.filters | 8 +++++++- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/file/file_util.cpp b/file/file_util.cpp index 705884d800..d0d8a212e3 100644 --- a/file/file_util.cpp +++ b/file/file_util.cpp @@ -234,7 +234,7 @@ bool FileInfo::operator <(const FileInfo &other) const { return false; } -size_t getFilesInDir(const char *directory, std::vector *files, const char *filter) { +size_t getFilesInDir(const char *directory, std::vector *files, const char *filter, int flags) { size_t foundEntries = 0; std::set filters; std::string tmp; @@ -292,7 +292,7 @@ size_t getFilesInDir(const char *directory, std::vector *files, const continue; // Remove dotfiles (should be made optional?) - if (virtualName[0] == '.') + if (!(flags & GETFILES_GETHIDDEN) && virtualName[0] == '.') continue; FileInfo info; diff --git a/file/file_util.h b/file/file_util.h index 34ee8e61ba..ff3290e5c5 100644 --- a/file/file_util.h +++ b/file/file_util.h @@ -27,7 +27,11 @@ std::string getFileExtension(const std::string &fn); std::string getDir(const std::string &path); std::string getFilename(std::string path); bool getFileInfo(const char *path, FileInfo *fileInfo); -size_t getFilesInDir(const char *directory, std::vector *files, const char *filter = 0); + +enum { + GETFILES_GETHIDDEN = 1 +}; +size_t getFilesInDir(const char *directory, std::vector *files, const char *filter = 0, int flags = 0); void deleteFile(const char *file); void deleteDir(const char *file); bool exists(const std::string &filename); diff --git a/native.vcxproj b/native.vcxproj index 8b8276ab32..5b8cb28793 100644 --- a/native.vcxproj +++ b/native.vcxproj @@ -242,6 +242,7 @@ + @@ -717,6 +718,12 @@ + + true + true + true + true + @@ -763,4 +770,4 @@ - + \ No newline at end of file diff --git a/native.vcxproj.filters b/native.vcxproj.filters index 4456492c57..eef91701ff 100644 --- a/native.vcxproj.filters +++ b/native.vcxproj.filters @@ -326,6 +326,9 @@ ext\vjson + + gfx + @@ -772,6 +775,9 @@ ext\vjson + + gfx + @@ -850,4 +856,4 @@ {c6910d82-73d3-4d97-ac9c-bcc03265b1bc} - + \ No newline at end of file