Mirror/GodMode9
1
0
Fork 1
mirror of https://github.com/d0k3/GodMode9.git synced 2025-06-26 05:32:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Scripting: add 'input' command

Browse Source
This commit is contained in:
d0k3 2017-07-26 14:14:12 +02:00
parent 3025329799
commit 96f6f2f34b
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
HelloScript.gm9
View File

@ -47,6 +47,13 @@ set SUCCESSMSG "HelloScript testing script success"
set TESTPATH 0:/testdir/$[SERIAL]_tick.db set TESTPATH 0:/testdir/$[SERIAL]_tick.db
echo "Your testpath is:\n$[TESTPATH]" echo "Your testpath is:\n$[TESTPATH]"
# 'input' COMMAND
# The 'input' command will allow the user to input a string and store that string in a variable
# Preset the variable to have an initial value
set USERINPUT "Hello World"
input "Enter something please?" USERINPUT
echo "You entered:\n$[USERINPUT]"
# 'allow' COMMAND # 'allow' COMMAND
# typically used at the beginning of a script, prompts to allow writes to the location given in the argument # typically used at the beginning of a script, prompts to allow writes to the location given in the argument
# doing this from the beginning is preferable, so that no actions are taken unless all required write permissions are unlocked # doing this from the beginning is preferable, so that no actions are taken unless all required write permissions are unlocked

29
source/filesys/fsscript.c
View File

@ -26,6 +26,7 @@ typedef enum {
CMD_ID_NONE = 0, CMD_ID_NONE = 0,
CMD_ID_ECHO, CMD_ID_ECHO,
CMD_ID_ASK, CMD_ID_ASK,
CMD_ID_INPUT,
CMD_ID_SET, CMD_ID_SET,
CMD_ID_ALLOW, CMD_ID_ALLOW,
CMD_ID_CP, CMD_ID_CP,
@ -58,6 +59,7 @@ typedef struct {
Gm9ScriptCmd cmd_list[] = { Gm9ScriptCmd cmd_list[] = {
{ CMD_ID_ECHO , "echo" , 1, 0 }, { CMD_ID_ECHO , "echo" , 1, 0 },
{ CMD_ID_ASK , "ask" , 1, 0 }, { CMD_ID_ASK , "ask" , 1, 0 },
{ CMD_ID_INPUT , "input" , 2, 0 },
{ CMD_ID_SET , "set" , 2, 0 }, { CMD_ID_SET , "set" , 2, 0 },
{ CMD_ID_ALLOW , "allow" , 1, _FLG('a') }, { CMD_ID_ALLOW , "allow" , 1, _FLG('a') },
{ CMD_ID_CP , "cp" , 2, _FLG('h') | _FLG('w') | _FLG('k') | _FLG('s') | _FLG('n')}, { CMD_ID_CP , "cp" , 2, _FLG('h') | _FLG('w') | _FLG('k') | _FLG('s') | _FLG('n')},
@ -99,11 +101,17 @@ char* get_var(const char* name, char** endptr) {
u32 max_vars = VAR_BUFFER_SIZE / sizeof(Gm9ScriptVar); u32 max_vars = VAR_BUFFER_SIZE / sizeof(Gm9ScriptVar);
u32 name_len = 0; u32 name_len = 0;
char* vname = (char*) name + 1; char* vname = NULL;
if (*name != '[') return NULL; if (!endptr) { // no endptr, var is verbatim
for (name_len = 0; vname[name_len] != ']'; name_len++) vname = name;
if ((name_len >= _VAR_NAME_LEN) || !vname[name_len]) return NULL; name_len = strnlen(vname, _VAR_NAME_LEN);
if (endptr) *endptr = vname + name_len + 1; } else { // endptr given, var is in [VAR] format
vname = (char*) name + 1;
if (*name != '[') return NULL;
for (name_len = 0; vname[name_len] != ']'; name_len++)
if ((name_len >= _VAR_NAME_LEN) || !vname[name_len]) return NULL;
*endptr = vname + name_len + 1;
}
u32 n_var = 0; u32 n_var = 0;
for (Gm9ScriptVar* var = vars; n_var < max_vars; n_var++, var++) { for (Gm9ScriptVar* var = vars; n_var < max_vars; n_var++, var++) {
@ -318,6 +326,11 @@ bool run_cmd(cmd_id id, u32 flags, char** argv, char* err_str) {
} else if (id == CMD_ID_ASK) { } else if (id == CMD_ID_ASK) {
ret = ShowPrompt(true, argv[0]); ret = ShowPrompt(true, argv[0]);
if (err_str) snprintf(err_str, _ERR_STR_LEN, "user abort"); if (err_str) snprintf(err_str, _ERR_STR_LEN, "user abort");
} else if (id == CMD_ID_INPUT) {
char* var = get_var(argv[1], NULL);
if (!*var) set_var(argv[1], ""); // make sure the var exists
ret = ShowStringPrompt(var, _VAR_CNT_LEN, argv[0]);
if (err_str) snprintf(err_str, _ERR_STR_LEN, "user abort");
} else if (id == CMD_ID_SET) { } else if (id == CMD_ID_SET) {
ret = set_var(argv[0], argv[1]); ret = set_var(argv[0], argv[1]);
if (err_str) snprintf(err_str, _ERR_STR_LEN, "set fail"); if (err_str) snprintf(err_str, _ERR_STR_LEN, "set fail");
@ -453,7 +466,7 @@ bool run_line(const char* line_start, const char* line_end, u32* flags, char* er
// run the command (if available) // run the command (if available)
if (cmdid && !run_cmd(cmdid, *flags, argv, err_str)) { if (cmdid && !run_cmd(cmdid, *flags, argv, err_str)) {
char* msg_fail = get_var("[ERRORMSG]", NULL); char* msg_fail = get_var("ERRORMSG", NULL);
if (msg_fail && *msg_fail) *err_str = '\0'; // use custom error message if (msg_fail && *msg_fail) *err_str = '\0'; // use custom error message
return false; return false;
} }
@ -500,7 +513,7 @@ bool ExecuteGM9Script(const char* path_script) {
if (!run_line(ptr, line_end, &flags, err_str)) { // error handling if (!run_line(ptr, line_end, &flags, err_str)) { // error handling
if (!(flags & _FLG('s'))) { // not silent if (!(flags & _FLG('s'))) { // not silent
if (!*err_str) { if (!*err_str) {
char* msg_fail = get_var("[ERRORMSG]", NULL); char* msg_fail = get_var("ERRORMSG", NULL);
if (msg_fail && *msg_fail) ShowPrompt(false, msg_fail); if (msg_fail && *msg_fail) ShowPrompt(false, msg_fail);
else snprintf(err_str, _ERR_STR_LEN, "error message fail"); else snprintf(err_str, _ERR_STR_LEN, "error message fail");
} }
@ -524,7 +537,7 @@ bool ExecuteGM9Script(const char* path_script) {
ptr = line_end + 1; ptr = line_end + 1;
} }
char* msg_okay = get_var("[SUCCESSMSG]", NULL); char* msg_okay = get_var("SUCCESSMSG", NULL);
if (msg_okay && *msg_okay) ShowPrompt(false, msg_okay); if (msg_okay && *msg_okay) ShowPrompt(false, msg_okay);
return true; return true;
} }