mirror of
https://gitlab.com/Theopse/fbi-i18n-zh.git
synced 2025-04-06 03:58:02 +08:00
Add option to install titles from CDN directly after ticket installation.
This commit is contained in:
Steven Smith
parent
91636d6741
commit
107cea8aad
@ -1,5 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
typedef struct ticket_info_s ticket_info;
|
||||
typedef struct linked_list_s linked_list;
|
||||
typedef struct list_item_s list_item;
|
||||
|
||||
@ -30,6 +31,7 @@ void action_delete_all_pending_titles(linked_list* items, list_item* selected);
|
||||
|
||||
void action_delete_ticket(linked_list* items, list_item* selected);
|
||||
void action_install_cdn(linked_list* items, list_item* selected);
|
||||
void action_install_cdn_noprompt(volatile bool* done, ticket_info* info, bool finishedPrompt);
|
||||
|
||||
void action_delete_title(linked_list* items, list_item* selected);
|
||||
void action_launch_title(linked_list* items, list_item* selected);
|
||||
|
||||
@ -17,6 +17,8 @@
|
||||
|
||||
typedef struct {
|
||||
ticket_info* ticket;
|
||||
volatile bool* done;
|
||||
bool finishedPrompt;
|
||||
|
||||
u32 contentCount;
|
||||
u16 contentIndices[CONTENTS_MAX];
|
||||
@ -160,6 +162,10 @@ static void action_install_cdn_draw_top(ui_view* view, void* data, float x1, flo
|
||||
}
|
||||
|
||||
static void action_install_cdn_free_data(install_cdn_data* data) {
|
||||
if(data->done != NULL) {
|
||||
*data->done = true;
|
||||
}
|
||||
|
||||
free(data);
|
||||
}
|
||||
|
||||
@ -182,7 +188,9 @@ static void action_install_cdn_update(ui_view* view, void* data, float* progress
|
||||
}
|
||||
|
||||
if(R_SUCCEEDED(installData->installInfo.result) && R_SUCCEEDED(res)) {
|
||||
prompt_display("Success", "Install finished.", COLOR_TEXT, false, installData->ticket, NULL, ui_draw_ticket_info, NULL);
|
||||
if(installData->finishedPrompt) {
|
||||
prompt_display("Success", "Install finished.", COLOR_TEXT, false, installData->ticket, NULL, ui_draw_ticket_info, NULL);
|
||||
}
|
||||
} else {
|
||||
AM_InstallTitleAbort();
|
||||
|
||||
@ -204,39 +212,76 @@ static void action_install_cdn_update(ui_view* view, void* data, float* progress
|
||||
snprintf(text, PROGRESS_TEXT_MAX, "%lu / %lu\n%.2f MB / %.2f MB", installData->installInfo.processed, installData->installInfo.total, installData->installInfo.currProcessed / 1024.0 / 1024.0, installData->installInfo.currTotal / 1024.0 / 1024.0);
|
||||
}
|
||||
|
||||
static void action_install_cdn_onresponse(ui_view* view, void* data, bool response) {
|
||||
install_cdn_data* installData = (install_cdn_data*) data;
|
||||
void action_install_cdn_noprompt(volatile bool* done, ticket_info* info, bool finishedPrompt) {
|
||||
install_cdn_data* data = (install_cdn_data*) calloc(1, sizeof(install_cdn_data));
|
||||
if(data == NULL) {
|
||||
error_display(NULL, NULL, NULL, "Failed to allocate install CDN data.");
|
||||
|
||||
if(response) {
|
||||
Result res = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
u8 n3ds = false;
|
||||
if(R_FAILED(APT_CheckNew3DS(&n3ds)) || n3ds || ((installData->ticket->titleId >> 28) & 0xF) != 2) {
|
||||
FS_MediaType dest = ((installData->ticket->titleId >> 32) & 0x8010) != 0 ? MEDIATYPE_NAND : MEDIATYPE_SD;
|
||||
data->ticket = info;
|
||||
data->done = done;
|
||||
data->finishedPrompt = finishedPrompt;
|
||||
|
||||
AM_DeleteTitle(dest, installData->ticket->titleId);
|
||||
if(dest == MEDIATYPE_SD) {
|
||||
AM_QueryAvailableExternalTitleDatabase(NULL);
|
||||
}
|
||||
data->responseCode = 0;
|
||||
|
||||
if(R_SUCCEEDED(res = AM_InstallTitleBegin(dest, installData->ticket->titleId, false))) {
|
||||
if(R_SUCCEEDED(res = task_data_op(&installData->installInfo))) {
|
||||
info_display("Installing CDN Title", "Press B to cancel.", true, data, action_install_cdn_update, action_install_cdn_draw_top);
|
||||
} else {
|
||||
AM_InstallTitleAbort();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
res = R_FBI_WRONG_SYSTEM;
|
||||
data->installInfo.data = data;
|
||||
|
||||
data->installInfo.op = DATAOP_COPY;
|
||||
|
||||
data->installInfo.copyEmpty = false;
|
||||
|
||||
data->installInfo.total = 1;
|
||||
|
||||
data->installInfo.isSrcDirectory = action_install_cdn_is_src_directory;
|
||||
data->installInfo.makeDstDirectory = action_install_cdn_make_dst_directory;
|
||||
|
||||
data->installInfo.openSrc = action_install_cdn_open_src;
|
||||
data->installInfo.closeSrc = action_install_cdn_close_src;
|
||||
data->installInfo.getSrcSize = action_install_cdn_get_src_size;
|
||||
data->installInfo.readSrc = action_install_cdn_read_src;
|
||||
|
||||
data->installInfo.openDst = action_install_cdn_open_dst;
|
||||
data->installInfo.closeDst = action_install_cdn_close_dst;
|
||||
data->installInfo.writeDst = action_install_cdn_write_dst;
|
||||
|
||||
data->installInfo.error = action_install_cdn_error;
|
||||
|
||||
Result res = 0;
|
||||
|
||||
u8 n3ds = false;
|
||||
if(R_FAILED(APT_CheckNew3DS(&n3ds)) || n3ds || ((data->ticket->titleId >> 28) & 0xF) != 2) {
|
||||
FS_MediaType dest = ((data->ticket->titleId >> 32) & 0x8010) != 0 ? MEDIATYPE_NAND : MEDIATYPE_SD;
|
||||
|
||||
AM_DeleteTitle(dest, data->ticket->titleId);
|
||||
if(dest == MEDIATYPE_SD) {
|
||||
AM_QueryAvailableExternalTitleDatabase(NULL);
|
||||
}
|
||||
|
||||
if(R_FAILED(res)) {
|
||||
error_display_res(NULL, installData->ticket, ui_draw_ticket_info, res, "Failed to initiate CDN title installation.");
|
||||
|
||||
action_install_cdn_free_data(installData);
|
||||
if(R_SUCCEEDED(res = AM_InstallTitleBegin(dest, data->ticket->titleId, false))) {
|
||||
if(R_SUCCEEDED(res = task_data_op(&data->installInfo))) {
|
||||
info_display("Installing CDN Title", "Press B to cancel.", true, data, action_install_cdn_update, action_install_cdn_draw_top);
|
||||
} else {
|
||||
AM_InstallTitleAbort();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
action_install_cdn_free_data(installData);
|
||||
res = R_FBI_WRONG_SYSTEM;
|
||||
}
|
||||
|
||||
if(R_FAILED(res)) {
|
||||
error_display_res(NULL, data->ticket, ui_draw_ticket_info, res, "Failed to initiate CDN title installation.");
|
||||
|
||||
action_install_cdn_free_data(data);
|
||||
}
|
||||
}
|
||||
|
||||
static void action_install_cdn_onresponse(ui_view* view, void* data, bool response) {
|
||||
ticket_info* info = (ticket_info*) data;
|
||||
|
||||
if(response) {
|
||||
action_install_cdn_noprompt(NULL, info, true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -22,6 +22,7 @@ typedef struct {
|
||||
linked_list contents;
|
||||
|
||||
bool delete;
|
||||
bool cdn;
|
||||
|
||||
data_op_data installInfo;
|
||||
} install_tickets_data;
|
||||
@ -119,8 +120,20 @@ static Result action_install_tickets_open_dst(void* data, u32 index, void* initi
|
||||
}
|
||||
|
||||
static Result action_install_tickets_close_dst(void* data, u32 index, bool succeeded, u32 handle) {
|
||||
install_tickets_data* installData = (install_tickets_data*) data;
|
||||
|
||||
if(succeeded) {
|
||||
return AM_InstallTicketFinish(handle);
|
||||
Result res = AM_InstallTicketFinish(handle);
|
||||
if(R_SUCCEEDED(res) && installData->cdn) {
|
||||
volatile bool done = false;
|
||||
action_install_cdn_noprompt(&done, &((file_info*) ((list_item*) linked_list_get(&installData->contents, index))->data)->ticketInfo, false);
|
||||
|
||||
while(!done) {
|
||||
svcSleepThread(100000000);
|
||||
}
|
||||
}
|
||||
|
||||
return res;
|
||||
} else {
|
||||
return AM_InstallTicketAbort(handle);
|
||||
}
|
||||
@ -182,23 +195,29 @@ static void action_install_tickets_update(ui_view* view, void* data, float* prog
|
||||
snprintf(text, PROGRESS_TEXT_MAX, "%lu / %lu\n%.2f MB / %.2f MB", installData->installInfo.processed, installData->installInfo.total, installData->installInfo.currProcessed / 1024.0 / 1024.0, installData->installInfo.currTotal / 1024.0 / 1024.0);
|
||||
}
|
||||
|
||||
static void action_install_tickets_onresponse(ui_view* view, void* data, bool response) {
|
||||
static void action_install_tickets_cdn_check_onresponse(ui_view* view, void* data, bool response) {
|
||||
install_tickets_data* installData = (install_tickets_data*) data;
|
||||
|
||||
if(response) {
|
||||
Result res = task_data_op(&installData->installInfo);
|
||||
if(R_SUCCEEDED(res)) {
|
||||
info_display("Installing ticket(s)", "Press B to cancel.", true, data, action_install_tickets_update, action_install_tickets_draw_top);
|
||||
} else {
|
||||
error_display_res(NULL, NULL, NULL, res, "Failed to initiate ticket installation.");
|
||||
installData->cdn = response;
|
||||
|
||||
action_install_tickets_free_data(installData);
|
||||
}
|
||||
Result res = task_data_op(&installData->installInfo);
|
||||
if(R_SUCCEEDED(res)) {
|
||||
info_display("Installing ticket(s)", "Press B to cancel.", true, data, action_install_tickets_update, action_install_tickets_draw_top);
|
||||
} else {
|
||||
error_display_res(NULL, NULL, NULL, res, "Failed to initiate ticket installation.");
|
||||
|
||||
action_install_tickets_free_data(installData);
|
||||
}
|
||||
}
|
||||
|
||||
static void action_install_tickets_onresponse(ui_view* view, void* data, bool response) {
|
||||
if(response) {
|
||||
prompt_display("Optional", "Install ticket titles from CDN?", COLOR_TEXT, true, data, NULL, action_install_tickets_draw_top, action_install_tickets_cdn_check_onresponse);
|
||||
} else {
|
||||
action_install_tickets_free_data((install_tickets_data*) data);
|
||||
}
|
||||
}
|
||||
|
||||
static void action_install_tickets_internal(linked_list* items, list_item* selected, const char* message, bool delete) {
|
||||
install_tickets_data* data = (install_tickets_data*) calloc(1, sizeof(install_tickets_data));
|
||||
if(data == NULL) {
|
||||
|
||||
@ -4,10 +4,12 @@
|
||||
#include <fcntl.h>
|
||||
#include <malloc.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <3ds.h>
|
||||
|
||||
#include "section.h"
|
||||
#include "action/action.h"
|
||||
#include "task/task.h"
|
||||
#include "../error.h"
|
||||
#include "../info.h"
|
||||
@ -22,6 +24,9 @@ typedef struct {
|
||||
u64 currTitleId;
|
||||
bool ticket;
|
||||
|
||||
bool cdn;
|
||||
ticket_info ticketInfo;
|
||||
|
||||
data_op_data installInfo;
|
||||
} network_install_data;
|
||||
|
||||
@ -105,6 +110,15 @@ static Result networkinstall_open_dst(void* data, u32 index, void* initialReadBl
|
||||
Result res = 0;
|
||||
|
||||
if(networkInstallData->ticket) {
|
||||
u8* ticket = (u8*) initialReadBlock;
|
||||
|
||||
static u32 dataOffsets[6] = {0x240, 0x140, 0x80, 0x240, 0x140, 0x80};
|
||||
static u32 titleIdOffset = 0x9C;
|
||||
|
||||
u64 titleId = 0;
|
||||
memcpy(&titleId, &ticket[dataOffsets[ticket[0x03]] + titleIdOffset], sizeof(u64));
|
||||
networkInstallData->ticketInfo.titleId = __builtin_bswap64(titleId);
|
||||
|
||||
res = AM_InstallTicketBegin(handle);
|
||||
} else {
|
||||
u8* cia = (u8*) initialReadBlock;
|
||||
@ -146,6 +160,15 @@ static Result networkinstall_close_dst(void* data, u32 index, bool succeeded, u3
|
||||
|
||||
if(networkInstallData->ticket) {
|
||||
res = AM_InstallTicketFinish(handle);
|
||||
|
||||
if(R_SUCCEEDED(res) && networkInstallData->cdn) {
|
||||
volatile bool done = false;
|
||||
action_install_cdn_noprompt(&done, &networkInstallData->ticketInfo, false);
|
||||
|
||||
while(!done) {
|
||||
svcSleepThread(100000000);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if(R_SUCCEEDED(res = AM_FinishCiaInstall(handle))) {
|
||||
if(networkInstallData->currTitleId == 0x0004013800000002 || networkInstallData->currTitleId == 0x0004013820000002) {
|
||||
@ -213,23 +236,29 @@ static void networkinstall_install_update(ui_view* view, void* data, float* prog
|
||||
snprintf(text, PROGRESS_TEXT_MAX, "%lu / %lu\n%.2f MB / %.2f MB", networkInstallData->installInfo.processed, networkInstallData->installInfo.total, networkInstallData->installInfo.currProcessed / 1024.0 / 1024.0, networkInstallData->installInfo.currTotal / 1024.0 / 1024.0);
|
||||
}
|
||||
|
||||
static void networkinstall_confirm_onresponse(ui_view* view, void* data, bool response) {
|
||||
static void networkinstall_cdn_check_onresponse(ui_view* view, void* data, bool response) {
|
||||
network_install_data* networkInstallData = (network_install_data*) data;
|
||||
|
||||
if(response) {
|
||||
Result res = task_data_op(&networkInstallData->installInfo);
|
||||
if(R_SUCCEEDED(res)) {
|
||||
info_display("Installing Received Files", "Press B to cancel.", true, data, networkinstall_install_update, NULL);
|
||||
} else {
|
||||
error_display_res(NULL, NULL, NULL, res, "Failed to initiate installation.");
|
||||
networkInstallData->cdn = response;
|
||||
|
||||
networkinstall_close_client(networkInstallData);
|
||||
}
|
||||
Result res = task_data_op(&networkInstallData->installInfo);
|
||||
if(R_SUCCEEDED(res)) {
|
||||
info_display("Installing Received Files", "Press B to cancel.", true, data, networkinstall_install_update, NULL);
|
||||
} else {
|
||||
error_display_res(NULL, NULL, NULL, res, "Failed to initiate installation.");
|
||||
|
||||
networkinstall_close_client(networkInstallData);
|
||||
}
|
||||
}
|
||||
|
||||
static void networkinstall_confirm_onresponse(ui_view* view, void* data, bool response) {
|
||||
if(response) {
|
||||
prompt_display("Optional", "Install ticket titles from CDN?", COLOR_TEXT, true, data, NULL, NULL, networkinstall_cdn_check_onresponse);
|
||||
} else {
|
||||
networkinstall_close_client((network_install_data*) data);
|
||||
}
|
||||
}
|
||||
|
||||
static void networkinstall_wait_update(ui_view* view, void* data, float* progress, char* text) {
|
||||
network_install_data* networkInstallData = (network_install_data*) data;
|
||||
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
#include <3ds.h>
|
||||
|
||||
#include "section.h"
|
||||
#include "action/action.h"
|
||||
#include "task/task.h"
|
||||
#include "../error.h"
|
||||
#include "../info.h"
|
||||
@ -29,6 +30,9 @@ typedef struct {
|
||||
u64 currTitleId;
|
||||
bool ticket;
|
||||
|
||||
bool cdn;
|
||||
ticket_info ticketInfo;
|
||||
|
||||
capture_cam_data captureInfo;
|
||||
data_op_data installInfo;
|
||||
} qr_install_data;
|
||||
@ -106,6 +110,15 @@ static Result qrinstall_open_dst(void* data, u32 index, void* initialReadBlock,
|
||||
Result res = 0;
|
||||
|
||||
if(qrInstallData->ticket) {
|
||||
u8* ticket = (u8*) initialReadBlock;
|
||||
|
||||
static u32 dataOffsets[6] = {0x240, 0x140, 0x80, 0x240, 0x140, 0x80};
|
||||
static u32 titleIdOffset = 0x9C;
|
||||
|
||||
u64 titleId = 0;
|
||||
memcpy(&titleId, &ticket[dataOffsets[ticket[0x03]] + titleIdOffset], sizeof(u64));
|
||||
qrInstallData->ticketInfo.titleId = __builtin_bswap64(titleId);
|
||||
|
||||
res = AM_InstallTicketBegin(handle);
|
||||
} else {
|
||||
u8* cia = (u8*) initialReadBlock;
|
||||
@ -147,6 +160,15 @@ static Result qrinstall_close_dst(void* data, u32 index, bool succeeded, u32 han
|
||||
|
||||
if(qrInstallData->ticket) {
|
||||
res = AM_InstallTicketFinish(handle);
|
||||
|
||||
if(R_SUCCEEDED(res) && qrInstallData->cdn) {
|
||||
volatile bool done = false;
|
||||
action_install_cdn_noprompt(&done, &qrInstallData->ticketInfo, false);
|
||||
|
||||
while(!done) {
|
||||
svcSleepThread(100000000);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if(R_SUCCEEDED(res = AM_FinishCiaInstall(handle))) {
|
||||
if(qrInstallData->currTitleId == 0x0004013800000002 || qrInstallData->currTitleId == 0x0004013820000002) {
|
||||
@ -223,16 +245,22 @@ static void qrinstall_install_update(ui_view* view, void* data, float* progress,
|
||||
snprintf(text, PROGRESS_TEXT_MAX, "%lu / %lu\n%.2f MB / %.2f MB", qrInstallData->installInfo.processed, qrInstallData->installInfo.total, qrInstallData->installInfo.currProcessed / 1024.0 / 1024.0, qrInstallData->installInfo.currTotal / 1024.0 / 1024.0);
|
||||
}
|
||||
|
||||
static void qrinstall_confirm_onresponse(ui_view* view, void* data, bool response) {
|
||||
static void qrinstall_cdn_check_onresponse(ui_view* view, void* data, bool response) {
|
||||
qr_install_data* qrInstallData = (qr_install_data*) data;
|
||||
|
||||
qrInstallData->cdn = response;
|
||||
|
||||
Result res = task_data_op(&qrInstallData->installInfo);
|
||||
if(R_SUCCEEDED(res)) {
|
||||
info_display("Installing From QR Code", "Press B to cancel.", true, data, qrinstall_install_update, NULL);
|
||||
} else {
|
||||
error_display_res(NULL, NULL, NULL, res, "Failed to initiate installation.");
|
||||
}
|
||||
}
|
||||
|
||||
static void qrinstall_confirm_onresponse(ui_view* view, void* data, bool response) {
|
||||
if(response) {
|
||||
Result res = task_data_op(&qrInstallData->installInfo);
|
||||
if(R_SUCCEEDED(res)) {
|
||||
info_display("Installing From QR Code", "Press B to cancel.", true, data, qrinstall_install_update, NULL);
|
||||
} else {
|
||||
error_display_res(NULL, NULL, NULL, res, "Failed to initiate installation.");
|
||||
}
|
||||
prompt_display("Optional", "Install ticket titles from CDN?", COLOR_TEXT, true, data, NULL, NULL, qrinstall_cdn_check_onresponse);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user