blackteay/fbi-i18n-zh
1
0
Fork 0
mirror of https://gitlab.com/Theopse/fbi-i18n-zh.git synced 2025-09-01 01:09:46 +08:00
Code Issues Projects Releases Wiki Activity

Remove duplicate TitleDB entries based on update date.

Browse Source
This commit is contained in:
Steveice10 2017-07-13 21:32:46 -07:00
parent 8d5b18dfa0
commit 80179d059a
4 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,12 +22,11 @@ void task_populate_titledb_update_status(list_item* item) {
info->installedVersion = info->installed ? entry.version : (u16) 0; info->installedVersion = info->installed ? entry.version : (u16) 0;
if(info->installed) { if(info->installed) {
// TODO: Latest version disabled pending TitleDB pull request. if(info->installedVersion < info->latestVersion) {
/*if(info->installedVersion < info->latestVersion) {
item->color = COLOR_TITLEDB_OUTDATED; item->color = COLOR_TITLEDB_OUTDATED;
} else {*/ } else {
item->color = COLOR_TITLEDB_INSTALLED; item->color = COLOR_TITLEDB_INSTALLED;
//} }
} else { } else {
item->color = COLOR_TITLEDB_NOT_INSTALLED; item->color = COLOR_TITLEDB_NOT_INSTALLED;
} }
@ -65,7 +64,7 @@ static void task_populate_titledb_thread(void* arg) {
char* text = (char*) calloc(sizeof(char), maxTextSize); char* text = (char*) calloc(sizeof(char), maxTextSize);
if(text != NULL) { if(text != NULL) {
u32 textSize = 0; u32 textSize = 0;
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"))) { if(R_SUCCEEDED(res = task_populate_titledb_download(&textSize, text, maxTextSize, "https://api.titledb.com/v1/cia?only=id&only=size&only=updated_at&only=titleid&only=version&only=name_s&only=name_l&only=publisher"))) {
json_value* json = json_parse(text, textSize); json_value* json = json_parse(text, textSize);
if(json != NULL) { if(json != NULL) {
if(json->type == json_array) { if(json->type == json_array) {
@ -86,7 +85,9 @@ static void task_populate_titledb_thread(void* arg) {
u32 nameLen = val->u.object.values[j].name_length; u32 nameLen = val->u.object.values[j].name_length;
json_value* subVal = val->u.object.values[j].value; json_value* subVal = val->u.object.values[j].value;
if(subVal->type == json_string) { if(subVal->type == json_string) {
if(strncmp(name, "titleid", nameLen) == 0) { if(strncmp(name, "updated_at", nameLen) == 0) {
strncpy(titledbInfo->updatedAt, subVal->u.string.ptr, sizeof(titledbInfo->updatedAt));
} else if(strncmp(name, "titleid", nameLen) == 0) {
titledbInfo->titleId = strtoull(subVal->u.string.ptr, NULL, 16); titledbInfo->titleId = strtoull(subVal->u.string.ptr, NULL, 16);
/*} else if(strncmp(name, "version", nameLen) == 0) { // TODO: Latest version disabled pending TitleDB pull request. /*} else if(strncmp(name, "version", nameLen) == 0) { // TODO: Latest version disabled pending TitleDB pull request.
u32 major = 0; u32 major = 0;
@ -125,13 +126,12 @@ static void task_populate_titledb_thread(void* arg) {
linked_list_iterate(data->items, &iter); linked_list_iterate(data->items, &iter);
bool add = true; bool add = true;
// TODO: Latest version disabled pending TitleDB pull request. while(linked_list_iter_has_next(&iter)) {
/*while(linked_list_iter_has_next(&iter)) {
list_item* currItem = (list_item*) linked_list_iter_next(&iter); list_item* currItem = (list_item*) linked_list_iter_next(&iter);
titledb_info* currTitledbInfo = (titledb_info*) currItem->data; titledb_info* currTitledbInfo = (titledb_info*) currItem->data;
if(titledbInfo->titleId == currTitledbInfo->titleId) { if(titledbInfo->titleId == currTitledbInfo->titleId) {
if(titledbInfo->latestVersion >= currTitledbInfo->latestVersion) { if(strncmp(titledbInfo->updatedAt, currTitledbInfo->updatedAt, sizeof(titledbInfo->updatedAt)) >= 0) {
linked_list_iter_remove(&iter); linked_list_iter_remove(&iter);
task_free_titledb(currItem); task_free_titledb(currItem);
} else { } else {
@ -140,7 +140,7 @@ static void task_populate_titledb_thread(void* arg) {
break; break;
} }
}*/ }
if(add) { if(add) {
linked_list_add_sorted(data->items, item, NULL, task_populate_titledb_compare); linked_list_add_sorted(data->items, item, NULL, task_populate_titledb_compare);

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

@ -76,6 +76,7 @@ typedef struct titledb_info_s {
u16 installedVersion; u16 installedVersion;
u16 latestVersion; u16 latestVersion;
u64 size; u64 size;
char updatedAt[32];
bool installed; bool installed;
meta_info meta; meta_info meta;
} titledb_info; } titledb_info;

4
source/ui/section/titledb.c
View File

@ -13,7 +13,9 @@
#include "../../core/screen.h" #include "../../core/screen.h"
static list_item install = {"Install", COLOR_TEXT, action_install_titledb}; static list_item install = {"Install", COLOR_TEXT, action_install_titledb};
static list_item update_all = {"Update All", COLOR_TEXT, action_update_titledb};
// TODO: Updating disabled pending TitleDB pull request.
//static list_item update_all = {"Update All", COLOR_TEXT, action_update_titledb};
typedef struct { typedef struct {
populate_titledb_data populateData; populate_titledb_data populateData;

11
source/ui/ui.c
View File

@ -611,6 +611,11 @@ void ui_draw_titledb_info(ui_view* view, void* data, float x1, float y1, float x
ui_draw_meta_info(view, &info->meta, x1, y1, x2, y2); ui_draw_meta_info(view, &info->meta, x1, y1, x2, y2);
char updatedDate[32];
char updatedTime[32];
sscanf(info->updatedAt, "%[^T]T%[^Z]Z", updatedDate, updatedTime);
char infoText[512]; char infoText[512];
// TODO: Latest version disabled pending TitleDB pull request. // TODO: Latest version disabled pending TitleDB pull request.
@ -618,11 +623,13 @@ void ui_draw_titledb_info(ui_view* view, void* data, float x1, float y1, float x
"Title ID: %016llX\n" "Title ID: %016llX\n"
"Installed Version: %hu (%d.%d.%d)\n" "Installed Version: %hu (%d.%d.%d)\n"
//"Latest Version: %hu (%d.%d.%d)\n" //"Latest Version: %hu (%d.%d.%d)\n"
"Size: %.2f %s", "Size: %.2f %s\n"
"Updated At: %s %s",
info->titleId, info->titleId,
info->installedVersion, (info->installedVersion >> 10) & 0x3F, (info->installedVersion >> 4) & 0x3F, info->installedVersion & 0xF, info->installedVersion, (info->installedVersion >> 10) & 0x3F, (info->installedVersion >> 4) & 0x3F, info->installedVersion & 0xF,
//info->latestVersion, (info->latestVersion >> 10) & 0x3F, (info->latestVersion >> 4) & 0x3F, info->latestVersion & 0xF, //info->latestVersion, (info->latestVersion >> 10) & 0x3F, (info->latestVersion >> 4) & 0x3F, info->latestVersion & 0xF,
util_get_display_size(info->size), util_get_display_size_units(info->size)); util_get_display_size(info->size), util_get_display_size_units(info->size),
updatedDate, updatedTime);
float infoWidth; float infoWidth;
screen_get_string_size(&infoWidth, NULL, infoText, 0.5f, 0.5f); screen_get_string_size(&infoWidth, NULL, infoText, 0.5f, 0.5f);