blackteay/fbi-i18n-zh
1
0
Fork 0
mirror of https://gitlab.com/Theopse/fbi-i18n-zh.git synced 2025-04-06 03:58:02 +08:00
Code Issues Projects Releases Wiki Activity

Use TitleDB API version 1.

Browse Source
This commit is contained in:
Steveice10 2017-02-27 00:03:04 -08:00
parent 7e7375226f
commit fe0768885d
8 changed files with 79 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
romfs/textcolor.cfg
View File

@ -7,7 +7,8 @@ file=FF000000
directory=FF0000FF
enabled=FF00FF00
disabled=FF0000FF
installed=FF00FF00
notinstalled=FF0000FF
titledboutdated=FFFF0000
titledbinstalled=FF00FF00
titledbnotinstalled=FF0000FF
ticketinuse=FF00FF00
ticketnotinuse=FF0000FF

10
source/core/screen.c
View File

@ -225,10 +225,12 @@ void screen_init() {
color_config[COLOR_ENABLED] = color;
} else if(strcasecmp(key, "disabled") == 0) {
color_config[COLOR_DISABLED] = color;
} else if(strcasecmp(key, "installed") == 0) {
color_config[COLOR_INSTALLED] = color;
} else if(strcasecmp(key, "notinstalled") == 0) {
color_config[COLOR_NOT_INSTALLED] = color;
} else if(strcasecmp(key, "titledboutdated") == 0) {
color_config[COLOR_TITLEDB_OUTDATED] = color;
} else if(strcasecmp(key, "titledbinstalled") == 0) {
color_config[COLOR_TITLEDB_INSTALLED] = color;
} else if(strcasecmp(key, "titledbnotinstalled") == 0) {
color_config[COLOR_TITLEDB_NOT_INSTALLED] = color;
} else if(strcasecmp(key, "ticketinuse") == 0) {
color_config[COLOR_TICKET_IN_USE] = color;
} else if(strcasecmp(key, "ticketnotinuse") == 0) {

11
source/core/screen.h
View File

@ -40,7 +40,7 @@
#define TEXTURE_WIFI_2 30
#define TEXTURE_WIFI_3 31
#define MAX_COLORS 13
#define MAX_COLORS 14
#define COLOR_TEXT 0
#define COLOR_NAND 1
@ -51,10 +51,11 @@
#define COLOR_DIRECTORY 6
#define COLOR_ENABLED 7
#define COLOR_DISABLED 8
#define COLOR_INSTALLED 9
#define COLOR_NOT_INSTALLED 10
#define COLOR_TICKET_IN_USE 11
#define COLOR_TICKET_NOT_IN_USE 12
#define COLOR_TITLEDB_OUTDATED 9
#define COLOR_TITLEDB_INSTALLED 10
#define COLOR_TITLEDB_NOT_INSTALLED 11
#define COLOR_TICKET_IN_USE 12
#define COLOR_TICKET_NOT_IN_USE 13
void screen_init();
void screen_exit();

15
source/ui/section/action/installtitledb.c
View File

@ -10,15 +10,10 @@
#include "../../../core/linkedlist.h"
void action_install_titledb(linked_list* items, list_item* selected) {
char* url = (char*) calloc(1, INSTALL_URL_MAX);
if(url != NULL) {
snprintf(url, INSTALL_URL_MAX, "https://api.titledb.com/v0/proxy/%016llX", ((titledb_info*) selected->data)->titleId);
action_url_install("Install the selected title from TitleDB?", url, NULL, NULL);
char url[64];
snprintf(url, INSTALL_URL_MAX, "https://3ds.titledb.com/v1/cia/%lu/download", ((titledb_info*) selected->data)->id);
free(url);
} else {
error_display_res(NULL, NULL, R_FBI_OUT_OF_MEMORY, "Failed to allocate URL text buffer.");
}
action_url_install("Install the selected title from TitleDB?", url, NULL, NULL);
}
void action_update_titledb(linked_list* items, list_item* selected) {
@ -31,8 +26,8 @@ void action_update_titledb(linked_list* items, list_item* selected) {
while(linked_list_iter_has_next(&iter) && pos < INSTALL_URL_MAX * INSTALL_URLS_MAX) {
titledb_info* info = (titledb_info*) ((list_item*) linked_list_iter_next(&iter))->data;
if(info->installed) {
pos += snprintf(urls + pos, (INSTALL_URL_MAX * INSTALL_URLS_MAX) - pos, "https://api.titledb.com/v0/proxy/%016llX\n", info->titleId);
if(info->outdated) {
pos += snprintf(urls + pos, (INSTALL_URL_MAX * INSTALL_URLS_MAX) - pos, "https://3ds.titledb.com/v1/cia/%lu/download\n", info->id);
}
}

111
source/ui/section/task/listtitledb.c
View File

@ -42,14 +42,11 @@ static void task_populate_titledb_thread(void* arg) {
Result res = 0;
linked_list tempItems;
linked_list_init(&tempItems);
u32 maxTextSize = 128 * 1024;
u32 maxTextSize = 256 * 1024;
char* text = (char*) calloc(sizeof(char), maxTextSize);
if(text != NULL) {
u32 textSize = 0;
if(R_SUCCEEDED(res = task_populate_titledb_download(&textSize, text, maxTextSize, "https://api.titledb.com/v0/"))) {
if(R_SUCCEEDED(res = task_populate_titledb_download(&textSize, text, maxTextSize, "https://api.titledb.com/v1/cia?only=id&only=size&only=titleid&only=version&only=name_s&only=name_l&only=publisher"))) {
json_value* json = json_parse(text, textSize);
if(json != NULL) {
if(json->type == json_array) {
@ -72,15 +69,24 @@ static void task_populate_titledb_thread(void* arg) {
if(subVal->type == json_string) {
if(strncmp(name, "titleid", nameLen) == 0) {
titledbInfo->titleId = strtoull(subVal->u.string.ptr, NULL, 16);
} else if(strncmp(name, "name", nameLen) == 0) {
} else if(strncmp(name, "version", nameLen) == 0) {
u32 major = 0;
u32 minor = 0;
u32 micro = 0;
sscanf(subVal->u.string.ptr, "%lu.%lu.%lu", &major, &minor, &micro);
titledbInfo->version = ((u8) (major & 0x3F) << 10) | ((u8) (minor & 0x3F) << 4) | ((u8) (micro & 0xF));
} else if(strncmp(name, "name_s", nameLen) == 0) {
strncpy(titledbInfo->meta.shortDescription, subVal->u.string.ptr, sizeof(titledbInfo->meta.shortDescription));
} else if(strncmp(name, "description", nameLen) == 0) {
} else if(strncmp(name, "name_l", nameLen) == 0) {
strncpy(titledbInfo->meta.longDescription, subVal->u.string.ptr, sizeof(titledbInfo->meta.longDescription));
} else if(strncmp(name, "author", nameLen) == 0) {
} else if(strncmp(name, "publisher", nameLen) == 0) {
strncpy(titledbInfo->meta.publisher, subVal->u.string.ptr, sizeof(titledbInfo->meta.publisher));
}
} else if(subVal->type == json_integer) {
if(strncmp(name, "size", nameLen) == 0) {
if(strncmp(name, "id", nameLen) == 0) {
titledbInfo->id = (u32) subVal->u.integer;
} else if(strncmp(name, "size", nameLen) == 0) {
titledbInfo->size = (u64) subVal->u.integer;
}
}
@ -88,6 +94,7 @@ static void task_populate_titledb_thread(void* arg) {
AM_TitleEntry entry;
titledbInfo->installed = R_SUCCEEDED(AM_GetTitleInfo(util_get_title_destination(titledbInfo->titleId), 1, &titledbInfo->titleId, &entry));
titledbInfo->outdated = titledbInfo->installed && entry.version < titledbInfo->version;
if(strlen(titledbInfo->meta.shortDescription) > 0) {
strncpy(item->name, titledbInfo->meta.shortDescription, LIST_ITEM_NAME_MAX);
@ -95,15 +102,39 @@ static void task_populate_titledb_thread(void* arg) {
snprintf(item->name, LIST_ITEM_NAME_MAX, "%016llX", titledbInfo->titleId);
}
if(titledbInfo->installed) {
item->color = COLOR_INSTALLED;
if(titledbInfo->outdated) {
item->color = COLOR_TITLEDB_OUTDATED;
} else if(titledbInfo->installed) {
item->color = COLOR_TITLEDB_INSTALLED;
} else {
item->color = COLOR_NOT_INSTALLED;
item->color = COLOR_TITLEDB_NOT_INSTALLED;
}
item->data = titledbInfo;
linked_list_add(&tempItems, item);
linked_list_iter iter;
linked_list_iterate(data->items, &iter);
bool add = true;
while(linked_list_iter_has_next(&iter)) {
list_item* currItem = (list_item*) linked_list_iter_next(&iter);
titledb_info* currTitledbInfo = (titledb_info*) currItem->data;
if(titledbInfo->titleId == currTitledbInfo->titleId) {
if(titledbInfo->version >= currTitledbInfo->version) {
linked_list_iter_remove(&iter);
task_free_titledb(currItem);
} else {
add = false;
}
break;
}
}
if(add) {
linked_list_add_sorted(data->items, item, NULL, task_populate_titledb_compare);
}
} else {
free(item);
@ -128,15 +159,6 @@ static void task_populate_titledb_thread(void* arg) {
}
if(R_SUCCEEDED(res)) {
linked_list_sort(&tempItems, NULL, task_populate_titledb_compare);
linked_list_iter tempIter;
linked_list_iterate(&tempItems, &tempIter);
while(linked_list_iter_has_next(&tempIter)) {
linked_list_add(data->items, linked_list_iter_next(&tempIter));
}
linked_list_iter iter;
linked_list_iterate(data->items, &iter);
@ -149,49 +171,18 @@ static void task_populate_titledb_thread(void* arg) {
list_item* item = (list_item*) linked_list_iter_next(&iter);
titledb_info* titledbInfo = (titledb_info*) item->data;
u32 maxPngSize = 128 * 1024;
u8* png = (u8*) calloc(1, maxPngSize);
if(png != NULL) {
char pngUrl[128];
snprintf(pngUrl, sizeof(pngUrl), "https://api.titledb.com/images/%016llX.png", titledbInfo->titleId);
char url[128];
snprintf(url, sizeof(url), "https://3ds.titledb.com/v1/cia/%lu/icon_l.bin", titledbInfo->id);
u32 pngSize = 0;
if(R_SUCCEEDED(task_populate_titledb_download(&pngSize, png, maxPngSize, pngUrl))) {
int width;
int height;
int depth;
u8* image = stbi_load_from_memory(png, (int) pngSize, &width, &height, &depth, STBI_rgb_alpha);
if(image != NULL && depth == STBI_rgb_alpha) {
for(u32 x = 0; x < width; x++) {
for(u32 y = 0; y < height; y++) {
u32 pos = (y * width + x) * 4;
u8 c1 = image[pos + 0];
u8 c2 = image[pos + 1];
u8 c3 = image[pos + 2];
u8 c4 = image[pos + 3];
image[pos + 0] = c4;
image[pos + 1] = c3;
image[pos + 2] = c2;
image[pos + 3] = c1;
}
}
titledbInfo->meta.texture = screen_allocate_free_texture();
screen_load_texture(titledbInfo->meta.texture, image, (u32) (width * height * 4), (u32) width, (u32) height, GPU_RGBA8, false);
free(image);
}
}
free(png);
u8 icon[0x1200];
u32 iconSize = 0;
if(R_SUCCEEDED(task_populate_titledb_download(&iconSize, &icon, sizeof(icon), url)) && iconSize == sizeof(icon)) {
titledbInfo->meta.texture = screen_allocate_free_texture();
screen_load_texture_tiled(titledbInfo->meta.texture, icon, sizeof(icon), 48, 48, GPU_RGB565, false);
}
}
}
linked_list_destroy(&tempItems);
svcCloseHandle(data->cancelEvent);
data->result = res;

7
source/ui/section/task/listtitles.c
View File

@ -1,4 +1,3 @@
#include <sys/syslimits.h>
#include <malloc.h>
#include <stdio.h>
#include <stdlib.h>
@ -44,7 +43,7 @@ static Result task_populate_titles_add_ctr(populate_titles_data* data, FS_MediaT
SMDH_title* smdhTitle = util_select_smdh_title(smdh);
utf16_to_utf8((uint8_t*) item->name, smdhTitle->shortDescription, NAME_MAX - 1);
utf16_to_utf8((uint8_t*) item->name, smdhTitle->shortDescription, LIST_ITEM_NAME_MAX - 1);
utf16_to_utf8((uint8_t*) titleInfo->meta.shortDescription, smdhTitle->shortDescription, sizeof(titleInfo->meta.shortDescription) - 1);
utf16_to_utf8((uint8_t*) titleInfo->meta.longDescription, smdhTitle->longDescription, sizeof(titleInfo->meta.longDescription) - 1);
@ -62,7 +61,7 @@ static Result task_populate_titles_add_ctr(populate_titles_data* data, FS_MediaT
}
if(util_is_string_empty(item->name)) {
snprintf(item->name, NAME_MAX, "%016llX", titleId);
snprintf(item->name, LIST_ITEM_NAME_MAX, "%016llX", titleId);
}
if(mediaType == MEDIATYPE_NAND) {
@ -198,7 +197,7 @@ static Result task_populate_titles_add_twl(populate_titles_data* data, FS_MediaT
}
if(util_is_string_empty(item->name)) {
snprintf(item->name, NAME_MAX, "%016llX", realTitleId);
snprintf(item->name, LIST_ITEM_NAME_MAX, "%016llX", realTitleId);
}
item->color = COLOR_DS_TITLE;

3
source/ui/section/task/task.h
View File

@ -71,9 +71,12 @@ typedef struct file_info_s {
} file_info;
typedef struct titledb_info_s {
u32 id;
u64 titleId;
u16 version;
u64 size;
bool installed;
bool outdated;
meta_info meta;
} titledb_info;

2
source/ui/ui.c
View File

@ -615,8 +615,10 @@ void ui_draw_titledb_info(ui_view* view, void* data, float x1, float y1, float x
snprintf(infoText, sizeof(infoText),
"Title ID: %016llX\n"
"Version: %hu (%d.%d.%d)\n"
"Size: %.2f %s",
info->titleId,
info->version, (info->version >> 10) & 0x3F, (info->version >> 4) & 0x3F, info->version & 0xF,
util_get_display_size(info->size), util_get_display_size_units(info->size));
float infoWidth;