Leahnaya/JKSV
1
0
Fork 0
mirror of https://github.com/J-D-K/JKSV.git synced 2026-04-25 07:57:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

New Snap/Journal space fix

Browse Source
This commit is contained in:
J-D-K 2021-05-05 19:59:40 -04:00
parent 97aa90034a
commit 5080aaeac1
6 changed files with 254 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -38,7 +38,7 @@ INCLUDES := inc
EXEFS_SRC := exefs_src
APP_TITLE := JKSV
APP_AUTHOR := JK
APP_VERSION := 12.20.2020
APP_VERSION := 05.05.2021
ROMFS := romfs
ICON := romfs/icon.jpg

6
inc/data.h
View File

@ -12,9 +12,9 @@
#define curUser users[data::selUser]
#define curData users[data::selUser].titles[data::selData]
#define BLD_MON 12
#define BLD_DAY 20
#define BLD_YEAR 2020
#define BLD_MON 05
#define BLD_DAY 05
#define BLD_YEAR 2021
namespace data
{

2
inc/fsfile.h
View File

@ -32,6 +32,8 @@ Mode needs to be:
FsOpenMode_Write
FsOpenMode_Append
*/
bool fsfcreate(const char *_p, int64_t crSize);
FSFILE *fsfopen(const char *_p, uint32_t mode);
/*Same as above, but FsFileSystem _s is used. Path cannot have device in it*/

300
src/file.cpp
View File

@ -18,17 +18,6 @@
#define BUFF_SIZE 0x80000
typedef struct
{
uint64_t appID;
uint8_t saveType;
uint8_t saveRank;
uint16_t saveIndex;
uint64_t saveSize;
uint64_t availableSize;
uint64_t journalSize;
} svInfo;
static std::string wd;
static std::vector<std::string> pathFilter;
@ -37,6 +26,31 @@ static FSFILE *log;
static FsFileSystem sv;
typedef struct
{
std::string to, from, dev;
uint64_t *offset;
zipFile *z;
bool fin;
} copyArgs;
static copyArgs *copyArgsCreate(const std::string& from, const std::string& to, const std::string& dev, zipFile *z, uint64_t *offset)
{
copyArgs *ret = new copyArgs;
ret->to = to;
ret->from = from;
ret->dev = dev;
ret->z = z;
ret->offset = offset;
ret->fin = false;
return ret;
}
static inline void copyArgsDestroy(copyArgs *args)
{
delete args;
}
static struct
{
bool operator()(const fs::dirItem& a, const fs::dirItem& b)
@ -66,6 +80,31 @@ static void mkdirRec(const std::string& _p)
}
}
//This is mostly for Pokemon snap, but it also seems to work better? Stops commit errors from journal space
static bool fwriteCommit(const std::string& _path, const void *buf, size_t _size, const std::string& _dev)
{
size_t written = 0;
if(data::directFsCmd)
{
FSFILE *out = fsfopen(_path.c_str(), FsOpenMode_Write | FsOpenMode_Append);
written = fsfwrite(buf, 1, _size, out);
fsfclose(out);
}
else
{
FILE *out = fopen(_path.c_str(), "ab");
written = fwrite(buf, 1, _size, out);
fclose(out);
}
Result commit = fsdevCommitDevice(_dev.c_str());
if(R_FAILED(commit) || written == 0)
fs::logWrite("Error writing/committing to file \"%s\"\n", _path.c_str());
return written > 0 && R_SUCCEEDED(commit);
}
void fs::init()
{
if(fs::fileExists("sdmc:/switch/jksv_dir.txt"))
@ -274,18 +313,21 @@ int fs::dataFile::getNextValueInt()
return ret;
}
void fs::copyFile(const std::string& from, const std::string& to)
static void copyfile_t(void *a)
{
copyArgs *args = (copyArgs *)a;
uint8_t *buff = new uint8_t[BUFF_SIZE];
ui::progBar prog(fs::fsize(from));
if(data::directFsCmd)
{
FSFILE *in = fsfopen(from.c_str(), FsOpenMode_Read);
FSFILE *out = fsfopen(to.c_str(), FsOpenMode_Write);
FSFILE *in = fsfopen(args->from.c_str(), FsOpenMode_Read);
FSFILE *out = fsfopen(args->to.c_str(), FsOpenMode_Write);
if(!in || !out)
{
fsfclose(in);
fsfclose(out);
args->fin = true;
return;
}
@ -293,23 +335,20 @@ void fs::copyFile(const std::string& from, const std::string& to)
while((readIn = fsfread(buff, 1, BUFF_SIZE, in)) > 0)
{
fsfwrite(buff, 1, readIn, out);
prog.update(fsftell(in));
gfxBeginFrame();
prog.draw(from, ui::copyHead);
gfxEndFrame();
*args->offset = in->offset;
}
fsfclose(in);
fsfclose(out);
}
else
{
FILE *in = fopen(from.c_str(), "rb");
FILE *out = fopen(to.c_str(), "wb");
FILE *in = fopen(args->from.c_str(), "rb");
FILE *out = fopen(args->to.c_str(), "wb");
if(!in || !out)
{
fclose(in);
fclose(out);
args->fin = true;
return;
}
@ -317,23 +356,114 @@ void fs::copyFile(const std::string& from, const std::string& to)
while((readIn = fread(buff, 1, BUFF_SIZE, in)) > 0)
{
fwrite(buff, 1, readIn, out);
prog.update(ftell(in));
gfxBeginFrame();
prog.draw(from, ui::copyHead);
gfxEndFrame();
*args->offset = ftell(in);
}
fclose(in);
fclose(out);
}
delete[] buff;
args->fin = true;
}
void fs::copyFile(const std::string& from, const std::string& to)
{
uint64_t progress = 0;
copyArgs *send = copyArgsCreate(from, to, "", NULL, &progress);
//Setup progress bar. This thread updates screen, other handles copying
ui::progBar prog(fsize(from));
Thread cpyThread;
threadCreate(&cpyThread, copyfile_t, send, NULL, 0x4000, 0x2B, 1);
threadStart(&cpyThread);
while(!send->fin)
{
prog.update(progress);
gfxBeginFrame();
prog.draw(from, ui::copyHead);
gfxEndFrame();
}
threadClose(&cpyThread);
copyArgsDestroy(send);
}
void copyFileCommit_t(void *a)
{
copyArgs *args = (copyArgs *)a;
uint8_t *buff = new uint8_t[BUFF_SIZE];
//Create empty destination file using fs
fsfcreate(args->to.c_str(), 0);
if(data::directFsCmd)
{
FSFILE *in = fsfopen(args->from.c_str(), FsOpenMode_Read);
if(!in)
{
fsfclose(in);
args->fin = true;
return;
}
size_t readIn = 0;
while((readIn = fsfread(buff, 1, BUFF_SIZE, in)) > 0)
{
if(!fwriteCommit(args->to, buff, readIn, args->dev))
break;
*args->offset = in->offset;
}
fsfclose(in);
}
else
{
FILE *in = fopen(args->from.c_str(), "rb");
if(!in)
{
fclose(in);
args->fin = true;
return;
}
size_t readIn = 0;
while((readIn = fread(buff, 1, BUFF_SIZE, in)) > 0)
{
if(!fwriteCommit(args->to, buff, readIn, args->dev))
break;
*args->offset = ftell(in);
}
fclose(in);
}
delete[] buff;
Result res = 0;
if(R_FAILED(res = fsdevCommitDevice(args->dev.c_str())))
fs::logWrite("Error committing file \"%s\"\n", args->to.c_str());
args->fin = true;
}
void fs::copyFileCommit(const std::string& from, const std::string& to, const std::string& dev)
{
fs::copyFile(from, to);
if(R_FAILED(fsdevCommitDevice(dev.c_str())))
ui::showMessage("*Error*", "Error committing file to device.");
uint64_t offset = 0;
ui::progBar prog(fsize(from));
copyArgs *send = copyArgsCreate(from, to, dev, NULL, &offset);
Thread cpyThread;
threadCreate(&cpyThread, copyFileCommit_t, send, NULL, 0x4000, 0x2B, 1);
threadStart(&cpyThread);
while(!send->fin)
{
prog.update(offset);
gfxBeginFrame();
prog.draw(from, ui::copyHead);
gfxEndFrame();
}
threadClose(&cpyThread);
copyArgsDestroy(send);
}
void fs::copyDirToDir(const std::string& from, const std::string& to)
@ -362,27 +492,47 @@ void fs::copyDirToDir(const std::string& from, const std::string& to)
}
}
void copyFileToZip(const std::string& from, zipFile *to)
void copyFileToZip_t(void *a)
{
ui::progBar prog(fs::fsize(from));
FILE *cpy = fopen(from.c_str(), "rb");
copyArgs *args = (copyArgs *)a;
FILE *cpy = fopen(args->from.c_str(), "rb");
size_t readIn = 0, offset = 0;
size_t readIn = 0;
uint8_t *inBuff= new uint8_t[BUFF_SIZE];
while((readIn = fread(inBuff, 1, BUFF_SIZE, cpy)) > 0)
{
if(zipWriteInFileInZip(*to, inBuff, readIn) != 0)
ui::showMessage("Failed", "zipWriteInFileInZip");
if(zipWriteInFileInZip(*args->z, inBuff, readIn) != 0)
{
fs::logWrite("Failed", "zipWriteInFileInZip -> \"%s\"\n", args->from.c_str());
break;
}
offset += readIn;
prog.update(offset);
gfxBeginFrame();
prog.draw(from, ui::copyHead);
gfxEndFrame();
*args->offset = ftell(cpy);
}
delete[] inBuff;
fclose(cpy);
args->fin = true;
}
void copyFileToZip(const std::string& from, zipFile *z)
{
ui::progBar prog(fs::fsize(from));
uint64_t progress = 0;
copyArgs *send = copyArgsCreate(from, "", "", z, &progress);
Thread cpyThread;
threadCreate(&cpyThread, copyFileToZip_t, send, NULL, 0x4000, 0x2B, 1);
threadStart(&cpyThread);
while(!send->fin)
{
prog.update(progress);
gfxBeginFrame();
prog.draw(from, ui::copyHead);
gfxEndFrame();
}
threadClose(&cpyThread);
copyArgsDestroy(send);
}
void fs::copyDirToZip(const std::string& from, zipFile *to)
@ -420,44 +570,46 @@ void fs::copyZipToDir(unzFile *unz, const std::string& to, const std::string& de
do
{
unzGetCurrentFileInfo(*unz, &info, filename, FS_MAX_PATH, NULL, 0, NULL, 0);
unzOpenCurrentFile(*unz);
std::string path = to + filename;
mkdirRec(path.substr(0, path.find_last_of('/') + 1));
ui::progBar prog(info.uncompressed_size);
size_t done = 0;
if(data::directFsCmd)
if(unzOpenCurrentFile(*unz) == UNZ_OK)
{
FSFILE *out = fsfopen(path.c_str(), FsOpenMode_Write);
while((readIn = unzReadCurrentFile(*unz, buff, BUFF_SIZE)) > 0)
{
done += readIn;
fsfwrite(buff, 1, readIn, out);
prog.update(done);
std::string path = to + filename;
mkdirRec(path.substr(0, path.find_last_of('/') + 1));
ui::progBar prog(info.uncompressed_size);
size_t done = 0;
gfxBeginFrame();
prog.draw(filename, ui::copyHead);
gfxEndFrame();
}
fsfclose(out);
}
else
{
FILE *out = fopen(path.c_str(), "wb");
while((readIn = unzReadCurrentFile(*unz, buff, BUFF_SIZE)) > 0)
{
done += readIn;
fwrite(buff, 1, readIn, out);
prog.update(done);
//Create new empty file using FS
fsfcreate(path.c_str(), 0);
gfxBeginFrame();
prog.draw(filename, ui::copyHead);
gfxEndFrame();
if(data::directFsCmd)
{
while((readIn = unzReadCurrentFile(*unz, buff, BUFF_SIZE)) > 0)
{
done += readIn;
fwriteCommit(path, buff, readIn, dev);
prog.update(done);
gfxBeginFrame();
prog.draw(filename, ui::copyHead);
gfxEndFrame();
}
}
fclose(out);
else
{
while((readIn = unzReadCurrentFile(*unz, buff, BUFF_SIZE)) > 0)
{
done += readIn;
fwriteCommit(path, buff, readIn, dev);
prog.update(done);
gfxBeginFrame();
prog.draw(filename, ui::copyHead);
gfxEndFrame();
}
}
unzCloseCurrentFile(*unz);
if(R_FAILED(fsdevCommitDevice(dev.c_str())))
ui::showMessage("*Error*", "Error committing file to device.");
}
unzCloseCurrentFile(*unz);
if(R_FAILED(fsdevCommitDevice(dev.c_str())))
ui::showMessage("*Error*", "Error committing file to device.");
}
while(unzGoToNextFile(*unz) != UNZ_END_OF_LIST_OF_FILE);

22
src/fsfile.c
View File

@ -52,6 +52,24 @@ Result fsDelDirRec(const char *_p)
return fsFsDeleteDirectoryRecursively(fsdevGetDeviceFileSystem(devStr), path);
}
bool fsfcreate(const char *_p, int64_t crSize)
{
char devStr[16];
char filePath[FS_MAX_PATH];
if(!getDeviceFromPath(devStr, 16, _p) || !getFilePath(filePath, FS_MAX_PATH, _p))
return false;
FsFileSystem *s = fsdevGetDeviceFileSystem(devStr);
if(s == NULL)
return false;
Result res = fsFsCreateFile(s, filePath, crSize, 0);
if(R_SUCCEEDED(res))
res = fsdevCommitDevice(devStr);
return R_SUCCEEDED(res) ? true : false;
}
FSFILE *fsfopen(const char *_p, uint32_t mode)
{
char devStr[16];
@ -63,13 +81,11 @@ FSFILE *fsfopen(const char *_p, uint32_t mode)
if(s == NULL)
return NULL;
if(mode & FsOpenMode_Write)
if(mode == FsOpenMode_Write)
{
fsFsDeleteFile(s, filePath);
fsFsCreateFile(s, filePath, 0, 0);
}
else if(mode & FsOpenMode_Append)
fsFsCreateFile(s, filePath, 0, 0);
FSFILE *ret = malloc(sizeof(FSFILE));
ret->error = fsFsOpenFile(s, filePath, mode, &ret->_f);

6
src/ui/menu.cpp
View File

@ -51,7 +51,7 @@ ui::menu::~menu()
void ui::menu::handleInput(const uint64_t& down, const uint64_t& held)
{
if( (held & KEY_UP) || (held & KEY_DOWN))
if( (held & HidNpadButton_Up) || (held & HidNpadButton_Down))
fc++;
else
fc = 0;
@ -59,7 +59,7 @@ void ui::menu::handleInput(const uint64_t& down, const uint64_t& held)
fc = 0;
int size = opt.size() - 1;
if((down & KEY_UP) || ((held & KEY_UP) && fc == 10))
if((down & HidNpadButton_Up) || ((held & HidNpadButton_Up) && fc == 10))
{
selected--;
if(selected < 0)
@ -72,7 +72,7 @@ void ui::menu::handleInput(const uint64_t& down, const uint64_t& held)
if((selected - 14) > start)
start = selected - 14;
}
else if((down & KEY_DOWN) || ((held & KEY_DOWN) && fc == 10))
else if((down & HidNpadButton_Down) || ((held & HidNpadButton_Down) && fc == 10))
{
selected++;
if(selected > size)