ash/Anemone3DS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Themeplaza caching (#147)

Browse Source 
* change fs to use a FS_Path argument for remake_file and buf_to_file

* more debug information when downloading

* browser caching v1: poc, works and is fast but not ideal

* add preview to cache

* this wasnt meant to be added now
This commit is contained in:
LiquidFenrir
2018-04-10 21:12:37 +02:00
committed by Alex Taber
parent 7b1d6f9860
commit 6c2f09147f
8 changed files with 140 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -55,7 +55,7 @@ CFLAGS := -g -Wall -Wextra -O2 -mword-relocations \
revision := $(shell git describe --tags --match v[0-9]* --abbrev=8 | sed 's/-[0-9]*-g/-/') revision := $(shell git describe --tags --match v[0-9]* --abbrev=8 | sed 's/-[0-9]*-g/-/')
CFLAGS += $(INCLUDE) -DARM11 -D_3DS -D_GNU_SOURCE -DVERSION="\"$(revision)\"" -DUSER_AGENT="\"$(APP_TITLE)/$(revision)\"" CFLAGS += $(INCLUDE) -DARM11 -D_3DS -D_GNU_SOURCE -DVERSION="\"$(revision)\"" -DUSER_AGENT="\"$(APP_TITLE)/$(revision)\"" -DAPP_TITLE="\"$(APP_TITLE)\""
ifneq ($(strip $(CITRA_MODE)),) ifneq ($(strip $(CITRA_MODE)),)
CFLAGS += -DCITRA_MODE CFLAGS += -DCITRA_MODE
endif endif

4
include/fs.h
View File

@@ -40,7 +40,7 @@ u32 file_to_buf(FS_Path path, FS_Archive archive, char** buf);
u32 zip_memory_to_buf(char *file_name, void * zip_memory, size_t zip_size, char ** buf); u32 zip_memory_to_buf(char *file_name, void * zip_memory, size_t zip_size, char ** buf);
u32 zip_file_to_buf(char *file_name, u16 *zip_path, char **buf); u32 zip_file_to_buf(char *file_name, u16 *zip_path, char **buf);
Result buf_to_file(u32 size, char *path, FS_Archive archive, char *buf); Result buf_to_file(u32 size, FS_Path path, FS_Archive archive, char *buf);
void remake_file(char *path, FS_Archive archive, u32 size); void remake_file(FS_Path path, FS_Archive archive, u32 size);
#endif #endif

8
include/remote.h
View File

@@ -41,15 +41,13 @@
#define THEMEPLAZA_JSON_ERROR_MESSAGE_NOT_FOUND "No items found" #define THEMEPLAZA_JSON_ERROR_MESSAGE_NOT_FOUND "No items found"
#define THEMEPLAZA_ENTRY_FORMAT THEMEPLAZA_BASE_API_URL "/query?item_id=%" JSON_INTEGER_FORMAT
#define THEMEPLAZA_JSON_ENTRY_NAME "title"
#define THEMEPLAZA_JSON_ENTRY_DESC "description"
#define THEMEPLAZA_JSON_ENTRY_AUTH "author"
#define THEMEPLAZA_DOWNLOAD_FORMAT THEMEPLAZA_BASE_URL "/download/%" JSON_INTEGER_FORMAT #define THEMEPLAZA_DOWNLOAD_FORMAT THEMEPLAZA_BASE_URL "/download/%" JSON_INTEGER_FORMAT
#define THEMEPLAZA_PREVIEW_FORMAT THEMEPLAZA_DOWNLOAD_FORMAT "/preview" #define THEMEPLAZA_PREVIEW_FORMAT THEMEPLAZA_DOWNLOAD_FORMAT "/preview"
#define THEMEPLAZA_BGM_FORMAT THEMEPLAZA_DOWNLOAD_FORMAT "/bgm" #define THEMEPLAZA_BGM_FORMAT THEMEPLAZA_DOWNLOAD_FORMAT "/bgm"
#define THEMEPLAZA_ICON_FORMAT THEMEPLAZA_DOWNLOAD_FORMAT "/preview/icon" #define THEMEPLAZA_ICON_FORMAT THEMEPLAZA_DOWNLOAD_FORMAT "/preview/icon"
#define THEMEPLAZA_SMDH_FORMAT THEMEPLAZA_DOWNLOAD_FORMAT "/smdh"
#define CACHE_PATH_FORMAT "/3ds/" APP_TITLE "/cache/%" JSON_INTEGER_FORMAT
bool themeplaza_browser(EntryMode mode); bool themeplaza_browser(EntryMode mode);
u32 http_get(const char *url, char ** filename, char ** buf); u32 http_get(const char *url, char ** filename, char ** buf);

4
source/camera.c
View File

@@ -255,8 +255,8 @@ void update_qr(qr_data *data)
if (extension == NULL || strcmp(extension, ".zip")) if (extension == NULL || strcmp(extension, ".zip"))
strcat(path_to_file, ".zip"); strcat(path_to_file, ".zip");
remake_file(path_to_file, ArchiveSD, zip_size); remake_file(fsMakePath(PATH_ASCII, path_to_file), ArchiveSD, zip_size);
buf_to_file(zip_size, path_to_file, ArchiveSD, zip_buf); buf_to_file(zip_size, fsMakePath(PATH_ASCII, path_to_file), ArchiveSD, zip_buf);
data->success = true; data->success = true;
} }
else else

15
source/fs.c
View File

@@ -68,6 +68,9 @@ Result open_archives(void)
FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, "/Themes"), FS_ATTRIBUTE_DIRECTORY); FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, "/Themes"), FS_ATTRIBUTE_DIRECTORY);
FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, "/Splashes"), FS_ATTRIBUTE_DIRECTORY); FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, "/Splashes"), FS_ATTRIBUTE_DIRECTORY);
FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, "/3ds"), FS_ATTRIBUTE_DIRECTORY);
FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, "/3ds/" APP_TITLE), FS_ATTRIBUTE_DIRECTORY);
FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, "/3ds/" APP_TITLE "/cache"), FS_ATTRIBUTE_DIRECTORY);
u32 homeMenuPath[3] = {MEDIATYPE_SD, archive2, 0}; u32 homeMenuPath[3] = {MEDIATYPE_SD, archive2, 0};
home.type = PATH_BINARY; home.type = PATH_BINARY;
@@ -178,23 +181,23 @@ u32 zip_file_to_buf(char *file_name, u16 *zip_path, char **buf)
return zip_to_buf(a, file_name, buf); return zip_to_buf(a, file_name, buf);
} }
Result buf_to_file(u32 size, char *path, FS_Archive archive, char *buf) Result buf_to_file(u32 size, FS_Path path, FS_Archive archive, char *buf)
{ {
Handle handle; Handle handle;
Result res = 0; Result res = 0;
if (R_FAILED(res = FSUSER_OpenFile(&handle, archive, fsMakePath(PATH_ASCII, path), FS_OPEN_WRITE, 0))) return res; if (R_FAILED(res = FSUSER_OpenFile(&handle, archive, path, FS_OPEN_WRITE, 0))) return res;
if (R_FAILED(res = FSFILE_Write(handle, NULL, 0, buf, size, FS_WRITE_FLUSH))) return res; if (R_FAILED(res = FSFILE_Write(handle, NULL, 0, buf, size, FS_WRITE_FLUSH))) return res;
if (R_FAILED(res = FSFILE_Close(handle))) return res; if (R_FAILED(res = FSFILE_Close(handle))) return res;
return 0; return 0;
} }
void remake_file(char *path, FS_Archive archive, u32 size) void remake_file(FS_Path path, FS_Archive archive, u32 size)
{ {
Handle handle; Handle handle;
if (R_SUCCEEDED(FSUSER_OpenFile(&handle, archive, fsMakePath(PATH_ASCII, path), FS_OPEN_READ, 0))) if (R_SUCCEEDED(FSUSER_OpenFile(&handle, archive, path, FS_OPEN_READ, 0)))
{ {
FSFILE_Close(handle); FSFILE_Close(handle);
FSUSER_DeleteFile(archive, fsMakePath(PATH_ASCII, path)); FSUSER_DeleteFile(archive, path);
} }
FSUSER_CreateFile(archive, fsMakePath(PATH_ASCII, path), 0, size); FSUSER_CreateFile(archive, path, 0, size);
} }

180
source/remote.c
View File

@@ -28,6 +28,7 @@
#include "loading.h" #include "loading.h"
#include "draw.h" #include "draw.h"
#include "fs.h" #include "fs.h"
#include "unicode.h"
#include "pp2d/pp2d/pp2d.h" #include "pp2d/pp2d/pp2d.h"
static Instructions_s browser_instructions[MODE_AMOUNT] = { static Instructions_s browser_instructions[MODE_AMOUNT] = {
@@ -85,7 +86,7 @@ static Instructions_s extra_instructions = {
}, },
{ {
L"\uE07B Toggle splash/theme", L"\uE07B Toggle splash/theme",
NULL L"\uE07C Reload without cache"
}, },
{ {
NULL, NULL,
@@ -98,60 +99,71 @@ static Instructions_s extra_instructions = {
} }
}; };
static void load_remote_entry(Entry_s * entry) static void load_remote_smdh(Entry_s * entry, size_t textureID, bool ignore_cache)
{ {
char * entry_json = NULL; bool not_cached = true;
char * smdh_buf = NULL;
u32 smdh_size = load_data("/info.smdh", *entry, &smdh_buf);
Icon_s * smdh = (Icon_s *)smdh_buf;
not_cached = !smdh_size || ignore_cache; // if the size is 0, the file wasn't there
if(not_cached)
{
free(smdh_buf);
smdh_buf = NULL;
char * api_url = NULL; char * api_url = NULL;
asprintf(&api_url, THEMEPLAZA_ENTRY_FORMAT, entry->tp_download_id); asprintf(&api_url, THEMEPLAZA_SMDH_FORMAT, entry->tp_download_id);
u32 json_len = http_get(api_url, NULL, &entry_json); smdh_size = http_get(api_url, NULL, &smdh_buf);
free(api_url); free(api_url);
smdh = (Icon_s *)smdh_buf;
if(json_len)
{
json_error_t error;
json_t *root = json_loadb(entry_json, json_len, 0, &error);
if(root)
{
const char *key;
json_t *value;
json_object_foreach(root, key, value)
{
if(json_is_string(value))
{
if(!strcmp(key, THEMEPLAZA_JSON_ENTRY_NAME))
{
utf8_to_utf16(entry->name, (u8*)json_string_value(value), 0x40);
}
else if(!strcmp(key, THEMEPLAZA_JSON_ENTRY_DESC))
utf8_to_utf16(entry->desc, (u8*)json_string_value(value), 0x80);
else if(!strcmp(key, THEMEPLAZA_JSON_ENTRY_AUTH))
utf8_to_utf16(entry->author, (u8*)json_string_value(value), 0x40);
}
}
}
else
DEBUG("json error on line %d: %s\n", error.line, error.text);
json_decref(root);
}
free(entry_json);
} }
static void load_remote_icon(size_t textureID, json_int_t id) if(!smdh_size)
{ {
char * icon_data = NULL; free(smdh_buf);
char * icon_url = NULL; utf8_to_utf16(entry->name, (u8*)"No name", 0x80);
asprintf(&icon_url, THEMEPLAZA_ICON_FORMAT, id); utf8_to_utf16(entry->desc, (u8*)"No description", 0x100);
u32 icon_size = http_get(icon_url, NULL, &icon_data); utf8_to_utf16(entry->author, (u8*)"Unknown author", 0x80);
free(icon_url); entry->placeholder_color = RGBA8(rand() % 255, rand() % 255, rand() % 255, 255);
return;
}
memcpy(entry->name, smdh->name, 0x40*sizeof(u16));
memcpy(entry->desc, smdh->desc, 0x80*sizeof(u16));
memcpy(entry->author, smdh->author, 0x40*sizeof(u16));
const u32 width = 48, height = 48;
u32 *image = malloc(width*height*sizeof(u32));
for(u32 x = 0; x < width; x++)
{
for(u32 y = 0; y < height; y++)
{
unsigned int dest_pixel = (x + y*width);
unsigned int source_pixel = (((y >> 3) * (width >> 3) + (x >> 3)) << 6) + ((x & 1) | ((y & 1) << 1) | ((x & 2) << 1) | ((y & 2) << 2) | ((x & 4) << 2) | ((y & 4) << 3));
image[dest_pixel] = RGB565_TO_ABGR8(smdh->big_icon[source_pixel]);
}
}
pp2d_free_texture(textureID); pp2d_free_texture(textureID);
pp2d_load_texture_png_memory(textureID, icon_data, icon_size); pp2d_load_texture_memory(textureID, (u8*)image, (u32)width, (u32)height);
free(icon_data); free(image);
if(not_cached)
{
FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_UTF16, entry->path), FS_ATTRIBUTE_DIRECTORY);
u16 path[0x107] = {0};
strucat(path, entry->path);
struacat(path, "/info.smdh");
remake_file(fsMakePath(PATH_UTF16, path), ArchiveSD, smdh_size);
buf_to_file(smdh_size, fsMakePath(PATH_UTF16, path), ArchiveSD, smdh_buf);
}
free(smdh_buf);
} }
static void load_remote_entries(Entry_List_s * list, json_t *ids_array) static void load_remote_entries(Entry_List_s * list, json_t *ids_array, bool ignore_cache)
{ {
list->entries_count = json_array_size(ids_array); list->entries_count = json_array_size(ids_array);
free(list->entries); free(list->entries);
@@ -167,15 +179,19 @@ static void load_remote_entries(Entry_List_s * list, json_t *ids_array)
size_t offset = i; size_t offset = i;
Entry_s * current_entry = &list->entries[offset]; Entry_s * current_entry = &list->entries[offset];
current_entry->tp_download_id = json_integer_value(id); current_entry->tp_download_id = json_integer_value(id);
load_remote_entry(current_entry);
size_t textureID = list->texture_id_offset + i; size_t textureID = list->texture_id_offset + i;
load_remote_icon(textureID, current_entry->tp_download_id);
char * entry_path = NULL;
asprintf(&entry_path, CACHE_PATH_FORMAT, current_entry->tp_download_id);
utf8_to_utf16(current_entry->path, (u8*)entry_path, 0x106);
free(entry_path);
load_remote_smdh(current_entry, textureID, ignore_cache);
list->icons_ids[offset] = textureID; list->icons_ids[offset] = textureID;
} }
} }
static void load_remote_list(Entry_List_s * list, json_int_t page, EntryMode mode) static void load_remote_list(Entry_List_s * list, json_int_t page, EntryMode mode, bool ignore_cache)
{ {
if(page > list->tp_page_count) if(page > list->tp_page_count)
page = 1; page = 1;
@@ -215,7 +231,7 @@ static void load_remote_list(Entry_List_s * list, json_int_t page, EntryMode mod
if(json_is_integer(value) && !strcmp(key, THEMEPLAZA_JSON_PAGE_COUNT)) if(json_is_integer(value) && !strcmp(key, THEMEPLAZA_JSON_PAGE_COUNT))
list->tp_page_count = json_integer_value(value); list->tp_page_count = json_integer_value(value);
else if(json_is_array(value) && !strcmp(key, THEMEPLAZA_JSON_PAGE_IDS)) else if(json_is_array(value) && !strcmp(key, THEMEPLAZA_JSON_PAGE_IDS))
load_remote_entries(list, value); load_remote_entries(list, value, ignore_cache);
else if(json_is_string(value) && !strcmp(key, THEMEPLAZA_JSON_ERROR_MESSAGE) && !strcmp(json_string_value(value), THEMEPLAZA_JSON_ERROR_MESSAGE_NOT_FOUND)) else if(json_is_string(value) && !strcmp(key, THEMEPLAZA_JSON_ERROR_MESSAGE) && !strcmp(json_string_value(value), THEMEPLAZA_JSON_ERROR_MESSAGE_NOT_FOUND))
throw_error("No results for this search.", ERROR_LEVEL_WARNING); throw_error("No results for this search.", ERROR_LEVEL_WARNING);
} }
@@ -231,22 +247,33 @@ static void load_remote_list(Entry_List_s * list, json_int_t page, EntryMode mod
free(page_json); free(page_json);
} }
static char previous_preview_url[0x100] = {0}; static u16 previous_path_preview[0x106] = {0};
static bool load_remote_preview(Entry_List_s list, int * preview_offset) static bool load_remote_preview(Entry_List_s list, int * preview_offset)
{ {
Entry_s entry = list.entries[list.selected_entry]; Entry_s entry = list.entries[list.selected_entry];
bool not_cached = true;
if(!memcmp(&previous_path_preview, &entry.path, 0x106*sizeof(u16))) return true;
char * preview_png = NULL;
u32 preview_size = load_data("/preview.png", entry, &preview_png);
not_cached = !preview_size;
if(not_cached)
{
free(preview_png);
preview_png = NULL;
char * preview_url = NULL; char * preview_url = NULL;
asprintf(&preview_url, THEMEPLAZA_PREVIEW_FORMAT, entry.tp_download_id); asprintf(&preview_url, THEMEPLAZA_PREVIEW_FORMAT, entry.tp_download_id);
if(!strncmp(previous_preview_url, preview_url, 0x100))
{
free(preview_url);
return true;
}
draw_install(INSTALL_LOADING_REMOTE_PREVIEW); draw_install(INSTALL_LOADING_REMOTE_PREVIEW);
char * preview_png = NULL;
u32 preview_size = http_get(preview_url, NULL, &preview_png); preview_size = http_get(preview_url, NULL, &preview_png);
free(preview_url);
}
if(!preview_size) if(!preview_size)
{ {
@@ -270,7 +297,7 @@ static bool load_remote_preview(Entry_List_s list, int * preview_offset)
} }
// mark the new preview as loaded for optimisation // mark the new preview as loaded for optimisation
strncpy(previous_preview_url, preview_url, 0x100); memcpy(&previous_path_preview, &entry.path, 0x106*sizeof(u16));
// free the previously loaded preview. wont do anything if there wasnt one // free the previously loaded preview. wont do anything if there wasnt one
pp2d_free_texture(TEXTURE_REMOTE_PREVIEW); pp2d_free_texture(TEXTURE_REMOTE_PREVIEW);
@@ -285,7 +312,15 @@ static bool load_remote_preview(Entry_List_s list, int * preview_offset)
} }
free(image); free(image);
free(preview_url);
if(not_cached)
{
u16 path[0x107] = {0};
strucat(path, entry.path);
struacat(path, "/preview.png");
remake_file(fsMakePath(PATH_UTF16, path), ArchiveSD, preview_size);
buf_to_file(preview_size, fsMakePath(PATH_UTF16, path), ArchiveSD, preview_png);
}
free(preview_png); free(preview_png);
return ret; return ret;
@@ -311,8 +346,8 @@ static void download_remote_entry(Entry_s * entry, EntryMode mode)
strcat(path_to_file, ".zip"); strcat(path_to_file, ".zip");
DEBUG("Saving to sd: %s\n", path_to_file); DEBUG("Saving to sd: %s\n", path_to_file);
remake_file(path_to_file, ArchiveSD, zip_size); remake_file(fsMakePath(PATH_ASCII, path_to_file), ArchiveSD, zip_size);
buf_to_file(zip_size, path_to_file, ArchiveSD, zip_buf); buf_to_file(zip_size, fsMakePath(PATH_ASCII, path_to_file), ArchiveSD, zip_buf);
free(zip_buf); free(zip_buf);
} }
@@ -361,7 +396,7 @@ static void jump_menu(Entry_List_s * list)
{ {
json_int_t newpage = (json_int_t)atoi(numbuf); json_int_t newpage = (json_int_t)atoi(numbuf);
if(newpage != list->tp_current_page) if(newpage != list->tp_current_page)
load_remote_list(list, newpage, list->mode); load_remote_list(list, newpage, list->mode, false);
} }
} }
@@ -389,7 +424,7 @@ static void search_menu(Entry_List_s * list)
search[i] = '+'; search[i] = '+';
} }
list->tp_search = search; list->tp_search = search;
load_remote_list(list, 1, list->mode); load_remote_list(list, 1, list->mode, false);
} }
else else
{ {
@@ -429,7 +464,7 @@ bool themeplaza_browser(EntryMode mode)
Entry_List_s list = {0}; Entry_List_s list = {0};
Entry_List_s * current_list = &list; Entry_List_s * current_list = &list;
current_list->tp_search = strdup(""); current_list->tp_search = strdup("");
load_remote_list(current_list, 1, mode); load_remote_list(current_list, 1, mode, false);
bool extra_mode = false; bool extra_mode = false;
@@ -479,7 +514,7 @@ bool themeplaza_browser(EntryMode mode)
free(current_list->tp_search); free(current_list->tp_search);
current_list->tp_search = strdup(""); current_list->tp_search = strdup("");
load_remote_list(current_list, 1, mode); load_remote_list(current_list, 1, mode, false);
} }
else if((kDown | kHeld) & KEY_DUP) else if((kDown | kHeld) & KEY_DUP)
{ {
@@ -487,7 +522,7 @@ bool themeplaza_browser(EntryMode mode)
} }
else if((kDown | kHeld) & KEY_DRIGHT) else if((kDown | kHeld) & KEY_DRIGHT)
{ {
load_remote_list(current_list, current_list->tp_current_page, mode, true);
} }
else if((kDown | kHeld) & KEY_DDOWN) else if((kDown | kHeld) & KEY_DDOWN)
{ {
@@ -530,11 +565,11 @@ bool themeplaza_browser(EntryMode mode)
} }
else if(kDown & KEY_L) else if(kDown & KEY_L)
{ {
load_remote_list(current_list, current_list->tp_current_page-1, mode); load_remote_list(current_list, current_list->tp_current_page-1, mode, false);
} }
else if(kDown & KEY_R) else if(kDown & KEY_R)
{ {
load_remote_list(current_list, current_list->tp_current_page+1, mode); load_remote_list(current_list, current_list->tp_current_page+1, mode, false);
} }
// Movement in the UI // Movement in the UI
@@ -628,11 +663,11 @@ bool themeplaza_browser(EntryMode mode)
{ {
if(BETWEEN(0, x, border)) if(BETWEEN(0, x, border))
{ {
load_remote_list(current_list, current_list->tp_current_page-1, mode); load_remote_list(current_list, current_list->tp_current_page-1, mode, false);
} }
else if(BETWEEN(320-border, x, 320)) else if(BETWEEN(320-border, x, 320))
{ {
load_remote_list(current_list, current_list->tp_current_page+1, mode); load_remote_list(current_list, current_list->tp_current_page+1, mode, false);
} }
} }
} }
@@ -722,7 +757,7 @@ u32 http_get(const char *url, char ** filename, char ** buf)
{ {
httpcCloseContext(&context); httpcCloseContext(&context);
if (new_url != NULL) free(new_url); if (new_url != NULL) free(new_url);
DEBUG("status_code\n"); DEBUG("status_code, %lu\n", status_code);
return 0; return 0;
} }
@@ -820,5 +855,6 @@ u32 http_get(const char *url, char ** filename, char ** buf)
httpcCloseContext(&context); httpcCloseContext(&context);
free(new_url); free(new_url);
DEBUG("size: %lu\n", size);
return size; return size;
} }

8
source/splashes.c
View File

@@ -41,15 +41,15 @@ void splash_install(Entry_s splash)
u32 size = load_data("/splash.bin", splash, &screen_buf); u32 size = load_data("/splash.bin", splash, &screen_buf);
if(size != 0) if(size != 0)
{ {
remake_file("/luma/splash.bin", ArchiveSD, size); remake_file(fsMakePath(PATH_ASCII, "/luma/splash.bin"), ArchiveSD, size);
buf_to_file(size, "/luma/splash.bin", ArchiveSD, screen_buf); buf_to_file(size, fsMakePath(PATH_ASCII, "/luma/splash.bin"), ArchiveSD, screen_buf);
} }
u32 bottom_size = load_data("/splashbottom.bin", splash, &screen_buf); u32 bottom_size = load_data("/splashbottom.bin", splash, &screen_buf);
if(bottom_size != 0) if(bottom_size != 0)
{ {
remake_file("/luma/splashbottom.bin", ArchiveSD, bottom_size); remake_file(fsMakePath(PATH_ASCII, "/luma/splashbottom.bin"), ArchiveSD, bottom_size);
buf_to_file(bottom_size, "/luma/splashbottom.bin", ArchiveSD, screen_buf); buf_to_file(bottom_size, fsMakePath(PATH_ASCII, "/luma/splashbottom.bin"), ArchiveSD, screen_buf);
} }
if(size == 0 && bottom_size == 0) if(size == 0 && bottom_size == 0)

16
source/themes.c
View File

@@ -61,7 +61,7 @@ static Result install_theme_internal(Entry_List_s themes, int installmode)
if(installmode & THEME_INSTALL_BODY) if(installmode & THEME_INSTALL_BODY)
{ {
remake_file("/BodyCache_rd.bin", ArchiveThemeExt, BODY_CACHE_SIZE * MAX_SHUFFLE_THEMES); remake_file(fsMakePath(PATH_ASCII, "/BodyCache_rd.bin"), ArchiveThemeExt, BODY_CACHE_SIZE * MAX_SHUFFLE_THEMES);
FSUSER_OpenFile(&body_cache_handle, ArchiveThemeExt, fsMakePath(PATH_ASCII, "/BodyCache_rd.bin"), FS_OPEN_WRITE, 0); FSUSER_OpenFile(&body_cache_handle, ArchiveThemeExt, fsMakePath(PATH_ASCII, "/BodyCache_rd.bin"), FS_OPEN_WRITE, 0);
} }
@@ -101,8 +101,8 @@ static Result install_theme_internal(Entry_List_s themes, int installmode)
} }
shuffle_music_sizes[shuffle_count] = music_size; shuffle_music_sizes[shuffle_count] = music_size;
remake_file(bgm_cache_path, ArchiveThemeExt, BGM_MAX_SIZE); remake_file(fsMakePath(PATH_ASCII, bgm_cache_path), ArchiveThemeExt, BGM_MAX_SIZE);
buf_to_file(music_size, bgm_cache_path, ArchiveThemeExt, music); buf_to_file(music_size, fsMakePath(PATH_ASCII, bgm_cache_path), ArchiveThemeExt, music);
free(music); free(music);
} }
@@ -116,7 +116,7 @@ static Result install_theme_internal(Entry_List_s themes, int installmode)
{ {
char bgm_cache_path[26] = {0}; char bgm_cache_path[26] = {0};
sprintf(bgm_cache_path, "/BgmCache_%.2i.bin", i); sprintf(bgm_cache_path, "/BgmCache_%.2i.bin", i);
remake_file(bgm_cache_path, ArchiveThemeExt, BGM_MAX_SIZE); remake_file(fsMakePath(PATH_ASCII, bgm_cache_path), ArchiveThemeExt, BGM_MAX_SIZE);
} }
} }
@@ -140,7 +140,7 @@ static Result install_theme_internal(Entry_List_s themes, int installmode)
return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_NOT_FOUND); return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_NOT_FOUND);
} }
res = buf_to_file(body_size, "/BodyCache.bin", ArchiveThemeExt, body); // Write body data to file res = buf_to_file(body_size, fsMakePath(PATH_ASCII, "/BodyCache.bin"), ArchiveThemeExt, body); // Write body data to file
free(body); free(body);
if(R_FAILED(res)) return res; if(R_FAILED(res)) return res;
@@ -156,7 +156,7 @@ static Result install_theme_internal(Entry_List_s themes, int installmode)
return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_TOO_LARGE); return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_TOO_LARGE);
} }
res = buf_to_file(music_size, "/BgmCache.bin", ArchiveThemeExt, music); res = buf_to_file(music_size, fsMakePath(PATH_ASCII, "/BgmCache.bin"), ArchiveThemeExt, music);
free(music); free(music);
if(R_FAILED(res)) return res; if(R_FAILED(res)) return res;
@@ -195,7 +195,7 @@ static Result install_theme_internal(Entry_List_s themes, int installmode)
theme_manage->dlc_theme_content_index = 0xFF; theme_manage->dlc_theme_content_index = 0xFF;
theme_manage->use_theme_cache = 0x0200; theme_manage->use_theme_cache = 0x0200;
res = buf_to_file(0x800, "/ThemeManage.bin", ArchiveThemeExt, thememanage_buf); res = buf_to_file(0x800, fsMakePath(PATH_ASCII, "/ThemeManage.bin"), ArchiveThemeExt, thememanage_buf);
free(thememanage_buf); free(thememanage_buf);
if(R_FAILED(res)) return res; if(R_FAILED(res)) return res;
//---------------------------------------- //----------------------------------------
@@ -220,7 +220,7 @@ static Result install_theme_internal(Entry_List_s themes, int installmode)
} }
} }
res = buf_to_file(savedata_size, "/SaveData.dat", ArchiveHomeExt, savedata_buf); res = buf_to_file(savedata_size, fsMakePath(PATH_ASCII, "/SaveData.dat"), ArchiveHomeExt, savedata_buf);
free(savedata_buf); free(savedata_buf);
if(R_FAILED(res)) return res; if(R_FAILED(res)) return res;
//---------------------------------------- //----------------------------------------