Exverge/suyu
3
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

file_util: Use enum instead of bool for specifing path behavior

Browse source
This commit is contained in:
Zach Hilman 2018-08-06 23:21:37 -04:00
parent dad2ae1ee0
commit 2b6128fe0b
4 changed files with 37 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/file_util.cpp
View file

@ -884,12 +884,12 @@ std::string_view RemoveTrailingSlash(std::string_view path) {
return path; return path;
} }
std::string SanitizePath(std::string_view path_, bool with_platform_slashes) { std::string SanitizePath(std::string_view path_, DirectorySeparator directory_separator) {
std::string path(path_); std::string path(path_);
char type1 = '\\'; char type1 = directory_separator == DirectorySeparator::BackwardSlash ? '/' : '\\';
char type2 = '/'; char type2 = directory_separator == DirectorySeparator::BackwardSlash ? '\\' : '/';
if (with_platform_slashes) { if (directory_separator == DirectorySeparator::PlatformDefault) {
#ifdef _WIN32 #ifdef _WIN32
type1 = '/'; type1 = '/';
type2 = '\\'; type2 = '\\';

7
src/common/file_util.h
View file

@ -182,9 +182,12 @@ std::vector<T> SliceVector(const std::vector<T>& vector, size_t first, size_t la
return std::vector<T>(vector.begin() + first, vector.begin() + first + last); return std::vector<T>(vector.begin() + first, vector.begin() + first + last);
} }
enum class DirectorySeparator { ForwardSlash, BackwardSlash, PlatformDefault };
// Removes trailing slash, makes all '\\' into '/', and removes duplicate '/'. Makes '/' into '\\' // Removes trailing slash, makes all '\\' into '/', and removes duplicate '/'. Makes '/' into '\\'
// if windows and with_platform_slashes is true. // depending if directory_separator is BackwardSlash or PlatformDefault and running on windows
std::string SanitizePath(std::string_view path, bool with_platform_slashes = false); std::string SanitizePath(std::string_view path,
DirectorySeparator directory_separator = DirectorySeparator::ForwardSlash);
// simple wrapper for cstdlib file functions to // simple wrapper for cstdlib file functions to
// hopefully will make error checking easier // hopefully will make error checking easier

44
src/core/file_sys/vfs_real.cpp
View file

@ -53,7 +53,7 @@ bool RealVfsFilesystem::IsWritable() const {
} }
VfsEntryType RealVfsFilesystem::GetEntryType(std::string_view path_) const { VfsEntryType RealVfsFilesystem::GetEntryType(std::string_view path_) const {
const auto path = FileUtil::SanitizePath(path_, true); const auto path = FileUtil::SanitizePath(path_, FileUtil::DirectorySeparator::PlatformDefault);
if (!FileUtil::Exists(path)) if (!FileUtil::Exists(path))
return VfsEntryType::None; return VfsEntryType::None;
if (FileUtil::IsDirectory(path)) if (FileUtil::IsDirectory(path))
@ -63,7 +63,7 @@ VfsEntryType RealVfsFilesystem::GetEntryType(std::string_view path_) const {
} }
VirtualFile RealVfsFilesystem::OpenFile(std::string_view path_, Mode perms) { VirtualFile RealVfsFilesystem::OpenFile(std::string_view path_, Mode perms) {
const auto path = FileUtil::SanitizePath(path_, true); const auto path = FileUtil::SanitizePath(path_, FileUtil::DirectorySeparator::PlatformDefault);
if (cache.find(path) != cache.end()) { if (cache.find(path) != cache.end()) {
auto weak = cache[path]; auto weak = cache[path];
if (!weak.expired()) { if (!weak.expired()) {
@ -82,15 +82,17 @@ VirtualFile RealVfsFilesystem::OpenFile(std::string_view path_, Mode perms) {
} }
VirtualFile RealVfsFilesystem::CreateFile(std::string_view path_, Mode perms) { VirtualFile RealVfsFilesystem::CreateFile(std::string_view path_, Mode perms) {
const auto path = FileUtil::SanitizePath(path_, true); const auto path = FileUtil::SanitizePath(path_, FileUtil::DirectorySeparator::PlatformDefault);
if (!FileUtil::Exists(path) && !FileUtil::CreateEmptyFile(path)) if (!FileUtil::Exists(path) && !FileUtil::CreateEmptyFile(path))
return nullptr; return nullptr;
return OpenFile(path, perms); return OpenFile(path, perms);
} }
VirtualFile RealVfsFilesystem::CopyFile(std::string_view old_path_, std::string_view new_path_) { VirtualFile RealVfsFilesystem::CopyFile(std::string_view old_path_, std::string_view new_path_) {
const auto old_path = FileUtil::SanitizePath(old_path_, true); const auto old_path =
const auto new_path = FileUtil::SanitizePath(new_path_, true); FileUtil::SanitizePath(old_path_, FileUtil::DirectorySeparator::PlatformDefault);
const auto new_path =
FileUtil::SanitizePath(new_path_, FileUtil::DirectorySeparator::PlatformDefault);
if (!FileUtil::Exists(old_path) || FileUtil::Exists(new_path) || if (!FileUtil::Exists(old_path) || FileUtil::Exists(new_path) ||
FileUtil::IsDirectory(old_path) || !FileUtil::Copy(old_path, new_path)) FileUtil::IsDirectory(old_path) || !FileUtil::Copy(old_path, new_path))
@ -99,8 +101,10 @@ VirtualFile RealVfsFilesystem::CopyFile(std::string_view old_path_, std::string_
} }
VirtualFile RealVfsFilesystem::MoveFile(std::string_view old_path_, std::string_view new_path_) { VirtualFile RealVfsFilesystem::MoveFile(std::string_view old_path_, std::string_view new_path_) {
const auto old_path = FileUtil::SanitizePath(old_path_, true); const auto old_path =
const auto new_path = FileUtil::SanitizePath(new_path_, true); FileUtil::SanitizePath(old_path_, FileUtil::DirectorySeparator::PlatformDefault);
const auto new_path =
FileUtil::SanitizePath(new_path_, FileUtil::DirectorySeparator::PlatformDefault);
if (!FileUtil::Exists(old_path) || FileUtil::Exists(new_path) || if (!FileUtil::Exists(old_path) || FileUtil::Exists(new_path) ||
FileUtil::IsDirectory(old_path) || !FileUtil::Rename(old_path, new_path)) FileUtil::IsDirectory(old_path) || !FileUtil::Rename(old_path, new_path))
@ -119,7 +123,7 @@ VirtualFile RealVfsFilesystem::MoveFile(std::string_view old_path_, std::string_
} }
bool RealVfsFilesystem::DeleteFile(std::string_view path_) { bool RealVfsFilesystem::DeleteFile(std::string_view path_) {
const auto path = FileUtil::SanitizePath(path_, true); const auto path = FileUtil::SanitizePath(path_, FileUtil::DirectorySeparator::PlatformDefault);
if (cache.find(path) != cache.end()) { if (cache.find(path) != cache.end()) {
if (!cache[path].expired()) if (!cache[path].expired())
cache[path].lock()->Close(); cache[path].lock()->Close();
@ -129,13 +133,13 @@ bool RealVfsFilesystem::DeleteFile(std::string_view path_) {
} }
VirtualDir RealVfsFilesystem::OpenDirectory(std::string_view path_, Mode perms) { VirtualDir RealVfsFilesystem::OpenDirectory(std::string_view path_, Mode perms) {
const auto path = FileUtil::SanitizePath(path_, true); const auto path = FileUtil::SanitizePath(path_, FileUtil::DirectorySeparator::PlatformDefault);
// Cannot use make_shared as RealVfsDirectory constructor is private // Cannot use make_shared as RealVfsDirectory constructor is private
return std::shared_ptr<RealVfsDirectory>(new RealVfsDirectory(*this, path, perms)); return std::shared_ptr<RealVfsDirectory>(new RealVfsDirectory(*this, path, perms));
} }
VirtualDir RealVfsFilesystem::CreateDirectory(std::string_view path_, Mode perms) { VirtualDir RealVfsFilesystem::CreateDirectory(std::string_view path_, Mode perms) {
const auto path = FileUtil::SanitizePath(path_, true); const auto path = FileUtil::SanitizePath(path_, FileUtil::DirectorySeparator::PlatformDefault);
if (!FileUtil::Exists(path) && !FileUtil::CreateDir(path)) if (!FileUtil::Exists(path) && !FileUtil::CreateDir(path))
return nullptr; return nullptr;
// Cannot use make_shared as RealVfsDirectory constructor is private // Cannot use make_shared as RealVfsDirectory constructor is private
@ -144,8 +148,10 @@ VirtualDir RealVfsFilesystem::CreateDirectory(std::string_view path_, Mode perms
VirtualDir RealVfsFilesystem::CopyDirectory(std::string_view old_path_, VirtualDir RealVfsFilesystem::CopyDirectory(std::string_view old_path_,
std::string_view new_path_) { std::string_view new_path_) {
const auto old_path = FileUtil::SanitizePath(old_path_, true); const auto old_path =
const auto new_path = FileUtil::SanitizePath(new_path_, true); FileUtil::SanitizePath(old_path_, FileUtil::DirectorySeparator::PlatformDefault);
const auto new_path =
FileUtil::SanitizePath(new_path_, FileUtil::DirectorySeparator::PlatformDefault);
if (!FileUtil::Exists(old_path) || FileUtil::Exists(new_path) || if (!FileUtil::Exists(old_path) || FileUtil::Exists(new_path) ||
!FileUtil::IsDirectory(old_path)) !FileUtil::IsDirectory(old_path))
return nullptr; return nullptr;
@ -155,8 +161,10 @@ VirtualDir RealVfsFilesystem::CopyDirectory(std::string_view old_path_,
VirtualDir RealVfsFilesystem::MoveDirectory(std::string_view old_path_, VirtualDir RealVfsFilesystem::MoveDirectory(std::string_view old_path_,
std::string_view new_path_) { std::string_view new_path_) {
const auto old_path = FileUtil::SanitizePath(old_path_, true); const auto old_path =
const auto new_path = FileUtil::SanitizePath(new_path_, true); FileUtil::SanitizePath(old_path_, FileUtil::DirectorySeparator::PlatformDefault);
const auto new_path =
FileUtil::SanitizePath(new_path_, FileUtil::DirectorySeparator::PlatformDefault);
if (!FileUtil::Exists(old_path) || FileUtil::Exists(new_path) || if (!FileUtil::Exists(old_path) || FileUtil::Exists(new_path) ||
FileUtil::IsDirectory(old_path) || !FileUtil::Rename(old_path, new_path)) FileUtil::IsDirectory(old_path) || !FileUtil::Rename(old_path, new_path))
return nullptr; return nullptr;
@ -164,9 +172,11 @@ VirtualDir RealVfsFilesystem::MoveDirectory(std::string_view old_path_,
for (auto& kv : cache) { for (auto& kv : cache) {
// Path in cache starts with old_path // Path in cache starts with old_path
if (kv.first.rfind(old_path, 0) == 0) { if (kv.first.rfind(old_path, 0) == 0) {
const auto file_old_path = FileUtil::SanitizePath(kv.first, true); const auto file_old_path =
FileUtil::SanitizePath(kv.first, FileUtil::DirectorySeparator::PlatformDefault);
const auto file_new_path = const auto file_new_path =
FileUtil::SanitizePath(new_path + DIR_SEP + kv.first.substr(old_path.size()), true); FileUtil::SanitizePath(new_path + DIR_SEP + kv.first.substr(old_path.size()),
FileUtil::DirectorySeparator::PlatformDefault);
auto cached = cache[file_old_path]; auto cached = cache[file_old_path];
if (!cached.expired()) { if (!cached.expired()) {
auto file = cached.lock(); auto file = cached.lock();
@ -181,7 +191,7 @@ VirtualDir RealVfsFilesystem::MoveDirectory(std::string_view old_path_,
} }
bool RealVfsFilesystem::DeleteDirectory(std::string_view path_) { bool RealVfsFilesystem::DeleteDirectory(std::string_view path_) {
const auto path = FileUtil::SanitizePath(path_, true); const auto path = FileUtil::SanitizePath(path_, FileUtil::DirectorySeparator::PlatformDefault);
for (auto& kv : cache) { for (auto& kv : cache) {
// Path in cache starts with old_path // Path in cache starts with old_path
if (kv.first.rfind(path, 0) == 0) { if (kv.first.rfind(path, 0) == 0) {

2
src/yuzu/game_list_p.h
View file

@ -140,7 +140,7 @@ class GameListWorker : public QObject, public QRunnable {
public: public:
GameListWorker(FileSys::VirtualFilesystem vfs, QString dir_path, bool deep_scan) GameListWorker(FileSys::VirtualFilesystem vfs, QString dir_path, bool deep_scan)
: dir_path(std::move(dir_path)), deep_scan(deep_scan) {} : vfs(std::move(vfs)), dir_path(std::move(dir_path)), deep_scan(deep_scan) {}
public slots: public slots:
/// Starts the processing of directory tree information. /// Starts the processing of directory tree information.