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

More reorganization work.

Browse Source
This commit is contained in:
Steven Smith 2018-02-06 17:49:25 -08:00
parent 52a2dbbf0f
commit 9fc47a1941
80 changed files with 2115 additions and 2333 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/core/core.h Normal file
View File

@ -0,0 +1,14 @@
#pragma once
#include "data/data.h"
#include "task/task.h"
#include "ui/ui.h"
#include "clipboard.h"
#include "error.h"
#include "fs.h"
#include "http.h"
#include "linkedlist.h"
#include "screen.h"
#include "spi.h"
#include "stringutil.h"

7
source/core/data/data.h Normal file
View File

@ -0,0 +1,7 @@
#pragma once
#include "bnr.h"
#include "cia.h"
#include "smdh.h"
#include "ticket.h"
#include "tmd.h"

2
source/core/screen.h
View File

@ -11,6 +11,8 @@ typedef struct __sFILE FILE;
#define MAX_TEXTURES 1024
#define MAX_COLORS 32
#define COLOR_TEXT 0
void screen_init();
void screen_exit();
void screen_set_base_alpha(u8 alpha);

11
source/ui/section/task/dataop.c → source/core/task/dataop.c
View File

@ -5,15 +5,8 @@
#include <curl/curl.h>
#include <jansson.h>
#include "uitask.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/error.h"
#include "../../../core/fs.h"
#include "../../../core/http.h"
#include "../../../core/screen.h"
#include "../../../core/task/task.h"
#include "dataop.h"
#include "../core.h"
static Result task_data_op_check_running(data_op_data* data, u32 index, u32* srcHandle, u32* dstHandle) {
Result res = 0;

77
source/core/task/dataop.h Normal file
View File

@ -0,0 +1,77 @@
#pragma once
typedef struct json_t json_t;
typedef struct ui_view_s ui_view;
#define DOWNLOAD_URL_MAX 1024
typedef enum data_op_e {
DATAOP_COPY,
DATAOP_DOWNLOAD,
DATAOP_DELETE
} data_op;
typedef struct data_op_data_s {
void* data;
data_op op;
u32 processed;
u32 total;
// Copy
bool copyEmpty;
Result (*isSrcDirectory)(void* data, u32 index, bool* isDirectory);
Result (*makeDstDirectory)(void* data, u32 index);
Result (*openSrc)(void* data, u32 index, u32* handle);
Result (*closeSrc)(void* data, u32 index, bool succeeded, u32 handle);
Result (*getSrcSize)(void* data, u32 handle, u64* size);
Result (*readSrc)(void* data, u32 handle, u32* bytesRead, void* buffer, u64 offset, u32 size);
// Download
char (*downloadUrls)[DOWNLOAD_URL_MAX];
// Copy/Download
u64 currProcessed;
u64 currTotal;
u32 bytesPerSecond;
u32 estimatedRemainingSeconds;
u32 bufferSize;
Result (*openDst)(void* data, u32 index, void* initialReadBlock, u64 size, u32* handle);
Result (*closeDst)(void* data, u32 index, bool succeeded, u32 handle);
Result (*writeDst)(void* data, u32 handle, u32* bytesWritten, void* buffer, u64 offset, u32 size);
Result (*suspendTransfer)(void* data, u32 index, u32* srcHandle, u32* dstHandle);
Result (*restoreTransfer)(void* data, u32 index, u32* srcHandle, u32* dstHandle);
// Delete
Result (*delete)(void* data, u32 index);
// Suspend
Result (*suspend)(void* data, u32 index);
Result (*restore)(void* data, u32 index);
// Errors
bool (*error)(void* data, u32 index, Result res, ui_view** errorView);
// General
volatile bool finished;
Result result;
Handle cancelEvent;
// Internal
volatile bool retryResponse;
} data_op_data;
Result task_download_sync(const char* url, u32* downloadedSize, void* buf, size_t size);
Result task_download_json_sync(const char* url, json_t** json, size_t maxSize);
Result task_download_seed_sync(u64 titleId);
Result task_data_op(data_op_data* data);

3
source/core/task/task.h
View File

@ -5,3 +5,6 @@ void task_exit();
bool task_is_quit_all();
Handle task_get_pause_event();
Handle task_get_suspend_event();
#include "capturecam.h"
#include "dataop.h"

6
source/ui/error.c → source/core/ui/error.c
View File

@ -8,9 +8,9 @@
#include "error.h"
#include "prompt.h"
#include "resources.h"
#include "../core/error.h"
#include "../core/screen.h"
#include "../error.h"
#include "../screen.h"
#include "../../fbi/resources.h"
static const char* level_to_string(Result res) {
switch(R_LEVEL(res)) {

0
source/ui/error.h → source/core/ui/error.h
View File

4
source/ui/info.c → source/core/ui/info.c
View File

@ -5,9 +5,9 @@
#include "error.h"
#include "info.h"
#include "resources.h"
#include "ui.h"
#include "../core/screen.h"
#include "../screen.h"
#include "../../fbi/resources.h"
typedef struct {
bool bar;

0
source/ui/info.h → source/core/ui/info.h
View File

0
source/ui/kbd.c → source/core/ui/kbd.c
View File

0
source/ui/kbd.h → source/core/ui/kbd.h
View File

6
source/ui/list.c → source/core/ui/list.c
View File

@ -4,10 +4,10 @@
#include "error.h"
#include "list.h"
#include "resources.h"
#include "ui.h"
#include "../core/screen.h"
#include "../core/linkedlist.h"
#include "../screen.h"
#include "../linkedlist.h"
#include "../../fbi/resources.h"
typedef struct {
void* data;

0
source/ui/list.h → source/core/ui/list.h
View File

4
source/ui/prompt.c → source/core/ui/prompt.c
View File

@ -6,9 +6,9 @@
#include "error.h"
#include "prompt.h"
#include "resources.h"
#include "ui.h"
#include "../core/screen.h"
#include "../screen.h"
#include "../../fbi/resources.h"
typedef struct {
const char* text;

0
source/ui/prompt.h → source/core/ui/prompt.h
View File

347
source/ui/ui.c → source/core/ui/ui.c
View File

@ -5,12 +5,11 @@
#include <3ds.h>
#include <malloc.h>
#include "resources.h"
#include "ui.h"
#include "section/task/uitask.h"
#include "../core/error.h"
#include "../core/screen.h"
#include "../core/data/smdh.h"
#include "../error.h"
#include "../screen.h"
#include "../data/smdh.h"
#include "../../fbi/resources.h"
#define MAX_UI_VIEWS 16
@ -30,8 +29,6 @@ void ui_init() {
svcCreateMutex(&ui_stack_mutex, false);
}
resources_load();
ui_fade_begin_time = osGetTime();
}
@ -407,339 +404,3 @@ const char* ui_get_display_size_units(u64 size) {
return "B";
}
void ui_draw_meta_info(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
meta_info* info = (meta_info*) data;
u32 metaInfoBoxShadowWidth;
u32 metaInfoBoxShadowHeight;
screen_get_texture_size(&metaInfoBoxShadowWidth, &metaInfoBoxShadowHeight, TEXTURE_META_INFO_BOX_SHADOW);
float metaInfoBoxShadowX = x1 + (x2 - x1 - metaInfoBoxShadowWidth) / 2;
float metaInfoBoxShadowY = y1 + (y2 - y1) / 4 - metaInfoBoxShadowHeight / 2;
screen_draw_texture(TEXTURE_META_INFO_BOX_SHADOW, metaInfoBoxShadowX, metaInfoBoxShadowY, metaInfoBoxShadowWidth, metaInfoBoxShadowHeight);
u32 metaInfoBoxWidth;
u32 metaInfoBoxHeight;
screen_get_texture_size(&metaInfoBoxWidth, &metaInfoBoxHeight, TEXTURE_META_INFO_BOX);
float metaInfoBoxX = x1 + (x2 - x1 - metaInfoBoxWidth) / 2;
float metaInfoBoxY = y1 + (y2 - y1) / 4 - metaInfoBoxHeight / 2;
screen_draw_texture(TEXTURE_META_INFO_BOX, metaInfoBoxX, metaInfoBoxY, metaInfoBoxWidth, metaInfoBoxHeight);
if(info->texture != 0) {
u32 iconWidth;
u32 iconHeight;
screen_get_texture_size(&iconWidth, &iconHeight, info->texture);
float iconX = metaInfoBoxX + (64 - iconWidth) / 2;
float iconY = metaInfoBoxY + (metaInfoBoxHeight - iconHeight) / 2;
screen_draw_texture(info->texture, iconX, iconY, iconWidth, iconHeight);
}
float metaTextX = metaInfoBoxX + 64;
float shortDescriptionHeight;
screen_get_string_size_wrap(NULL, &shortDescriptionHeight, info->shortDescription, 0.5f, 0.5f, metaInfoBoxX + metaInfoBoxWidth - 8 - metaTextX);
float longDescriptionHeight;
screen_get_string_size_wrap(NULL, &longDescriptionHeight, info->longDescription, 0.5f, 0.5f, metaInfoBoxX + metaInfoBoxWidth - 8 - metaTextX);
float publisherHeight;
screen_get_string_size_wrap(NULL, &publisherHeight, info->publisher, 0.5f, 0.5f, metaInfoBoxX + metaInfoBoxWidth - 8 - metaTextX);
float shortDescriptionY = metaInfoBoxY + (64 - shortDescriptionHeight - 2 - longDescriptionHeight - 2 - publisherHeight) / 2;
screen_draw_string_wrap(info->shortDescription, metaTextX, shortDescriptionY, 0.5f, 0.5f, COLOR_TEXT, false, metaInfoBoxX + metaInfoBoxWidth - 8);
float longDescriptionY = shortDescriptionY + shortDescriptionHeight + 2;
screen_draw_string_wrap(info->longDescription, metaTextX, longDescriptionY, 0.5f, 0.5f, COLOR_TEXT, false, metaInfoBoxX + metaInfoBoxWidth - 8);
float publisherY = longDescriptionY + longDescriptionHeight + 2;
screen_draw_string_wrap(info->publisher, metaTextX, publisherY, 0.5f, 0.5f, COLOR_TEXT, false, metaInfoBoxX + metaInfoBoxWidth - 8);
}
void ui_draw_ext_save_data_info(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
ext_save_data_info* info = (ext_save_data_info*) data;
if(info->hasMeta) {
ui_draw_meta_info(view, &info->meta, x1, y1, x2, y2);
}
char infoText[512];
snprintf(infoText, sizeof(infoText),
"Ext Save Data ID: %016llX\n"
"Shared: %s",
info->extSaveDataId,
info->shared ? "Yes" : "No");
float infoWidth;
screen_get_string_size(&infoWidth, NULL, infoText, 0.5f, 0.5f);
float infoX = x1 + (x2 - x1 - infoWidth) / 2;
float infoY = y1 + (y2 - y1) / 2 - 8;
screen_draw_string(infoText, infoX, infoY, 0.5f, 0.5f, COLOR_TEXT, true);
}
void ui_draw_file_info(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
file_info* info = (file_info*) data;
char infoText[512];
size_t infoTextPos = 0;
if(strlen(info->name) > 48) {
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "Name: %.45s...\n", info->name);
} else {
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "Name: %.48s\n", info->name);
}
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "Attributes: ");
if(info->attributes & (FS_ATTRIBUTE_DIRECTORY | FS_ATTRIBUTE_HIDDEN | FS_ATTRIBUTE_ARCHIVE | FS_ATTRIBUTE_READ_ONLY)) {
bool needsSeparator = false;
if(info->attributes & FS_ATTRIBUTE_DIRECTORY) {
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "Directory");
needsSeparator = true;
}
if(info->attributes & FS_ATTRIBUTE_HIDDEN) {
if(needsSeparator) {
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, ", ");
}
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "Hidden");
needsSeparator = true;
}
if(info->attributes & FS_ATTRIBUTE_ARCHIVE) {
if(needsSeparator) {
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, ", ");
}
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "Archive");
needsSeparator = true;
}
if(info->attributes & FS_ATTRIBUTE_READ_ONLY) {
if(needsSeparator) {
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, ", ");
}
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "Read Only");
needsSeparator = true;
}
} else {
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "None");
}
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "\n");
if(!(info->attributes & FS_ATTRIBUTE_DIRECTORY)) {
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "Size: %.2f %s\n",
ui_get_display_size(info->size), ui_get_display_size_units(info->size));
if(info->isCia) {
char regionString[64];
if(info->ciaInfo.hasMeta) {
ui_draw_meta_info(view, &info->ciaInfo.meta, x1, y1, x2, y2);
smdh_region_to_string(regionString, info->ciaInfo.meta.region, sizeof(regionString));
} else {
snprintf(regionString, sizeof(regionString), "Unknown");
}
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos,
"Title ID: %016llX\n"
"Version: %hu (%d.%d.%d)\n"
"Region: %s\n"
"Installed Size: %.2f %s",
info->ciaInfo.titleId,
info->ciaInfo.version, (info->ciaInfo.version >> 10) & 0x3F, (info->ciaInfo.version >> 4) & 0x3F, info->ciaInfo.version & 0xF,
regionString,
ui_get_display_size(info->ciaInfo.installedSize),
ui_get_display_size_units(info->ciaInfo.installedSize));
} else if(info->isTicket) {
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "Ticket ID: %016llX", info->ticketInfo.titleId);
}
}
float infoWidth;
screen_get_string_size(&infoWidth, NULL, infoText, 0.5f, 0.5f);
float infoX = x1 + (x2 - x1 - infoWidth) / 2;
float infoY = y1 + (y2 - y1) / 2 - 8;
screen_draw_string(infoText, infoX, infoY, 0.5f, 0.5f, COLOR_TEXT, true);
}
void ui_draw_pending_title_info(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
pending_title_info* info = (pending_title_info*) data;
char infoText[512];
snprintf(infoText, sizeof(infoText),
"Pending Title ID: %016llX\n"
"Media Type: %s\n"
"Version: %hu (%d.%d.%d)",
info->titleId,
info->mediaType == MEDIATYPE_NAND ? "NAND" : info->mediaType == MEDIATYPE_SD ? "SD" : "Game Card",
info->version, (info->version >> 10) & 0x3F, (info->version >> 4) & 0x3F, info->version & 0xF);
float infoWidth;
screen_get_string_size(&infoWidth, NULL, infoText, 0.5f, 0.5f);
float infoX = x1 + (x2 - x1 - infoWidth) / 2;
float infoY = y1 + (y2 - y1) / 2 - 8;
screen_draw_string(infoText, infoX, infoY, 0.5f, 0.5f, COLOR_TEXT, true);
}
void ui_draw_system_save_data_info(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
system_save_data_info* info = (system_save_data_info*) data;
char infoText[512];
snprintf(infoText, sizeof(infoText), "System Save Data ID: %08lX", info->systemSaveDataId);
float infoWidth;
screen_get_string_size(&infoWidth, NULL, infoText, 0.5f, 0.5f);
float infoX = x1 + (x2 - x1 - infoWidth) / 2;
float infoY = y1 + (y2 - y1) / 2 - 8;
screen_draw_string(infoText, infoX, infoY, 0.5f, 0.5f, COLOR_TEXT, true);
}
void ui_draw_ticket_info(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
ticket_info* info = (ticket_info*) data;
char infoText[512];
snprintf(infoText, sizeof(infoText), "Title ID: %016llX", info->titleId);
float infoWidth;
screen_get_string_size(&infoWidth, NULL, infoText, 0.5f, 0.5f);
float infoX = x1 + (x2 - x1 - infoWidth) / 2;
float infoY = y1 + (y2 - y1) / 2 - 8;
screen_draw_string(infoText, infoX, infoY, 0.5f, 0.5f, COLOR_TEXT, true);
}
void ui_draw_title_info(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
title_info* info = (title_info*) data;
char regionString[64];
if(info->hasMeta) {
ui_draw_meta_info(view, &info->meta, x1, y1, x2, y2);
smdh_region_to_string(regionString, info->meta.region, sizeof(regionString));
} else {
snprintf(regionString, sizeof(regionString), "Unknown");
}
char infoText[512];
snprintf(infoText, sizeof(infoText),
"Title ID: %016llX\n"
"Media Type: %s\n"
"Version: %hu (%d.%d.%d)\n"
"Product Code: %s\n"
"Region: %s\n"
"Size: %.2f %s",
info->titleId,
info->mediaType == MEDIATYPE_NAND ? "NAND" : info->mediaType == MEDIATYPE_SD ? "SD" : "Game Card",
info->version, (info->version >> 10) & 0x3F, (info->version >> 4) & 0x3F, info->version & 0xF,
info->productCode,
regionString,
ui_get_display_size(info->installedSize), ui_get_display_size_units(info->installedSize));
float infoWidth;
screen_get_string_size(&infoWidth, NULL, infoText, 0.5f, 0.5f);
float infoX = x1 + (x2 - x1 - infoWidth) / 2;
float infoY = y1 + (y2 - y1) / 2 - 8;
screen_draw_string(infoText, infoX, infoY, 0.5f, 0.5f, COLOR_TEXT, true);
}
void ui_draw_titledb_info(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
titledb_info* info = (titledb_info*) data;
ui_draw_meta_info(view, &info->meta, x1, y1, x2, y2);
char infoText[1024];
snprintf(infoText, sizeof(infoText),
"%s\n"
"\n"
"Category: %s\n",
info->headline,
info->category);
float infoWidth;
screen_get_string_size_wrap(&infoWidth, NULL, infoText, 0.5f, 0.5f, x2 - x1 - 10);
// TODO: Wrap by word, not character?
float infoX = x1 + (x2 - x1 - infoWidth) / 2;
float infoY = y1 + (y2 - y1) / 2 - 8;
screen_draw_string_wrap(infoText, infoX, infoY, 0.5f, 0.5f, COLOR_TEXT, true, infoX + infoWidth + 1);
}
void ui_draw_titledb_info_cia(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
titledb_info* info = (titledb_info*) data;
ui_draw_meta_info(view, &info->meta, x1, y1, x2, y2);
char updatedDate[32] = "";
char updatedTime[32] = "";
sscanf(info->cia.updatedAt, "%31[^T]T%31[^Z]Z", updatedDate, updatedTime);
char infoText[512];
snprintf(infoText, sizeof(infoText),
"Title ID: %016llX\n"
"TitleDB Version: %s\n"
"Installed Version: %hu (%d.%d.%d)\n"
"Size: %.2f %s\n"
"Updated At: %s %s",
info->cia.titleId,
info->cia.version,
info->cia.installedVersion, (info->cia.installedVersion >> 10) & 0x3F, (info->cia.installedVersion >> 4) & 0x3F, info->cia.installedVersion & 0xF,
ui_get_display_size(info->cia.size), ui_get_display_size_units(info->cia.size),
updatedDate, updatedTime);
float infoWidth;
screen_get_string_size(&infoWidth, NULL, infoText, 0.5f, 0.5f);
float infoX = x1 + (x2 - x1 - infoWidth) / 2;
float infoY = y1 + (y2 - y1) / 2 - 8;
screen_draw_string(infoText, infoX, infoY, 0.5f, 0.5f, COLOR_TEXT, true);
}
void ui_draw_titledb_info_tdsx(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
titledb_info* info = (titledb_info*) data;
ui_draw_meta_info(view, &info->meta, x1, y1, x2, y2);
char updatedDate[32] = "";
char updatedTime[32] = "";
sscanf(info->tdsx.updatedAt, "%31[^T]T%31[^Z]Z", updatedDate, updatedTime);
char infoText[512];
snprintf(infoText, sizeof(infoText),
"TitleDB Version: %s\n"
"Size: %.2f %s\n"
"Updated At: %s %s",
info->tdsx.version,
ui_get_display_size(info->tdsx.size), ui_get_display_size_units(info->tdsx.size),
updatedDate, updatedTime);
float infoWidth;
screen_get_string_size(&infoWidth, NULL, infoText, 0.5f, 0.5f);
float infoX = x1 + (x2 - x1 - infoWidth) / 2;
float infoY = y1 + (y2 - y1) / 2 - 8;
screen_draw_string(infoText, infoX, infoY, 0.5f, 0.5f, COLOR_TEXT, true);
}

33
source/core/ui/ui.h Normal file
View File

@ -0,0 +1,33 @@
#pragma once
typedef struct ui_view_s {
const char* name;
const char* info;
void* data;
void (*update)(struct ui_view_s* view, void* data, float bx1, float by1, float bx2, float by2);
void (*drawTop)(struct ui_view_s* view, void* data, float x1, float y1, float x2, float y2);
void (*drawBottom)(struct ui_view_s* view, void* data, float x1, float y1, float x2, float y2);
Handle active;
} ui_view;
void ui_init();
void ui_exit();
ui_view* ui_create();
void ui_destroy(ui_view* view);
ui_view* ui_top();
bool ui_push(ui_view* view);
void ui_pop();
bool ui_update();
const char* ui_get_display_eta(u32 seconds);
double ui_get_display_size(u64 size);
const char* ui_get_display_size_units(u64 size);
#include "error.h"
#include "info.h"
#include "kbd.h"
#include "list.h"
#include "prompt.h"

0
source/ui/section/action/action.h → source/fbi/action/action.h
View File

3
source/ui/section/action/browsebossextsavedata.c → source/fbi/action/browsebossextsavedata.c
View File

@ -3,8 +3,7 @@
#include "action.h"
#include "../section.h"
#include "../task/uitask.h"
#include "../../list.h"
#include "../../../core/fs.h"
#include "../../core/core.h"
void action_browse_boss_ext_save_data(linked_list* items, list_item* selected) {
ext_save_data_info* info = (ext_save_data_info*) selected->data;

3
source/ui/section/action/browsesystemsavedata.c → source/fbi/action/browsesystemsavedata.c
View File

@ -3,8 +3,7 @@
#include "action.h"
#include "../section.h"
#include "../task/uitask.h"
#include "../../list.h"
#include "../../../core/fs.h"
#include "../../core/core.h"
void action_browse_system_save_data(linked_list* items, list_item* selected) {
system_save_data_info* info = (system_save_data_info*) selected->data;

3
source/ui/section/action/browsetitlesavedata.c → source/fbi/action/browsetitlesavedata.c
View File

@ -3,8 +3,7 @@
#include "action.h"
#include "../section.h"
#include "../task/uitask.h"
#include "../../list.h"
#include "../../../core/fs.h"
#include "../../core/core.h"
void action_browse_title_save_data(linked_list* items, list_item* selected) {
title_info* info = (title_info*) selected->data;

3
source/ui/section/action/browseuserextsavedata.c → source/fbi/action/browseuserextsavedata.c
View File

@ -3,8 +3,7 @@
#include "action.h"
#include "../section.h"
#include "../task/uitask.h"
#include "../../list.h"
#include "../../../core/fs.h"
#include "../../core/core.h"
void action_browse_user_ext_save_data(linked_list* items, list_item* selected) {
ext_save_data_info* info = (ext_save_data_info*) selected->data;

16
source/ui/section/action/deletecontents.c → source/fbi/action/deletecontents.c
View File

@ -5,17 +5,9 @@
#include <3ds.h>
#include "action.h"
#include "../resources.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../info.h"
#include "../../list.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/error.h"
#include "../../../core/fs.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../core/core.h"
typedef struct {
linked_list* items;
@ -33,9 +25,9 @@ static void action_delete_draw_top(ui_view* view, void* data, float x1, float y1
u32 curr = deleteData->deleteInfo.processed;
if(curr < deleteData->deleteInfo.total) {
ui_draw_file_info(view, ((list_item*) linked_list_get(&deleteData->contents, linked_list_size(&deleteData->contents) - curr - 1))->data, x1, y1, x2, y2);
task_draw_file_info(view, ((list_item*) linked_list_get(&deleteData->contents, linked_list_size(&deleteData->contents) - curr - 1))->data, x1, y1, x2, y2);
} else {
ui_draw_file_info(view, deleteData->target, x1, y1, x2, y2);
task_draw_file_info(view, deleteData->target, x1, y1, x2, y2);
}
}

14
source/ui/section/action/deleteextsavedata.c → source/fbi/action/deleteextsavedata.c
View File

@ -3,15 +3,9 @@
#include <3ds.h>
#include "action.h"
#include "../resources.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../info.h"
#include "../../list.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../core/core.h"
typedef struct {
linked_list* items;
@ -19,7 +13,7 @@ typedef struct {
} delete_ext_save_data_data;
static void action_delete_ext_save_data_draw_top(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
ui_draw_ext_save_data_info(view, ((delete_ext_save_data_data*) data)->selected->data, x1, y1, x2, y2);
task_draw_ext_save_data_info(view, ((delete_ext_save_data_data*) data)->selected->data, x1, y1, x2, y2);
}
static void action_delete_ext_save_data_update(ui_view* view, void* data, float* progress, char* text) {
@ -33,7 +27,7 @@ static void action_delete_ext_save_data_update(ui_view* view, void* data, float*
info_destroy(view);
if(R_FAILED(res)) {
error_display_res(info, ui_draw_ext_save_data_info, res, "Failed to delete ext save data.");
error_display_res(info, task_draw_ext_save_data_info, res, "Failed to delete ext save data.");
} else {
linked_list_remove(deleteData->items, deleteData->selected);
task_free_ext_save_data(deleteData->selected);

12
source/ui/section/action/deletependingtitles.c → source/fbi/action/deletependingtitles.c
View File

@ -5,15 +5,9 @@
#include <3ds.h>
#include "action.h"
#include "../resources.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../info.h"
#include "../../list.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../core/core.h"
typedef struct {
linked_list* items;
@ -30,7 +24,7 @@ static void action_delete_pending_titles_draw_top(ui_view* view, void* data, flo
u32 index = deleteData->deleteInfo.processed;
if(index < deleteData->deleteInfo.total) {
ui_draw_pending_title_info(view, (pending_title_info*) ((list_item*) linked_list_get(&deleteData->contents, index))->data, x1, y1, x2, y2);
task_draw_pending_title_info(view, (pending_title_info*) ((list_item*) linked_list_get(&deleteData->contents, index))->data, x1, y1, x2, y2);
}
}

18
source/ui/section/action/deletesecurevalue.c → source/fbi/action/deletesecurevalue.c
View File

@ -3,15 +3,9 @@
#include <3ds.h>
#include "action.h"
#include "../resources.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../info.h"
#include "../../list.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../core/core.h"
static void action_delete_secure_value_update(ui_view* view, void* data, float* progress, char* text) {
title_info* info = (title_info*) data;
@ -24,18 +18,18 @@ static void action_delete_secure_value_update(ui_view* view, void* data, float*
info_destroy(view);
if(R_FAILED(res)) {
error_display_res(info, ui_draw_title_info, res, "Failed to delete secure value.");
error_display_res(info, task_draw_title_info, res, "Failed to delete secure value.");
} else {
prompt_display_notify("Success", "Secure value deleted.", COLOR_TEXT, info, ui_draw_title_info, NULL);
prompt_display_notify("Success", "Secure value deleted.", COLOR_TEXT, info, task_draw_title_info, NULL);
}
}
static void action_delete_secure_value_onresponse(ui_view* view, void* data, u32 response) {
if(response == PROMPT_YES) {
info_display("Deleting Secure Value", "", false, data, action_delete_secure_value_update, ui_draw_title_info);
info_display("Deleting Secure Value", "", false, data, action_delete_secure_value_update, task_draw_title_info);
}
}
void action_delete_secure_value(linked_list* items, list_item* selected) {
prompt_display_yes_no("Confirmation", "Delete the secure value of the selected title?", COLOR_TEXT, selected->data, ui_draw_title_info, action_delete_secure_value_onresponse);
prompt_display_yes_no("Confirmation", "Delete the secure value of the selected title?", COLOR_TEXT, selected->data, task_draw_title_info, action_delete_secure_value_onresponse);
}

14
source/ui/section/action/deletesystemsavedata.c → source/fbi/action/deletesystemsavedata.c
View File

@ -3,15 +3,9 @@
#include <3ds.h>
#include "action.h"
#include "../resources.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../info.h"
#include "../../list.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../core/core.h"
typedef struct {
linked_list* items;
@ -19,7 +13,7 @@ typedef struct {
} delete_system_save_data_data;
static void action_delete_system_save_data_draw_top(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
ui_draw_system_save_data_info(view, ((delete_system_save_data_data*) data)->selected->data, x1, y1, x2, y2);
task_draw_system_save_data_info(view, ((delete_system_save_data_data*) data)->selected->data, x1, y1, x2, y2);
}
static void action_delete_system_save_data_update(ui_view* view, void* data, float* progress, char* text) {
@ -34,7 +28,7 @@ static void action_delete_system_save_data_update(ui_view* view, void* data, flo
info_destroy(view);
if(R_FAILED(res)) {
error_display_res(info, ui_draw_system_save_data_info, res, "Failed to delete system save data.");
error_display_res(info, task_draw_system_save_data_info, res, "Failed to delete system save data.");
} else {
linked_list_remove(deleteData->items, deleteData->selected);
task_free_system_save_data(deleteData->selected);

12
source/ui/section/action/deletetickets.c → source/fbi/action/deletetickets.c
View File

@ -4,15 +4,9 @@
#include <3ds.h>
#include "action.h"
#include "../resources.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../info.h"
#include "../../list.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../core/core.h"
typedef struct {
linked_list* items;
@ -28,7 +22,7 @@ static void action_delete_tickets_draw_top(ui_view* view, void* data, float x1,
u32 curr = deleteData->deleteInfo.processed;
if(curr < deleteData->deleteInfo.total) {
ui_draw_ticket_info(view, ((list_item*) linked_list_get(&deleteData->contents, curr))->data, x1, y1, x2, y2);
task_draw_ticket_info(view, ((list_item*) linked_list_get(&deleteData->contents, curr))->data, x1, y1, x2, y2);
}
}

14
source/ui/section/action/deletetitle.c → source/fbi/action/deletetitle.c
View File

@ -3,15 +3,9 @@
#include <3ds.h>
#include "action.h"
#include "../resources.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../info.h"
#include "../../list.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../core/core.h"
typedef struct {
linked_list* items;
@ -20,7 +14,7 @@ typedef struct {
} delete_title_data;
static void action_delete_title_draw_top(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
ui_draw_title_info(view, ((delete_title_data*) data)->selected->data, x1, y1, x2, y2);
task_draw_title_info(view, ((delete_title_data*) data)->selected->data, x1, y1, x2, y2);
}
static void action_delete_title_update(ui_view* view, void* data, float* progress, char* text) {
@ -38,7 +32,7 @@ static void action_delete_title_update(ui_view* view, void* data, float* progres
info_destroy(view);
if(R_FAILED(res)) {
error_display_res(info, ui_draw_title_info, res, "Failed to delete title.");
error_display_res(info, task_draw_title_info, res, "Failed to delete title.");
} else {
linked_list_remove(deleteData->items, deleteData->selected);
task_free_title(deleteData->selected);

20
source/ui/section/action/erasetwlsave.c → source/fbi/action/erasetwlsave.c
View File

@ -5,17 +5,9 @@
#include <3ds.h>
#include "action.h"
#include "../resources.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../info.h"
#include "../../list.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../../core/spi.h"
#include "../../../core/stringutil.h"
#include "../../core/core.h"
typedef struct {
title_info* title;
@ -24,7 +16,7 @@ typedef struct {
} erase_twl_save_data;
static void action_erase_twl_save_draw_top(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
ui_draw_title_info(view, ((erase_twl_save_data*) data)->title, x1, y1, x2, y2);
task_draw_title_info(view, ((erase_twl_save_data*) data)->title, x1, y1, x2, y2);
}
static Result action_erase_twl_save_is_src_directory(void* data, u32 index, bool* isDirectory) {
@ -91,7 +83,7 @@ static Result action_erase_twl_save_restore(void* data, u32 index) {
}
static bool action_erase_twl_save_error(void* data, u32 index, Result res, ui_view** errorView) {
*errorView = error_display_res(((erase_twl_save_data*) data)->title, ui_draw_title_info, res, "Failed to erase save.");
*errorView = error_display_res(((erase_twl_save_data*) data)->title, task_draw_title_info, res, "Failed to erase save.");
return true;
}
@ -103,7 +95,7 @@ static void action_erase_twl_save_update(ui_view* view, void* data, float* progr
info_destroy(view);
if(R_SUCCEEDED(eraseData->eraseInfo.result)) {
prompt_display_notify("Success", "Save erased.", COLOR_TEXT, eraseData->title, ui_draw_title_info, NULL);
prompt_display_notify("Success", "Save erased.", COLOR_TEXT, eraseData->title, task_draw_title_info, NULL);
}
free(data);
@ -134,7 +126,7 @@ static void action_erase_twl_save_onresponse(ui_view* view, void* data, u32 resp
if(R_SUCCEEDED(res)) {
info_display("Erasing Save", "Press B to cancel.", true, data, action_erase_twl_save_update, action_erase_twl_save_draw_top);
} else {
error_display_res(eraseData->title, ui_draw_title_info, res, "Failed to initiate save erase.");
error_display_res(eraseData->title, task_draw_title_info, res, "Failed to initiate save erase.");
free(data);
}
} else {

22
source/ui/section/action/exportsecurevalue.c → source/fbi/action/exportsecurevalue.c
View File

@ -3,17 +3,9 @@
#include <3ds.h>
#include "action.h"
#include "../resources.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../info.h"
#include "../../list.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/error.h"
#include "../../../core/fs.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../core/core.h"
static void action_export_secure_value_update(ui_view* view, void* data, float* progress, char* text) {
title_info* info = (title_info*) data;
@ -27,7 +19,7 @@ static void action_export_secure_value_update(ui_view* view, void* data, float*
ui_pop();
info_destroy(view);
prompt_display_notify("Failure", "Secure value not set.", COLOR_TEXT, info, ui_draw_title_info, NULL);
prompt_display_notify("Failure", "Secure value not set.", COLOR_TEXT, info, task_draw_title_info, NULL);
return;
}
@ -61,18 +53,18 @@ static void action_export_secure_value_update(ui_view* view, void* data, float*
info_destroy(view);
if(R_SUCCEEDED(res)) {
prompt_display_notify("Success", "Secure value exported.", COLOR_TEXT, info, ui_draw_title_info, NULL);
prompt_display_notify("Success", "Secure value exported.", COLOR_TEXT, info, task_draw_title_info, NULL);
} else {
error_display_res(info, ui_draw_title_info, res, "Failed to export secure value.");
error_display_res(info, task_draw_title_info, res, "Failed to export secure value.");
}
}
static void action_export_secure_value_onresponse(ui_view* view, void* data, u32 response) {
if(response == PROMPT_YES) {
info_display("Exporting Secure Value", "", false, data, action_export_secure_value_update, ui_draw_title_info);
info_display("Exporting Secure Value", "", false, data, action_export_secure_value_update, task_draw_title_info);
}
}
void action_export_secure_value(linked_list* items, list_item* selected) {
prompt_display_yes_no("Confirmation", "Export the secure value of the selected title?", COLOR_TEXT, selected->data, ui_draw_title_info, action_export_secure_value_onresponse);
prompt_display_yes_no("Confirmation", "Export the secure value of the selected title?", COLOR_TEXT, selected->data, task_draw_title_info, action_export_secure_value_onresponse);
}

22
source/ui/section/action/exporttwlsave.c → source/fbi/action/exporttwlsave.c
View File

@ -4,19 +4,9 @@
#include <3ds.h>
#include "action.h"
#include "../resources.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../info.h"
#include "../../list.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/error.h"
#include "../../../core/fs.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../../core/spi.h"
#include "../../../core/stringutil.h"
#include "../../core/core.h"
typedef struct {
title_info* title;
@ -25,7 +15,7 @@ typedef struct {
} export_twl_save_data;
static void action_export_twl_save_draw_top(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
ui_draw_title_info(view, ((export_twl_save_data*) data)->title, x1, y1, x2, y2);
task_draw_title_info(view, ((export_twl_save_data*) data)->title, x1, y1, x2, y2);
}
static Result action_export_twl_save_is_src_directory(void* data, u32 index, bool* isDirectory) {
@ -115,7 +105,7 @@ static Result action_export_twl_save_restore(void* data, u32 index) {
}
static bool action_export_twl_save_error(void* data, u32 index, Result res, ui_view** errorView) {
*errorView = error_display_res(((export_twl_save_data*) data)->title, ui_draw_title_info, res, "Failed to export save.");
*errorView = error_display_res(((export_twl_save_data*) data)->title, task_draw_title_info, res, "Failed to export save.");
return true;
}
@ -127,7 +117,7 @@ static void action_export_twl_save_update(ui_view* view, void* data, float* prog
info_destroy(view);
if(R_SUCCEEDED(exportData->exportInfo.result)) {
prompt_display_notify("Success", "Save exported.", COLOR_TEXT, exportData->title, ui_draw_title_info, NULL);
prompt_display_notify("Success", "Save exported.", COLOR_TEXT, exportData->title, task_draw_title_info, NULL);
}
free(data);
@ -158,7 +148,7 @@ static void action_export_twl_save_onresponse(ui_view* view, void* data, u32 res
if(R_SUCCEEDED(res)) {
info_display("Exporting Save", "Press B to cancel.", true, data, action_export_twl_save_update, action_export_twl_save_draw_top);
} else {
error_display_res(exportData->title, ui_draw_title_info, res, "Failed to initiate save export.");
error_display_res(exportData->title, task_draw_title_info, res, "Failed to initiate save export.");
free(data);
}
} else {

21
source/ui/section/action/extractsmdh.c → source/fbi/action/extractsmdh.c
View File

@ -4,18 +4,9 @@
#include <3ds.h>
#include "action.h"
#include "../resources.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../info.h"
#include "../../list.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/error.h"
#include "../../../core/fs.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../../core/data/smdh.h"
#include "../../core/core.h"
static void action_extract_smdh_update(ui_view* view, void* data, float* progress, char* text) {
title_info* info = (title_info*) data;
@ -70,18 +61,18 @@ static void action_extract_smdh_update(ui_view* view, void* data, float* progres
info_destroy(view);
if(R_SUCCEEDED(res)) {
prompt_display_notify("Success", "SMDH extracted.", COLOR_TEXT, info, ui_draw_title_info, NULL);
prompt_display_notify("Success", "SMDH extracted.", COLOR_TEXT, info, task_draw_title_info, NULL);
} else {
error_display_res(info, ui_draw_title_info, res, "Failed to extract SMDH.");
error_display_res(info, task_draw_title_info, res, "Failed to extract SMDH.");
}
}
static void action_extract_smdh_onresponse(ui_view* view, void* data, u32 response) {
if(response == PROMPT_YES) {
info_display("Extracting SMDH", "", false, data, action_extract_smdh_update, ui_draw_title_info);
info_display("Extracting SMDH", "", false, data, action_extract_smdh_update, task_draw_title_info);
}
}
void action_extract_smdh(linked_list* items, list_item* selected) {
prompt_display_yes_no("Confirmation", "Extract the SMDH of the selected title?", COLOR_TEXT, selected->data, ui_draw_title_info, action_extract_smdh_onresponse);
prompt_display_yes_no("Confirmation", "Extract the SMDH of the selected title?", COLOR_TEXT, selected->data, task_draw_title_info, action_extract_smdh_onresponse);
}

20
source/ui/section/action/importsecurevalue.c → source/fbi/action/importsecurevalue.c
View File

@ -3,17 +3,9 @@
#include <3ds.h>
#include "action.h"
#include "../resources.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../info.h"
#include "../../list.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/error.h"
#include "../../../core/fs.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../core/core.h"
static void action_import_secure_value_update(ui_view* view, void* data, float* progress, char* text) {
title_info* info = (title_info*) data;
@ -45,18 +37,18 @@ static void action_import_secure_value_update(ui_view* view, void* data, float*
info_destroy(view);
if(R_SUCCEEDED(res)) {
prompt_display_notify("Success", "Secure value imported.", COLOR_TEXT, info, ui_draw_title_info, NULL);
prompt_display_notify("Success", "Secure value imported.", COLOR_TEXT, info, task_draw_title_info, NULL);
} else {
error_display_res(info, ui_draw_title_info, res, "Failed to import secure value.");
error_display_res(info, task_draw_title_info, res, "Failed to import secure value.");
}
}
static void action_import_secure_value_onresponse(ui_view* view, void* data, u32 response) {
if(response == PROMPT_YES) {
info_display("Importing Secure Value", "", false, data, action_import_secure_value_update, ui_draw_title_info);
info_display("Importing Secure Value", "", false, data, action_import_secure_value_update, task_draw_title_info);
}
}
void action_import_secure_value(linked_list* items, list_item* selected) {
prompt_display_yes_no("Confirmation", "Import the secure value of the selected title?", COLOR_TEXT, selected->data, ui_draw_title_info, action_import_secure_value_onresponse);
prompt_display_yes_no("Confirmation", "Import the secure value of the selected title?", COLOR_TEXT, selected->data, task_draw_title_info, action_import_secure_value_onresponse);
}

18
source/ui/section/action/importseed.c → source/fbi/action/importseed.c
View File

@ -3,15 +3,9 @@
#include <3ds.h>
#include "action.h"
#include "../resources.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../info.h"
#include "../../list.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../core/core.h"
static void action_import_seed_update(ui_view* view, void* data, float* progress, char* text) {
title_info* info = (title_info*) data;
@ -22,18 +16,18 @@ static void action_import_seed_update(ui_view* view, void* data, float* progress
info_destroy(view);
if(R_SUCCEEDED(res)) {
prompt_display_notify("Success", "Seed imported.", COLOR_TEXT, info, ui_draw_title_info, NULL);
prompt_display_notify("Success", "Seed imported.", COLOR_TEXT, info, task_draw_title_info, NULL);
} else {
error_display_res(info, ui_draw_title_info, res, "Failed to import seed.");
error_display_res(info, task_draw_title_info, res, "Failed to import seed.");
}
}
static void action_import_seed_onresponse(ui_view* view, void* data, u32 response) {
if(response == PROMPT_YES) {
info_display("Importing Seed", "", false, data, action_import_seed_update, ui_draw_title_info);
info_display("Importing Seed", "", false, data, action_import_seed_update, task_draw_title_info);
}
}
void action_import_seed(linked_list* items, list_item* selected) {
prompt_display_yes_no("Confirmation", "Import the seed of the selected title?", COLOR_TEXT, selected->data, ui_draw_title_info, action_import_seed_onresponse);
prompt_display_yes_no("Confirmation", "Import the seed of the selected title?", COLOR_TEXT, selected->data, task_draw_title_info, action_import_seed_onresponse);
}

22
source/ui/section/action/importtwlsave.c → source/fbi/action/importtwlsave.c
View File

@ -4,19 +4,9 @@
#include <3ds.h>
#include "action.h"
#include "../resources.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../info.h"
#include "../../list.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/error.h"
#include "../../../core/fs.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../../core/spi.h"
#include "../../../core/stringutil.h"
#include "../../core/core.h"
typedef struct {
title_info* title;
@ -25,7 +15,7 @@ typedef struct {
} import_twl_save_data;
static void action_import_twl_save_draw_top(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
ui_draw_title_info(view, ((import_twl_save_data*) data)->title, x1, y1, x2, y2);
task_draw_title_info(view, ((import_twl_save_data*) data)->title, x1, y1, x2, y2);
}
static Result action_import_twl_save_is_src_directory(void* data, u32 index, bool* isDirectory) {
@ -101,7 +91,7 @@ static Result action_import_twl_save_restore(void* data, u32 index) {
}
static bool action_import_twl_save_error(void* data, u32 index, Result res, ui_view** errorView) {
*errorView = error_display_res(((import_twl_save_data*) data)->title, ui_draw_title_info, res, "Failed to import save.");
*errorView = error_display_res(((import_twl_save_data*) data)->title, task_draw_title_info, res, "Failed to import save.");
return true;
}
@ -113,7 +103,7 @@ static void action_import_twl_save_update(ui_view* view, void* data, float* prog
info_destroy(view);
if(R_SUCCEEDED(importData->importInfo.result)) {
prompt_display_notify("Success", "Save imported.", COLOR_TEXT, importData->title, ui_draw_title_info, NULL);
prompt_display_notify("Success", "Save imported.", COLOR_TEXT, importData->title, task_draw_title_info, NULL);
}
free(data);
@ -144,7 +134,7 @@ static void action_import_twl_save_onresponse(ui_view* view, void* data, u32 res
if(R_SUCCEEDED(res)) {
info_display("Importing Save", "Press B to cancel.", true, data, action_import_twl_save_update, action_import_twl_save_draw_top);
} else {
error_display_res(importData->title, ui_draw_title_info, res, "Failed to initiate save import.");
error_display_res(importData->title, task_draw_title_info, res, "Failed to initiate save import.");
free(data);
}
} else {

27
source/ui/section/action/installcdn.c → source/fbi/action/installcdn.c
View File

@ -5,20 +5,9 @@
#include <3ds.h>
#include "action.h"
#include "../resources.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../info.h"
#include "../../kbd.h"
#include "../../list.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/error.h"
#include "../../../core/fs.h"
#include "../../../core/http.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../../core/data/tmd.h"
#include "../../core/core.h"
#define CONTENTS_MAX 256
@ -178,13 +167,13 @@ static Result action_install_cdn_restore(void* data, u32 index) {
bool action_install_cdn_error(void* data, u32 index, Result res, ui_view** errorView) {
install_cdn_data* installData = (install_cdn_data*) data;
*errorView = error_display_res(installData->ticket, ui_draw_ticket_info, res, "Failed to install %s from CDN.", index == 0 ? "TMD" : "content");
*errorView = error_display_res(installData->ticket, task_draw_ticket_info, res, "Failed to install %s from CDN.", index == 0 ? "TMD" : "content");
return false;
}
static void action_install_cdn_draw_top(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
ui_draw_ticket_info(view, ((install_cdn_data*) data)->ticket, x1, y1, x2, y2);
task_draw_ticket_info(view, ((install_cdn_data*) data)->ticket, x1, y1, x2, y2);
}
static void action_install_cdn_free_data(install_cdn_data* data) {
@ -221,13 +210,13 @@ static void action_install_cdn_update(ui_view* view, void* data, float* progress
task_populate_tickets_update_use(installData->item);
}
prompt_display_notify("Success", "Install finished.", COLOR_TEXT, installData->ticket, ui_draw_ticket_info, NULL);
prompt_display_notify("Success", "Install finished.", COLOR_TEXT, installData->ticket, task_draw_ticket_info, NULL);
}
} else {
AM_InstallTitleAbort();
if(R_FAILED(res)) {
error_display_res(installData->ticket, ui_draw_ticket_info, res, "Failed to install CDN title.");
error_display_res(installData->ticket, task_draw_ticket_info, res, "Failed to install CDN title.");
}
}
@ -273,7 +262,7 @@ static void action_install_cdn_n3ds_onresponse(ui_view* view, void* data, u32 re
}
if(R_FAILED(res)) {
error_display_res(installData->ticket, ui_draw_ticket_info, res, "Failed to initiate CDN title installation.");
error_display_res(installData->ticket, task_draw_ticket_info, res, "Failed to initiate CDN title installation.");
action_install_cdn_free_data(data);
}
@ -375,5 +364,5 @@ static void action_install_cdn_onresponse(ui_view* view, void* data, u32 respons
void action_install_cdn(linked_list* items, list_item* selected) {
static const char* options[3] = {"Default\nVersion", "Select\nVersion", "No"};
static u32 optionButtons[3] = {KEY_A, KEY_X, KEY_B};
prompt_display_multi_choice("Confirmation", "Install the selected title from the CDN?", COLOR_TEXT, options, optionButtons, 3, selected, ui_draw_ticket_info, action_install_cdn_onresponse);
prompt_display_multi_choice("Confirmation", "Install the selected title from the CDN?", COLOR_TEXT, options, optionButtons, 3, selected, task_draw_ticket_info, action_install_cdn_onresponse);
}

16
source/ui/section/action/installcias.c → source/fbi/action/installcias.c
View File

@ -5,17 +5,9 @@
#include <3ds.h>
#include "action.h"
#include "../resources.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../info.h"
#include "../../list.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/error.h"
#include "../../../core/fs.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../core/core.h"
typedef struct {
linked_list* items;
@ -41,9 +33,9 @@ static void action_install_cias_draw_top(ui_view* view, void* data, float x1, fl
u32 curr = installData->installInfo.processed;
if(curr < installData->installInfo.total) {
ui_draw_file_info(view, ((list_item*) linked_list_get(&installData->contents, curr))->data, x1, y1, x2, y2);
task_draw_file_info(view, ((list_item*) linked_list_get(&installData->contents, curr))->data, x1, y1, x2, y2);
} else {
ui_draw_file_info(view, installData->target, x1, y1, x2, y2);
task_draw_file_info(view, installData->target, x1, y1, x2, y2);
}
}

16
source/ui/section/action/installtickets.c → source/fbi/action/installtickets.c
View File

@ -5,17 +5,9 @@
#include <3ds.h>
#include "action.h"
#include "../resources.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../info.h"
#include "../../list.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/error.h"
#include "../../../core/fs.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../core/core.h"
typedef struct {
linked_list* items;
@ -37,9 +29,9 @@ static void action_install_tickets_draw_top(ui_view* view, void* data, float x1,
u32 curr = installData->installInfo.processed;
if(curr < installData->installInfo.total) {
ui_draw_file_info(view, ((list_item*) linked_list_get(&installData->contents, curr))->data, x1, y1, x2, y2);
task_draw_file_info(view, ((list_item*) linked_list_get(&installData->contents, curr))->data, x1, y1, x2, y2);
} else {
ui_draw_file_info(view, installData->target, x1, y1, x2, y2);
task_draw_file_info(view, installData->target, x1, y1, x2, y2);
}
}

10
source/ui/section/action/installtitledb.c → source/fbi/action/installtitledb.c
View File

@ -5,11 +5,7 @@
#include "action.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../list.h"
#include "../../ui.h"
#include "../../../core/linkedlist.h"
#include "../../../core/stringutil.h"
#include "../../core/core.h"
typedef struct {
list_item* selected;
@ -20,9 +16,9 @@ static void action_install_titledb_draw_top(ui_view* view, void* data, float x1,
install_titledb_data* installData = (install_titledb_data*) data;
if(installData->cia) {
ui_draw_titledb_info_cia(view, installData->selected->data, x1, y1, x2, y2);
task_draw_titledb_info_cia(view, installData->selected->data, x1, y1, x2, y2);
} else {
ui_draw_titledb_info_tdsx(view, installData->selected->data, x1, y1, x2, y2);
task_draw_titledb_info_tdsx(view, installData->selected->data, x1, y1, x2, y2);
}
}

16
source/ui/section/action/installurl.c → source/fbi/action/installurl.c
View File

@ -4,20 +4,10 @@
#include <3ds.h>
#include "../action/action.h"
#include "action.h"
#include "../resources.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../info.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/error.h"
#include "../../../core/fs.h"
#include "../../../core/http.h"
#include "../../../core/screen.h"
#include "../../../core/stringutil.h"
#include "../../../core/data/cia.h"
#include "../../../core/data/ticket.h"
#include "../../core/core.h"
typedef enum content_type_e {
CONTENT_CIA,

15
source/ui/section/action/launchtitle.c → source/fbi/action/launchtitle.c
View File

@ -1,14 +1,9 @@
#include <3ds.h>
#include "action.h"
#include "../resources.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../info.h"
#include "../../list.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/screen.h"
#include "../../core/core.h"
static void action_launch_title_update(ui_view* view, void* data, float* progress, char* text) {
title_info* info = (title_info*) data;
@ -26,16 +21,16 @@ static void action_launch_title_update(ui_view* view, void* data, float* progres
ui_pop();
info_destroy(view);
error_display_res(info, ui_draw_title_info, res, "Failed to launch title.");
error_display_res(info, task_draw_title_info, res, "Failed to launch title.");
}
}
static void action_launch_title_onresponse(ui_view* view, void* data, u32 response) {
if(response == PROMPT_YES) {
info_display("Launching Title", "", false, data, action_launch_title_update, ui_draw_title_info);
info_display("Launching Title", "", false, data, action_launch_title_update, task_draw_title_info);
}
}
void action_launch_title(linked_list* items, list_item* selected) {
prompt_display_yes_no("Confirmation", "Launch the selected title?", COLOR_TEXT, selected->data, ui_draw_title_info, action_launch_title_onresponse);
prompt_display_yes_no("Confirmation", "Launch the selected title?", COLOR_TEXT, selected->data, task_draw_title_info, action_launch_title_onresponse);
}

14
source/ui/section/action/newfolder.c → source/fbi/action/newfolder.c
View File

@ -4,19 +4,9 @@
#include <3ds.h>
#include "action.h"
#include "../resources.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../info.h"
#include "../../kbd.h"
#include "../../list.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/error.h"
#include "../../../core/fs.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../../core/stringutil.h"
#include "../../core/core.h"
typedef struct {
linked_list* items;

18
source/ui/section/action/pastecontents.c → source/fbi/action/pastecontents.c
View File

@ -5,19 +5,9 @@
#include <3ds.h>
#include "action.h"
#include "../resources.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../info.h"
#include "../../list.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/error.h"
#include "../../../core/fs.h"
#include "../../../core/clipboard.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../../core/stringutil.h"
#include "../../core/core.h"
typedef struct {
linked_list* items;
@ -35,9 +25,9 @@ static void action_paste_contents_draw_top(ui_view* view, void* data, float x1,
u32 curr = pasteData->pasteInfo.processed;
if(curr < pasteData->pasteInfo.total) {
ui_draw_file_info(view, ((list_item*) linked_list_get(&pasteData->contents, curr))->data, x1, y1, x2, y2);
task_draw_file_info(view, ((list_item*) linked_list_get(&pasteData->contents, curr))->data, x1, y1, x2, y2);
} else {
ui_draw_file_info(view, pasteData->target, x1, y1, x2, y2);
task_draw_file_info(view, pasteData->target, x1, y1, x2, y2);
}
}

14
source/ui/section/action/rename.c → source/fbi/action/rename.c
View File

@ -5,19 +5,9 @@
#include <3ds.h>
#include "action.h"
#include "../resources.h"
#include "../task/uitask.h"
#include "../../error.h"
#include "../../info.h"
#include "../../kbd.h"
#include "../../list.h"
#include "../../prompt.h"
#include "../../resources.h"
#include "../../ui.h"
#include "../../../core/error.h"
#include "../../../core/fs.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../../core/stringutil.h"
#include "../../core/core.h"
typedef struct {
linked_list* items;

10
source/ui/section/dumpnand.c → source/fbi/dumpnand.c
View File

@ -5,16 +5,10 @@
#include <3ds.h>
#include "resources.h"
#include "section.h"
#include "task/uitask.h"
#include "../error.h"
#include "../info.h"
#include "../prompt.h"
#include "../resources.h"
#include "../ui.h"
#include "../../core/error.h"
#include "../../core/fs.h"
#include "../../core/screen.h"
#include "../core/core.h"
static Result dumpnand_is_src_directory(void* data, u32 index, bool* isDirectory) {
*isDirectory = false;

13
source/ui/section/extsavedata.c → source/fbi/extsavedata.c
View File

@ -4,16 +4,11 @@
#include <3ds.h>
#include "resources.h"
#include "section.h"
#include "action/action.h"
#include "task/uitask.h"
#include "../error.h"
#include "../list.h"
#include "../resources.h"
#include "../ui.h"
#include "../../core/linkedlist.h"
#include "../../core/screen.h"
#include "../../core/stringutil.h"
#include "../core/core.h"
static list_item browse_user_save_data = {"Browse User Save Data", COLOR_TEXT, action_browse_user_ext_save_data};
static list_item browse_spotpass_save_data = {"Browse SpotPass Save Data", COLOR_TEXT, action_browse_boss_ext_save_data};
@ -36,7 +31,7 @@ typedef struct {
} extsavedata_action_data;
static void extsavedata_action_draw_top(ui_view* view, void* data, float x1, float y1, float x2, float y2, list_item* selected) {
ui_draw_ext_save_data_info(view, ((extsavedata_action_data*) data)->selected->data, x1, y1, x2, y2);
task_draw_ext_save_data_info(view, ((extsavedata_action_data*) data)->selected->data, x1, y1, x2, y2);
}
static void extsavedata_action_update(ui_view* view, void* data, linked_list* items, list_item* selected, bool selectedTouched) {
@ -153,7 +148,7 @@ static void extsavedata_options_open(extsavedata_data* data) {
static void extsavedata_draw_top(ui_view* view, void* data, float x1, float y1, float x2, float y2, list_item* selected) {
if(selected != NULL && selected->data != NULL) {
ui_draw_ext_save_data_info(view, selected->data, x1, y1, x2, y2);
task_draw_ext_save_data_info(view, selected->data, x1, y1, x2, y2);
}
}

20
source/ui/section/files.c → source/fbi/files.c
View File

@ -4,19 +4,11 @@
#include <3ds.h>
#include "resources.h"
#include "section.h"
#include "action/action.h"
#include "task/uitask.h"
#include "../error.h"
#include "../list.h"
#include "../prompt.h"
#include "../resources.h"
#include "../ui.h"
#include "../../core/clipboard.h"
#include "../../core/fs.h"
#include "../../core/linkedlist.h"
#include "../../core/screen.h"
#include "../../core/stringutil.h"
#include "../core/core.h"
static list_item rename_opt = {"Rename", COLOR_TEXT, action_rename};
static list_item copy = {"Copy", COLOR_TEXT, NULL};
@ -71,7 +63,7 @@ typedef struct {
} files_action_data;
static void files_action_draw_top(ui_view* view, void* data, float x1, float y1, float x2, float y2, list_item* selected) {
ui_draw_file_info(view, ((files_action_data*) data)->selected->data, x1, y1, x2, y2);
task_draw_file_info(view, ((files_action_data*) data)->selected->data, x1, y1, x2, y2);
}
static void files_action_update(ui_view* view, void* data, linked_list* items, list_item* selected, bool selectedTouched) {
@ -97,9 +89,9 @@ static void files_action_update(ui_view* view, void* data, linked_list* items, l
Result res = 0;
if(R_SUCCEEDED(res = clipboard_set_contents(actionData->parent->archive, info->path, selected == &copy_all_contents))) {
prompt_display_notify("Success", selected == &copy_all_contents ? "Current directory contents copied to clipboard." : (info->attributes & FS_ATTRIBUTE_DIRECTORY) ? "Current directory copied to clipboard." : "File copied to clipboard.", COLOR_TEXT, info, ui_draw_file_info, NULL);
prompt_display_notify("Success", selected == &copy_all_contents ? "Current directory contents copied to clipboard." : (info->attributes & FS_ATTRIBUTE_DIRECTORY) ? "Current directory copied to clipboard." : "File copied to clipboard.", COLOR_TEXT, info, task_draw_file_info, NULL);
} else {
error_display_res(info, ui_draw_file_info, res, "Failed to copy to clipboard.");
error_display_res(info, task_draw_file_info, res, "Failed to copy to clipboard.");
}
} else {
action(actionData->items, actionData->selected);
@ -236,7 +228,7 @@ static void files_options_open(files_data* data) {
static void files_draw_top(ui_view* view, void* data, float x1, float y1, float x2, float y2, list_item* selected) {
if(selected != NULL && selected->data != NULL) {
ui_draw_file_info(view, selected->data, x1, y1, x2, y2);
task_draw_file_info(view, selected->data, x1, y1, x2, y2);
}
}

14
source/main.c → source/fbi/main.c
View File

@ -4,13 +4,13 @@
#include <3ds.h>
#include <curl/curl.h>
#include "core/clipboard.h"
#include "core/error.h"
#include "core/fs.h"
#include "core/screen.h"
#include "core/task/task.h"
#include "ui/mainmenu.h"
#include "ui/ui.h"
#include "../core/clipboard.h"
#include "../core/error.h"
#include "../core/fs.h"
#include "../core/screen.h"
#include "../core/task/task.h"
#include "../core/ui/ui.h"
#include "section.h"
#define CURRENT_KPROCESS (*(void**) 0xFFFF9004)

10
source/ui/mainmenu.c → source/fbi/mainmenu.c
View File

@ -3,13 +3,9 @@
#include <3ds.h>
#include "list.h"
#include "mainmenu.h"
#include "resources.h"
#include "ui.h"
#include "section/section.h"
#include "../core/linkedlist.h"
#include "../core/screen.h"
#include "section.h"
#include "../core/core.h"
static list_item sd = {"SD", COLOR_TEXT, files_open_sd};
static list_item ctr_nand = {"CTR NAND", COLOR_TEXT, files_open_ctr_nand};
@ -68,5 +64,7 @@ static void mainmenu_update(ui_view* view, void* data, linked_list* items, list_
}
void mainmenu_open() {
resources_load();
list_display("Main Menu", "A: Select, START: Exit", NULL, mainmenu_update, mainmenu_draw_top);
}

12
source/ui/section/pendingtitles.c → source/fbi/pendingtitles.c
View File

@ -3,15 +3,11 @@
#include <3ds.h>
#include "resources.h"
#include "section.h"
#include "action/action.h"
#include "task/uitask.h"
#include "../error.h"
#include "../list.h"
#include "../resources.h"
#include "../ui.h"
#include "../../core/linkedlist.h"
#include "../../core/screen.h"
#include "../core/core.h"
static list_item delete_pending_title = {"Delete Pending Title", COLOR_TEXT, action_delete_pending_title};
static list_item delete_all_pending_titles = {"Delete All Pending Titles", COLOR_TEXT, action_delete_all_pending_titles};
@ -28,7 +24,7 @@ typedef struct {
} pendingtitles_action_data;
static void pendingtitles_action_draw_top(ui_view* view, void* data, float x1, float y1, float x2, float y2, list_item* selected) {
ui_draw_pending_title_info(view, ((pendingtitles_action_data*) data)->selected->data, x1, y1, x2, y2);
task_draw_pending_title_info(view, ((pendingtitles_action_data*) data)->selected->data, x1, y1, x2, y2);
}
static void pendingtitles_action_update(ui_view* view, void* data, linked_list* items, list_item* selected, bool selectedTouched) {
@ -78,7 +74,7 @@ static void pendingtitles_action_open(linked_list* items, list_item* selected) {
static void pendingtitles_draw_top(ui_view* view, void* data, float x1, float y1, float x2, float y2, list_item* selected) {
if(selected != NULL && selected->data != NULL) {
ui_draw_pending_title_info(view, selected->data, x1, y1, x2, y2);
task_draw_pending_title_info(view, selected->data, x1, y1, x2, y2);
}
}

16
source/ui/section/remoteinstall.c → source/fbi/remoteinstall.c
View File

@ -8,22 +8,12 @@
#include <3ds.h>
#include "resources.h"
#include "section.h"
#include "action/action.h"
#include "task/uitask.h"
#include "../error.h"
#include "../info.h"
#include "../kbd.h"
#include "../list.h"
#include "../prompt.h"
#include "../resources.h"
#include "../ui.h"
#include "../../core/error.h"
#include "../../core/fs.h"
#include "../../core/linkedlist.h"
#include "../../core/screen.h"
#include "../../core/task/capturecam.h"
#include "../../libs/quirc/quirc_internal.h"
#include "../core/core.h"
#include "../libs/quirc/quirc_internal.h"
static bool remoteinstall_get_last_urls(char* out, size_t size) {
if(out == NULL || size == 0) {

5
source/ui/resources.c → source/fbi/resources.c
View File

@ -5,10 +5,7 @@
#include <3ds.h>
#include "resources.h"
#include "../core/error.h"
#include "../core/fs.h"
#include "../core/screen.h"
#include "../core/task/task.h"
#include "../core/core.h"
static FILE* resources_open_file(const char* path) {
char realPath[FILE_PATH_MAX];

1
source/ui/resources.h → source/fbi/resources.h
View File

@ -31,7 +31,6 @@
#define TEXTURE_WIFI_2 29
#define TEXTURE_WIFI_3 30
#define COLOR_TEXT 0
#define COLOR_NAND 1
#define COLOR_SD 2
#define COLOR_GAME_CARD 3

2
source/ui/section/section.h → source/fbi/section.h
View File

@ -1,5 +1,7 @@
#pragma once
void mainmenu_open();
void dumpnand_open();
void extsavedata_open();
void files_open(FS_ArchiveID archiveId, FS_Path archivePath);

12
source/ui/section/systemsavedata.c → source/fbi/systemsavedata.c
View File

@ -3,15 +3,11 @@
#include <3ds.h>
#include "resources.h"
#include "section.h"
#include "action/action.h"
#include "task/uitask.h"
#include "../error.h"
#include "../list.h"
#include "../resources.h"
#include "../ui.h"
#include "../../core/linkedlist.h"
#include "../../core/screen.h"
#include "../core/core.h"
static list_item browse_save_data = {"Browse Save Data", COLOR_TEXT, action_browse_system_save_data};
static list_item delete_save_data = {"Delete Save Data", COLOR_TEXT, action_delete_system_save_data};
@ -28,7 +24,7 @@ typedef struct {
} systemsavedata_action_data;
static void systemsavedata_action_draw_top(ui_view* view, void* data, float x1, float y1, float x2, float y2, list_item* selected) {
ui_draw_system_save_data_info(view, ((systemsavedata_action_data*) data)->selected->data, x1, y1, x2, y2);
task_draw_system_save_data_info(view, ((systemsavedata_action_data*) data)->selected->data, x1, y1, x2, y2);
}
static void systemsavedata_action_update(ui_view* view, void* data, linked_list* items, list_item* selected, bool selectedTouched) {
@ -78,7 +74,7 @@ static void systemsavedata_action_open(linked_list* items, list_item* selected)
static void systemsavedata_draw_top(ui_view* view, void* data, float x1, float y1, float x2, float y2, list_item* selected) {
if(selected != NULL && selected->data != NULL) {
ui_draw_system_save_data_info(view, selected->data, x1, y1, x2, y2);
task_draw_system_save_data_info(view, selected->data, x1, y1, x2, y2);
}
}

11
source/ui/section/task/listextsavedata.c → source/fbi/task/listextsavedata.c
View File

@ -6,14 +6,9 @@
#include <3ds.h>
#include "uitask.h"
#include "../../list.h"
#include "../../resources.h"
#include "../../../core/error.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../../core/stringutil.h"
#include "../../../core/data/smdh.h"
#include "../../../core/task/task.h"
#include "listextsavedata.h"
#include "../resources.h"
#include "../../core/core.h"
#define MAX_EXT_SAVE_DATA 512

28
source/fbi/task/listextsavedata.h Normal file
View File

@ -0,0 +1,28 @@
#pragma once
typedef struct linked_list_s linked_list;
typedef struct list_item_s list_item;
typedef struct ext_save_data_info_s {
FS_MediaType mediaType;
u64 extSaveDataId;
bool shared;
bool hasMeta;
meta_info meta;
} ext_save_data_info;
typedef struct populate_ext_save_data_data_s {
linked_list* items;
void* userData;
bool (*filter)(void* data, u64 extSaveDataId, FS_MediaType mediaType);
int (*compare)(void* data, const void* p1, const void* p2);
volatile bool finished;
Result result;
Handle cancelEvent;
} populate_ext_save_data_data;
void task_free_ext_save_data(list_item* item);
void task_clear_ext_save_data(linked_list* items);
Result task_populate_ext_save_data(populate_ext_save_data_data* data);

13
source/ui/section/task/listfiles.c → source/fbi/task/listfiles.c
View File

@ -6,16 +6,9 @@
#include <3ds.h>
#include "uitask.h"
#include "../../list.h"
#include "../../resources.h"
#include "../../../core/error.h"
#include "../../../core/fs.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../../core/stringutil.h"
#include "../../../core/data/cia.h"
#include "../../../core/data/smdh.h"
#include "../../../core/task/task.h"
#include "listfiles.h"
#include "../resources.h"
#include "../../core/core.h"
#define MAX_FILES 1024

54
source/fbi/task/listfiles.h Normal file
View File

@ -0,0 +1,54 @@
#pragma once
#ifndef FILE_NAME_MAX
#define FILE_NAME_MAX 512
#define FILE_PATH_MAX 512
#endif
typedef struct linked_list_s linked_list;
typedef struct list_item_s list_item;
typedef struct cia_info_s {
u64 titleId;
u16 version;
u64 installedSize;
bool hasMeta;
meta_info meta;
} cia_info;
typedef struct file_info_s {
FS_Archive archive;
char name[FILE_NAME_MAX];
char path[FILE_PATH_MAX];
u32 attributes;
// Files only
u64 size;
bool isCia;
cia_info ciaInfo;
bool isTicket;
ticket_info ticketInfo;
} file_info;
typedef struct populate_files_data_s {
linked_list* items;
FS_Archive archive;
char path[FILE_PATH_MAX];
bool recursive;
bool includeBase;
bool (*filter)(void* data, const char* name, u32 attributes);
void* filterData;
volatile bool finished;
Result result;
Handle cancelEvent;
} populate_files_data;
int task_compare_files(void* userData, const void* p1, const void* p2);
void task_free_file(list_item* item);
void task_clear_files(linked_list* items);
Result task_create_file_item(list_item** out, FS_Archive archive, const char* path, u32 attributes);
Result task_populate_files(populate_files_data* data);

10
source/ui/section/task/listpendingtitles.c → source/fbi/task/listpendingtitles.c
View File

@ -4,13 +4,9 @@
#include <3ds.h>
#include "uitask.h"
#include "../../list.h"
#include "../../resources.h"
#include "../../../core/error.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../../core/task/task.h"
#include "listpendingtitles.h"
#include "../resources.h"
#include "../../core/core.h"
static int task_populate_pending_titles_compare_ids(const void* e1, const void* e2) {
u64 id1 = *(u64*) e1;

22
source/fbi/task/listpendingtitles.h Normal file
View File

@ -0,0 +1,22 @@
#pragma once
typedef struct linked_list_s linked_list;
typedef struct list_item_s list_item;
typedef struct pending_title_info_s {
FS_MediaType mediaType;
u64 titleId;
u16 version;
} pending_title_info;
typedef struct populate_pending_titles_data_s {
linked_list* items;
volatile bool finished;
Result result;
Handle cancelEvent;
} populate_pending_titles_data;
void task_free_pending_title(list_item* item);
void task_clear_pending_titles(linked_list* items);
Result task_populate_pending_titles(populate_pending_titles_data* data);

10
source/ui/section/task/listsystemsavedata.c → source/fbi/task/listsystemsavedata.c
View File

@ -4,13 +4,9 @@
#include <3ds.h>
#include "uitask.h"
#include "../../list.h"
#include "../../resources.h"
#include "../../../core/error.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../../core/task/task.h"
#include "listsystemsavedata.h"
#include "../resources.h"
#include "../../core/core.h"
#define MAX_SYSTEM_SAVE_DATA 512

20
source/fbi/task/listsystemsavedata.h Normal file
View File

@ -0,0 +1,20 @@
#pragma once
typedef struct linked_list_s linked_list;
typedef struct list_item_s list_item;
typedef struct system_save_data_info_s {
u32 systemSaveDataId;
} system_save_data_info;
typedef struct populate_system_save_data_data_s {
linked_list* items;
volatile bool finished;
Result result;
Handle cancelEvent;
} populate_system_save_data_data;
void task_free_system_save_data(list_item* item);
void task_clear_system_save_data(linked_list* items);
Result task_populate_system_save_data(populate_system_save_data_data* data);

10
source/ui/section/task/listtickets.c → source/fbi/task/listtickets.c
View File

@ -4,13 +4,9 @@
#include <3ds.h>
#include "uitask.h"
#include "../../list.h"
#include "../../resources.h"
#include "../../../core/error.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../../core/task/task.h"
#include "listtickets.h"
#include "../resources.h"
#include "../../core/core.h"
static int task_populate_tickets_compare_ids(const void* e1, const void* e2) {
u64 id1 = *(u64*) e1;

22
source/fbi/task/listtickets.h Normal file
View File

@ -0,0 +1,22 @@
#pragma once
typedef struct linked_list_s linked_list;
typedef struct list_item_s list_item;
typedef struct ticket_info_s {
u64 titleId;
bool inUse;
} ticket_info;
typedef struct populate_tickets_data_s {
linked_list* items;
volatile bool finished;
Result result;
Handle cancelEvent;
} populate_tickets_data;
void task_populate_tickets_update_use(list_item* item);
void task_free_ticket(list_item* item);
void task_clear_tickets(linked_list* items);
Result task_populate_tickets(populate_tickets_data* data);

15
source/ui/section/task/listtitledb.c → source/fbi/task/listtitledb.c
View File

@ -7,15 +7,11 @@
#include <jansson.h>
#include "uitask.h"
#include "../../list.h"
#include "../../resources.h"
#include "../../../core/error.h"
#include "../../../core/fs.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../../core/stringutil.h"
#include "../../../core/task/task.h"
#include "../../../libs/stb_image/stb_image.h"
#include "listtitledb.h"
#include "../resources.h"
#include "../../core/core.h"
#include "../../core/task/dataop.h"
#include "../../libs/stb_image/stb_image.h"
#define json_object_get_string(obj, name, def) (json_is_string(json_object_get(obj, name)) ? json_string_value(json_object_get(obj, name)) : def)
#define json_object_get_integer(obj, name, def) (json_is_integer(json_object_get(obj, name)) ? json_integer_value(json_object_get(obj, name)) : def)
@ -51,7 +47,6 @@ void task_populate_titledb_update_status(list_item* item) {
}
}
// TODO: Outdated color(?)
if((info->cia.exists && info->cia.installed) || (info->tdsx.exists && info->tdsx.installed)) {
item->color = COLOR_TITLEDB_INSTALLED;
} else {

60
source/fbi/task/listtitledb.h Normal file
View File

@ -0,0 +1,60 @@
#pragma once
typedef struct linked_list_s linked_list;
typedef struct list_item_s list_item;
typedef struct titledb_cia_info_s {
bool exists;
u32 id;
char updatedAt[32];
char version[32];
u64 size;
u64 titleId;
bool installed;
u16 installedVersion;
} titledb_cia_info;
typedef struct titledb_smdh_info_s {
bool exists;
u32 id;
} titledb_smdh_info;
typedef struct titledb_tdsx_info_s {
bool exists;
u32 id;
char updatedAt[32];
char version[32];
u64 size;
titledb_smdh_info smdh;
bool installed;
} titledb_tdsx_info;
typedef struct titledb_info_s {
u32 id;
char category[64];
char headline[512];
titledb_cia_info cia;
titledb_tdsx_info tdsx;
meta_info meta;
} titledb_info;
typedef struct populate_titledb_data_s {
linked_list* items;
volatile bool itemsListed;
volatile bool finished;
Result result;
Handle cancelEvent;
Handle resumeEvent;
} populate_titledb_data;
void task_populate_titledb_update_status(list_item* item);
void task_free_titledb(list_item* item);
void task_clear_titledb(linked_list* items);
Result task_populate_titledb(populate_titledb_data* data);

13
source/ui/section/task/listtitles.c → source/fbi/task/listtitles.c
View File

@ -6,16 +6,9 @@
#include <3ds.h>
#include "uitask.h"
#include "../../list.h"
#include "../../resources.h"
#include "../../../core/error.h"
#include "../../../core/fs.h"
#include "../../../core/linkedlist.h"
#include "../../../core/screen.h"
#include "../../../core/stringutil.h"
#include "../../../core/data/bnr.h"
#include "../../../core/data/smdh.h"
#include "../../../core/task/task.h"
#include "listtitles.h"
#include "../resources.h"
#include "../../core/core.h"
static Result task_populate_titles_add_ctr(populate_titles_data* data, FS_MediaType mediaType, u64 titleId) {
Result res = 0;

31
source/fbi/task/listtitles.h Normal file
View File

@ -0,0 +1,31 @@
#pragma once
typedef struct linked_list_s linked_list;
typedef struct list_item_s list_item;
typedef struct title_info_s {
FS_MediaType mediaType;
u64 titleId;
char productCode[0x10];
u16 version;
u64 installedSize;
bool twl;
bool hasMeta;
meta_info meta;
} title_info;
typedef struct populate_titles_data_s {
linked_list* items;
void* userData;
bool (*filter)(void* data, u64 titleId, FS_MediaType mediaType);
int (*compare)(void* data, const void* p1, const void* p2);
volatile bool finished;
Result result;
Handle cancelEvent;
} populate_titles_data;
void task_free_title(list_item* item);
void task_clear_titles(linked_list* items);
Result task_populate_titles(populate_titles_data* data);

344
source/fbi/task/uitask.c Normal file
View File

@ -0,0 +1,344 @@
#include <stdio.h>
#include <string.h>
#include <3ds.h>
#include "uitask.h"
#include "../resources.h"
#include "../../core/core.h"
void task_draw_meta_info(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
meta_info* info = (meta_info*) data;
u32 metaInfoBoxShadowWidth;
u32 metaInfoBoxShadowHeight;
screen_get_texture_size(&metaInfoBoxShadowWidth, &metaInfoBoxShadowHeight, TEXTURE_META_INFO_BOX_SHADOW);
float metaInfoBoxShadowX = x1 + (x2 - x1 - metaInfoBoxShadowWidth) / 2;
float metaInfoBoxShadowY = y1 + (y2 - y1) / 4 - metaInfoBoxShadowHeight / 2;
screen_draw_texture(TEXTURE_META_INFO_BOX_SHADOW, metaInfoBoxShadowX, metaInfoBoxShadowY, metaInfoBoxShadowWidth, metaInfoBoxShadowHeight);
u32 metaInfoBoxWidth;
u32 metaInfoBoxHeight;
screen_get_texture_size(&metaInfoBoxWidth, &metaInfoBoxHeight, TEXTURE_META_INFO_BOX);
float metaInfoBoxX = x1 + (x2 - x1 - metaInfoBoxWidth) / 2;
float metaInfoBoxY = y1 + (y2 - y1) / 4 - metaInfoBoxHeight / 2;
screen_draw_texture(TEXTURE_META_INFO_BOX, metaInfoBoxX, metaInfoBoxY, metaInfoBoxWidth, metaInfoBoxHeight);
if(info->texture != 0) {
u32 iconWidth;
u32 iconHeight;
screen_get_texture_size(&iconWidth, &iconHeight, info->texture);
float iconX = metaInfoBoxX + (64 - iconWidth) / 2;
float iconY = metaInfoBoxY + (metaInfoBoxHeight - iconHeight) / 2;
screen_draw_texture(info->texture, iconX, iconY, iconWidth, iconHeight);
}
float metaTextX = metaInfoBoxX + 64;
float shortDescriptionHeight;
screen_get_string_size_wrap(NULL, &shortDescriptionHeight, info->shortDescription, 0.5f, 0.5f, metaInfoBoxX + metaInfoBoxWidth - 8 - metaTextX);
float longDescriptionHeight;
screen_get_string_size_wrap(NULL, &longDescriptionHeight, info->longDescription, 0.5f, 0.5f, metaInfoBoxX + metaInfoBoxWidth - 8 - metaTextX);
float publisherHeight;
screen_get_string_size_wrap(NULL, &publisherHeight, info->publisher, 0.5f, 0.5f, metaInfoBoxX + metaInfoBoxWidth - 8 - metaTextX);
float shortDescriptionY = metaInfoBoxY + (64 - shortDescriptionHeight - 2 - longDescriptionHeight - 2 - publisherHeight) / 2;
screen_draw_string_wrap(info->shortDescription, metaTextX, shortDescriptionY, 0.5f, 0.5f, COLOR_TEXT, false, metaInfoBoxX + metaInfoBoxWidth - 8);
float longDescriptionY = shortDescriptionY + shortDescriptionHeight + 2;
screen_draw_string_wrap(info->longDescription, metaTextX, longDescriptionY, 0.5f, 0.5f, COLOR_TEXT, false, metaInfoBoxX + metaInfoBoxWidth - 8);
float publisherY = longDescriptionY + longDescriptionHeight + 2;
screen_draw_string_wrap(info->publisher, metaTextX, publisherY, 0.5f, 0.5f, COLOR_TEXT, false, metaInfoBoxX + metaInfoBoxWidth - 8);
}
void task_draw_ext_save_data_info(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
ext_save_data_info* info = (ext_save_data_info*) data;
if(info->hasMeta) {
task_draw_meta_info(view, &info->meta, x1, y1, x2, y2);
}
char infoText[512];
snprintf(infoText, sizeof(infoText),
"Ext Save Data ID: %016llX\n"
"Shared: %s",
info->extSaveDataId,
info->shared ? "Yes" : "No");
float infoWidth;
screen_get_string_size(&infoWidth, NULL, infoText, 0.5f, 0.5f);
float infoX = x1 + (x2 - x1 - infoWidth) / 2;
float infoY = y1 + (y2 - y1) / 2 - 8;
screen_draw_string(infoText, infoX, infoY, 0.5f, 0.5f, COLOR_TEXT, true);
}
void task_draw_file_info(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
file_info* info = (file_info*) data;
char infoText[512];
size_t infoTextPos = 0;
if(strlen(info->name) > 48) {
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "Name: %.45s...\n", info->name);
} else {
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "Name: %.48s\n", info->name);
}
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "Attributes: ");
if(info->attributes & (FS_ATTRIBUTE_DIRECTORY | FS_ATTRIBUTE_HIDDEN | FS_ATTRIBUTE_ARCHIVE | FS_ATTRIBUTE_READ_ONLY)) {
bool needsSeparator = false;
if(info->attributes & FS_ATTRIBUTE_DIRECTORY) {
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "Directory");
needsSeparator = true;
}
if(info->attributes & FS_ATTRIBUTE_HIDDEN) {
if(needsSeparator) {
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, ", ");
}
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "Hidden");
needsSeparator = true;
}
if(info->attributes & FS_ATTRIBUTE_ARCHIVE) {
if(needsSeparator) {
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, ", ");
}
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "Archive");
needsSeparator = true;
}
if(info->attributes & FS_ATTRIBUTE_READ_ONLY) {
if(needsSeparator) {
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, ", ");
}
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "Read Only");
needsSeparator = true;
}
} else {
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "None");
}
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "\n");
if(!(info->attributes & FS_ATTRIBUTE_DIRECTORY)) {
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "Size: %.2f %s\n",
ui_get_display_size(info->size), ui_get_display_size_units(info->size));
if(info->isCia) {
char regionString[64];
if(info->ciaInfo.hasMeta) {
task_draw_meta_info(view, &info->ciaInfo.meta, x1, y1, x2, y2);
smdh_region_to_string(regionString, info->ciaInfo.meta.region, sizeof(regionString));
} else {
snprintf(regionString, sizeof(regionString), "Unknown");
}
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos,
"Title ID: %016llX\n"
"Version: %hu (%d.%d.%d)\n"
"Region: %s\n"
"Installed Size: %.2f %s",
info->ciaInfo.titleId,
info->ciaInfo.version, (info->ciaInfo.version >> 10) & 0x3F, (info->ciaInfo.version >> 4) & 0x3F, info->ciaInfo.version & 0xF,
regionString,
ui_get_display_size(info->ciaInfo.installedSize),
ui_get_display_size_units(info->ciaInfo.installedSize));
} else if(info->isTicket) {
infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "Ticket ID: %016llX", info->ticketInfo.titleId);
}
}
float infoWidth;
screen_get_string_size(&infoWidth, NULL, infoText, 0.5f, 0.5f);
float infoX = x1 + (x2 - x1 - infoWidth) / 2;
float infoY = y1 + (y2 - y1) / 2 - 8;
screen_draw_string(infoText, infoX, infoY, 0.5f, 0.5f, COLOR_TEXT, true);
}
void task_draw_pending_title_info(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
pending_title_info* info = (pending_title_info*) data;
char infoText[512];
snprintf(infoText, sizeof(infoText),
"Pending Title ID: %016llX\n"
"Media Type: %s\n"
"Version: %hu (%d.%d.%d)",
info->titleId,
info->mediaType == MEDIATYPE_NAND ? "NAND" : info->mediaType == MEDIATYPE_SD ? "SD" : "Game Card",
info->version, (info->version >> 10) & 0x3F, (info->version >> 4) & 0x3F, info->version & 0xF);
float infoWidth;
screen_get_string_size(&infoWidth, NULL, infoText, 0.5f, 0.5f);
float infoX = x1 + (x2 - x1 - infoWidth) / 2;
float infoY = y1 + (y2 - y1) / 2 - 8;
screen_draw_string(infoText, infoX, infoY, 0.5f, 0.5f, COLOR_TEXT, true);
}
void task_draw_system_save_data_info(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
system_save_data_info* info = (system_save_data_info*) data;
char infoText[512];
snprintf(infoText, sizeof(infoText), "System Save Data ID: %08lX", info->systemSaveDataId);
float infoWidth;
screen_get_string_size(&infoWidth, NULL, infoText, 0.5f, 0.5f);
float infoX = x1 + (x2 - x1 - infoWidth) / 2;
float infoY = y1 + (y2 - y1) / 2 - 8;
screen_draw_string(infoText, infoX, infoY, 0.5f, 0.5f, COLOR_TEXT, true);
}
void task_draw_ticket_info(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
ticket_info* info = (ticket_info*) data;
char infoText[512];
snprintf(infoText, sizeof(infoText), "Title ID: %016llX", info->titleId);
float infoWidth;
screen_get_string_size(&infoWidth, NULL, infoText, 0.5f, 0.5f);
float infoX = x1 + (x2 - x1 - infoWidth) / 2;
float infoY = y1 + (y2 - y1) / 2 - 8;
screen_draw_string(infoText, infoX, infoY, 0.5f, 0.5f, COLOR_TEXT, true);
}
void task_draw_title_info(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
title_info* info = (title_info*) data;
char regionString[64];
if(info->hasMeta) {
task_draw_meta_info(view, &info->meta, x1, y1, x2, y2);
smdh_region_to_string(regionString, info->meta.region, sizeof(regionString));
} else {
snprintf(regionString, sizeof(regionString), "Unknown");
}
char infoText[512];
snprintf(infoText, sizeof(infoText),
"Title ID: %016llX\n"
"Media Type: %s\n"
"Version: %hu (%d.%d.%d)\n"
"Product Code: %s\n"
"Region: %s\n"
"Size: %.2f %s",
info->titleId,
info->mediaType == MEDIATYPE_NAND ? "NAND" : info->mediaType == MEDIATYPE_SD ? "SD" : "Game Card",
info->version, (info->version >> 10) & 0x3F, (info->version >> 4) & 0x3F, info->version & 0xF,
info->productCode,
regionString,
ui_get_display_size(info->installedSize), ui_get_display_size_units(info->installedSize));
float infoWidth;
screen_get_string_size(&infoWidth, NULL, infoText, 0.5f, 0.5f);
float infoX = x1 + (x2 - x1 - infoWidth) / 2;
float infoY = y1 + (y2 - y1) / 2 - 8;
screen_draw_string(infoText, infoX, infoY, 0.5f, 0.5f, COLOR_TEXT, true);
}
void task_draw_titledb_info(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
titledb_info* info = (titledb_info*) data;
task_draw_meta_info(view, &info->meta, x1, y1, x2, y2);
char infoText[1024];
snprintf(infoText, sizeof(infoText),
"%s\n"
"\n"
"Category: %s\n",
info->headline,
info->category);
float infoWidth;
screen_get_string_size_wrap(&infoWidth, NULL, infoText, 0.5f, 0.5f, x2 - x1 - 10);
// TODO: Wrap by word, not character?
float infoX = x1 + (x2 - x1 - infoWidth) / 2;
float infoY = y1 + (y2 - y1) / 2 - 8;
screen_draw_string_wrap(infoText, infoX, infoY, 0.5f, 0.5f, COLOR_TEXT, true, infoX + infoWidth + 1);
}
void task_draw_titledb_info_cia(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
titledb_info* info = (titledb_info*) data;
task_draw_meta_info(view, &info->meta, x1, y1, x2, y2);
char updatedDate[32] = "";
char updatedTime[32] = "";
sscanf(info->cia.updatedAt, "%31[^T]T%31[^Z]Z", updatedDate, updatedTime);
char infoText[512];
snprintf(infoText, sizeof(infoText),
"Title ID: %016llX\n"
"TitleDB Version: %s\n"
"Installed Version: %hu (%d.%d.%d)\n"
"Size: %.2f %s\n"
"Updated At: %s %s",
info->cia.titleId,
info->cia.version,
info->cia.installedVersion, (info->cia.installedVersion >> 10) & 0x3F, (info->cia.installedVersion >> 4) & 0x3F, info->cia.installedVersion & 0xF,
ui_get_display_size(info->cia.size), ui_get_display_size_units(info->cia.size),
updatedDate, updatedTime);
float infoWidth;
screen_get_string_size(&infoWidth, NULL, infoText, 0.5f, 0.5f);
float infoX = x1 + (x2 - x1 - infoWidth) / 2;
float infoY = y1 + (y2 - y1) / 2 - 8;
screen_draw_string(infoText, infoX, infoY, 0.5f, 0.5f, COLOR_TEXT, true);
}
void task_draw_titledb_info_tdsx(ui_view* view, void* data, float x1, float y1, float x2, float y2) {
titledb_info* info = (titledb_info*) data;
task_draw_meta_info(view, &info->meta, x1, y1, x2, y2);
char updatedDate[32] = "";
char updatedTime[32] = "";
sscanf(info->tdsx.updatedAt, "%31[^T]T%31[^Z]Z", updatedDate, updatedTime);
char infoText[512];
snprintf(infoText, sizeof(infoText),
"TitleDB Version: %s\n"
"Size: %.2f %s\n"
"Updated At: %s %s",
info->tdsx.version,
ui_get_display_size(info->tdsx.size), ui_get_display_size_units(info->tdsx.size),
updatedDate, updatedTime);
float infoWidth;
screen_get_string_size(&infoWidth, NULL, infoText, 0.5f, 0.5f);
float infoX = x1 + (x2 - x1 - infoWidth) / 2;
float infoY = y1 + (y2 - y1) / 2 - 8;
screen_draw_string(infoText, infoX, infoY, 0.5f, 0.5f, COLOR_TEXT, true);
}

30
source/fbi/task/uitask.h Normal file
View File

@ -0,0 +1,30 @@
#pragma once
typedef struct ui_view_s ui_view;
typedef struct meta_info_s {
char shortDescription[0x100];
char longDescription[0x200];
char publisher[0x100];
u32 region;
u32 texture;
} meta_info;
void task_draw_meta_info(ui_view* view, void* data, float x1, float y1, float x2, float y2);
void task_draw_ext_save_data_info(ui_view* view, void* data, float x1, float y1, float x2, float y2);
void task_draw_file_info(ui_view* view, void* data, float x1, float y1, float x2, float y2);
void task_draw_pending_title_info(ui_view* view, void* data, float x1, float y1, float x2, float y2);
void task_draw_system_save_data_info(ui_view* view, void* data, float x1, float y1, float x2, float y2);
void task_draw_ticket_info(ui_view* view, void* data, float x1, float y1, float x2, float y2);
void task_draw_title_info(ui_view* view, void* data, float x1, float y1, float x2, float y2);
void task_draw_titledb_info(ui_view* view, void* data, float x1, float y1, float x2, float y2);
void task_draw_titledb_info_cia(ui_view* view, void* data, float x1, float y1, float x2, float y2);
void task_draw_titledb_info_tdsx(ui_view* view, void* data, float x1, float y1, float x2, float y2);
#include "listextsavedata.h"
#include "listpendingtitles.h"
#include "listsystemsavedata.h"
#include "listtickets.h"
#include "listtitledb.h"
#include "listtitles.h"
#include "listfiles.h"

12
source/ui/section/tickets.c → source/fbi/tickets.c
View File

@ -3,15 +3,11 @@
#include <3ds.h>
#include "resources.h"
#include "section.h"
#include "action/action.h"
#include "task/uitask.h"
#include "../error.h"
#include "../list.h"
#include "../resources.h"
#include "../ui.h"
#include "../../core/linkedlist.h"
#include "../../core/screen.h"
#include "../core/core.h"
static list_item install_from_cdn = {"Install from CDN", COLOR_TEXT, action_install_cdn};
static list_item delete_ticket = {"Delete Ticket", COLOR_TEXT, action_delete_ticket};
@ -29,7 +25,7 @@ typedef struct {
} tickets_action_data;
static void tickets_action_draw_top(ui_view* view, void* data, float x1, float y1, float x2, float y2, list_item* selected) {
ui_draw_ticket_info(view, ((tickets_action_data*) data)->selected->data, x1, y1, x2, y2);
task_draw_ticket_info(view, ((tickets_action_data*) data)->selected->data, x1, y1, x2, y2);
}
static void tickets_action_update(ui_view* view, void* data, linked_list* items, list_item* selected, bool selectedTouched) {
@ -80,7 +76,7 @@ static void tickets_action_open(linked_list* items, list_item* selected) {
static void tickets_draw_top(ui_view* view, void* data, float x1, float y1, float x2, float y2, list_item* selected) {
if(selected != NULL && selected->data != NULL) {
ui_draw_ticket_info(view, selected->data, x1, y1, x2, y2);
task_draw_ticket_info(view, selected->data, x1, y1, x2, y2);
}
}

18
source/ui/section/titledb.c → source/fbi/titledb.c
View File

@ -4,15 +4,11 @@
#include <3ds.h>
#include "resources.h"
#include "section.h"
#include "action/action.h"
#include "task/uitask.h"
#include "../error.h"
#include "../list.h"
#include "../resources.h"
#include "../ui.h"
#include "../../core/linkedlist.h"
#include "../../core/screen.h"
#include "../core/core.h"
static list_item install = {"Install", COLOR_TEXT, action_install_titledb};
@ -37,9 +33,9 @@ static void titledb_action_draw_top(ui_view* view, void* data, float x1, float y
titledb_action_data* actionData = (titledb_action_data*) data;
if(actionData->cia) {
ui_draw_titledb_info_cia(view, actionData->selected->data, x1, y1, x2, y2);
task_draw_titledb_info_cia(view, actionData->selected->data, x1, y1, x2, y2);
} else {
ui_draw_titledb_info_tdsx(view, actionData->selected->data, x1, y1, x2, y2);
task_draw_titledb_info_tdsx(view, actionData->selected->data, x1, y1, x2, y2);
}
}
@ -93,9 +89,9 @@ static void titledb_entry_draw_top(ui_view* view, void* data, float x1, float y1
if(selected != NULL) {
if(strncmp(selected->name, "CIA", sizeof(selected->name)) == 0) {
ui_draw_titledb_info_cia(view, entryData->selected->data, x1, y1, x2, y2);
task_draw_titledb_info_cia(view, entryData->selected->data, x1, y1, x2, y2);
} else if(strncmp(selected->name, "3DSX", sizeof(selected->name)) == 0) {
ui_draw_titledb_info_tdsx(view, entryData->selected->data, x1, y1, x2, y2);
task_draw_titledb_info_tdsx(view, entryData->selected->data, x1, y1, x2, y2);
}
}
}
@ -177,7 +173,7 @@ static void titledb_draw_top(ui_view* view, void* data, float x1, float y1, floa
screen_get_string_size(&textWidth, &textHeight, text, 0.5f, 0.5f);
screen_draw_string(text, x1 + (x2 - x1 - textWidth) / 2, y1 + (y2 - y1 - textHeight) / 2, 0.5f, 0.5f, COLOR_TEXT, true);
} else if(selected != NULL && selected->data != NULL) {
ui_draw_titledb_info(view, selected->data, x1, y1, x2, y2);
task_draw_titledb_info(view, selected->data, x1, y1, x2, y2);
}
}

13
source/ui/section/titles.c → source/fbi/titles.c
View File

@ -4,16 +4,11 @@
#include <3ds.h>
#include "resources.h"
#include "section.h"
#include "action/action.h"
#include "task/uitask.h"
#include "../error.h"
#include "../list.h"
#include "../resources.h"
#include "../ui.h"
#include "../../core/linkedlist.h"
#include "../../core/screen.h"
#include "../../core/stringutil.h"
#include "../core/core.h"
static list_item launch_title = {"Launch Title", COLOR_TEXT, action_launch_title};
static list_item delete_title = {"Delete Title", COLOR_TEXT, action_delete_title};
@ -47,7 +42,7 @@ typedef struct {
} titles_action_data;
static void titles_action_draw_top(ui_view* view, void* data, float x1, float y1, float x2, float y2, list_item* selected) {
ui_draw_title_info(view, ((titles_action_data*) data)->selected->data, x1, y1, x2, y2);
task_draw_title_info(view, ((titles_action_data*) data)->selected->data, x1, y1, x2, y2);
}
static void titles_action_update(ui_view* view, void* data, linked_list* items, list_item* selected, bool selectedTouched) {
@ -196,7 +191,7 @@ static void titles_options_open(titles_data* data) {
static void titles_draw_top(ui_view* view, void* data, float x1, float y1, float x2, float y2, list_item* selected) {
if(selected != NULL && selected->data != NULL) {
ui_draw_title_info(view, selected->data, x1, y1, x2, y2);
task_draw_title_info(view, selected->data, x1, y1, x2, y2);
}
}

10
source/ui/section/update.c → source/fbi/update.c
View File

@ -5,17 +5,11 @@
#include <3ds.h>
#include <jansson.h>
#include "resources.h"
#include "section.h"
#include "action/action.h"
#include "task/uitask.h"
#include "../error.h"
#include "../info.h"
#include "../prompt.h"
#include "../resources.h"
#include "../ui.h"
#include "../../core/error.h"
#include "../../core/fs.h"
#include "../../core/screen.h"
#include "../core/core.h"
static void update_check_update(ui_view* view, void* data, float* progress, char* text) {
bool hasUpdate = false;

3
source/ui/mainmenu.h
View File

@ -1,3 +0,0 @@
#pragma once
void mainmenu_open();

297
source/ui/section/task/uitask.h
View File

@ -1,297 +0,0 @@
#pragma once
// TODO: Find a way to get rid of this?
#ifndef FILE_NAME_MAX
#define FILE_NAME_MAX 512
#define FILE_PATH_MAX 512
#endif
#define DOWNLOAD_URL_MAX 1024
typedef struct json_t json_t;
typedef struct linked_list_s linked_list;
typedef struct list_item_s list_item;
typedef struct ui_view_s ui_view;
typedef struct meta_info_s {
char shortDescription[0x100];
char longDescription[0x200];
char publisher[0x100];
u32 region;
u32 texture;
} meta_info;
typedef struct title_info_s {
FS_MediaType mediaType;
u64 titleId;
char productCode[0x10];
u16 version;
u64 installedSize;
bool twl;
bool hasMeta;
meta_info meta;
} title_info;
typedef struct pending_title_info_s {
FS_MediaType mediaType;
u64 titleId;
u16 version;
} pending_title_info;
typedef struct ticket_info_s {
u64 titleId;
bool inUse;
} ticket_info;
typedef struct ext_save_data_info_s {
FS_MediaType mediaType;
u64 extSaveDataId;
bool shared;
bool hasMeta;
meta_info meta;
} ext_save_data_info;
typedef struct system_save_data_info_s {
u32 systemSaveDataId;
} system_save_data_info;
typedef struct cia_info_s {
u64 titleId;
u16 version;
u64 installedSize;
bool hasMeta;
meta_info meta;
} cia_info;
typedef struct file_info_s {
FS_Archive archive;
char name[FILE_NAME_MAX];
char path[FILE_PATH_MAX];
u32 attributes;
// Files only
u64 size;
bool isCia;
cia_info ciaInfo;
bool isTicket;
ticket_info ticketInfo;
} file_info;
typedef struct titledb_cia_info_s {
bool exists;
u32 id;
char updatedAt[32];
char version[32];
u64 size;
u64 titleId;
bool installed;
u16 installedVersion;
} titledb_cia_info;
typedef struct titledb_smdh_info_s {
bool exists;
u32 id;
} titledb_smdh_info;
typedef struct titledb_tdsx_info_s {
bool exists;
u32 id;
char updatedAt[32];
char version[32];
u64 size;
titledb_smdh_info smdh;
bool installed;
} titledb_tdsx_info;
typedef struct titledb_info_s {
u32 id;
char category[64];
char headline[512];
titledb_cia_info cia;
titledb_tdsx_info tdsx;
meta_info meta;
} titledb_info;
typedef enum data_op_e {
DATAOP_COPY,
DATAOP_DOWNLOAD,
DATAOP_DELETE
} data_op;
typedef struct data_op_data_s {
void* data;
data_op op;
u32 processed;
u32 total;
// Copy
bool copyEmpty;
Result (*isSrcDirectory)(void* data, u32 index, bool* isDirectory);
Result (*makeDstDirectory)(void* data, u32 index);
Result (*openSrc)(void* data, u32 index, u32* handle);
Result (*closeSrc)(void* data, u32 index, bool succeeded, u32 handle);
Result (*getSrcSize)(void* data, u32 handle, u64* size);
Result (*readSrc)(void* data, u32 handle, u32* bytesRead, void* buffer, u64 offset, u32 size);
// Download
char (*downloadUrls)[DOWNLOAD_URL_MAX];
// Copy/Download
u64 currProcessed;
u64 currTotal;
u32 bytesPerSecond;
u32 estimatedRemainingSeconds;
u32 bufferSize;
Result (*openDst)(void* data, u32 index, void* initialReadBlock, u64 size, u32* handle);
Result (*closeDst)(void* data, u32 index, bool succeeded, u32 handle);
Result (*writeDst)(void* data, u32 handle, u32* bytesWritten, void* buffer, u64 offset, u32 size);
Result (*suspendTransfer)(void* data, u32 index, u32* srcHandle, u32* dstHandle);
Result (*restoreTransfer)(void* data, u32 index, u32* srcHandle, u32* dstHandle);
// Delete
Result (*delete)(void* data, u32 index);
// Suspend
Result (*suspend)(void* data, u32 index);
Result (*restore)(void* data, u32 index);
// Errors
bool (*error)(void* data, u32 index, Result res, ui_view** errorView);
// General
volatile bool finished;
Result result;
Handle cancelEvent;
// Internal
volatile bool retryResponse;
} data_op_data;
typedef struct populate_ext_save_data_data_s {
linked_list* items;
void* userData;
bool (*filter)(void* data, u64 extSaveDataId, FS_MediaType mediaType);
int (*compare)(void* data, const void* p1, const void* p2);
volatile bool finished;
Result result;
Handle cancelEvent;
} populate_ext_save_data_data;
typedef struct populate_files_data_s {
linked_list* items;
FS_Archive archive;
char path[FILE_PATH_MAX];
bool recursive;
bool includeBase;
bool (*filter)(void* data, const char* name, u32 attributes);
void* filterData;
volatile bool finished;
Result result;
Handle cancelEvent;
} populate_files_data;
typedef struct populate_pending_titles_data_s {
linked_list* items;
volatile bool finished;
Result result;
Handle cancelEvent;
} populate_pending_titles_data;
typedef struct populate_system_save_data_data_s {
linked_list* items;
volatile bool finished;
Result result;
Handle cancelEvent;
} populate_system_save_data_data;
typedef struct populate_tickets_data_s {
linked_list* items;
volatile bool finished;
Result result;
Handle cancelEvent;
} populate_tickets_data;
typedef struct populate_titles_data_s {
linked_list* items;
void* userData;
bool (*filter)(void* data, u64 titleId, FS_MediaType mediaType);
int (*compare)(void* data, const void* p1, const void* p2);
volatile bool finished;
Result result;
Handle cancelEvent;
} populate_titles_data;
typedef struct populate_titledb_data_s {
linked_list* items;
volatile bool itemsListed;
volatile bool finished;
Result result;
Handle cancelEvent;
Handle resumeEvent;
} populate_titledb_data;
Result task_download_sync(const char* url, u32* downloadedSize, void* buf, size_t size);
Result task_download_json_sync(const char* url, json_t** json, size_t maxSize);
Result task_download_seed_sync(u64 titleId);
Result task_data_op(data_op_data* data);
void task_free_ext_save_data(list_item* item);
void task_clear_ext_save_data(linked_list* items);
Result task_populate_ext_save_data(populate_ext_save_data_data* data);
int task_compare_files(void* userData, const void* p1, const void* p2);
void task_free_file(list_item* item);
void task_clear_files(linked_list* items);
Result task_create_file_item(list_item** out, FS_Archive archive, const char* path, u32 attributes);
Result task_populate_files(populate_files_data* data);
void task_free_pending_title(list_item* item);
void task_clear_pending_titles(linked_list* items);
Result task_populate_pending_titles(populate_pending_titles_data* data);
void task_free_system_save_data(list_item* item);
void task_clear_system_save_data(linked_list* items);
Result task_populate_system_save_data(populate_system_save_data_data* data);
void task_populate_tickets_update_use(list_item* item);
void task_free_ticket(list_item* item);
void task_clear_tickets(linked_list* items);
Result task_populate_tickets(populate_tickets_data* data);
void task_free_title(list_item* item);
void task_clear_titles(linked_list* items);
Result task_populate_titles(populate_titles_data* data);
void task_populate_titledb_update_status(list_item* item);
void task_free_titledb(list_item* item);
void task_clear_titledb(linked_list* items);
Result task_populate_titledb(populate_titledb_data* data);

40
source/ui/ui.h
View File

@ -1,40 +0,0 @@
#pragma once
#include <stdbool.h>
typedef struct ui_view_s {
const char* name;
const char* info;
void* data;
void (*update)(struct ui_view_s* view, void* data, float bx1, float by1, float bx2, float by2);
void (*drawTop)(struct ui_view_s* view, void* data, float x1, float y1, float x2, float y2);
void (*drawBottom)(struct ui_view_s* view, void* data, float x1, float y1, float x2, float y2);
Handle active;
} ui_view;
void ui_init();
void ui_exit();
ui_view* ui_create();
void ui_destroy(ui_view* view);
ui_view* ui_top();
bool ui_push(ui_view* view);
void ui_pop();
bool ui_update();
const char* ui_get_display_eta(u32 seconds);
double ui_get_display_size(u64 size);
const char* ui_get_display_size_units(u64 size);
void ui_draw_meta_info(ui_view* view, void* data, float x1, float y1, float x2, float y2);
void ui_draw_ext_save_data_info(ui_view* view, void* data, float x1, float y1, float x2, float y2);
void ui_draw_file_info(ui_view* view, void* data, float x1, float y1, float x2, float y2);
void ui_draw_pending_title_info(ui_view* view, void* data, float x1, float y1, float x2, float y2);
void ui_draw_system_save_data_info(ui_view* view, void* data, float x1, float y1, float x2, float y2);
void ui_draw_ticket_info(ui_view* view, void* data, float x1, float y1, float x2, float y2);
void ui_draw_title_info(ui_view* view, void* data, float x1, float y1, float x2, float y2);
void ui_draw_titledb_info(ui_view* view, void* data, float x1, float y1, float x2, float y2);
void ui_draw_titledb_info_cia(ui_view* view, void* data, float x1, float y1, float x2, float y2);
void ui_draw_titledb_info_tdsx(ui_view* view, void* data, float x1, float y1, float x2, float y2);