Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Android: Optimize content URI exists check.

Browse source
This commit is contained in:
Unknown W. Brackets 2021-12-05 19:06:18 -08:00
parent 197897979a
commit f9bab64bdf
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Core/FileLoaders/LocalFileLoader.cpp
View file

@ -60,9 +60,9 @@ LocalFileLoader::LocalFileLoader(const Path &filename)
#if PPSSPP_PLATFORM(ANDROID) #if PPSSPP_PLATFORM(ANDROID)
if (filename.Type() == PathType::CONTENT_URI) { if (filename.Type() == PathType::CONTENT_URI) {
int fd = Android_OpenContentUriFd(filename.ToString(), Android_OpenContentUriMode::READ); int fd = Android_OpenContentUriFd(filename.ToString(), Android_OpenContentUriMode::READ);
VERBOSE_LOG(SYSTEM, "Fd %d for content URI: '%s'", fd, filename.c_str()); VERBOSE_LOG(SYSTEM, "LocalFileLoader Fd %d for content URI: '%s'", fd, filename.c_str());
if (fd < 0) { if (fd < 0) {
ERROR_LOG(FILESYS, "LoadFileLoader failed to open content URI: '%s'", filename.c_str()); ERROR_LOG(FILESYS, "LocalFileLoader failed to open content URI: '%s'", filename.c_str());
return; return;
} }
fd_ = fd; fd_ = fd;
@ -118,23 +118,26 @@ LocalFileLoader::~LocalFileLoader() {
} }
bool LocalFileLoader::Exists() { bool LocalFileLoader::Exists() {
// If we couldn't open it for reading, we say it does not exist. // If we opened it for reading, it must exist. Done.
#ifndef _WIN32 #ifndef _WIN32
if (isOpenedByFd_) { if (isOpenedByFd_) {
// As an optimization, if we already tried and failed, quickly return.
// This is used because Android Content URIs are so slow.
return fd_ != -1; return fd_ != -1;
} }
if (fd_ != -1 || IsDirectory()) { if (fd_ != -1)
return true;
#else #else
if (handle_ != INVALID_HANDLE_VALUE || IsDirectory()) { if (handle_ != INVALID_HANDLE_VALUE)
return true;
#endif #endif
File::FileInfo info;
if (File::GetFileInfo(filename_, &info)) { File::FileInfo info;
return info.exists; if (File::GetFileInfo(filename_, &info)) {
} else { return info.exists;
return false; } else {
} return false;
} }
return false;
} }
bool LocalFileLoader::IsDirectory() { bool LocalFileLoader::IsDirectory() {