Disable TitleDB features relying on version.

This commit is contained in:
Steveice10 2017-07-13 13:34:42 -07:00
parent c636cab6b8
commit 0fad926688
3 changed files with 15 additions and 10 deletions

View File

@ -22,11 +22,12 @@ void task_populate_titledb_update_status(list_item* item) {
info->installedVersion = info->installed ? entry.version : (u16) 0;
if(info->installed) {
if(info->installedVersion < info->latestVersion) {
// TODO: Latest version disabled pending TitleDB pull request.
/*if(info->installedVersion < info->latestVersion) {
item->color = COLOR_TITLEDB_OUTDATED;
} else {
} else {*/
item->color = COLOR_TITLEDB_INSTALLED;
}
//}
} else {
item->color = COLOR_TITLEDB_NOT_INSTALLED;
}
@ -87,13 +88,13 @@ 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, "version", nameLen) == 0) {
/*} else if(strncmp(name, "version", nameLen) == 0) { // TODO: Latest version disabled pending TitleDB pull request.
u32 major = 0;
u32 minor = 0;
u32 micro = 0;
sscanf(subVal->u.string.ptr, "%lu.%lu.%lu", &major, &minor, &micro);
titledbInfo->latestVersion = ((u8) (major & 0x3F) << 10) | ((u8) (minor & 0x3F) << 4) | ((u8) (micro & 0xF));
titledbInfo->latestVersion = ((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, "name_l", nameLen) == 0) {
@ -124,7 +125,8 @@ static void task_populate_titledb_thread(void* arg) {
linked_list_iterate(data->items, &iter);
bool add = true;
while(linked_list_iter_has_next(&iter)) {
// TODO: Latest version disabled pending TitleDB pull request.
/*while(linked_list_iter_has_next(&iter)) {
list_item* currItem = (list_item*) linked_list_iter_next(&iter);
titledb_info* currTitledbInfo = (titledb_info*) currItem->data;
@ -138,7 +140,7 @@ static void task_populate_titledb_thread(void* arg) {
break;
}
}
}*/
if(add) {
linked_list_add_sorted(data->items, item, NULL, task_populate_titledb_compare);

View File

@ -57,7 +57,9 @@ static void titledb_action_update(ui_view* view, void* data, linked_list* items,
if(linked_list_size(items) == 0) {
linked_list_add(items, &install);
linked_list_add(items, &update_all);
// TODO: Updating disabled pending TitleDB pull request.
//linked_list_add(items, &update_all);
}
}

View File

@ -613,14 +613,15 @@ void ui_draw_titledb_info(ui_view* view, void* data, float x1, float y1, float x
char infoText[512];
// TODO: Latest version disabled pending TitleDB pull request.
snprintf(infoText, sizeof(infoText),
"Title ID: %016llX\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",
info->titleId,
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));
float infoWidth;