ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make it not shitty, I guess? still not gonna do much

This commit is contained in:
Arisotura 2021-09-28 00:40:50 +02:00
parent 8e42500fdd
commit 049eefe3ae
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/DSi_NAND.cpp
View File

@ -567,8 +567,8 @@ void debug_listfiles(const char* path)
for (;;) for (;;)
{ {
res = f_readdir(&dir, &info); res = f_readdir(&dir, &info);
if (res != FR_OK) return; if (res != FR_OK) break;
if (!info.fname[0]) return; if (!info.fname[0]) break;
char fullname[512]; char fullname[512];
sprintf(fullname, "%s/%s", path, info.fname); sprintf(fullname, "%s/%s", path, info.fname);

34
src/FATStorage.cpp
View File

@ -171,7 +171,7 @@ int FATStorage::CleanupDirectory(std::string path, int level)
FILINFO info; FILINFO info;
FRESULT res; FRESULT res;
res = f_opendir(&dir, path); res = f_opendir(&dir, path.c_str());
if (res != FR_OK) return 0; if (res != FR_OK) return 0;
std::vector<std::string> deletelist; std::vector<std::string> deletelist;
@ -181,8 +181,8 @@ int FATStorage::CleanupDirectory(std::string path, int level)
for (;;) for (;;)
{ {
res = f_readdir(&dir, &info); res = f_readdir(&dir, &info);
if (res != FR_OK) return; if (res != FR_OK) break;
if (!info.fname[0]) return; if (!info.fname[0]) break;
std::string fullpath = path + info.fname; std::string fullpath = path + info.fname;
@ -307,12 +307,30 @@ bool FATStorage::BuildSubdirectory(const char* sourcedir, const char* path, int
auto lastmodified = entry.last_write_time(); auto lastmodified = entry.last_write_time();
s64 lastmodified_raw = std::chrono::duration_cast<std::chrono::seconds>(lastmodified.time_since_epoch()).count(); s64 lastmodified_raw = std::chrono::duration_cast<std::chrono::seconds>(lastmodified.time_since_epoch()).count();
IndexEntry derpo; bool import = false;
derpo.Path = entry.path().string(); if (Index.count(innerpath) < 1)
derpo.Size = filesize; {
derpo.LastModified = lastmodified_raw; import = true;
}
else
{
IndexEntry& chk = Index[innerpath];
if (chk.Size != filesize) import = true;
if (chk.LastModified != lastmodified_raw) import = true;
}
Index[derpo.Path] = derpo; if (import)
{
IndexEntry entry;
entry.Path = innerpath;
entry.Size = filesize;
entry.LastModified = lastmodified_raw;
Index[entry.Path] = entry;
innerpath = "0:/" + innerpath;
// import!
}
} }
} }