Mirrors/Awoo-Installer
2
0
Fork 0
mirror of https://github.com/Huntereb/Awoo-Installer synced 2024-11-10 14:14:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Made install progress look less jumpy and odd

Browse source
This commit is contained in:
Huntereb 2019-11-03 19:13:10 -05:00
parent fe435842d4
commit ad388c412d
4 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/install/http_nsp.cpp
View file

@ -132,6 +132,7 @@ namespace tin::install::nsp
inst::ui::setInstBarPerc((double)downloadProgress);
//consoleUpdate(NULL);
}
inst::ui::setInstBarPerc(100);
u64 totalSizeMB = bufferedPlaceholderWriter.GetTotalDataSize() / 1000000;
@ -146,6 +147,7 @@ namespace tin::install::nsp
inst::ui::setInstBarPerc((double)installProgress);
//consoleUpdate(NULL);
}
inst::ui::setInstBarPerc(100);
thrd_join(curlThread, NULL);
thrd_join(writeThread, NULL);

1
source/install/install_nsp.cpp
View file

@ -147,6 +147,7 @@ namespace tin::install::nsp
fileOff += readSize;
//consoleUpdate(NULL);
}
inst::ui::setInstBarPerc(100);
}
catch (...)
{

6
source/netInstall.cpp
View file

@ -142,18 +142,20 @@ namespace netInstStuff{
printf("Failed to install");
printf("%s", e.what());
fprintf(stdout, "%s", e.what());
inst::ui::setInstInfoText("Failed to install");
inst::ui::setInstBarPerc(0);
inst::ui::mainApp->CreateShowDialog("Failed to install!", "Partially installed contents can be removed from the System Settings applet.\n\n" + (std::string)e.what(), {"OK"}, true);
nspInstalled = false;
}
printf("%s\n", "Telling the server we're done installing");
inst::ui::setInstInfoText("Telling the server we're done installing...");
// Send 1 byte ack to close the server
u8 ack = 0;
tin::network::WaitSendNetworkData(m_clientSocket, &ack, sizeof(u8));
inst::ui::setInstBarPerc(100);
if(nspInstalled) {
inst::ui::setInstInfoText("Install complete");
inst::ui::setInstBarPerc(100);
if (ourUrlList.size() > 1) inst::ui::mainApp->CreateShowDialog("Selected files installed!", nspInstStuff::finishedMessage(), {"OK"}, true);
else inst::ui::mainApp->CreateShowDialog(inst::util::shortenString(inst::util::formatUrlString(ourUrlList[0]), 64, true) + " installed!", nspInstStuff::finishedMessage(), {"OK"}, true);
}

4
source/nspInstall.cpp
View file

@ -127,11 +127,15 @@ namespace nspInstStuff {
printf("Failed to install");
printf("%s", e.what());
fprintf(stdout, "%s", e.what());
inst::ui::setInstInfoText("Failed to install");
inst::ui::setInstBarPerc(0);
inst::ui::mainApp->CreateShowDialog("Failed to install!", "Partially installed contents can be removed from the System Settings applet.\n\n" + (std::string)e.what(), {"OK"}, true);
nspInstalled = false;
}
if(nspInstalled) {
inst::ui::setInstInfoText("Install complete");
inst::ui::setInstBarPerc(100);
if (ourNspList.size() > 1) {
if(inst::ui::mainApp->CreateShowDialog("Selected files installed! Delete them from the SD card?", nspInstStuff::finishedMessage(), {"No","Yes"}, false) == 1) {
for (long unsigned int i = 0; i < ourNspList.size(); i++) {