FileSystem: Slight ifdef tidy-ups
This commit is contained in:
Stenzek
parent
75babc74cb
commit
ccc3b114d4
|
|
@ -47,8 +47,6 @@
|
|||
|
||||
LOG_CHANNEL(FileSystem);
|
||||
|
||||
#ifndef __ANDROID__
|
||||
|
||||
#ifdef _WIN32
|
||||
static std::time_t ConvertFileTimeToUnixTime(const FILETIME& ft)
|
||||
{
|
||||
|
|
@ -96,49 +94,6 @@ static inline bool FileSystemCharacterIsSane(char32_t c, bool strip_slashes)
|
|||
return true;
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
static inline void PathAppendString(std::string& dst, const T& src)
|
||||
{
|
||||
if (dst.capacity() < (dst.length() + src.length()))
|
||||
dst.reserve(dst.length() + src.length());
|
||||
|
||||
bool last_separator = (!dst.empty() && dst.back() == FS_OSPATH_SEPARATOR_CHARACTER);
|
||||
|
||||
size_t index = 0;
|
||||
|
||||
#ifdef _WIN32
|
||||
// special case for UNC paths here
|
||||
if (dst.empty() && IsUNCPath(src))
|
||||
{
|
||||
dst.append("\\\\");
|
||||
index = 2;
|
||||
}
|
||||
#endif
|
||||
|
||||
for (; index < src.length(); index++)
|
||||
{
|
||||
const char ch = src[index];
|
||||
|
||||
#ifdef _WIN32
|
||||
// convert forward slashes to backslashes
|
||||
if (ch == '\\' || ch == '/')
|
||||
#else
|
||||
if (ch == '/')
|
||||
#endif
|
||||
{
|
||||
if (last_separator)
|
||||
continue;
|
||||
last_separator = true;
|
||||
dst.push_back(FS_OSPATH_SEPARATOR_CHARACTER);
|
||||
}
|
||||
else
|
||||
{
|
||||
last_separator = false;
|
||||
dst.push_back(ch);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
std::string Path::SanitizeFileName(std::string_view str, bool strip_slashes /* = true */)
|
||||
{
|
||||
std::string ret;
|
||||
|
|
@ -287,6 +242,51 @@ std::wstring FileSystem::GetWin32Path(std::string_view str)
|
|||
|
||||
#endif
|
||||
|
||||
#ifndef __ANDROID__
|
||||
|
||||
template<typename T>
|
||||
static inline void PathAppendString(std::string& dst, const T& src)
|
||||
{
|
||||
if (dst.capacity() < (dst.length() + src.length()))
|
||||
dst.reserve(dst.length() + src.length());
|
||||
|
||||
bool last_separator = (!dst.empty() && dst.back() == FS_OSPATH_SEPARATOR_CHARACTER);
|
||||
|
||||
size_t index = 0;
|
||||
|
||||
#ifdef _WIN32
|
||||
// special case for UNC paths here
|
||||
if (dst.empty() && IsUNCPath(src))
|
||||
{
|
||||
dst.append("\\\\");
|
||||
index = 2;
|
||||
}
|
||||
#endif
|
||||
|
||||
for (; index < src.length(); index++)
|
||||
{
|
||||
const char ch = src[index];
|
||||
|
||||
#ifdef _WIN32
|
||||
// convert forward slashes to backslashes
|
||||
if (ch == '\\' || ch == '/')
|
||||
#else
|
||||
if (ch == '/')
|
||||
#endif
|
||||
{
|
||||
if (last_separator)
|
||||
continue;
|
||||
last_separator = true;
|
||||
dst.push_back(FS_OSPATH_SEPARATOR_CHARACTER);
|
||||
}
|
||||
else
|
||||
{
|
||||
last_separator = false;
|
||||
dst.push_back(ch);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool Path::IsAbsolute(std::string_view path)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
|
|
@ -873,114 +873,6 @@ std::string Path::Combine(std::string_view base, std::string_view next)
|
|||
return ret;
|
||||
}
|
||||
|
||||
std::string Path::URLEncode(std::string_view str)
|
||||
{
|
||||
std::string ret;
|
||||
ret.reserve(str.length() + ((str.length() + 3) / 4) * 3);
|
||||
|
||||
for (size_t i = 0, l = str.size(); i < l; i++)
|
||||
{
|
||||
const char c = str[i];
|
||||
if ((c >= '0' && c <= '9') || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '-' || c == '_' ||
|
||||
c == '.' || c == '!' || c == '~' || c == '*' || c == '\'' || c == '(' || c == ')')
|
||||
{
|
||||
ret.push_back(c);
|
||||
}
|
||||
else
|
||||
{
|
||||
ret.push_back('%');
|
||||
|
||||
const unsigned char n1 = static_cast<unsigned char>(c) >> 4;
|
||||
const unsigned char n2 = static_cast<unsigned char>(c) & 0x0F;
|
||||
ret.push_back((n1 >= 10) ? ('a' + (n1 - 10)) : ('0' + n1));
|
||||
ret.push_back((n2 >= 10) ? ('a' + (n2 - 10)) : ('0' + n2));
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
std::string Path::URLDecode(std::string_view str)
|
||||
{
|
||||
std::string ret;
|
||||
ret.reserve(str.length());
|
||||
|
||||
for (size_t i = 0, l = str.size(); i < l; i++)
|
||||
{
|
||||
const char c = str[i];
|
||||
if (c == '+')
|
||||
{
|
||||
ret.push_back(c);
|
||||
}
|
||||
else if (c == '%')
|
||||
{
|
||||
if ((i + 2) >= str.length())
|
||||
break;
|
||||
|
||||
const char clower = str[i + 1];
|
||||
const char cupper = str[i + 2];
|
||||
const unsigned char lower =
|
||||
(clower >= '0' && clower <= '9') ?
|
||||
static_cast<unsigned char>(clower - '0') :
|
||||
((clower >= 'a' && clower <= 'f') ?
|
||||
static_cast<unsigned char>(clower - 'a') :
|
||||
((clower >= 'A' && clower <= 'F') ? static_cast<unsigned char>(clower - 'A') : 0));
|
||||
const unsigned char upper =
|
||||
(cupper >= '0' && cupper <= '9') ?
|
||||
static_cast<unsigned char>(cupper - '0') :
|
||||
((cupper >= 'a' && cupper <= 'f') ?
|
||||
static_cast<unsigned char>(cupper - 'a') :
|
||||
((cupper >= 'A' && cupper <= 'F') ? static_cast<unsigned char>(cupper - 'A') : 0));
|
||||
const char dch = static_cast<char>(lower | (upper << 4));
|
||||
ret.push_back(dch);
|
||||
}
|
||||
else
|
||||
{
|
||||
ret.push_back(c);
|
||||
}
|
||||
}
|
||||
|
||||
return std::string(str);
|
||||
}
|
||||
|
||||
std::string Path::CreateFileURL(std::string_view path)
|
||||
{
|
||||
DebugAssert(IsAbsolute(path));
|
||||
|
||||
std::string ret;
|
||||
ret.reserve(path.length() + 10);
|
||||
ret.append("file://");
|
||||
|
||||
const std::vector<std::string_view> components = SplitNativePath(path);
|
||||
Assert(!components.empty());
|
||||
|
||||
const std::string_view& first = components.front();
|
||||
#ifdef _WIN32
|
||||
// Windows doesn't urlencode the drive letter.
|
||||
// UNC paths should be omit the leading slash.
|
||||
if (first.starts_with("\\\\"))
|
||||
{
|
||||
// file://hostname/...
|
||||
ret.append(first.substr(2));
|
||||
}
|
||||
else
|
||||
{
|
||||
// file:///c:/...
|
||||
fmt::format_to(std::back_inserter(ret), "/{}", first);
|
||||
}
|
||||
#else
|
||||
// Don't append a leading slash for the first component.
|
||||
ret.append(first);
|
||||
#endif
|
||||
|
||||
for (size_t comp = 1; comp < components.size(); comp++)
|
||||
{
|
||||
fmt::format_to(std::back_inserter(ret), "/{}", URLEncode(components[comp]));
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
std::FILE* FileSystem::OpenCFile(const char* filename, const char* mode, Error* error)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
|
|
@ -1163,6 +1055,116 @@ std::FILE* FileSystem::OpenSharedCFile(const char* filename, const char* mode, F
|
|||
#endif
|
||||
}
|
||||
|
||||
#endif // __ANDROID__
|
||||
|
||||
std::string Path::URLEncode(std::string_view str)
|
||||
{
|
||||
std::string ret;
|
||||
ret.reserve(str.length() + ((str.length() + 3) / 4) * 3);
|
||||
|
||||
for (size_t i = 0, l = str.size(); i < l; i++)
|
||||
{
|
||||
const char c = str[i];
|
||||
if ((c >= '0' && c <= '9') || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '-' || c == '_' ||
|
||||
c == '.' || c == '!' || c == '~' || c == '*' || c == '\'' || c == '(' || c == ')')
|
||||
{
|
||||
ret.push_back(c);
|
||||
}
|
||||
else
|
||||
{
|
||||
ret.push_back('%');
|
||||
|
||||
const unsigned char n1 = static_cast<unsigned char>(c) >> 4;
|
||||
const unsigned char n2 = static_cast<unsigned char>(c) & 0x0F;
|
||||
ret.push_back((n1 >= 10) ? ('a' + (n1 - 10)) : ('0' + n1));
|
||||
ret.push_back((n2 >= 10) ? ('a' + (n2 - 10)) : ('0' + n2));
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
std::string Path::URLDecode(std::string_view str)
|
||||
{
|
||||
std::string ret;
|
||||
ret.reserve(str.length());
|
||||
|
||||
for (size_t i = 0, l = str.size(); i < l; i++)
|
||||
{
|
||||
const char c = str[i];
|
||||
if (c == '+')
|
||||
{
|
||||
ret.push_back(c);
|
||||
}
|
||||
else if (c == '%')
|
||||
{
|
||||
if ((i + 2) >= str.length())
|
||||
break;
|
||||
|
||||
const char clower = str[i + 1];
|
||||
const char cupper = str[i + 2];
|
||||
const unsigned char lower =
|
||||
(clower >= '0' && clower <= '9') ?
|
||||
static_cast<unsigned char>(clower - '0') :
|
||||
((clower >= 'a' && clower <= 'f') ?
|
||||
static_cast<unsigned char>(clower - 'a') :
|
||||
((clower >= 'A' && clower <= 'F') ? static_cast<unsigned char>(clower - 'A') : 0));
|
||||
const unsigned char upper =
|
||||
(cupper >= '0' && cupper <= '9') ?
|
||||
static_cast<unsigned char>(cupper - '0') :
|
||||
((cupper >= 'a' && cupper <= 'f') ?
|
||||
static_cast<unsigned char>(cupper - 'a') :
|
||||
((cupper >= 'A' && cupper <= 'F') ? static_cast<unsigned char>(cupper - 'A') : 0));
|
||||
const char dch = static_cast<char>(lower | (upper << 4));
|
||||
ret.push_back(dch);
|
||||
}
|
||||
else
|
||||
{
|
||||
ret.push_back(c);
|
||||
}
|
||||
}
|
||||
|
||||
return std::string(str);
|
||||
}
|
||||
|
||||
std::string Path::CreateFileURL(std::string_view path)
|
||||
{
|
||||
DebugAssert(IsAbsolute(path));
|
||||
|
||||
std::string ret;
|
||||
ret.reserve(path.length() + 10);
|
||||
ret.append("file://");
|
||||
|
||||
const std::vector<std::string_view> components = SplitNativePath(path);
|
||||
Assert(!components.empty());
|
||||
|
||||
const std::string_view& first = components.front();
|
||||
#ifdef _WIN32
|
||||
// Windows doesn't urlencode the drive letter.
|
||||
// UNC paths should be omit the leading slash.
|
||||
if (first.starts_with("\\\\"))
|
||||
{
|
||||
// file://hostname/...
|
||||
ret.append(first.substr(2));
|
||||
}
|
||||
else
|
||||
{
|
||||
// file:///c:/...
|
||||
fmt::format_to(std::back_inserter(ret), "/{}", first);
|
||||
}
|
||||
#else
|
||||
// Don't append a leading slash for the first component.
|
||||
ret.append(first);
|
||||
#endif
|
||||
|
||||
for (size_t comp = 1; comp < components.size(); comp++)
|
||||
{
|
||||
fmt::format_to(std::back_inserter(ret), "/{}", URLEncode(components[comp]));
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
FileSystem::AtomicRenamedFileDeleter::AtomicRenamedFileDeleter(std::string temp_filename, std::string final_filename)
|
||||
: m_temp_filename(std::move(temp_filename)), m_final_filename(std::move(final_filename))
|
||||
{
|
||||
|
|
@ -1304,8 +1306,6 @@ bool FileSystem::CommitAtomicRenamedFile(AtomicRenamedFile& file, Error* error)
|
|||
return false;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
FileSystem::ManagedCFilePtr FileSystem::OpenManagedCFile(const char* filename, const char* mode, Error* error)
|
||||
{
|
||||
return ManagedCFilePtr(OpenCFile(filename, mode, error));
|
||||
|
|
|
|||
Loading…
Reference in New Issue