Emulation/Avocado
1
0
Fork 0
mirror of https://github.com/JaCzekanski/Avocado.git synced 2024-06-02 11:17:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

externals: update filesystem to 1.3.6 (fixes exception during directory read)

Browse source 
Skip time machine volumes in macOS
This commit is contained in:
Jakub Czekański 2020-11-13 03:50:05 +01:00
parent 2e951f06a0
commit 9948c2fbf7
3 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
externals/filesystem vendored

@ -1 +1 @@
Subproject commit 8facfa004441255dfa7f83dd21ea7bed70786656
Subproject commit 7e37433f318488ae4bc80f80e12df12a01579874

4
src/disc/track.h
View file

@ -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

29
src/platform/windows/gui/helper/file_dialog.cpp
View file

@ -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 {