Clean up text color loading, remove TitleDB update code.

romfs/textcolor.cfg

@@ -7,7 +7,6 @@ file=FF000000
 directory=FF0000FF
 enabled=FF00FF00
 disabled=FF0000FF
-titledboutdated=FFFF0000
 titledbinstalled=FF00FF00
 titledbnotinstalled=FF0000FF
 ticketinuse=FF00FF00

source/core/screen.c

@@ -176,50 +176,37 @@ void screen_init() {
 
     char line[128];
     while(fgets(line, sizeof(line), fd) != NULL) {
-        char* newline = strchr(line, '\n');
+        char key[64];
-        if(newline != NULL) {
+        u32 color = 0;
-            *newline = '\0';
-        }
 
-        char* equals = strchr(line, '=');
+        sscanf(line, "%63[^=]=%lx", key, &color);
-        if(equals != NULL) {
-            char key[64] = {'\0'};
-            char value[64] = {'\0'};
 
-            strncpy(key, line, equals - line);
+        if(strcasecmp(key, "text") == 0) {
-            strncpy(value, equals + 1, strlen(equals) - 1);
+            color_config[COLOR_TEXT] = color;
-
+        } else if(strcasecmp(key, "nand") == 0) {
-            u32 color = strtoul(value, NULL, 16);
+            color_config[COLOR_NAND] = color;
-
+        } else if(strcasecmp(key, "sd") == 0) {
-            if(strcasecmp(key, "text") == 0) {
+            color_config[COLOR_SD] = color;
-                color_config[COLOR_TEXT] = color;
+        } else if(strcasecmp(key, "gamecard") == 0) {
-            } else if(strcasecmp(key, "nand") == 0) {
+            color_config[COLOR_GAME_CARD] = color;
-                color_config[COLOR_NAND] = color;
+        } else if(strcasecmp(key, "dstitle") == 0) {
-            } else if(strcasecmp(key, "sd") == 0) {
+            color_config[COLOR_DS_TITLE] = color;
-                color_config[COLOR_SD] = color;
+        } else if(strcasecmp(key, "file") == 0) {
-            } else if(strcasecmp(key, "gamecard") == 0) {
+            color_config[COLOR_FILE] = color;
-                color_config[COLOR_GAME_CARD] = color;
+        } else if(strcasecmp(key, "directory") == 0) {
-            } else if(strcasecmp(key, "dstitle") == 0) {
+            color_config[COLOR_DIRECTORY] = color;
-                color_config[COLOR_DS_TITLE] = color;
+        } else if(strcasecmp(key, "enabled") == 0) {
-            } else if(strcasecmp(key, "file") == 0) {
+            color_config[COLOR_ENABLED] = color;
-                color_config[COLOR_FILE] = color;
+        } else if(strcasecmp(key, "disabled") == 0) {
-            } else if(strcasecmp(key, "directory") == 0) {
+            color_config[COLOR_DISABLED] = color;
-                color_config[COLOR_DIRECTORY] = color;
+        } else if(strcasecmp(key, "titledbinstalled") == 0) {
-            } else if(strcasecmp(key, "enabled") == 0) {
+            color_config[COLOR_TITLEDB_INSTALLED] = color;
-                color_config[COLOR_ENABLED] = color;
+        } else if(strcasecmp(key, "titledbnotinstalled") == 0) {
-            } else if(strcasecmp(key, "disabled") == 0) {
+            color_config[COLOR_TITLEDB_NOT_INSTALLED] = color;
-                color_config[COLOR_DISABLED] = color;
+        } else if(strcasecmp(key, "ticketinuse") == 0) {
-            } else if(strcasecmp(key, "titledboutdated") == 0) {
+            color_config[COLOR_TICKET_IN_USE] = color;
-                color_config[COLOR_TITLEDB_OUTDATED] = color;
+        } else if(strcasecmp(key, "ticketnotinuse") == 0) {
-            } else if(strcasecmp(key, "titledbinstalled") == 0) {
+            color_config[COLOR_TICKET_NOT_IN_USE] = color;
-                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) {
-                color_config[COLOR_TICKET_NOT_IN_USE] = color;
-            }
         }
     }
 

source/core/screen.h

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

source/ui/section/action/action.h

@@ -56,5 +56,4 @@ void action_delete_secure_value(linked_list* items, list_item* selected);
 void action_install_url(const char* confirmMessage, const char* urls, const char* path3dsx, void* userData, void (*finished)(void* data),
                                                                                                             void (*drawTop)(ui_view* view, void* data, float x1, float y1, float x2, float y2, u32 index));
 
-void action_install_titledb(linked_list* items, list_item* selected);
+void action_install_titledb(linked_list* items, list_item* selected);
-void action_update_titledb(linked_list* items, list_item* selected);

source/ui/section/action/updatetitledb.c

@@ -1,65 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <3ds.h>
-
-#include "action.h"
-#include "../task/task.h"
-#include "../../error.h"
-#include "../../list.h"
-#include "../../ui.h"
-#include "../../../core/linkedlist.h"
-
-static void action_update_titledb_draw_top(ui_view* view, void* data, float x1, float y1, float x2, float y2, u32 index) {
-    linked_list* updates = (linked_list*) data;
-
-    if(index < linked_list_size(updates)) {
-        ui_draw_titledb_info(view, ((list_item*) linked_list_get(updates, index))->data, x1, y1, x2, y2);
-    }
-}
-
-static void action_update_titledb_finished(void* data) {
-    linked_list* updates = (linked_list*) data;
-
-    linked_list_iter iter;
-    linked_list_iterate(updates, &iter);
-
-    while(linked_list_iter_has_next(&iter)) {
-        task_populate_titledb_update_status((list_item*) linked_list_iter_next(&iter));
-    }
-
-    linked_list_destroy(updates);
-    free(updates);
-}
-
-void action_update_titledb(linked_list* items, list_item* selected) {
-    char* urls = (char*) calloc(1, INSTALL_URL_MAX * INSTALL_URLS_MAX);
-    if(urls != NULL) {
-        linked_list* updates = (linked_list*) calloc(1, sizeof(linked_list));
-        if(updates != NULL) {
-            linked_list_init(updates);
-
-            linked_list_iter iter;
-            linked_list_iterate(items, &iter);
-
-            size_t pos = 0;
-            while(linked_list_iter_has_next(&iter) && pos < INSTALL_URL_MAX * INSTALL_URLS_MAX) {
-                list_item* item = (list_item*) linked_list_iter_next(&iter);
-                titledb_info* info = (titledb_info*) item->data;
-
-                if(info->installed && info->installedVersion < info->latestVersion) {
-                    linked_list_add(updates, item);
-                    pos += snprintf(urls + pos, (INSTALL_URL_MAX * INSTALL_URLS_MAX) - pos, "https://3ds.titledb.com/v1/%s/%lu/download\n", info->type == TITLEDB_TYPE_CIA ? "cia" : "tdsx", info->id);
-                }
-            }
-
-            action_install_url("Update installed titles from TitleDB?", urls, NULL, updates, action_update_titledb_finished, action_update_titledb_draw_top);
-
-            free(urls);
-        } else {
-            error_display_res(NULL, NULL, R_FBI_OUT_OF_MEMORY, "Failed to allocate update list.");
-        }
-    } else {
-        error_display_res(NULL, NULL, R_FBI_OUT_OF_MEMORY, "Failed to allocate URL text buffer.");
-    }
-}

source/ui/section/task/listtitledb.c

@@ -22,11 +22,7 @@ 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) {
+        item->color = COLOR_TITLEDB_INSTALLED;
-            item->color = COLOR_TITLEDB_OUTDATED;
-        } else {
-            item->color = COLOR_TITLEDB_INSTALLED;
-        }
     } else {
         item->color = COLOR_TITLEDB_NOT_INSTALLED;
     }
@@ -97,13 +93,6 @@ static void task_populate_titledb_thread(void* arg) {
                                                 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);
-                                            /*} 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));*/
                                             } 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) {

source/ui/section/task/task.h

@@ -81,7 +81,6 @@ typedef struct titledb_info_s {
     u32 id;
     u64 titleId;
     u16 installedVersion;
-    u16 latestVersion;
     u64 size;
     char updatedAt[32];
     bool installed;

source/ui/section/titledb.c

@@ -19,9 +19,6 @@ static list_item section_3dsx = {"3DSX", COLOR_TEXT, &section_3dsx_type};
 
 static list_item action_install = {"Install", COLOR_TEXT, action_install_titledb};
 
-// TODO: Updating disabled pending TitleDB pull request.
-//static list_item update_all = {"Update All", COLOR_TEXT, action_update_titledb};
-
 typedef struct {
     populate_titledb_data populateData;
 
@@ -64,9 +61,6 @@ static void titledb_action_update(ui_view* view, void* data, linked_list* items,
 
     if(linked_list_size(items) == 0) {
         linked_list_add(items, &action_install);
-
-        // TODO: Updating disabled pending TitleDB pull request.
-        //linked_list_add(items, &update_all);
     }
 }
 

source/ui/ui.c

@@ -618,16 +618,13 @@ 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"
              "Size: %.2f %s\n"
              "Updated At: %s %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,
              util_get_display_size(info->size), util_get_display_size_units(info->size),
              updatedDate, updatedTime);