externals: update filesystem to 1.3.6 (fixes exception during directo…

…ry read) Skip time machine volumes in macOS
JaCzekanski · Nov 13, 2020 · 9948c2f · 9948c2f
1 parent 2e951f0
commit 9948c2f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/externals/filesystem b/externals/filesystem
diff --git a/src/disc/track.h b/src/disc/track.h
@@ -5,7 +5,7 @@
 
 namespace disc {
 struct Track {
-    static const int SECTOR_SIZE = 2352;
+    inline static const int SECTOR_SIZE = 2352;
 
     std::string filename;
     int number = 0;
@@ -27,4 +27,4 @@ struct Track {
         frames = 0;
     }
 };
-}  // namespace utils
+}  // namespace disc
diff --git a/src/platform/windows/gui/helper/file_dialog.cpp b/src/platform/windows/gui/helper/file_dialog.cpp
@@ -19,6 +19,11 @@
 
 namespace gui::helper {
 
+bool isHidden(const fs::directory_entry& f) {
+    auto filename = f.path().filename().string();
+    return filename[0] == '.' && filename != "..";
+}
+
 File::File(const fs::directory_entry& f, bool isSupported) : entry(f), isSupported(isSupported) {
     filename = f.path().filename().string();
     extension = f.path().extension().string();
@@ -29,7 +34,7 @@ File::File(const fs::directory_entry& f, bool isSupported) : entry(f), isSupport
         size = formatFileSize(fs::file_size(f));
     }
 
-    isHidden = filename[0] == '.' && filename != "..";
+    isHidden = gui::helper::isHidden(f);
 }
 
 void FileDialog::getDriveList() {
@@ -52,15 +57,15 @@ void FileDialog::getDriveList() {
 #ifdef __APPLE__
     // Get list of drives by iterating /Volumes
     auto volumes = fs::directory_iterator("/Volumes", fs::directory_options::skip_permission_denied);
-    try {
-        for (auto& volume : volumes) {
-            if (!fs::exists(volume) || !fs::is_directory(volume)) {
+    for (auto& volume : volumes) {
+        try {
+            if (!fs::exists(volume) || !fs::is_directory(volume) || isHidden(volume)) {
                 continue;
             }
             drivePaths[volume.path().filename().string()] = volume.path().string();
+        } catch (fs::filesystem_error& err) {
+            fmt::print("{}\n", err.what());
         }
-    } catch (fs::filesystem_error& err) {
-        fmt::print("{}\n", err.what());
     }
 #endif
 
@@ -107,15 +112,15 @@ void FileDialog::readDirectory(const fs::path& _path) {
 
     path = fs::canonical(_path);
 
-    try {
-        auto it = fs::directory_iterator(path, fs::directory_options::skip_permission_denied);
+    auto it = fs::directory_iterator(path, fs::directory_options::skip_permission_denied);
 
-        files.push_back(fs::directory_entry(path / ".."));
-        for (auto& f : it) {
+    files.push_back(fs::directory_entry(path / ".."));
+    for (auto& f : it) {
+        try {
             files.push_back(File(f, isFileSupported(f)));
+        } catch (fs::filesystem_error& err) {
+            fmt::print("{}\n", err.what());
         }
-    } catch (fs::filesystem_error& err) {
-        fmt::print("{}\n", err.what());
     }
 
     std::sort(files.begin(), files.end(), [](const File& lhs, const File& rhs) -> bool {
+4 −0		.ci/unix-build.sh
+6 −0		.ci/unix-test.sh
+35 −0		.cirrus.yml
+43 −0		.drone.yml
+6 −1		.gitignore
+1 −5		.travis.yml
+15 −23		LICENSE
+107 −23		README.md
+11 −6		cmake/GhcHelper.cmake
+597 −106		include/ghc/filesystem.hpp
+17 −25		include/ghc/fs_fwd.hpp
+17 −25		include/ghc/fs_impl.hpp
+17 −25		include/ghc/fs_std.hpp
+17 −25		include/ghc/fs_std_fwd.hpp
+17 −25		include/ghc/fs_std_impl.hpp
+11 −1		test/CMakeLists.txt
+11 −6		test/cmake/ParseAndAddCatchTests.cmake
+5 −0		test/exception.cpp
+98 −34		test/filesystem_test.cpp
+15 −23		test/multi1.cpp
+15 −23		test/multi2.cpp