Leahnaya/JKSV
1
0
Fork 0
mirror of https://github.com/J-D-K/JKSV.git synced 2026-03-21 17:24:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

File Mode almost done.

Browse Source
This commit is contained in:
J-D-K 2021-08-01 22:02:06 -04:00
parent 92d0f3f74e
commit 1001eeb8de
4 changed files with 253 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/util.h
View File

@ -46,6 +46,8 @@ namespace util
//removes char from C++ string
void stripChar(char _c, std::string& _s);
void replaceStr(std::string& _str, const std::string& _find, const std::string& _rep);
//For future external translation support. Replaces [button] with button chars
void replaceButtonsInString(std::string& rep);

6
src/file.cpp
View File

@ -303,7 +303,11 @@ std::string fs::dataFile::getNextValueStr()
else
lPos = line.find_first_of(",;\n", pos1);//Set lPos to end of string we want. This should just set lPos to the end of the line if it fails, which is ok
return line.substr(pos1, lPos++ - pos1);
ret = line.substr(pos1, lPos++ - pos1);
util::replaceStr(ret, "\\n", "\n");
return ret;
}
int fs::dataFile::getNextValueInt()

256
src/ui/fm.cpp
View File

@ -4,8 +4,13 @@
#include "file.h"
#include "util.h"
#include "fm.h"
#include "type.h"
//This is going to be a mess but the old one was too.
//It gets more complicated because of system saves and committing.
//Major Todo: have thread status update
//Todo: Not have menus completely reset.
//Struct to hold info so i don't have to if else if if if
typedef struct
@ -27,29 +32,34 @@ static bool commit = false;
static void _listFunctionA(void *a);
/*General stuff*/
static void refreshMenu(ui::menu *m, fs::dirList *d, menuFuncArgs *_args, const std::string& _path)
static void refreshMenu(void *a)
{
d->reassign(_path);
util::copyDirListToMenu(*d, *m);
for(int i = 1; i < m->getCount(); i++)
threadInfo *t = (threadInfo *)a;
menuFuncArgs *ma = (menuFuncArgs *)t->argPtr;
fs::backupArgs *b = ma->b;
b->d->reassign(*ma->path);
util::copyDirListToMenu(*b->d, *b->m);
for(int i = 1; i < b->m->getCount(); i++)
{
m->optAddButtonEvent(i, HidNpadButton_A, _listFunctionA, _args);
b->m->optAddButtonEvent(i, HidNpadButton_A, _listFunctionA, ma);
}
t->finished = true;
}
/*Callbacks and menu functions*/
static void _devMenuCallback(void *a)
{
menuFuncArgs *ma = (menuFuncArgs *)a;
fs::backupArgs *b = (fs::backupArgs *)ma->b;
switch(ui::padKeysDown())
{
case HidNpadButton_B:
if(*ma->path != dev && *ma->path != "sdmc:/")
{
util::removeLastFolderFromString(*ma->path);
refreshMenu(b->m, b->d, ma, *ma->path);
threadInfo fake;
fake.argPtr = ma;
refreshMenu(&fake);
}
break;
@ -76,14 +86,15 @@ static void _devCopyMenuCallback(void *a)
static void _sdMenuCallback(void *a)
{
menuFuncArgs *ma = (menuFuncArgs *)a;
fs::backupArgs *b = (fs::backupArgs *)ma->b;
switch(ui::padKeysDown())
{
case HidNpadButton_B:
if(*ma->path != dev && *ma->path != "sdmc:/")
{
util::removeLastFolderFromString(*ma->path);
refreshMenu(b->m, b->d, ma, *ma->path);
threadInfo fake;
fake.argPtr = ma;
refreshMenu(&fake);
}
break;
@ -107,6 +118,7 @@ static void _sdCopyMenuCallback(void *a)
}
}
//These draw to the panel texture passed
static void _devCopyPanelDraw(void *a)
{
SDL_Texture *target = (SDL_Texture *)a;
@ -122,7 +134,7 @@ static void _sdCopyPanelDraw(void *a)
static void _listFunctionA(void *a)
{
menuFuncArgs *ma = (menuFuncArgs *)a;
fs::backupArgs *b = (fs::backupArgs *)ma->b;
fs::backupArgs *b = ma->b;
int sel = b->m->getSelected();
bool isDir = b->d->isDir(sel - 2);
@ -146,6 +158,218 @@ static void _listFunctionA(void *a)
}
}
static void _copyMenuCopy_t(void *a)
{
threadInfo *t = (threadInfo *)a;
menuFuncArgs *ma = (menuFuncArgs *)t->argPtr;
fs::backupArgs *b = ma->b;
int sel = b->m->getSelected();
if(ma == devArgs)
{
if(sel == 0)
fs::copyDirToDir(*ma->path, *sdmcArgs->path);
else if(sel > 1 && b->d->isDir(sel - 2))
{
std::string srcPath = *ma->path + b->d->getItem(sel - 2) + "/";
std::string dstPath = *sdmcArgs->path + b->d->getItem(sel - 2) + "/";
mkdir(dstPath.substr(0, dstPath.length() - 1).c_str(), 777);
fs::copyDirToDir(srcPath, dstPath);
}
else if(sel > 1)
{
std::string srcPath = *ma->path + b->d->getItem(sel - 2);
std::string dstPath = *sdmcArgs->path + b->d->getItem(sel - 2);
fs::copyFile(srcPath, dstPath);
}
}
else if(ma == sdmcArgs)
{
//I know
if(sel == 0)
{
if(commit)
fs::copyDirToDirCommit(*ma->path, *devArgs->path, dev);
else
fs::copyDirToDir(*ma->path, *devArgs->path);
}
else if(sel > 1 && b->d->isDir(sel - 2))
{
std::string srcPath = *ma->path + b->d->getItem(sel - 2) + "/";
std::string dstPath = *devArgs->path + b->d->getItem(sel - 2) + "/";
mkdir(dstPath.substr(0, dstPath.length() - 1).c_str(), 777);
if(commit)
fs::copyDirToDirCommit(srcPath, dstPath, dev);
else
fs::copyDirToDir(srcPath, dstPath);
}
else if(sel > 1)
{
std::string srcPath = *ma->path + b->d->getItem(sel - 2);
std::string dstPath = *devArgs->path + b->d->getItem(sel - 2);
if(commit)
fs::copyFileCommit(srcPath, dstPath, dev);
else
fs::copyFile(srcPath, dstPath);
}
}
ui::newThread(refreshMenu, devArgs, NULL);
ui::newThread(refreshMenu, sdmcArgs, NULL);
t->finished = true;
}
//Sets up a confirm thread that then runs ^
static void _copyMenuCopy(void *a)
{
menuFuncArgs *ma = (menuFuncArgs *)a;
fs::backupArgs *b = ma->b;
std::string srcPath, dstPath;
if(ma == devArgs)
{
srcPath = *ma->path + b->d->getItem(b->m->getSelected() - 2);
dstPath = *sdmcArgs->path + b->d->getItem(b->m->getSelected() - 2);
}
else
{
srcPath = *ma->path + b->d->getItem(b->m->getSelected() - 2);
dstPath = *devArgs->path + b->d->getItem(b->m->getSelected() - 2);
}
if(ma == devArgs || (ma == sdmcArgs && (type != FsSaveDataType_System || data::config["sysSaveWrite"])))
{
ui::confirmArgs *send = ui::confirmArgsCreate(false, _copyMenuCopy_t, ma, true, ui::confCopy.c_str(), srcPath.c_str(), dstPath.c_str());
ui::confirm(send);
}
}
static void _copyMenuDelete_t(void *a)
{
threadInfo *t = (threadInfo *)a;
menuFuncArgs *ma = (menuFuncArgs *)t->argPtr;
fs::backupArgs *b = ma->b;
t->status->setStatus("Deleting...");
int sel = b->m->getSelected();
if(ma == devArgs)
{
if(sel == 0 && *ma->path != "sdmc:/")
{
fs::delDir(*ma->path);
if(commit)
fs::commitToDevice(dev);
}
else if(sel > 1 && b->d->isDir(sel - 2))
{
std::string delPath = *ma->path + b->d->getItem(sel - 2) + "/";
fs::delDir(delPath);
if(commit)
fs::commitToDevice(dev);
}
else if(sel > 1)
{
std::string delPath = *ma->path + b->d->getItem(sel - 2);
fs::delfile(delPath);
if(commit)
fs::commitToDevice(dev);
}
}
else
{
if(sel == 0 && *ma->path != "sdmc:/")
fs::delDir(*ma->path);
else if(sel > 1 && b->d->isDir(sel - 2))
{
std::string delPath = *ma->path + b->d->getItem(sel - 2) + "/";
fs::delDir(delPath);
}
else if(sel > 1)
{
std::string delPath = *ma->path + b->d->getItem(sel - 2);
fs::delfile(delPath);
}
}
ui::newThread(refreshMenu, devArgs, NULL);
ui::newThread(refreshMenu, sdmcArgs, NULL);
t->finished = true;
}
//Prepares confirm then runs ^
static void _copyMenuDelete(void *a)
{
menuFuncArgs *ma = (menuFuncArgs *)a;
fs::backupArgs *b = ma->b;
int sel = b->m->getSelected();
std::string itmPath;
if(sel == 0)
itmPath = *ma->path;
else if(sel > 1)
itmPath = *ma->path + b->d->getItem(sel - 2);
if(sel == 0 || sel > 1)
{
ui::confirmArgs *send = ui::confirmArgsCreate(data::config["holdDel"], _copyMenuDelete_t, a, true, ui::confDel.c_str(), itmPath.c_str());
ui::confirm(send);
}
}
static void _copyMenuRename(void *a)
{
menuFuncArgs *ma = (menuFuncArgs *)a;
fs::backupArgs *b = ma->b;
int sel = b->m->getSelected();
if(sel > 1)
{
std::string getNewName = util::getStringInput(SwkbdType_QWERTY, b->d->getItem(sel - 2), "Enter a new name", 64, 0, NULL);
if(!getNewName.empty())
{
std::string prevPath = *ma->path + b->d->getItem(sel - 2);
std::string newPath = *ma->path + getNewName;
rename(prevPath.c_str(), newPath.c_str());
}
threadInfo fake;
fake.argPtr = devArgs;
refreshMenu(&fake);
fake.argPtr = sdmcArgs;
refreshMenu(&fake);
}
}
static void _copyMenuMkDir(void *a)
{
menuFuncArgs *ma = (menuFuncArgs *)a;
std::string getNewFolder = util::getStringInput(SwkbdType_QWERTY, "New Folder", "Enter a name", 64, 0, NULL);
if(!getNewFolder.empty())
{
std::string createPath = *ma->path + getNewFolder;
mkdir(createPath.c_str(), 777);
}
threadInfo fake;
fake.argPtr = devArgs;
refreshMenu(&fake);
fake.argPtr = sdmcArgs;
refreshMenu(&fake);
}
static void _copyMenuClose(void *a)
{
menuFuncArgs *ma = (menuFuncArgs *)a;
if(ma == devArgs)
{
devCopyMenu->setActive(false);
devMenu->setActive(true);
devPanel->closePanel();
}
else
{
sdCopyMenu->setActive(false);
sdMenu->setActive(true);
sdPanel->closePanel();
}
}
void ui::fmInit()
{
//This needs to be done in a strange order so everything works
@ -171,6 +395,11 @@ void ui::fmInit()
devCopyMenu->addOpt(NULL, ui::advMenuStr[0] + "SDMC");
for(int i = 1; i < 6; i++)
devCopyMenu->addOpt(NULL, advMenuStr[i]);
devCopyMenu->optAddButtonEvent(0, HidNpadButton_A, _copyMenuCopy, devArgs);
devCopyMenu->optAddButtonEvent(1, HidNpadButton_A, _copyMenuDelete, devArgs);
devCopyMenu->optAddButtonEvent(2, HidNpadButton_A, _copyMenuRename, devArgs);
devCopyMenu->optAddButtonEvent(3, HidNpadButton_A, _copyMenuMkDir, devArgs);
devCopyMenu->optAddButtonEvent(5, HidNpadButton_A, _copyMenuClose, devArgs);
ui::registerPanel(devPanel);
sdMenu = new ui::menu;
@ -186,6 +415,11 @@ void ui::fmInit()
sdCopyMenu->setParams(10, 236, 246, 20, 5);
for(int i = 0; i < 6; i++)
sdCopyMenu->addOpt(NULL, advMenuStr[i]);
sdCopyMenu->optAddButtonEvent(0, HidNpadButton_A, _copyMenuCopy, sdmcArgs);
sdCopyMenu->optAddButtonEvent(1, HidNpadButton_A, _copyMenuDelete, sdmcArgs);
sdCopyMenu->optAddButtonEvent(2, HidNpadButton_A, _copyMenuRename, sdmcArgs);
sdCopyMenu->optAddButtonEvent(3, HidNpadButton_A, _copyMenuMkDir, sdmcArgs);
sdCopyMenu->optAddButtonEvent(5, HidNpadButton_A, _copyMenuClose, sdmcArgs);
ui::registerPanel(sdPanel);
devList = new fs::dirList;

2
src/util.cpp
View File

@ -30,7 +30,7 @@ static inline bool isASCII(const uint32_t& t)
return t > 30 && t < 127;
}
inline void replaceStr(std::string& _str, const std::string& _find, const std::string& _rep)
void util::replaceStr(std::string& _str, const std::string& _find, const std::string& _rep)
{
size_t pos = 0;
while((pos = _str.find(_find)) != _str.npos)