Reuh/ctruLua
1
0
Fork 0
mirror of https://github.com/ctruLua/ctruLua.git synced 2025-10-27 16:39:29 +00:00
Code Releases Activity

In ctr.fs: automatically select archive when using absolute paths without archive prefix; fs.list should work with RomFS

Browse source
This commit is contained in:
Reuh 2015-10-25 17:01:26 +01:00
parent b32fa5da2b
commit e6e99f59c4
1 changed files with 41 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

47
source/fs.c
View file

@ -27,6 +27,26 @@ The `ctr.fs.lzlib` module.
*/ */
void load_lzlib(lua_State *L); void load_lzlib(lua_State *L);
/*
Automatically prefix the path if it's absolute (starts with /)
*/
const char* prefix_path(const char* path) {
if (strncmp(path, "/", 1) == 0) {
#ifdef ROMFS
char* prefix = "romfs:";
#else
char* prefix = "sdmc:";
#endif
char out[256];
strcpy(out, prefix);
return strcat(out, path);
} else {
return path;
}
}
/*** /***
Lists a directory contents. Lists a directory contents.
@function list @function list
@ -46,17 +66,32 @@ Lists a directory contents.
` `
*/ */
static int fs_list(lua_State *L) { static int fs_list(lua_State *L) {
const char *path = luaL_checkstring(L, 1); const char *path = prefix_path(luaL_checkstring(L, 1));
if (strncmp(path, "sdmc:", 5) == 0) path += 5; // Ignore sdmc: prefix
lua_newtable(L); lua_newtable(L);
int i = 1; // table index int i = 1; // table index
// Get default archive
#ifdef ROMFS
FS_archive archive = romfsArchive;
#else
FS_archive archive = sdmcArchive;
#endif
// Archive path override (and skip path prefix)
if (strncmp(path, "sdmc:", 5) == 0) {
path += 5;
archive = sdmcArchive;
#ifdef ROMFS
} else if (strncmp(path, "romfs:", 6) == 0) {
path += 6;
archive = romfsArchive;
#endif
}
FS_path dirPath = FS_makePath(PATH_CHAR, path); FS_path dirPath = FS_makePath(PATH_CHAR, path);
Handle dirHandle; Handle dirHandle;
FSUSER_OpenDirectory(fsuHandle, &dirHandle, sdmcArchive, dirPath); FSUSER_OpenDirectory(fsuHandle, &dirHandle, archive, dirPath);
u32 entriesRead = 0; u32 entriesRead = 0;
do { do {
@ -106,7 +141,7 @@ Check if a item (file or directory) exists.
@treturn boolean true if it exists, false otherwise @treturn boolean true if it exists, false otherwise
*/ */
static int fs_exists(lua_State *L) { static int fs_exists(lua_State *L) {
const char *path = luaL_checkstring(L, 1); const char *path = prefix_path(luaL_checkstring(L, 1));
lua_pushboolean(L, access(path, F_OK) == 0); lua_pushboolean(L, access(path, F_OK) == 0);
@ -135,7 +170,7 @@ Set the current working directory.
@treturn[2] string error message @treturn[2] string error message
*/ */
static int fs_setDirectory(lua_State *L) { static int fs_setDirectory(lua_State *L) {
const char *path = luaL_checkstring(L, 1); const char *path = prefix_path(luaL_checkstring(L, 1));
int result = chdir(path); int result = chdir(path);