nold/hekate
1
0
Fork 0
mirror of https://github.com/CTCaer/hekate synced 2024-12-22 19:31:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

nyx: Fix eMMC split restore when < 10 parts

Browse source 
Now it properly follows the double digit scheme.
(rawnand.bin.##)
This commit is contained in:
CTCaer 2019-08-28 02:23:46 +03:00
parent 92a60a1e89
commit 6cc3d9df67
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
nyx/nyx_gui/frontend/fe_emmc_tools.c
View file

@ -132,9 +132,9 @@ static lv_obj_t *create_mbox_text(char *text, bool button_ok)
return dark_bg; return dark_bg;
} }
static void _update_filename(char *outFilename, u32 sdPathLen, u32 numSplitParts, u32 currPartIdx) static void _update_filename(char *outFilename, u32 sdPathLen, u32 currPartIdx)
{ {
if (numSplitParts >= 10 && currPartIdx < 10) if (currPartIdx < 10)
{ {
outFilename[sdPathLen] = '0'; outFilename[sdPathLen] = '0';
itoa(currPartIdx, &outFilename[sdPathLen + 1], 10); itoa(currPartIdx, &outFilename[sdPathLen + 1], 10);
@ -443,7 +443,7 @@ static int _dump_emmc_part(emmc_tool_gui_t *gui, char *sd_path, sdmmc_storage_t
outFilename[sdPathLen++] = '.'; outFilename[sdPathLen++] = '.';
// Continue from where we left, if Partial Backup in progress. // Continue from where we left, if Partial Backup in progress.
_update_filename(outFilename, sdPathLen, numSplitParts, partialDumpInProgress ? currPartIdx : 0); _update_filename(outFilename, sdPathLen, partialDumpInProgress ? currPartIdx : 0);
} }
FIL fp; FIL fp;
@ -530,7 +530,7 @@ static int _dump_emmc_part(emmc_tool_gui_t *gui, char *sd_path, sdmmc_storage_t
lv_bar_set_style(gui->bar, LV_BAR_STYLE_INDIC, gui->bar_white_ind); lv_bar_set_style(gui->bar, LV_BAR_STYLE_INDIC, gui->bar_white_ind);
} }
_update_filename(outFilename, sdPathLen, numSplitParts, currPartIdx); _update_filename(outFilename, sdPathLen, currPartIdx);
// Always create partial.idx before next part, in case a fatal error occurs. // Always create partial.idx before next part, in case a fatal error occurs.
if (isSmallSdCard) if (isSmallSdCard)
@ -935,7 +935,7 @@ static int _restore_emmc_part(emmc_tool_gui_t *gui, char *sd_path, int active_pa
outFilename[sdPathLen++] = '.'; outFilename[sdPathLen++] = '.';
_update_filename(outFilename, sdPathLen, 99, numSplitParts); _update_filename(outFilename, sdPathLen, numSplitParts);
s_printf(gui->txt_buf, "#96FF00 Filepath:#\n%s\n#96FF00 Filename:# #FF8000 %s#", s_printf(gui->txt_buf, "#96FF00 Filepath:#\n%s\n#96FF00 Filename:# #FF8000 %s#",
gui->base_path, outFilename + strlen(gui->base_path)); gui->base_path, outFilename + strlen(gui->base_path));
@ -944,7 +944,7 @@ static int _restore_emmc_part(emmc_tool_gui_t *gui, char *sd_path, int active_pa
// Stat total size of the part files. // Stat total size of the part files.
while ((u32)((u64)totalCheckFileSize >> (u64)9) != totalSectors) while ((u32)((u64)totalCheckFileSize >> (u64)9) != totalSectors)
{ {
_update_filename(outFilename, sdPathLen, 99, numSplitParts); _update_filename(outFilename, sdPathLen, numSplitParts);
s_printf(gui->txt_buf, "%s#", outFilename + strlen(gui->base_path)); s_printf(gui->txt_buf, "%s#", outFilename + strlen(gui->base_path));
lv_label_ins_text(gui->label_info, lv_label_ins_text(gui->label_info,
@ -988,7 +988,7 @@ static int _restore_emmc_part(emmc_tool_gui_t *gui, char *sd_path, int active_pa
else else
{ {
use_multipart = true; use_multipart = true;
_update_filename(outFilename, sdPathLen, numSplitParts, 0); _update_filename(outFilename, sdPathLen, 0);
} }
} }
} }
@ -1109,7 +1109,7 @@ static int _restore_emmc_part(emmc_tool_gui_t *gui, char *sd_path, int active_pa
} }
} }
_update_filename(outFilename, sdPathLen, numSplitParts, currPartIdx); _update_filename(outFilename, sdPathLen, currPartIdx);
// Read from next part. // Read from next part.
s_printf(gui->txt_buf, "%s#", outFilename + strlen(gui->base_path)); s_printf(gui->txt_buf, "%s#", outFilename + strlen(gui->base_path));