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

Fix multi CIA installation.

Browse Source
This commit is contained in:
Steven Smith 2016-04-16 10:36:14 -07:00
parent c585211212
commit 258c4a5752
2 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
source/ui/section/action/installcias.c
View File

@ -49,6 +49,11 @@ static void action_install_cias_draw_top(ui_view* view, void* data, float x1, fl
} }
static void action_install_cias_free_data(install_cias_data* data) { static void action_install_cias_free_data(install_cias_data* data) {
if(data->currHandle != 0) {
FSFILE_Close(data->currHandle);
data->currHandle = 0;
}
util_free_contents(data->contents, data->total); util_free_contents(data->contents, data->total);
free(data); free(data);
} }
@ -72,17 +77,18 @@ static void action_install_cias_update(ui_view* view, void* data, float* progres
} }
if(!installData->installStarted || installData->installResult.finished) { if(!installData->installStarted || installData->installResult.finished) {
char* path = installData->contents[installData->processed];
if(installData->currHandle != 0) { if(installData->currHandle != 0) {
FSFILE_Close(installData->currHandle); FSFILE_Close(installData->currHandle);
installData->currHandle = 0; installData->currHandle = 0;
} }
if(installData->installResult.finished) { if(installData->installResult.finished) {
char* path = installData->contents[installData->processed];
if(installData->installResult.failed) { if(installData->installResult.failed) {
if(installData->installResult.cancelled || installData->processed >= installData->total - 1) { if(installData->installResult.cancelled || installData->processed >= installData->total - 1) {
ui_pop(); ui_pop();
progressbar_destroy(view);
} }
if(installData->installResult.cancelled) { if(installData->installResult.cancelled) {
@ -108,12 +114,9 @@ static void action_install_cias_update(ui_view* view, void* data, float* progres
action_install_cias_free_data(installData); action_install_cias_free_data(installData);
} }
progressbar_destroy(view);
return; return;
} }
} } else if(installData->delete) {
if(installData->delete) {
if(R_SUCCEEDED(FSUSER_DeleteFile(*installData->base->archive, fsMakePath(PATH_ASCII, path))) && installData->base->archive->id == ARCHIVE_USER_SAVEDATA) { if(R_SUCCEEDED(FSUSER_DeleteFile(*installData->base->archive, fsMakePath(PATH_ASCII, path))) && installData->base->archive->id == ARCHIVE_USER_SAVEDATA) {
FSUSER_ControlArchive(*installData->base->archive, ARCHIVE_ACTION_COMMIT_SAVE_DATA, NULL, 0, NULL, 0); FSUSER_ControlArchive(*installData->base->archive, ARCHIVE_ACTION_COMMIT_SAVE_DATA, NULL, 0, NULL, 0);
} }
@ -122,9 +125,13 @@ static void action_install_cias_update(ui_view* view, void* data, float* progres
} }
installData->processed++; installData->processed++;
}
installData->installStarted = true; installData->currProcessed = 0;
installData->currTotal = 0;
memset(&installData->installResult, 0, sizeof(installData->installResult));
installData->installCancelEvent = 0;
}
if(installData->processed >= installData->total) { if(installData->processed >= installData->total) {
ui_pop(); ui_pop();
@ -133,20 +140,30 @@ static void action_install_cias_update(ui_view* view, void* data, float* progres
ui_push(prompt_create("Success", "Install finished.", COLOR_TEXT, false, data, NULL, action_install_cias_draw_top, action_install_cias_done_onresponse)); ui_push(prompt_create("Success", "Install finished.", COLOR_TEXT, false, data, NULL, action_install_cias_draw_top, action_install_cias_done_onresponse));
return; return;
} else { } else {
FS_Archive* archive = installData->base->archive; char* path = installData->contents[installData->processed];
FS_Path fsPath = fsMakePath(PATH_ASCII, path);
Result res = 0; Result res = 0;
if(R_SUCCEEDED(res = FSUSER_OpenFile(&installData->currHandle, *archive, fsPath, FS_OPEN_READ, 0))) { if(R_SUCCEEDED(res = FSUSER_OpenFile(&installData->currHandle, *installData->base->archive, fsMakePath(PATH_ASCII, path), FS_OPEN_READ, 0))) {
u64 size = 0; u64 size = 0;
if(R_SUCCEEDED(res = FSFILE_GetSize(installData->currHandle, &size))) { if(R_SUCCEEDED(res = FSFILE_GetSize(installData->currHandle, &size))) {
installData->currTotal = size; installData->currTotal = size;
installData->installCancelEvent = task_install_cia(&installData->installResult, installData->currTotal, installData, action_install_cias_read); installData->installCancelEvent = task_install_cia(&installData->installResult, installData->currTotal, installData, action_install_cias_read);
if(installData->installCancelEvent == 0) { if(installData->installCancelEvent != 0) {
installData->installStarted = true;
} else {
ui_pop(); ui_pop();
progressbar_destroy(view); progressbar_destroy(view);
if(strlen(path) > 48) {
error_display_res(installData->base, ui_draw_file_info, res, "Failed to start CIA install.\n%.45s...", path);
} else {
error_display_res(installData->base, ui_draw_file_info, res, "Failed to start CIA install.\n%.48s", path);
}
action_install_cias_free_data(installData);
return; return;
} }
} }
@ -160,6 +177,7 @@ static void action_install_cias_update(ui_view* view, void* data, float* progres
if(installData->processed >= installData->total - 1) { if(installData->processed >= installData->total - 1) {
ui_pop(); ui_pop();
progressbar_destroy(view);
} }
if(strlen(path) > 48) { if(strlen(path) > 48) {
@ -170,7 +188,7 @@ static void action_install_cias_update(ui_view* view, void* data, float* progres
if(installData->processed >= installData->total - 1) { if(installData->processed >= installData->total - 1) {
action_install_cias_free_data(installData); action_install_cias_free_data(installData);
progressbar_destroy(view);
return; return;
} }
} }
@ -198,11 +216,15 @@ static void action_install_cias_internal(file_info* info, bool* populated, bool
data->base = info; data->base = info;
data->delete = delete; data->delete = delete;
data->populated = populated; data->populated = populated;
data->currHandle = 0;
data->installStarted = false; data->installStarted = false;
data->currProcessed = 0; data->currProcessed = 0;
data->currTotal = 0; data->currTotal = 0;
data->processed = 0; data->processed = 0;
memset(&data->installResult, 0, sizeof(data->installResult));
data->installCancelEvent = 0;
Result res = 0; Result res = 0;
if(R_FAILED(res = util_populate_contents(&data->contents, &data->total, info->archive, info->path, false, false, ".cia", util_filter_file_extension))) { if(R_FAILED(res = util_populate_contents(&data->contents, &data->total, info->archive, info->path, false, false, ".cia", util_filter_file_extension))) {
error_display_res(info, ui_draw_file_info, res, "Failed to retrieve content list."); error_display_res(info, ui_draw_file_info, res, "Failed to retrieve content list.");

6
source/ui/section/networkinstall.c
View File

@ -66,7 +66,7 @@ static Result networkinstall_read(void* data, u32* bytesRead, void* buffer, u32
*bytesRead = (u32) ret; *bytesRead = (u32) ret;
} }
} else { } else {
res = -2; res = -1;
} }
return res; return res;
@ -167,8 +167,12 @@ static void networkinstall_install_update(ui_view* view, void* data, float* prog
if(networkInstallData->currTotal != 0) { if(networkInstallData->currTotal != 0) {
networkInstallData->installCancelEvent = task_install_cia(&networkInstallData->installResult, networkInstallData->currTotal, networkInstallData, networkinstall_read); networkInstallData->installCancelEvent = task_install_cia(&networkInstallData->installResult, networkInstallData->currTotal, networkInstallData, networkinstall_read);
if(networkInstallData->installCancelEvent == 0) { if(networkInstallData->installCancelEvent == 0) {
networkinstall_close_client(networkInstallData);
ui_pop(); ui_pop();
progressbar_destroy(view); progressbar_destroy(view);
error_display(NULL, NULL, "Failed to start CIA install.");
return; return;
} }
} else { } else {