Skip to content

Portable Tool for an Ideal Windows Setup

add backup (ota server) & re

Greedeks6ee01269687b
diff --git a/.Source/GTweak/App.xaml.cs b/.Source/GTweak/App.xaml.cs
index d17d8991..44e82902 100644
--- a/.Source/GTweak/App.xaml.cs
+++ b/.Source/GTweak/App.xaml.cs
@@ -18,7 +18,7 @@ namespace GTweak
internal static event EventHandler ThemeChanged;
internal static event EventHandler TweaksImported;
- private readonly SystemDiagnostics _systemDiagnostics = new SystemDiagnostics();
+ private readonly SystemDataCollector _systemDataCollector = new SystemDataCollector();
internal static void UpdateImport() => TweaksImported?.Invoke(default, EventArgs.Empty);
@@ -28,7 +28,7 @@ namespace GTweak
DispatcherUnhandledException += OnDispatcherUnhandledException;
AppDomain.CurrentDomain.UnhandledException += OnUnhandledException;
- _systemDiagnostics.HandleDevicesEvents += OnHandleDevicesEvents;
+ _systemDataCollector.HandleDevicesEvents += OnHandleDevicesEvents;
}
private async void App_Startup(object sender, StartupEventArgs e)
@@ -45,7 +45,7 @@ namespace GTweak
RunGuard.CheckingApplicationCopies();
await RunGuard.CheckingSystemRequirements();
- _systemDiagnostics.StartDeviceMonitoring();
+ _systemDataCollector.StartDeviceMonitoring();
new LoadingWindow().Show();
}
@@ -73,7 +73,7 @@ namespace GTweak
private async void OnHandleDevicesEvents(MonitoringService.DeviceType deviceType)
{
BackgroundQueue backgroundQueue = new BackgroundQueue();
- await backgroundQueue.QueueTask(delegate { _systemDiagnostics.RefreshDevicesData(deviceType); });
+ await backgroundQueue.QueueTask(delegate { _systemDataCollector.RefreshDevicesData(deviceType); });
}
private static Uri GetResourceUri(string folder, bool isTheme = false) => isTheme ? new Uri($"Styles/Themes/{folder}/Colors.xaml", UriKind.Relative) : new Uri($"Languages/{folder}/Localize.xaml", UriKind.Relative);
@@ -82,7 +82,7 @@ namespace GTweak
{
set
{
- var (code, region) = SystemDiagnostics.GetCurrentSystemLang();
+ var (code, region) = SystemDataCollector.GetCurrentSystemLang();
value ??= $"{code}-{region}";
@@ -132,7 +132,7 @@ namespace GTweak
protected override void OnExit(ExitEventArgs e)
{
- _systemDiagnostics?.StopDeviceMonitoring();
+ _systemDataCollector?.StopDeviceMonitoring();
base.OnExit(e);
}
}
diff --git a/.Source/GTweak/Core/ViewModel/DataSystemViewModel.cs b/.Source/GTweak/Core/ViewModel/DataSystemViewModel.cs
index fb591654..9cb6600d 100644
--- a/.Source/GTweak/Core/ViewModel/DataSystemViewModel.cs
+++ b/.Source/GTweak/Core/ViewModel/DataSystemViewModel.cs
@@ -86,8 +86,8 @@ namespace GTweak.Core.ViewModel
CreateModelCollection("IpAddress", HardwareData.UserIPAddress, "connection_lose_sysinfo")
};
- SetBlurValue = (SystemDiagnostics.isIPAddressFormatValid && SettingsEngine.IsHiddenIpAddress) ? 20 : 0;
- SetVisibility = SystemDiagnostics.isIPAddressFormatValid ? Visibility.Visible : Visibility.Hidden;
+ SetBlurValue = (SystemDataCollector.isIPAddressFormatValid && SettingsEngine.IsHiddenIpAddress) ? 20 : 0;
+ SetVisibility = SystemDataCollector.isIPAddressFormatValid ? Visibility.Visible : Visibility.Hidden;
}
private DataSystemModel CreateModelCollection(string name, object data, string fallbackResourceKey = null)
diff --git a/.Source/GTweak/Core/ViewModel/MainWinViewModel.cs b/.Source/GTweak/Core/ViewModel/MainWinViewModel.cs
index deb5ad71..bc2834ee 100644
--- a/.Source/GTweak/Core/ViewModel/MainWinViewModel.cs
+++ b/.Source/GTweak/Core/ViewModel/MainWinViewModel.cs
@@ -19,7 +19,7 @@ namespace GTweak.Core.ViewModel
public ObservableCollection<MainWinModel.LanguageItem> Languages { get; } = new ObservableCollection<MainWinModel.LanguageItem>();
private readonly MainWinModel _model = new MainWinModel();
- private readonly SystemDiagnostics _systemDiagnostics = new SystemDiagnostics();
+ private readonly SystemDataCollector _systemDataCollector = new SystemDataCollector();
public object CurrentView
{
@@ -27,9 +27,9 @@ namespace GTweak.Core.ViewModel
set { _model.CurrentView = value; OnPropertyChanged(); }
}
- public ImageSource DisplayProfileAvatar => _systemDiagnostics.GetProfileImage();
+ public ImageSource DisplayProfileAvatar => _systemDataCollector.GetProfileImage();
- public string DisplayProfileName => _systemDiagnostics.GetProfileName();
+ public string DisplayProfileName => _systemDataCollector.GetProfileName();
public string DisplayTweakVersion => (Assembly.GetEntryAssembly() ?? throw new InvalidOperationException()).GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
@@ -45,7 +45,7 @@ namespace GTweak.Core.ViewModel
public string CurrentVersion => SettingsEngine.currentRelease;
- public string DownloadVersion => SystemDiagnostics.DownloadVersion;
+ public string DownloadVersion => SystemDataCollector.DownloadVersion;
public bool IsViewNotification => SettingsEngine.IsViewNotification;
diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csproj
index a79315e8..96884c20 100644
--- a/.Source/GTweak/GTweak.csproj
+++ b/.Source/GTweak/GTweak.csproj
@@ -416,7 +416,7 @@
<Compile Include="Utilities\Animation\NumberAnimation.cs" />
<Compile Include="Utilities\Animation\TypewriterAnimation.cs" />
<Compile Include="Utilities\Configuration\MonitoringService.cs" />
- <Compile Include="Utilities\Configuration\SystemDiagnostics.cs" />
+ <Compile Include="Utilities\Configuration\SystemDataCollector.cs" />
<Compile Include="Utilities\Controls\ErrorLogging.cs" />
<Compile Include="Utilities\Controls\PathLocator.cs" />
<Compile Include="Utilities\Controls\RunGuard.cs" />
diff --git a/.Source/GTweak/Properties/AssemblyInfo.cs b/.Source/GTweak/Properties/AssemblyInfo.cs
index c12ccf9b..89baa203 100644
--- a/.Source/GTweak/Properties/AssemblyInfo.cs
+++ b/.Source/GTweak/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Windows;
[assembly: AssemblyTitle("GTweak")]
[assembly: AssemblyDescription("Portable Tool for an Ideal Windows Setup")]
[assembly: AssemblyProduct("GTweak")]
-[assembly: AssemblyCopyright("� 2024-2026 Greedeks")]
+[assembly: AssemblyCopyright("© 2024-2026 Greedeks")]
[assembly: AssemblyTrademark("Greedeks")]
[assembly: AssemblyInformationalVersion("Build: 5.4.2")]
[assembly: AssemblyVersion("5.4.31.921")]
diff --git a/.Source/GTweak/Utilities/Configuration/MonitoringService.cs b/.Source/GTweak/Utilities/Configuration/MonitoringService.cs
index 06506056..484af4b3 100644
--- a/.Source/GTweak/Utilities/Configuration/MonitoringService.cs
+++ b/.Source/GTweak/Utilities/Configuration/MonitoringService.cs
@@ -23,7 +23,6 @@ namespace GTweak.Utilities.Configuration
Network
}
-
[StructLayout(LayoutKind.Sequential)]
private struct SystemTime
{
@@ -176,7 +175,7 @@ namespace GTweak.Utilities.Configuration
internal void StartDeviceMonitoring()
{
Parallel.ForEach(new List<(string filter, DeviceType type, string scope)> {
- ($"TargetInstance ISA {(SystemDiagnostics.isMsftAvailable ? "'MSFT_PhysicalDisk'" : "'Win32_DiskDrive'")}", DeviceType.Storage, SystemDiagnostics.isMsftAvailable ? @"root\microsoft\windows\storage" : null),
+ ($"TargetInstance ISA {(SystemDataCollector.isMsftAvailable ? "'MSFT_PhysicalDisk'" : "'Win32_DiskDrive'")}", DeviceType.Storage, SystemDataCollector.isMsftAvailable ? @"root\microsoft\windows\storage" : null),
("TargetInstance ISA 'Win32_SoundDevice'", DeviceType.Audio, null),
("TargetInstance ISA 'Win32_NetworkAdapter' AND TargetInstance.NetConnectionStatus IS NOT NULL", DeviceType.Network, null),},
parameters => { SubscribeToDeviceEvents(parameters.filter, parameters.type, parameters.scope); });
diff --git a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs b/.Source/GTweak/Utilities/Configuration/SystemDataCollector.cs
similarity index 93%
rename from .Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
rename to .Source/GTweak/Utilities/Configuration/SystemDataCollector.cs
index 9f788634..d2333ca4 100644
--- a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
+++ b/.Source/GTweak/Utilities/Configuration/SystemDataCollector.cs
@@ -21,12 +21,18 @@ using Newtonsoft.Json.Linq;
namespace GTweak.Utilities.Configuration
{
- internal sealed class SystemDiagnostics : MonitoringService
+ internal sealed class SystemDataCollector : MonitoringService
{
- private sealed class GitMetadata
+ private class GitMetadata
{
[JsonProperty("tag_name")]
- internal string СurrentVersion { get; set; }
+ internal string CurrentVersion { get; set; }
+ }
+
+ private sealed class GitLabMetadata : GitMetadata
+ {
+ [JsonProperty("description")]
+ internal string Description { get; set; }
}
private sealed class IPMetadata
@@ -745,26 +751,54 @@ namespace GTweak.Utilities.Configuration
return;
}
- try
+ foreach (string api in PathLocator.Links.ReleaseApi)
{
- HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(PathLocator.Links.GitHubApi);
+ try
+ {
+ HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(api);
+ webRequest.ContentType = "application/json";
+ webRequest.UserAgent = "Nothing";
+ webRequest.Timeout = 5000;
- webRequest.ContentType = "application/json";
- webRequest.UserAgent = "Nothing";
- webRequest.Timeout = 5000;
+ using HttpWebResponse response = (HttpWebResponse)webRequest.GetResponse();
+ using StreamReader reader = new StreamReader(response.GetResponseStream());
+ string json = reader.ReadToEnd();
+ GitMetadata latest = null;
- using HttpWebResponse response = (HttpWebResponse)webRequest.GetResponse();
- using StreamReader sreader = new StreamReader(response.GetResponseStream());
- string DataAsJson = sreader.ReadToEnd();
- GitMetadata gitVersionUtility = JsonConvert.DeserializeObject<GitMetadata>(DataAsJson);
+ if (api.Contains("github"))
+ {
+ latest = JsonConvert.DeserializeObject<GitMetadata>(json);
+ }
+ else
+ {
+ List<GitLabMetadata> releases = JsonConvert.DeserializeObject<List<GitLabMetadata>>(json);
+ latest = releases?.FirstOrDefault();
- if (!string.IsNullOrWhiteSpace(gitVersionUtility.СurrentVersion) && gitVersionUtility.СurrentVersion.CompareTo(SettingsEngine.currentRelease) > 0)
- {
- IsNeedUpdate = true;
- DownloadVersion = gitVersionUtility.СurrentVersion;
+ if (latest != null && !string.IsNullOrEmpty(((GitLabMetadata)latest).Description))
+ {
+ GitLabMetadata gitLabMetadata = (GitLabMetadata)latest;
+ Match match = Regex.Match(gitLabMetadata.Description, @"\[(?<name>.*?)\]\(/uploads/(?<hash>.+?)\)");
+
+ if (match.Success)
+ {
+ string hashFile = match.Groups["hash"].Value;
+ PathLocator.Links.GitLabLatest = (true, $"{PathLocator.Links.GitLabLatest.Url}{hashFile}");
+ }
+ }
+ }
+
+ if (latest != null && !string.IsNullOrWhiteSpace(latest.CurrentVersion))
+ {
+ if (new Version(latest.CurrentVersion) > new Version(SettingsEngine.currentRelease))
+ {
+ IsNeedUpdate = true;
+ DownloadVersion = latest.CurrentVersion;
+ break;
+ }
+ }
}
+ catch { continue; }
}
- catch { IsNeedUpdate = false; }
}
}
}
diff --git a/.Source/GTweak/Utilities/Controls/PathLocator.cs b/.Source/GTweak/Utilities/Controls/PathLocator.cs
index 085a09ba..44f06d1b 100644
--- a/.Source/GTweak/Utilities/Controls/PathLocator.cs
+++ b/.Source/GTweak/Utilities/Controls/PathLocator.cs
@@ -7,6 +7,12 @@ namespace GTweak.Utilities.Controls
{
internal class PathLocator
{
+ internal static class Registry
+ {
+ internal const string SubKey = @"Software\GTweak";
+ internal static readonly string BaseKey = @$"HKEY_CURRENT_USER\{SubKey}";
+ }
+
internal static class Folders
{
internal static readonly string Workspace = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "GTweak");
@@ -322,12 +328,6 @@ namespace GTweak.Utilities.Controls
internal static readonly string BackupAclWD = Path.Combine(Folders.DefenderBackup, "AclBackup.acl");
}
- internal static class Registry
- {
- internal const string SubKey = @"Software\GTweak";
- internal static readonly string BaseKey = @$"HKEY_CURRENT_USER\{SubKey}";
- }
-
internal static class Links
{
internal const string GitHub = "https://github.com/Greedeks";
@@ -338,7 +338,13 @@ namespace GTweak.Utilities.Controls
internal const string GitHubLatest = "https://github.com/Greedeks/GTweak/releases/latest/download/GTweak.exe";
- internal const string GitHubApi = "https://api.github.com/repos/greedeks/gtweak/releases/latest";
+ internal static (bool Created, string Url) GitLabLatest = (false, "https://gitlab.com/-/project/79375382/uploads/");
+
+ internal static readonly IReadOnlyList<string> ReleaseApi = Array.AsReadOnly(new[]
+ {
+ "https://api.github.com/repos/greedeks/gtweak/releases/latest",
+ "https://gitlab.com/api/v4/projects/Greedeks%2Fgtweak-ota-server/releases"
+ });
internal static readonly IReadOnlyList<string> IpServices = Array.AsReadOnly(new[]
{
diff --git a/.Source/GTweak/Utilities/Controls/RunGuard.cs b/.Source/GTweak/Utilities/Controls/RunGuard.cs
index e2f829ab..873c7dba 100644
--- a/.Source/GTweak/Utilities/Controls/RunGuard.cs
+++ b/.Source/GTweak/Utilities/Controls/RunGuard.cs
@@ -49,7 +49,7 @@ namespace GTweak.Utilities.Controls
internal static async Task CheckingSystemRequirements()
{
- await Task.Run(() => new SystemDiagnostics().GetOperatingSystemInfo());
+ await Task.Run(() => new SystemDataCollector().GetOperatingSystemInfo());
if ((HardwareData.OS.IsWin11 || HardwareData.OS.IsWin10) && HardwareData.OS.Build.CompareTo(18362.116m) >= 0)
{
diff --git a/.Source/GTweak/Utilities/Controls/SettingsEngine.cs b/.Source/GTweak/Utilities/Controls/SettingsEngine.cs
index f4bb9416..d07a6eb5 100644
--- a/.Source/GTweak/Utilities/Controls/SettingsEngine.cs
+++ b/.Source/GTweak/Utilities/Controls/SettingsEngine.cs
@@ -34,7 +34,7 @@ namespace GTweak.Utilities.Controls
["EnableIpBlur"] = true,
["EnableSound"] = true,
["VolumeLevel"] = 50,
- ["Language"] = SystemDiagnostics.GetCurrentSystemLang().Code,
+ ["Language"] = SystemDataCollector.GetCurrentSystemLang().Code,
["Theme"] = AvailableThemes.First(),
["AddonsPath"] = string.Empty,
};
diff --git a/.Source/GTweak/View/DataSystemView.xaml.cs b/.Source/GTweak/View/DataSystemView.xaml.cs
index ceddab47..617ffe38 100644
--- a/.Source/GTweak/View/DataSystemView.xaml.cs
+++ b/.Source/GTweak/View/DataSystemView.xaml.cs
@@ -19,7 +19,7 @@ namespace GTweak.View
{
public partial class DataSystemView : UserControl
{
- private readonly SystemDiagnostics _systemDiagnostics = new SystemDiagnostics();
+ private readonly SystemDataCollector _systemDataCollector = new SystemDataCollector();
private readonly BackgroundQueue backgroundQueue = new BackgroundQueue();
private TimerControlManager _timer = default;
@@ -62,23 +62,23 @@ namespace GTweak.View
if ((int)time.TotalSeconds % 2 == 0)
{
- await backgroundQueue.QueueTask(async delegate { await _systemDiagnostics.GetTotalProcessorUsage(); });
- await backgroundQueue.QueueTask(async delegate { await _systemDiagnostics.GetPhysicalAvailableMemory(); });
+ await backgroundQueue.QueueTask(async delegate { await _systemDataCollector.GetTotalProcessorUsage(); });
+ await backgroundQueue.QueueTask(async delegate { await _systemDataCollector.GetPhysicalAvailableMemory(); });
AnimationProgressBars(HardwareData.Processor.Usage, HardwareData.Memory.Usage);
_ = Dispatcher.BeginInvoke(new Action(async () =>
{
- HardwareData.RunningProcessesCount = await Task.Run(() => _systemDiagnostics.GetProcessCount());
- HardwareData.RunningServicesCount = await Task.Run(() => _systemDiagnostics.GetServicesCount());
+ HardwareData.RunningProcessesCount = await Task.Run(() => _systemDataCollector.GetProcessCount());
+ HardwareData.RunningServicesCount = await Task.Run(() => _systemDataCollector.GetServicesCount());
}));
}
else if ((int)time.TotalSeconds % 5 == 0)
{
- await backgroundQueue.QueueTask(delegate { _systemDiagnostics.GetUserIpAddress(); });
+ await backgroundQueue.QueueTask(delegate { _systemDataCollector.GetUserIpAddress(); });
_ = Dispatcher.BeginInvoke(new Action(() => { DataContext = new DataSystemViewModel(); }));
}
_ = Dispatcher.BeginInvoke(new Action(() =>
{
- if (BtnVision.IsChecked.Value & BtnVision.Visibility == Visibility.Hidden & !SystemDiagnostics.isIPAddressFormatValid)
+ if (BtnVision.IsChecked.Value & BtnVision.Visibility == Visibility.Hidden & !SystemDataCollector.isIPAddressFormatValid)
{
IpAddress.Effect.BeginAnimation(BlurEffect.RadiusProperty, FactoryAnimation.CreateTo(0.18, () => { SettingsEngine.IsHiddenIpAddress = false; }));
}
diff --git a/.Source/GTweak/View/UtilsView.xaml.cs b/.Source/GTweak/View/UtilsView.xaml.cs
index 34bbb020..e44fcacb 100644
--- a/.Source/GTweak/View/UtilsView.xaml.cs
+++ b/.Source/GTweak/View/UtilsView.xaml.cs
@@ -32,7 +32,7 @@ namespace GTweak.View
}
else
{
- if (new SystemDiagnostics().IsNetworkAvailable())
+ if (new SystemDataCollector().IsNetworkAvailable())
{
await WinLicenseHandler.StartActivation();
}
diff --git a/.Source/GTweak/Windows/LoadingWindow.xaml.cs b/.Source/GTweak/Windows/LoadingWindow.xaml.cs
index a63085ce..c1e8ec37 100644
--- a/.Source/GTweak/Windows/LoadingWindow.xaml.cs
+++ b/.Source/GTweak/Windows/LoadingWindow.xaml.cs
@@ -14,7 +14,7 @@ namespace GTweak.Windows
{
public partial class LoadingWindow : FluentWindow
{
- private readonly SystemDiagnostics _systemDiagnostics = new SystemDiagnostics();
+ private readonly SystemDataCollector _systemDataCollector = new SystemDataCollector();
private readonly UninstallingPakages _uninstallingPakages = new UninstallingPakages();
public LoadingWindow()
@@ -54,17 +54,17 @@ namespace GTweak.Windows
ExecuteWithLogging(TrustedInstaller.StartTrustedInstallerService, nameof(TrustedInstaller.StartTrustedInstallerService));
ExecuteWithLogging(WinLicenseHandler.LicenseStatus, nameof(WinLicenseHandler.LicenseStatus));
- ExecuteWithLogging(() => _systemDiagnostics.GetHardwareData(), nameof(_systemDiagnostics.GetHardwareData));
- ExecuteWithLogging(_systemDiagnostics.ValidateVersionUpdates, nameof(_systemDiagnostics.ValidateVersionUpdates));
+ ExecuteWithLogging(() => _systemDataCollector.GetHardwareData(), nameof(_systemDataCollector.GetHardwareData));
+ ExecuteWithLogging(_systemDataCollector.ValidateVersionUpdates, nameof(_systemDataCollector.ValidateVersionUpdates));
ExecuteWithLogging(_uninstallingPakages.GetInstalledPackages, nameof(_uninstallingPakages.GetInstalledPackages));
ExecuteWithLogging(UninstallingPakages.CheckingForLocalAccount, nameof(UninstallingPakages.CheckingForLocalAccount));
ExecuteWithLogging(SystemTweaks.ViewNetshState, nameof(SystemTweaks.ViewNetshState));
ExecuteWithLogging(SystemTweaks.ViewBluetoothStatus, nameof(SystemTweaks.ViewBluetoothStatus));
ExecuteWithLogging(SystemTweaks.ViewConfigTick, nameof(SystemTweaks.ViewConfigTick));
- ExecuteWithLogging(() => HardwareData.RunningProcessesCount = _systemDiagnostics.GetProcessCount().GetAwaiter().GetResult(), nameof(_systemDiagnostics.GetProcessCount));
- ExecuteWithLogging(() => HardwareData.RunningServicesCount = _systemDiagnostics.GetServicesCount().GetAwaiter().GetResult(), nameof(_systemDiagnostics.GetServicesCount));
- ExecuteWithLogging(() => _systemDiagnostics.GetTotalProcessorUsage().GetAwaiter().GetResult(), nameof(_systemDiagnostics.GetTotalProcessorUsage));
- ExecuteWithLogging(() => _systemDiagnostics.GetPhysicalAvailableMemory().GetAwaiter().GetResult(), nameof(_systemDiagnostics.GetPhysicalAvailableMemory));
+ ExecuteWithLogging(() => HardwareData.RunningProcessesCount = _systemDataCollector.GetProcessCount().GetAwaiter().GetResult(), nameof(_systemDataCollector.GetProcessCount));
+ ExecuteWithLogging(() => HardwareData.RunningServicesCount = _systemDataCollector.GetServicesCount().GetAwaiter().GetResult(), nameof(_systemDataCollector.GetServicesCount));
+ ExecuteWithLogging(() => _systemDataCollector.GetTotalProcessorUsage().GetAwaiter().GetResult(), nameof(_systemDataCollector.GetTotalProcessorUsage));
+ ExecuteWithLogging(() => _systemDataCollector.GetPhysicalAvailableMemory().GetAwaiter().GetResult(), nameof(_systemDataCollector.GetPhysicalAvailableMemory));
ExecuteWithLogging(RunGuard.CheckingDefenderExclusions, nameof(RunGuard.CheckingDefenderExclusions));
}
diff --git a/.Source/GTweak/Windows/MainWindow.xaml.cs b/.Source/GTweak/Windows/MainWindow.xaml.cs
index 1e643405..7241dd1f 100644
--- a/.Source/GTweak/Windows/MainWindow.xaml.cs
+++ b/.Source/GTweak/Windows/MainWindow.xaml.cs
@@ -247,7 +247,7 @@ namespace GTweak.Windows
TypewriterAnimation.Create(TitleName.Text, TitleName, TimeSpan.FromSeconds(0.4));
- if (SystemDiagnostics.IsNeedUpdate && SettingsEngine.IsUpdateCheckRequired)
+ if (SystemDataCollector.IsNeedUpdate && SettingsEngine.IsUpdateCheckRequired)
{
await Task.Delay(500);
diff --git a/.Source/GTweak/Windows/UpdateWindow.xaml.cs b/.Source/GTweak/Windows/UpdateWindow.xaml.cs
index 6aa177d4..8e7ff3be 100644
--- a/.Source/GTweak/Windows/UpdateWindow.xaml.cs
+++ b/.Source/GTweak/Windows/UpdateWindow.xaml.cs
@@ -12,7 +12,7 @@ namespace GTweak.Windows
{
public partial class UpdateWindow : FluentWindow
{
- public string DownloadVersion { get; set; } = SystemDiagnostics.DownloadVersion;
+ public string DownloadVersion { get; set; } = SystemDataCollector.DownloadVersion;
public UpdateWindow()
{
@@ -44,7 +44,7 @@ namespace GTweak.Windows
{
CommandExecutor.RunCommand($"/c taskkill /f /im \"{SettingsEngine.currentName}\" && timeout /t 2 && del \"{SettingsEngine.currentLocation}\" && ren {tempFileName} \"{SettingsEngine.currentName}\" && \"{SettingsEngine.currentLocation}\"");
};
- webClient.DownloadFileAsync(new Uri(PathLocator.Links.GitHubLatest), tempFileName);
+ webClient.DownloadFileAsync(new Uri(PathLocator.Links.GitLabLatest.Created == false ? PathLocator.Links.GitHubLatest : PathLocator.Links.GitLabLatest.Url), tempFileName);
}
catch
{