blackteay/fbi-i18n-zh
1
0
Fork 0
mirror of https://gitlab.com/Theopse/fbi-i18n-zh.git synced 2025-04-26 03:16:36 +08:00
Code Issues Projects Releases Wiki Activity

Show byte progress when pasting files.

Browse Source
This commit is contained in:
Steven Smith 2016-04-16 19:17:30 -07:00
parent 078fbe7adf
commit 3e6e6912b2
2 changed files with 133 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
source/ui/section/action/pastefiles.c
View File

@ -12,9 +12,17 @@
#include "../../../screen.h" #include "../../../screen.h"
#include "../../../util.h" #include "../../../util.h"
#define PASTE_BUFFER_SIZE (1024 * 512)
typedef struct { typedef struct {
file_info* base; file_info* base;
bool* populated; bool* populated;
bool started;
u8* buffer;
Handle currSrc;
Handle currDst;
u64 currProcessed;
u64 currTotal;
u32 processed; u32 processed;
u32 total; u32 total;
char** contents; char** contents;
@ -30,6 +38,7 @@ static void action_paste_files_failure_onresponse(ui_view* view, void* data, boo
static void action_paste_files_free_data(paste_files_data* data) { static void action_paste_files_free_data(paste_files_data* data) {
util_free_contents(data->contents, data->total); util_free_contents(data->contents, data->total);
free(data->buffer);
free(data); free(data);
} }
@ -43,6 +52,16 @@ static void action_paste_files_update(ui_view* view, void* data, float* progress
paste_files_data* pasteData = (paste_files_data*) data; paste_files_data* pasteData = (paste_files_data*) data;
if(hidKeysDown() & KEY_B) { if(hidKeysDown() & KEY_B) {
if(pasteData->currSrc != 0) {
FSFILE_Close(pasteData->currSrc);
pasteData->currSrc = 0;
}
if(pasteData->currDst != 0) {
FSFILE_Close(pasteData->currDst);
pasteData->currDst = 0;
}
progressbar_destroy(view); progressbar_destroy(view);
ui_pop(); ui_pop();
@ -50,15 +69,37 @@ static void action_paste_files_update(ui_view* view, void* data, float* progress
return; return;
} }
if(!pasteData->started || pasteData->currProcessed >= pasteData->currTotal) {
if(pasteData->started) {
if(pasteData->currSrc != 0) {
FSFILE_Close(pasteData->currSrc);
pasteData->currSrc = 0;
}
if(pasteData->currDst != 0) {
FSFILE_Close(pasteData->currDst);
pasteData->currDst = 0;
}
if(pasteData->base->archive->id == ARCHIVE_USER_SAVEDATA) {
FSUSER_ControlArchive(*pasteData->base->archive, ARCHIVE_ACTION_COMMIT_SAVE_DATA, NULL, 0, NULL, 0);
}
pasteData->currProcessed = 0;
pasteData->currTotal = 0;
pasteData->processed++;
}
if(pasteData->processed >= pasteData->total) { if(pasteData->processed >= pasteData->total) {
progressbar_destroy(view);
ui_pop(); ui_pop();
progressbar_destroy(view);
ui_push(prompt_create("Success", "Contents pasted.", COLOR_TEXT, false, data, NULL, action_paste_files_draw_top, action_paste_files_done_onresponse)); ui_push(prompt_create("Success", "Contents pasted.", COLOR_TEXT, false, data, NULL, action_paste_files_draw_top, action_paste_files_done_onresponse));
return;
} else { } else {
FS_Archive* srcArchive = clipboard_get_archive(); FS_Archive* srcArchive = clipboard_get_archive();
char* srcPath = pasteData->contents[pasteData->processed]; char* srcPath = pasteData->contents[pasteData->processed];
FS_Path srcFsPath = fsMakePath(PATH_ASCII, srcPath);
char baseDstPath[PATH_MAX]; char baseDstPath[PATH_MAX];
if(pasteData->base->isDirectory) { if(pasteData->base->isDirectory) {
@ -71,45 +112,31 @@ static void action_paste_files_update(ui_view* view, void* data, float* progress
char dstPath[PATH_MAX]; char dstPath[PATH_MAX];
util_get_parent_path(dstPath, clipboard_get_path(), PATH_MAX); util_get_parent_path(dstPath, clipboard_get_path(), PATH_MAX);
snprintf(dstPath, PATH_MAX, "%s%s", baseDstPath, srcPath + strlen(dstPath)); snprintf(dstPath, PATH_MAX, "%s%s", baseDstPath, srcPath + strlen(dstPath));
FS_Path dstFsPath = fsMakePath(PATH_ASCII, dstPath);
Result res = 0; Result res = 0;
if(util_is_dir(srcArchive, srcPath)) { if(util_is_dir(srcArchive, srcPath)) {
res = FSUSER_CreateDirectory(*dstArchive, dstFsPath, 0); res = FSUSER_CreateDirectory(*dstArchive, fsMakePath(PATH_ASCII, dstPath), 0);
} else { } else {
Handle srcFileHandle; if(R_SUCCEEDED(res = FSUSER_OpenFile(&pasteData->currSrc, *srcArchive, fsMakePath(PATH_ASCII, srcPath), FS_OPEN_READ, 0)) && R_SUCCEEDED(res = FSFILE_GetSize(pasteData->currSrc, &pasteData->currTotal))) {
if(R_SUCCEEDED(res = FSUSER_OpenFile(&srcFileHandle, *srcArchive, srcFsPath, FS_OPEN_READ, 0))) { res = FSUSER_OpenFile(&pasteData->currDst, *dstArchive, fsMakePath(PATH_ASCII, dstPath), FS_OPEN_WRITE | FS_OPEN_CREATE, 0);
Handle dstFileHandle;
if(R_SUCCEEDED(res = FSUSER_OpenFile(&dstFileHandle, *dstArchive, dstFsPath, FS_OPEN_WRITE | FS_OPEN_CREATE, 0))) {
u32 bytesRead = 0;
u32 offset = 0;
u8* buffer = (u8*) calloc(1, 1024 * 512);
while(R_SUCCEEDED(FSFILE_Read(srcFileHandle, &bytesRead, offset, buffer, 1024 * 512)) && bytesRead > 0) {
u32 bytesWritten = 0;
if(R_FAILED(res = FSFILE_Write(dstFileHandle, &bytesWritten, offset, buffer, bytesRead, 0))) {
break;
}
offset += bytesWritten;
}
free(buffer);
FSFILE_Close(dstFileHandle);
if(R_SUCCEEDED(res) && dstArchive->id == ARCHIVE_USER_SAVEDATA) {
res = FSUSER_ControlArchive(*dstArchive, ARCHIVE_ACTION_COMMIT_SAVE_DATA, NULL, 0, NULL, 0);
}
}
FSFILE_Close(srcFileHandle);
} }
} }
if(R_FAILED(res)) { if(R_FAILED(res)) {
if(pasteData->currSrc != 0) {
FSFILE_Close(pasteData->currSrc);
pasteData->currSrc = 0;
}
if(pasteData->currDst != 0) {
FSFILE_Close(pasteData->currDst);
pasteData->currDst = 0;
}
if(pasteData->processed >= pasteData->total - 1) { if(pasteData->processed >= pasteData->total - 1) {
ui_pop(); ui_pop();
progressbar_destroy(view);
} }
if(strlen(srcPath) > 48) { if(strlen(srcPath) > 48) {
@ -120,20 +147,68 @@ static void action_paste_files_update(ui_view* view, void* data, float* progress
if(pasteData->processed >= pasteData->total - 1) { if(pasteData->processed >= pasteData->total - 1) {
action_paste_files_free_data(pasteData); action_paste_files_free_data(pasteData);
progressbar_destroy(view);
return; return;
} }
} else { } else {
*pasteData->populated = false; *pasteData->populated = false;
pasteData->started = true;
}
}
} else if(pasteData->currSrc != 0 && pasteData->currDst != 0) {
Result res = 0;
u32 size = PASTE_BUFFER_SIZE;
if((u64) size > pasteData->currTotal - pasteData->currProcessed) {
size = (u32) (pasteData->currTotal - pasteData->currProcessed);
} }
pasteData->processed++; u32 bytesRead = 0;
if(R_SUCCEEDED(res = FSFILE_Read(pasteData->currSrc, &bytesRead, pasteData->currProcessed, pasteData->buffer, size)) && bytesRead > 0) {
*progress = (float) pasteData->processed / (float) pasteData->total; u32 bytesWritten = 0;
snprintf(progressText, PROGRESS_TEXT_MAX, "%lu / %lu", pasteData->processed, pasteData->total); if(R_SUCCEEDED(res = FSFILE_Write(pasteData->currDst, &bytesWritten, pasteData->currProcessed, pasteData->buffer, bytesRead, 0))) {
pasteData->currProcessed += bytesWritten;
} }
} }
if(R_FAILED(res)) {
if(pasteData->currSrc != 0) {
FSFILE_Close(pasteData->currSrc);
pasteData->currSrc = 0;
}
if(pasteData->currDst != 0) {
FSFILE_Close(pasteData->currDst);
pasteData->currDst = 0;
}
if(pasteData->processed >= pasteData->total - 1) {
ui_pop();
progressbar_destroy(view);
}
char* srcPath = pasteData->contents[pasteData->processed];
if(strlen(srcPath) > 48) {
error_display_res(pasteData->base, ui_draw_file_info, res, "Failed to paste content.\n%.45s...", srcPath);
} else {
error_display_res(pasteData->base, ui_draw_file_info, res, "Failed to paste content.\n%.48s", srcPath);
}
pasteData->currProcessed = pasteData->currTotal;
if(pasteData->processed >= pasteData->total - 1) {
action_paste_files_free_data(pasteData);
return;
}
}
}
*progress = pasteData->currTotal != 0 ? (float) ((double) pasteData->currProcessed / (double) pasteData->currTotal) : 1;
snprintf(progressText, PROGRESS_TEXT_MAX, "%lu / %lu\n%.2f MB / %.2f MB", pasteData->processed, pasteData->total, pasteData->currProcessed / 1024.0 / 1024.0, pasteData->currTotal / 1024.0 / 1024.0);
}
static void action_paste_files_onresponse(ui_view* view, void* data, bool response) { static void action_paste_files_onresponse(ui_view* view, void* data, bool response) {
prompt_destroy(view); prompt_destroy(view);
@ -155,6 +230,12 @@ void action_paste_contents(file_info* info, bool* populated) {
paste_files_data* data = (paste_files_data*) calloc(1, sizeof(paste_files_data)); paste_files_data* data = (paste_files_data*) calloc(1, sizeof(paste_files_data));
data->base = info; data->base = info;
data->populated = populated; data->populated = populated;
data->started = false;
data->buffer = (u8*) calloc(1, PASTE_BUFFER_SIZE);
data->currSrc = 0;
data->currDst = 0;
data->currProcessed = 0;
data->currTotal = 0;
data->processed = 0; data->processed = 0;
Result res = 0; Result res = 0;

1
source/ui/section/tickets.c
View File

@ -4,7 +4,6 @@
#include <3ds.h> #include <3ds.h>
#include "action/action.h" #include "action/action.h"
#include "task/task.h"
#include "../../screen.h" #include "../../screen.h"
#include "section.h" #include "section.h"