Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Savedata: Combine file info and dir listing calls.

Browse Source
This commit is contained in:
Unknown W. Brackets 2022-10-09 09:33:39 -07:00
parent 4942692558
commit 8c1acc30e4
4 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Common/File/DirListing.cpp
View File

@ -220,7 +220,7 @@ bool GetFilesInDir(const Path &directory, std::vector<FileInfo> *files, const ch
HANDLE hFind = FindFirstFileEx((directory.ToWString() + L"\\*").c_str(), FindExInfoStandard, &ffd, FindExSearchNameMatch, NULL, 0);
#endif
if (hFind == INVALID_HANDLE_VALUE) {
return 0;
return false;
}
do {
const std::string virtualName = ConvertWStringToUTF8(ffd.cFileName);
@ -267,7 +267,7 @@ bool GetFilesInDir(const Path &directory, std::vector<FileInfo> *files, const ch
struct dirent *result = NULL;
DIR *dirp = opendir(directory.c_str());
if (!dirp)
return 0;
return false;
while ((result = readdir(dirp))) {
const std::string virtualName(result->d_name);
// check for "." and ".."

38
Core/Dialog/SavedataParam.cpp
View File

@ -95,6 +95,18 @@ namespace
return result == dataSize;
}
PSPFileInfo FileFromListing(const std::vector<PSPFileInfo> &listing, const std::string &filename) {
for (const PSPFileInfo &sub : listing) {
if (sub.name == filename)
return sub;
}
PSPFileInfo info;
info.name = filename;
info.exists = false;
return info;
}
bool PSPMatch(std::string text, std::string regexp)
{
if(text.empty() && regexp.empty())
@ -1094,13 +1106,12 @@ int SavedataParam::GetSizes(SceUtilitySavedataParam *param)
const std::string saveName(msData->saveName, strnlen(msData->saveName, sizeof(msData->saveName)));
// TODO: How should <> be handled?
std::string path = GetSaveFilePath(param, gameName + (saveName == "<>" ? "" : saveName));
PSPFileInfo finfo = pspFileSystem.GetFileInfo(path);
if (finfo.exists)
{
bool listingExists = false;
auto listing = pspFileSystem.GetDirListing(path, &listingExists);
if (listingExists) {
param->msData->info.usedClusters = 0;
auto listing = pspFileSystem.GetDirListing(path);
for (auto it = listing.begin(), end = listing.end(); it != end; ++it) {
param->msData->info.usedClusters += (it->size + (u32)MemoryStick_SectorSize() - 1) / (u32)MemoryStick_SectorSize();
for (auto &item : listing) {
param->msData->info.usedClusters += (item.size + (u32)MemoryStick_SectorSize() - 1) / (u32)MemoryStick_SectorSize();
}
// The usedSpaceKB value is definitely based on clusters, not bytes or even KB.
@ -1251,7 +1262,9 @@ int SavedataParam::GetFilesList(SceUtilitySavedataParam *param, u32 requestAddr)
}
std::string dirPath = savePath + GetGameName(param) + GetSaveName(param);
if (!pspFileSystem.GetFileInfo(dirPath).exists) {
bool dirPathExists = false;
auto files = pspFileSystem.GetDirListing(dirPath, &dirPathExists);
if (!dirPathExists) {
DEBUG_LOG(SCEUTILITY, "SavedataParam::GetFilesList(): directory %s does not exist", dirPath.c_str());
return SCE_UTILITY_SAVEDATA_ERROR_RW_NO_DATA;
}
@ -1262,7 +1275,7 @@ int SavedataParam::GetFilesList(SceUtilitySavedataParam *param, u32 requestAddr)
fileList->resultNumSystemEntries = 0;
// We need PARAM.SFO's SAVEDATA_FILE_LIST to determine which entries are secure.
PSPFileInfo sfoFileInfo = pspFileSystem.GetFileInfo(dirPath + "/" + SFO_FILENAME);
PSPFileInfo sfoFileInfo = FileFromListing(files, SFO_FILENAME);
std::set<std::string> secureFilenames;
if (sfoFileInfo.exists) {
@ -1279,7 +1292,6 @@ int SavedataParam::GetFilesList(SceUtilitySavedataParam *param, u32 requestAddr)
requestPtr->bind = 1021;
// Does not list directories, nor recurse into them, and ignores files not ALL UPPERCASE.
auto files = pspFileSystem.GetDirListing(dirPath);
for (auto file = files.begin(), end = files.end(); file != end; ++file) {
if (file->type == FILETYPE_DIRECTORY) {
continue;
@ -1348,8 +1360,8 @@ bool SavedataParam::GetSize(SceUtilitySavedataParam *param)
}
const std::string saveDir = savePath + GetGameName(param) + GetSaveName(param);
PSPFileInfo info = pspFileSystem.GetFileInfo(saveDir);
bool exists = info.exists;
bool exists = false;
auto listing = pspFileSystem.GetDirListing(saveDir, &exists);
if (param->sizeInfo.IsValid())
{
@ -1359,12 +1371,12 @@ bool SavedataParam::GetSize(SceUtilitySavedataParam *param)
s64 writeBytes = 0;
for (int i = 0; i < param->sizeInfo->numNormalEntries; ++i) {
const auto &entry = param->sizeInfo->normalEntries[i];
overwriteBytes += pspFileSystem.GetFileInfo(saveDir + "/" + entry.name).size;
overwriteBytes += FileFromListing(listing, entry.name).size;
writeBytes += entry.size;
}
for (int i = 0; i < param->sizeInfo->numSecureEntries; ++i) {
const auto &entry = param->sizeInfo->secureEntries[i];
overwriteBytes += pspFileSystem.GetFileInfo(saveDir + "/" + entry.name).size;
overwriteBytes += FileFromListing(listing, entry.name).size;
writeBytes += entry.size + 0x10;
}

16
Core/FileSystems/DirectoryFileSystem.cpp
View File

@ -795,24 +795,22 @@ std::vector<PSPFileInfo> DirectoryFileSystem::GetDirListing(const std::string &p
std::vector<File::FileInfo> files;
Path localPath = GetLocalPath(path);
const int flags = File::GETFILES_GETHIDDEN | File::GETFILES_GET_NAVIGATION_ENTRIES;
if (!File::GetFilesInDir(localPath, &files, nullptr, flags)) {
// TODO: Case sensitivity should be checked on a file system basis, right?
bool success = File::GetFilesInDir(localPath, &files, nullptr, flags);
#if HOST_IS_CASE_SENSITIVE
if (!success) {
// TODO: Case sensitivity should be checked on a file system basis, right?
std::string fixedPath = path;
if (FixPathCase(basePath, fixedPath, FPC_FILE_MUST_EXIST)) {
// May have failed due to case sensitivity, try again
localPath = GetLocalPath(fixedPath);
if (!File::GetFilesInDir(localPath, &files, nullptr, 0)) {
if (exists)
*exists = false;
return ReplayApplyDiskListing(myVector, CoreTiming::GetGlobalTimeUs());
}
success = File::GetFilesInDir(localPath, &files, nullptr, flags);
}
#else
}
#endif
if (!success) {
if (exists)
*exists = false;
return ReplayApplyDiskListing(myVector, CoreTiming::GetGlobalTimeUs());
#endif
}
bool hideISOFiles = PSP_CoreParameter().compat.flags().HideISOFiles;

11
Core/HLE/sceIo.cpp
View File

@ -2336,16 +2336,19 @@ public:
static u32 sceIoDopen(const char *path) {
DEBUG_LOG(SCEIO, "sceIoDopen(\"%s\")", path);
if (!pspFileSystem.GetFileInfo(path).exists) {
double startTime = time_now_d();
bool listingExists = false;
auto listing = pspFileSystem.GetDirListing(path, &listingExists);
if (!listingExists) {
return SCE_KERNEL_ERROR_ERRNO_FILE_NOT_FOUND;
}
DirListing *dir = new DirListing();
SceUID id = kernelObjects.Create(dir);
double startTime = time_now_d();
dir->listing = pspFileSystem.GetDirListing(path);
dir->listing = listing;
dir->index = 0;
dir->name = std::string(path);