diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs index 78258b7..f53ef42 100644 --- a/EnvyUpdate/DashboardPage.xaml.cs +++ b/EnvyUpdate/DashboardPage.xaml.cs @@ -210,6 +210,15 @@ namespace EnvyUpdate if (skippedVer != onlineDriv) { + if (GlobalVars.autoDownload) + { + if (buttonDownload.IsVisible) + { + Debug.LogToFile("INFO Auto-Downloading driver."); + buttonDownload_Click(null, null); + } + } + Debug.LogToFile("INFO Showing update popup notification."); Notify.ShowDrivUpdatePopup(); } @@ -340,25 +349,34 @@ namespace EnvyUpdate private void buttonDownload_Click(object sender, RoutedEventArgs e) { - progressbarDownload.Visibility = Visibility.Visible; - buttonDownload.IsEnabled = false; - - if (File.Exists(Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe.downloading"))) + if (GlobalVars.isDownloading) { - Debug.LogToFile("WARN Found previous unfinished download, retrying."); - File.Delete(Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe.downloading")); + Debug.LogToFile("WARN A download is already running."); + ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Danger, Wpf.Ui.Common.SymbolRegular.ErrorCircle24, Properties.Resources.info_download_running, Properties.Resources.info_download_running_title); } - Thread thread = new Thread(() => { - using (WebClient client = new WebClient()) + else + { + progressbarDownload.Visibility = Visibility.Visible; + buttonDownload.IsEnabled = false; + GlobalVars.isDownloading = true; + + if (File.Exists(Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe.downloading"))) { - client.Headers["User-Agent"] = GlobalVars.useragent; - client.DownloadProgressChanged += new DownloadProgressChangedEventHandler(client_DownloadProgressChanged); - client.DownloadFileCompleted += new AsyncCompletedEventHandler(client_DownloadFileCompleted); - client.DownloadFileAsync(new Uri(Util.GetDirectDownload(gpuURL)), Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe.downloading")); + Debug.LogToFile("WARN Found previous unfinished download, retrying."); + File.Delete(Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe.downloading")); } - }); - thread.Start(); - Debug.LogToFile("INFO Started installer download."); + Thread thread = new Thread(() => { + using (WebClient client = new WebClient()) + { + client.Headers["User-Agent"] = GlobalVars.useragent; + client.DownloadProgressChanged += new DownloadProgressChangedEventHandler(client_DownloadProgressChanged); + client.DownloadFileCompleted += new AsyncCompletedEventHandler(client_DownloadFileCompleted); + client.DownloadFileAsync(new Uri(Util.GetDirectDownload(gpuURL)), Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe.downloading")); + } + }); + thread.Start(); + Debug.LogToFile("INFO Started installer download."); + } } void client_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e) @@ -376,6 +394,7 @@ namespace EnvyUpdate Application.Current.Dispatcher.Invoke(new Action(() => { buttonDownload.IsEnabled = true; progressbarDownload.Visibility = Visibility.Collapsed; + GlobalVars.isDownloading = false; })); if (e.Error == null) { @@ -420,7 +439,7 @@ namespace EnvyUpdate WindowStyle = ProcessWindowStyle.Minimized, WorkingDirectory = destinationDir, FileName = sevenZipPath, - Arguments = "x -aoa -y " + filePath + " Display.Driver Display.Nview Display.Optimus HDAudio MSVCR NVI2 NVPCF PhysX PPC ShieldWirelessController EULA.txt ListDevices.txt setup.cfg setup.exe" + Arguments = "x -aoa -y \"" + filePath + "\" Display.Driver Display.Nview Display.Optimus HDAudio MSVCR NVI2 NVPCF PhysX PPC ShieldWirelessController EULA.txt ListDevices.txt setup.cfg setup.exe" }; process.EnableRaisingEvents = true; process.StartInfo = startInfo; diff --git a/EnvyUpdate/EnvyUpdate.csproj b/EnvyUpdate/EnvyUpdate.csproj index 4dd0c93..cc7331b 100644 --- a/EnvyUpdate/EnvyUpdate.csproj +++ b/EnvyUpdate/EnvyUpdate.csproj @@ -271,7 +271,7 @@ 5.7.0 - 6.8.0 + 6.8.1 runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -282,7 +282,7 @@ 2.2.0 - 7.0.3 + 8.0.4 2.1.0 diff --git a/EnvyUpdate/GlobalVars.cs b/EnvyUpdate/GlobalVars.cs index e830039..f52b4af 100644 --- a/EnvyUpdate/GlobalVars.cs +++ b/EnvyUpdate/GlobalVars.cs @@ -19,5 +19,7 @@ namespace EnvyUpdate public static readonly string useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:115.0) Gecko/20100101 Firefox/115.0"; public static bool useAppdata = false; public static bool hasWrite = true; + public static bool autoDownload = false; + public static bool isDownloading = false; } } diff --git a/EnvyUpdate/MainWindow.xaml b/EnvyUpdate/MainWindow.xaml index af4f6a7..5015f14 100644 --- a/EnvyUpdate/MainWindow.xaml +++ b/EnvyUpdate/MainWindow.xaml @@ -11,7 +11,7 @@ ExtendsContentIntoTitleBar="True" WindowBackdropType="Mica" - Title="EnvyUpdate" MinHeight="500" Height="500" MinWidth="600" Width="600" Icon="icon.ico" StateChanged="Window_StateChanged" Closing="Window_Closing" ResizeMode="CanMinimize" WindowStyle="None"> + Title="EnvyUpdate" MinHeight="500" Height="550" MinWidth="700" Width="750" Icon="icon.ico" StateChanged="Window_StateChanged" Closing="Window_Closing" ResizeMode="CanMinimize" WindowStyle="None"> diff --git a/EnvyUpdate/MainWindow.xaml.cs b/EnvyUpdate/MainWindow.xaml.cs index 51fc08c..6522ee3 100644 --- a/EnvyUpdate/MainWindow.xaml.cs +++ b/EnvyUpdate/MainWindow.xaml.cs @@ -102,8 +102,25 @@ namespace EnvyUpdate GlobalVars.startMinimized = true; } + //Check for old unfinished downloads + string[] leftovers = Directory.GetFiles(GlobalVars.directoryOfExe, "*-nvidia-installer.exe.downloading"); + if (leftovers.Length > 0) + { + foreach (string leftover in leftovers) + { + Debug.LogToFile("INFO Deleting leftover download " + leftover); + File.Delete(leftover); + } + } + GlobalVars.isMobile = Util.IsMobile(); Debug.LogToFile("INFO Mobile: " + GlobalVars.isMobile); + + if (File.Exists(Path.Combine(GlobalVars.saveDirectory, "autodl.envy"))) + { + Debug.LogToFile("INFO Auto-download is enabled."); + GlobalVars.autoDownload = true; + } } private void Window_StateChanged(object sender, EventArgs e) { diff --git a/EnvyUpdate/Notify.cs b/EnvyUpdate/Notify.cs index ac317c1..d889163 100644 --- a/EnvyUpdate/Notify.cs +++ b/EnvyUpdate/Notify.cs @@ -6,9 +6,16 @@ namespace EnvyUpdate { public static void ShowDrivUpdatePopup() { - var toast = new ToastContentBuilder(); - toast.AddText(Properties.Resources.update_popup_message); - toast.Show(); + try + { + var toast = new ToastContentBuilder(); + toast.AddText(Properties.Resources.update_popup_message); + toast.Show(); + } + catch (System.Exception ex) + { + Debug.LogToFile("WARN Could not show notification. Error: " + ex.Message); + } } } } \ No newline at end of file diff --git a/EnvyUpdate/Properties/AssemblyInfo.cs b/EnvyUpdate/Properties/AssemblyInfo.cs index 620e972..b9441b1 100644 --- a/EnvyUpdate/Properties/AssemblyInfo.cs +++ b/EnvyUpdate/Properties/AssemblyInfo.cs @@ -49,5 +49,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.2")] -[assembly: AssemblyFileVersion("3.2")] +[assembly: AssemblyVersion("3.6")] +[assembly: AssemblyFileVersion("3.6")] diff --git a/EnvyUpdate/Properties/Resources.Designer.cs b/EnvyUpdate/Properties/Resources.Designer.cs index 4f80cf9..466a9c0 100644 --- a/EnvyUpdate/Properties/Resources.Designer.cs +++ b/EnvyUpdate/Properties/Resources.Designer.cs @@ -105,6 +105,24 @@ namespace EnvyUpdate.Properties { } } + /// + /// Looks up a localized string similar to A download process is already running!. + /// + public static string info_download_running { + get { + return ResourceManager.GetString("info_download_running", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Download running. + /// + public static string info_download_running_title { + get { + return ResourceManager.GetString("info_download_running_title", resourceCulture); + } + } + /// /// Looks up a localized string similar to Driver installer successfully downloaded.. /// @@ -267,6 +285,15 @@ namespace EnvyUpdate.Properties { } } + /// + /// Looks up a localized string similar to Download updates automatically. + /// + public static string ui_enable_autodownload { + get { + return ResourceManager.GetString("ui_enable_autodownload", resourceCulture); + } + } + /// /// Looks up a localized string similar to Enable logging to file. /// diff --git a/EnvyUpdate/Properties/Resources.de.resx b/EnvyUpdate/Properties/Resources.de.resx index 40102a4..b5a18f5 100644 --- a/EnvyUpdate/Properties/Resources.de.resx +++ b/EnvyUpdate/Properties/Resources.de.resx @@ -132,6 +132,12 @@ Fehler beim Herunterladen + + Ein Downloadvorgang läuft bereits! + + + Download läuft + Treiber-Installationsdatei erfolgreich heruntergeladen. @@ -186,6 +192,9 @@ Programmdaten in AppData speichern + + Updates automatisch herunterladen + Programm-Log in Datei schreiben diff --git a/EnvyUpdate/Properties/Resources.resx b/EnvyUpdate/Properties/Resources.resx index 3780249..2623dae 100644 --- a/EnvyUpdate/Properties/Resources.resx +++ b/EnvyUpdate/Properties/Resources.resx @@ -132,6 +132,12 @@ Error while downloading + + A download process is already running! + + + Download running + Driver installer successfully downloaded. @@ -186,6 +192,9 @@ Save files to AppData + + Download updates automatically + Enable logging to file diff --git a/EnvyUpdate/SettingsPage.xaml b/EnvyUpdate/SettingsPage.xaml index f00cd4b..ab6f973 100644 --- a/EnvyUpdate/SettingsPage.xaml +++ b/EnvyUpdate/SettingsPage.xaml @@ -35,9 +35,19 @@ - - - + + + + + + + + + + + + +