Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #10994 from shuffle2/fs 
get rid of HAS_STD_FILESYSTEM
  • Loading branch information
@delroth
delroth committed Jan 24, 2023
2 parents d4d6f3d + d51e4e5 commit caca662
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 119 deletions.
127 changes: 39 additions & 88 deletions Source/Core/Common/FileSearch.cpp
View file
Expand Up @@ -4,17 +4,17 @@
#include "Common/FileSearch.h"

#include <algorithm>
#include <filesystem>
#include <functional>
#include <iterator>
#include <system_error>

#include "Common/CommonPaths.h"
#include "Common/Logging/Log.h"
#include "Common/StringUtil.h"

#ifdef _MSC_VER
#include <Windows.h>
#include <filesystem>
namespace fs = std::filesystem;
#define HAS_STD_FILESYSTEM
#else
#ifdef ANDROID
#include "jni/AndroidCommon/AndroidCommon.h"
Expand All @@ -25,119 +25,72 @@ namespace fs = std::filesystem;
#include "Common/FileUtil.h"
#endif

namespace Common
{
#ifndef HAS_STD_FILESYSTEM

static void FileSearchWithTest(const std::string& directory, bool recursive,
std::vector<std::string>* result_out,
std::function<bool(const File::FSTEntry&)> callback)
{
File::FSTEntry top = File::ScanDirectoryTree(directory, recursive);

const std::function<void(File::FSTEntry&)> DoEntry = [&](File::FSTEntry& entry) {
if (callback(entry))
result_out->push_back(entry.physicalName);
for (auto& child : entry.children)
DoEntry(child);
};

for (auto& child : top.children)
DoEntry(child);
}
namespace fs = std::filesystem;

std::vector<std::string> DoFileSearch(const std::vector<std::string>& directories,
const std::vector<std::string>& exts, bool recursive)
namespace Common
{
std::vector<std::string> result;

bool accept_all = exts.empty();
const auto callback = [&exts, accept_all](const File::FSTEntry& entry) {
if (accept_all)
return true;
if (entry.isDirectory)
return false;
return std::any_of(exts.begin(), exts.end(), [&](const std::string& ext) {
const std::string& name = entry.virtualName;
return name.length() >= ext.length() &&
strcasecmp(name.c_str() + name.length() - ext.length(), ext.c_str()) == 0;
});
};

for (const std::string& directory : directories)
{
#ifdef ANDROID
// While File::ScanDirectoryTree (which is called in FileSearchWithTest) does handle Android
// content correctly, having a specialized implementation of DoFileSearch for Android content
// provides a much needed performance boost. Also, this specialized implementation will be
// required if we in the future replace the use of File::ScanDirectoryTree with std::filesystem.
if (IsPathAndroidContent(directory))
{
const std::vector<std::string> partial_result =
DoFileSearchAndroidContent(directory, exts, recursive);

result.insert(result.end(), std::make_move_iterator(partial_result.begin()),
std::make_move_iterator(partial_result.end()));
}
else
#endif
{
FileSearchWithTest(directory, recursive, &result, callback);
}
}

// remove duplicates
std::sort(result.begin(), result.end());
result.erase(std::unique(result.begin(), result.end()), result.end());
return result;
}

#else

std::vector<std::string> DoFileSearch(const std::vector<std::string>& directories,
const std::vector<std::string>& exts, bool recursive)
{
bool accept_all = exts.empty();
const bool accept_all = exts.empty();

std::vector<fs::path> native_exts;
for (const auto& ext : exts)
native_exts.push_back(StringToPath(ext));

// N.B. This avoids doing any copies
auto ext_matches = [&native_exts](const fs::path& path) {
const auto& native_path = path.native();
const std::basic_string_view<fs::path::value_type> native_path = path.native();
return std::any_of(native_exts.cbegin(), native_exts.cend(), [&native_path](const auto& ext) {
// TODO provide cross-platform compat for the comparison function, once more platforms
// support std::filesystem
int compare_len = static_cast<int>(ext.native().length());
return native_path.length() >= compare_len &&
CompareStringOrdinal(&native_path.c_str()[native_path.length() - compare_len],
compare_len, ext.c_str(), compare_len, TRUE) == CSTR_EQUAL;
const auto compare_len = ext.native().length();
if (native_path.length() < compare_len)
return false;
const auto substr_to_compare = native_path.substr(native_path.length() - compare_len);
#ifdef _WIN32
return CompareStringOrdinal(substr_to_compare.data(), static_cast<int>(compare_len),
ext.c_str(), static_cast<int>(compare_len), TRUE) == CSTR_EQUAL;
#else
return strncasecmp(substr_to_compare.data(), ext.c_str(), compare_len) == 0;
#endif
});
};

std::vector<std::string> result;
auto add_filtered = [&](const fs::directory_entry& entry) {
auto& path = entry.path();
if (accept_all || (ext_matches(path) && !fs::is_directory(path)))
if (accept_all || (!entry.is_directory() && ext_matches(path)))
result.emplace_back(PathToString(path));
};
for (const auto& directory : directories)
{
fs::path directory_path = StringToPath(directory);
if (fs::is_directory(directory_path)) // Can't create iterators for non-existant directories
#ifdef ANDROID
if (IsPathAndroidContent(directory))
{
const std::vector<std::string> partial_result =
DoFileSearchAndroidContent(directory, exts, recursive);

result.insert(result.end(), std::make_move_iterator(partial_result.begin()),
std::make_move_iterator(partial_result.end()));
}
else
#endif
{
fs::path directory_path = StringToPath(directory);
std::error_code error;
if (recursive)
{
// TODO use fs::directory_options::follow_directory_symlink ?
for (auto& entry : fs::recursive_directory_iterator(std::move(directory_path)))
add_filtered(entry);
for (auto it = fs::recursive_directory_iterator(std::move(directory_path), error);
it != fs::recursive_directory_iterator(); it.increment(error))
add_filtered(*it);
}
else
{
for (auto& entry : fs::directory_iterator(std::move(directory_path)))
add_filtered(entry);
for (auto it = fs::directory_iterator(std::move(directory_path), error);
it != fs::directory_iterator(); it.increment(error))
add_filtered(*it);
}
if (error)
ERROR_LOG_FMT(COMMON, "{} error on {}: {}", __func__, directory, error.message());
}
}

Expand All @@ -160,6 +113,4 @@ std::vector<std::string> DoFileSearch(const std::vector<std::string>& directorie
return result;
}

#endif

} // namespace Common
1 change: 0 additions & 1 deletion Source/Core/Common/FileUtil.cpp
View file
Expand Up @@ -54,7 +54,6 @@
#endif

#ifdef ANDROID
#include "Common/StringUtil.h"
#include "jni/AndroidCommon/AndroidCommon.h"
#endif

Expand Down
2 changes: 0 additions & 2 deletions Source/Core/Common/StringUtil.cpp
View file
Expand Up @@ -645,7 +645,6 @@ std::u16string UTF8ToUTF16(std::string_view input)
return converter.from_bytes(input.data(), input.data() + input.size());
}

#ifdef HAS_STD_FILESYSTEM
// This is a replacement for path::u8path, which is deprecated starting with C++20.
std::filesystem::path StringToPath(std::string_view path)
{
Expand All @@ -666,7 +665,6 @@ std::string PathToString(const std::filesystem::path& path)
return path.native();
#endif
}
#endif

#ifdef _WIN32
std::vector<std::string> CommandLineToUtf8Argv(const wchar_t* command_line)
Expand Down
8 changes: 1 addition & 7 deletions Source/Core/Common/StringUtil.h
View file
Expand Up @@ -6,6 +6,7 @@
#include <cstdarg>
#include <cstddef>
#include <cstdlib>
#include <filesystem>
#include <iomanip>
#include <limits>
#include <locale>
Expand All @@ -16,11 +17,6 @@

#include "Common/CommonTypes.h"

#ifdef _MSC_VER
#include <filesystem>
#define HAS_STD_FILESYSTEM
#endif

std::string StringFromFormatV(const char* format, va_list args);

std::string StringFromFormat(const char* format, ...)
Expand Down Expand Up @@ -214,10 +210,8 @@ inline std::string UTF8ToTStr(std::string_view str)

#endif

#ifdef HAS_STD_FILESYSTEM
std::filesystem::path StringToPath(std::string_view path);
std::string PathToString(const std::filesystem::path& path);
#endif

// Thousand separator. Turns 12345678 into 12,345,678
template <typename I>
Expand Down
15 changes: 0 additions & 15 deletions Source/Core/Core/Boot/Boot.cpp
View file
Expand Up @@ -3,12 +3,6 @@

#include "Core/Boot/Boot.h"

#ifdef _MSC_VER
#include <filesystem>
namespace fs = std::filesystem;
#define HAS_STD_FILESYSTEM
#endif

#include <algorithm>
#include <array>
#include <cstring>
Expand Down Expand Up @@ -67,10 +61,6 @@ namespace fs = std::filesystem;
static std::vector<std::string> ReadM3UFile(const std::string& m3u_path,
const std::string& folder_path)
{
#ifndef HAS_STD_FILESYSTEM
ASSERT(folder_path.back() == '/');
#endif

std::vector<std::string> result;
std::vector<std::string> nonexistent;

Expand All @@ -91,12 +81,7 @@ static std::vector<std::string> ReadM3UFile(const std::string& m3u_path,

if (!line.empty() && line.front() != '#') // Comments start with #
{
#ifdef HAS_STD_FILESYSTEM
const std::string path_to_add = PathToString(StringToPath(folder_path) / StringToPath(line));
#else
const std::string path_to_add = line.front() != '/' ? folder_path + line : line;
#endif

(File::Exists(path_to_add) ? result : nonexistent).push_back(path_to_add);
}
}
Expand Down
6 changes: 0 additions & 6 deletions Source/Core/DiscIO/GameModDescriptor.cpp
View file
Expand Up @@ -18,13 +18,7 @@ namespace DiscIO
{
static std::string MakeAbsolute(const std::string& directory, const std::string& path)
{
#ifdef _WIN32
return PathToString(StringToPath(directory) / StringToPath(path));
#else
if (StringBeginsWith(path, "/"))
return path;
return directory + "/" + path;
#endif
}

std::optional<GameModDescriptor> ParseGameModDescriptorFile(const std::string& filename)
Expand Down

0 comments on commit caca662

Please sign in to comment.