tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2025-01-14 08:36:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reimplement Auto/Manual OSUpgrade choice and functionality.

Browse source
This commit is contained in:
TomAwezome 2022-10-24 01:41:53 -04:00
parent f43001300e
commit 5a8a1ab528
1 changed files with 37 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/Misc/OSInstall.ZC
View file

@ -54,21 +54,12 @@ U0 OSFilesMergeInner(CDirEntry *tmpde1, CDirEntry *tmpde2, I64 *_df_flags)
OSFilesMergeInner(tmpde1->sub, tmpde->sub, _df_flags); OSFilesMergeInner(tmpde1->sub, tmpde->sub, _df_flags);
else else
{ {
// if (AbsI64(tmpde1->datetime - tmpde->datetime) > CDATE_FREQ * 2) //slop
// {
"\n$$LTRED$$%s$$FG$$\n", tmpde->full_name;
"$$LTGREEN$$%s$$FG$$\n", tmpde1->full_name;
// if (Bt(_fuf_flags, FUf_DIFF))
// {
if (FilesFindMatch(tmpde1->full_name, FILEMASK_TXT)) if (FilesFindMatch(tmpde1->full_name, FILEMASK_TXT))
{ {
// if (!auto) "\n$$LTRED$$%s$$FG$$\n", tmpde->full_name;
"$$LTGREEN$$%s$$FG$$\n", tmpde1->full_name;
Diff(tmpde->full_name, tmpde1->full_name, _df_flags); Diff(tmpde->full_name, tmpde1->full_name, _df_flags);
// else
// Copy(tmpde1->full_name, tmpde->full_name);
} }
// }
// }
} }
} }
tmpde1 = tmpde1->next; tmpde1 = tmpde1->next;
@ -77,10 +68,9 @@ U0 OSFilesMergeInner(CDirEntry *tmpde1, CDirEntry *tmpde2, I64 *_df_flags)
U0 OSFilesMerge(U8 *dst_files_find_mask="/*", U8 *src_files_find_mask="/*", U8 *fu_flags=NULL) U0 OSFilesMerge(U8 *dst_files_find_mask="/*", U8 *src_files_find_mask="/*", U8 *fu_flags=NULL)
{ // See $LK+PU,"Merge",A="FF:::/System/Utils/Merge.ZC,public U0 Merge"$. { // See $LK+PU,"Merge",A="FF:::/System/Utils/Merge.ZC,public U0 Merge"$.
I64 df_flags, fuf_flags = 0; I64 df_flags, fuf_flags = 0, ch;
CDirEntry *tmpde1 = NULL, *tmpde2 = NULL; CDirEntry *tmpde1 = NULL, *tmpde2 = NULL;
df_flags = DF_REMAINDER_ALL_FILE2 | DF_NO_MORE_PROMPTS_THIS_FILE | DF_KEEP_FLAGS;
FlagsScan(&fuf_flags, Define("ST_FILE_UTIL_FLAGS"), "+r"); FlagsScan(&fuf_flags, Define("ST_FILE_UTIL_FLAGS"), "+r");
FlagsScan(&fuf_flags, Define("ST_FILE_UTIL_FLAGS"), fu_flags); FlagsScan(&fuf_flags, Define("ST_FILE_UTIL_FLAGS"), fu_flags);
if (fuf_flags & ~(FUG_FILES_FIND | FUF_DIFF)) if (fuf_flags & ~(FUG_FILES_FIND | FUF_DIFF))
@ -88,20 +78,23 @@ U0 OSFilesMerge(U8 *dst_files_find_mask="/*", U8 *src_files_find_mask="/*", U8 *
PrintWarn("This is based strictly on file dates.\n"); PrintWarn("This is based strictly on file dates.\n");
tmpde1 = FilesFind(src_files_find_mask, fuf_flags & FUG_FILES_FIND); tmpde1 = FilesFind(src_files_find_mask, fuf_flags & FUG_FILES_FIND);
tmpde2 = FilesFind(dst_files_find_mask, fuf_flags & FUG_FILES_FIND); tmpde2 = FilesFind(dst_files_find_mask, fuf_flags & FUG_FILES_FIND);
// fuf_flags &= FUF_DIFF;
// "\n\nManual or Automatic Upgrade? (M/A): "; "\n\nManual or Automatic Upgrade? (M/A): ";
// do do
// ch = ToUpper(CharGet(, FALSE)); ch = ToUpper(CharGet(, FALSE));
// while (ch != 'M' && ch != 'A'); while (ch != 'M' && ch != 'A');
// if (ch == 'M') if (ch == 'M')
// { {
// PopUpOk("\n$$LTGREEN$$FILE2$$FG$$ is new changes.\n" PopUpOk("\n$$LTGREEN$$FILE2$$FG$$ is new changes.\n"
// "$$LTRED$$FILE1$$FG$$ is from existing install."); "$$LTRED$$FILE1$$FG$$ is from existing install.");
// OSFilesMergeInner(tmpde1, tmpde2, &fuf_flags, &df_flags); df_flags = 0;
// }
// else
OSFilesMergeInner(tmpde1, tmpde2, &df_flags); OSFilesMergeInner(tmpde1, tmpde2, &df_flags);
}
else
{
df_flags = DF_REMAINDER_ALL_FILE2 | DF_NO_MORE_PROMPTS_THIS_FILE | DF_KEEP_FLAGS;
OSFilesMergeInner(tmpde1, tmpde2, &df_flags);
}
DirTreeDel(tmpde1); DirTreeDel(tmpde1);
DirTreeDel(tmpde2); DirTreeDel(tmpde2);
@ -115,8 +108,25 @@ U0 OSMerge(U8 dst_drv, U8 src_drv=':')
CopyTree(dst, "B:/"); CopyTree(dst, "B:/");
Del("B:/Misc/Bible.TXT"); // Deleting from B:/ prevents causing hang when merging large .TXT files, Del("B:/Misc/Bible.TXT"); // Deleting from B:/ prevents causing hang when merging large .TXT files,
Del("B:/Misc/Clementine.TXT"); // they will instead be copied over from boot drive in OSMergeInner Del("B:/Misc/Clementine.TXT"); // they will instead be copied over from boot drive in OSMergeInner
DocMax;
"$$PB$$$$PB$$$$LTCYAN$$Beginning Upgrade (running OSFilesMerge) ...$$FG$$\n\n";
OSFilesMerge("B:/", src, "+d"); OSFilesMerge("B:/", src, "+d");
"\n\n$$LTCYAN$$Upgrade merge completed."
"\nChanges listed above, scroll up to see all."
"\n\nPress ESC when you are ready to finish Upgrade (write merged files to disk).$$FG$$\n\n";
View;
DocBottom;
CopyTree("B:/", dst); CopyTree("B:/", dst);
ExePrint("Del(\"%C:/Boot/Limine-CD.BIN\");", dst_drv);
ExePrint("Del(\"%C:/Boot/Limine-CD-EFI.BIN\");", dst_drv);
ExePrint("Del(\"%C:/boot.catalog\");", dst_drv);
} }
U0 OSUpgrade() U0 OSUpgrade()
@ -168,10 +178,6 @@ U0 OSUpgrade()
'\n'; '\n';
DocMax;
"\nBeginning Upgrade...\n\n";
OSMerge(drv_let); // src_drv needed? OSMerge(drv_let); // src_drv needed?
XTalkWait(task, "BootHDIns('%C');\n\nB\n0x20000\n%C\n%s\n\n", drv_let, drv_let, port_st); XTalkWait(task, "BootHDIns('%C');\n\nB\n0x20000\n%C\n%s\n\n", drv_let, drv_let, port_st);