Mirrors/UWUVCI-AIO-WPF
2
0
Fork 0
mirror of https://github.com/stuff-by-3-random-dudes/UWUVCI-AIO-WPF synced 2024-11-10 05:34:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Progress bar for downloading base is now mapped to the eta, the text will change once the base is downloaded to state that it's verifying the base, progress bar will now go up to 95 instead of 75.

Browse source
This commit is contained in:
ZestyTS 2023-10-05 11:38:31 -07:00
parent 491c052118
commit 996f1e919c
2 changed files with 44 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
UWUVCI AIO WPF/Classes/Injection.cs
View file

@ -1750,7 +1750,7 @@ namespace UWUVCI_AIO_WPF
download.Start();
download.WaitForExit();
}
mvm.Progress = 95;
mvm.Progress = 96;
using (Process decrypt = new Process())
{
@ -1766,11 +1766,10 @@ namespace UWUVCI_AIO_WPF
decrypt.Start();
decrypt.WaitForExit();
}
mvm.Progress += 4;
mvm.Progress = 99;
foreach (string sFile in Directory.GetFiles(Path.Combine(Properties.Settings.Default.BasePath, $"{b.Name.Replace(":", "")} [{b.Region.ToString()}]", "content"), "*.nfs"))
{
File.Delete(sFile);
}
/* File.Delete(Path.Combine(Properties.Settings.Default.BasePath, $"{b.Name.Replace(":", "")} [{b.Region.ToString()}]", "code", "fw.img"));
File.Delete(Path.Combine(Properties.Settings.Default.BasePath, $"{b.Name.Replace(":", "")} [{b.Region.ToString()}]", "code", "fw.tmd"));
@ -1818,7 +1817,7 @@ namespace UWUVCI_AIO_WPF
File.Copy(Path.Combine(toolsPath, "IKVM", name, "code", "fw.tmd"), Path.Combine(Properties.Settings.Default.BasePath, $"{b.Name.Replace(":", "")} [{b.Region.ToString()}]", "code", "fw.tmd"));
Directory.Delete(Path.Combine(toolsPath, "IKVM"), true);*/
mvm.Progress += 1;
mvm.Progress = 100;
}
}
else

55
UWUVCI AIO WPF/UI/Windows/DownloadWait.xaml.cs
View file

@ -12,8 +12,12 @@ namespace UWUVCI_AIO_WPF.UI.Windows
{
MainViewModel mvm;
DispatcherTimer timer = new DispatcherTimer();
//These variables are for handling a better progress bar
private TimeSpan remainingTime;
private int motion = 1;
private double accumulatedProgress = 0.0;
private double progressIncrementPerSecond = 0.0;
public DownloadWait(string doing, string msg, MainViewModel mvm)
{
try
@ -40,9 +44,7 @@ namespace UWUVCI_AIO_WPF.UI.Windows
try
{
if (Owner?.GetType() != typeof(MainWindow))
{
WindowStartupLocation = WindowStartupLocation.CenterScreen;
}
}
catch (Exception)
{
@ -63,9 +65,7 @@ namespace UWUVCI_AIO_WPF.UI.Windows
try
{
if (Owner?.GetType() == typeof(MainWindow))
{
WindowStartupLocation = WindowStartupLocation.CenterOwner;
}
}
catch (Exception)
{
@ -90,19 +90,49 @@ namespace UWUVCI_AIO_WPF.UI.Windows
{
WindowState = WindowState.Minimized;
}
private void timer_Tick(object sender, EventArgs e)
{
msgT.Text = mvm.msg;
pb.Value = mvm.Progress;
if(Key.Text.Contains("Downloading Base"))
if (Key.Text.Contains("Downloading Base"))
{
if (mvm.Progress >= 96)
{
msgT.Text += $"Verifying Base...";
if (motion == 6)
motion = 1;
for (var i = 0; i < motion; i++)
msgT.Text += ".";
motion++;
}
// Check if remainingTime has been initialized (i.e., not zero)
if (remainingTime != TimeSpan.Zero)
else if (remainingTime != TimeSpan.Zero)
{
if (remainingTime.TotalSeconds > 0)
{
msgT.Text += $"Estimated time remaining: {remainingTime.Minutes} minutes {remainingTime.Seconds} seconds";
remainingTime = remainingTime.Add(TimeSpan.FromSeconds(-1));
if (mvm.Progress < 95)
{
// Calculate the progress increment if not already calculated
if (progressIncrementPerSecond == 0.0)
progressIncrementPerSecond = (95 - mvm.Progress) / remainingTime.TotalSeconds;
accumulatedProgress += progressIncrementPerSecond;
while (accumulatedProgress >= 1)
{
mvm.Progress++;
accumulatedProgress--;
}
remainingTime = remainingTime.Add(TimeSpan.FromSeconds(-1));
}
}
else
{
@ -114,27 +144,22 @@ namespace UWUVCI_AIO_WPF.UI.Windows
for (var i = 0; i < motion; i++)
msgT.Text += ".";
motion++;
}
if (mvm.Progress < 95)
mvm.Progress += 1;
}
else
{
if (mvm.Progress < 75)
{
if (mvm.Progress < 95)
mvm.Progress += 1;
}
}
}
if(mvm.Progress == 100)
if (mvm.Progress == 100)
{
timer.Stop();
Close();
}
}
public void changeOwner(MainWindow ow)
{
Owner = ow;