Skip to content

Portable Tool for an Ideal Windows Setup

migrate toolset catalog from XML to JSON add ThrottleStop to toolset list

Greedeks65740c8479ae
diff --git a/.Source/GTweak/Assets/Images/AddonsFiles/BatFile.png b/.Source/GTweak/Assets/Images/AddonFiles/Bat.png
similarity index 100%
rename from .Source/GTweak/Assets/Images/AddonsFiles/BatFile.png
rename to .Source/GTweak/Assets/Images/AddonFiles/Bat.png
diff --git a/.Source/GTweak/Assets/Images/AddonsFiles/CmdFile.png b/.Source/GTweak/Assets/Images/AddonFiles/Cmd.png
similarity index 100%
rename from .Source/GTweak/Assets/Images/AddonsFiles/CmdFile.png
rename to .Source/GTweak/Assets/Images/AddonFiles/Cmd.png
diff --git a/.Source/GTweak/Assets/Images/AddonsFiles/PowershellFile.png b/.Source/GTweak/Assets/Images/AddonFiles/PowerShell.png
similarity index 100%
rename from .Source/GTweak/Assets/Images/AddonsFiles/PowershellFile.png
rename to .Source/GTweak/Assets/Images/AddonFiles/PowerShell.png
diff --git a/.Source/GTweak/Assets/Images/AddonsFiles/RegistryFile.png b/.Source/GTweak/Assets/Images/AddonFiles/Registry.png
similarity index 100%
rename from .Source/GTweak/Assets/Images/AddonsFiles/RegistryFile.png
rename to .Source/GTweak/Assets/Images/AddonFiles/Registry.png
diff --git a/.Source/GTweak/Assets/Images/DownloadApps/Amd.png b/.Source/GTweak/Assets/Images/DownloadToolset/Amd.png
similarity index 100%
rename from .Source/GTweak/Assets/Images/DownloadApps/Amd.png
rename to .Source/GTweak/Assets/Images/DownloadToolset/Amd.png
diff --git a/.Source/GTweak/Assets/Images/DownloadApps/Autoruns.png b/.Source/GTweak/Assets/Images/DownloadToolset/Autoruns.png
similarity index 100%
rename from .Source/GTweak/Assets/Images/DownloadApps/Autoruns.png
rename to .Source/GTweak/Assets/Images/DownloadToolset/Autoruns.png
diff --git a/.Source/GTweak/Assets/Images/DownloadApps/CPUz.png b/.Source/GTweak/Assets/Images/DownloadToolset/CPUz.png
similarity index 100%
rename from .Source/GTweak/Assets/Images/DownloadApps/CPUz.png
rename to .Source/GTweak/Assets/Images/DownloadToolset/CPUz.png
diff --git a/.Source/GTweak/Assets/Images/DownloadApps/DeviceTweaker.png b/.Source/GTweak/Assets/Images/DownloadToolset/DeviceTweaker.png
similarity index 100%
rename from .Source/GTweak/Assets/Images/DownloadApps/DeviceTweaker.png
rename to .Source/GTweak/Assets/Images/DownloadToolset/DeviceTweaker.png
diff --git a/.Source/GTweak/Assets/Images/DownloadApps/DiskInfo.png b/.Source/GTweak/Assets/Images/DownloadToolset/DiskInfo.png
similarity index 100%
rename from .Source/GTweak/Assets/Images/DownloadApps/DiskInfo.png
rename to .Source/GTweak/Assets/Images/DownloadToolset/DiskInfo.png
diff --git a/.Source/GTweak/Assets/Images/DownloadApps/DiskMark.png b/.Source/GTweak/Assets/Images/DownloadToolset/DiskMark.png
similarity index 100%
rename from .Source/GTweak/Assets/Images/DownloadApps/DiskMark.png
rename to .Source/GTweak/Assets/Images/DownloadToolset/DiskMark.png
diff --git a/.Source/GTweak/Assets/Images/DownloadApps/FirstEverTech.png b/.Source/GTweak/Assets/Images/DownloadToolset/FirstEverTech.png
similarity index 100%
rename from .Source/GTweak/Assets/Images/DownloadApps/FirstEverTech.png
rename to .Source/GTweak/Assets/Images/DownloadToolset/FirstEverTech.png
diff --git a/.Source/GTweak/Assets/Images/DownloadApps/GPUz.png b/.Source/GTweak/Assets/Images/DownloadToolset/GPUz.png
similarity index 100%
rename from .Source/GTweak/Assets/Images/DownloadApps/GPUz.png
rename to .Source/GTweak/Assets/Images/DownloadToolset/GPUz.png
diff --git a/.Source/GTweak/Assets/Images/DownloadApps/Nvidia.png b/.Source/GTweak/Assets/Images/DownloadToolset/Nvidia.png
similarity index 100%
rename from .Source/GTweak/Assets/Images/DownloadApps/Nvidia.png
rename to .Source/GTweak/Assets/Images/DownloadToolset/Nvidia.png
diff --git a/.Source/GTweak/Assets/Images/DownloadApps/NvidiaPI.png b/.Source/GTweak/Assets/Images/DownloadToolset/NvidiaPI.png
similarity index 100%
rename from .Source/GTweak/Assets/Images/DownloadApps/NvidiaPI.png
rename to .Source/GTweak/Assets/Images/DownloadToolset/NvidiaPI.png
diff --git a/.Source/GTweak/Assets/Images/DownloadApps/Occt.png b/.Source/GTweak/Assets/Images/DownloadToolset/Occt.png
similarity index 100%
rename from .Source/GTweak/Assets/Images/DownloadApps/Occt.png
rename to .Source/GTweak/Assets/Images/DownloadToolset/Occt.png
diff --git a/.Source/GTweak/Assets/Images/DownloadApps/PCIz.png b/.Source/GTweak/Assets/Images/DownloadToolset/PCIz.png
similarity index 100%
rename from .Source/GTweak/Assets/Images/DownloadApps/PCIz.png
rename to .Source/GTweak/Assets/Images/DownloadToolset/PCIz.png
diff --git a/.Source/GTweak/Assets/Images/DownloadApps/Rapr.png b/.Source/GTweak/Assets/Images/DownloadToolset/Rapr.png
similarity index 100%
rename from .Source/GTweak/Assets/Images/DownloadApps/Rapr.png
rename to .Source/GTweak/Assets/Images/DownloadToolset/Rapr.png
diff --git a/.Source/GTweak/Assets/Images/DownloadApps/Rufus.png b/.Source/GTweak/Assets/Images/DownloadToolset/Rufus.png
similarity index 100%
rename from .Source/GTweak/Assets/Images/DownloadApps/Rufus.png
rename to .Source/GTweak/Assets/Images/DownloadToolset/Rufus.png
diff --git a/.Source/GTweak/Assets/Images/DownloadApps/SystemInfo.png b/.Source/GTweak/Assets/Images/DownloadToolset/SystemInfo.png
similarity index 100%
rename from .Source/GTweak/Assets/Images/DownloadApps/SystemInfo.png
rename to .Source/GTweak/Assets/Images/DownloadToolset/SystemInfo.png
diff --git a/.Source/GTweak/Assets/Images/DownloadToolset/ThrottleStop.png b/.Source/GTweak/Assets/Images/DownloadToolset/ThrottleStop.png
new file mode 100644
index 00000000..b25eb10a
Binary files /dev/null and b/.Source/GTweak/Assets/Images/DownloadToolset/ThrottleStop.png differ
diff --git a/.Source/GTweak/Assets/Images/ImageResources.xaml b/.Source/GTweak/Assets/Images/ImageResources.xaml
index fb8cc657..6a034f95 100644
--- a/.Source/GTweak/Assets/Images/ImageResources.xaml
+++ b/.Source/GTweak/Assets/Images/ImageResources.xaml
@@ -1,29 +1,30 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
- <!--#region AddonsFiles -->
- <BitmapImage x:Key="Img_BatFile" UriSource="/GTweak;component/Assets/Images/AddonsFiles/BatFile.png"/>
- <BitmapImage x:Key="Img_CmdFile" UriSource="/GTweak;component/Assets/Images/AddonsFiles/CmdFile.png"/>
- <BitmapImage x:Key="Img_PowershellFile" UriSource="/GTweak;component/Assets/Images/AddonsFiles/PowershellFile.png"/>
- <BitmapImage x:Key="Img_RegistryFile" UriSource="/GTweak;component/Assets/Images/AddonsFiles/RegistryFile.png"/>
+ <!--#region AddonFiles -->
+ <BitmapImage x:Key="Img_Bat" UriSource="/GTweak;component/Assets/Images/AddonFiles/Bat.png"/>
+ <BitmapImage x:Key="Img_Cmd" UriSource="/GTweak;component/Assets/Images/AddonFiles/Cmd.png"/>
+ <BitmapImage x:Key="Img_PowerShell" UriSource="/GTweak;component/Assets/Images/AddonFiles/PowerShell.png"/>
+ <BitmapImage x:Key="Img_Registry" UriSource="/GTweak;component/Assets/Images/AddonFiles/Registry.png"/>
<!--#endregion -->
- <!--#region DownloadApps -->
- <BitmapImage x:Key="Img_Amd" UriSource="/GTweak;component/Assets/Images/DownloadApps/Amd.png"/>
- <BitmapImage x:Key="Img_Autoruns" UriSource="/GTweak;component/Assets/Images/DownloadApps/Autoruns.png"/>
- <BitmapImage x:Key="Img_CPUz" UriSource="/GTweak;component/Assets/Images/DownloadApps/CPUz.png"/>
- <BitmapImage x:Key="Img_DeviceTweaker" UriSource="/GTweak;component/Assets/Images/DownloadApps/DeviceTweaker.png"/>
- <BitmapImage x:Key="Img_DiskInfo" UriSource="/GTweak;component/Assets/Images/DownloadApps/DiskInfo.png"/>
- <BitmapImage x:Key="Img_DiskMark" UriSource="/GTweak;component/Assets/Images/DownloadApps/DiskMark.png"/>
- <BitmapImage x:Key="Img_FirstEverTech" UriSource="/GTweak;component/Assets/Images/DownloadApps/FirstEverTech.png"/>
- <BitmapImage x:Key="Img_GPUz" UriSource="/GTweak;component/Assets/Images/DownloadApps/GPUz.png"/>
- <BitmapImage x:Key="Img_Nvidia" UriSource="/GTweak;component/Assets/Images/DownloadApps/Nvidia.png"/>
- <BitmapImage x:Key="Img_NvidiaPI" UriSource="/GTweak;component/Assets/Images/DownloadApps/NvidiaPI.png"/>
- <BitmapImage x:Key="Img_Occt" UriSource="/GTweak;component/Assets/Images/DownloadApps/Occt.png"/>
- <BitmapImage x:Key="Img_PCIz" UriSource="/GTweak;component/Assets/Images/DownloadApps/PCIz.png"/>
- <BitmapImage x:Key="Img_Rapr" UriSource="/GTweak;component/Assets/Images/DownloadApps/Rapr.png"/>
- <BitmapImage x:Key="Img_Rufus" UriSource="/GTweak;component/Assets/Images/DownloadApps/Rufus.png"/>
- <BitmapImage x:Key="Img_SystemInfo" UriSource="/GTweak;component/Assets/Images/DownloadApps/SystemInfo.png"/>
+ <!--#region DownloadToolset -->
+ <BitmapImage x:Key="Img_Amd" UriSource="/GTweak;component/Assets/Images/DownloadToolset/Amd.png"/>
+ <BitmapImage x:Key="Img_Autoruns" UriSource="/GTweak;component/Assets/Images/DownloadToolset/Autoruns.png"/>
+ <BitmapImage x:Key="Img_CPUz" UriSource="/GTweak;component/Assets/Images/DownloadToolset/CPUz.png"/>
+ <BitmapImage x:Key="Img_DeviceTweaker" UriSource="/GTweak;component/Assets/Images/DownloadToolset/DeviceTweaker.png"/>
+ <BitmapImage x:Key="Img_DiskInfo" UriSource="/GTweak;component/Assets/Images/DownloadToolset/DiskInfo.png"/>
+ <BitmapImage x:Key="Img_DiskMark" UriSource="/GTweak;component/Assets/Images/DownloadToolset/DiskMark.png"/>
+ <BitmapImage x:Key="Img_FirstEverTech" UriSource="/GTweak;component/Assets/Images/DownloadToolset/FirstEverTech.png"/>
+ <BitmapImage x:Key="Img_GPUz" UriSource="/GTweak;component/Assets/Images/DownloadToolset/GPUz.png"/>
+ <BitmapImage x:Key="Img_Nvidia" UriSource="/GTweak;component/Assets/Images/DownloadToolset/Nvidia.png"/>
+ <BitmapImage x:Key="Img_NvidiaPI" UriSource="/GTweak;component/Assets/Images/DownloadToolset/NvidiaPI.png"/>
+ <BitmapImage x:Key="Img_Occt" UriSource="/GTweak;component/Assets/Images/DownloadToolset/Occt.png"/>
+ <BitmapImage x:Key="Img_PCIz" UriSource="/GTweak;component/Assets/Images/DownloadToolset/PCIz.png"/>
+ <BitmapImage x:Key="Img_Rapr" UriSource="/GTweak;component/Assets/Images/DownloadToolset/Rapr.png"/>
+ <BitmapImage x:Key="Img_Rufus" UriSource="/GTweak;component/Assets/Images/DownloadToolset/Rufus.png"/>
+ <BitmapImage x:Key="Img_SystemInfo" UriSource="/GTweak;component/Assets/Images/DownloadToolset/SystemInfo.png"/>
+ <BitmapImage x:Key="Img_ThrottleStop" UriSource="/GTweak;component/Assets/Images/DownloadToolset/ThrottleStop.png"/>
<!--#endregion -->
<!--#region PreinstalledApps -->
diff --git a/.Source/GTweak/Assets/UserControls/FileCard.xaml b/.Source/GTweak/Assets/UserControls/FileCard.xaml
index 30070266..a24f6037 100644
--- a/.Source/GTweak/Assets/UserControls/FileCard.xaml
+++ b/.Source/GTweak/Assets/UserControls/FileCard.xaml
@@ -24,7 +24,7 @@
</Grid.RowDefinitions>
<Viewbox Grid.Row="0" Width="50" Height="50" Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center">
- <Image Source="{Binding IconSource,ElementName=Root,TargetNullValue={StaticResource Img_BatFile}}" Stretch="Uniform"/>
+ <Image Source="{Binding IconSource,ElementName=Root,TargetNullValue={StaticResource Img_Bat}}" Stretch="Uniform"/>
</Viewbox>
<TextBlock Grid.Row="1" Margin="0,15,0,0" FontSize="13px" FontFamily="{StaticResource Jura}" Foreground="{StaticResource Brush_Highlighted}" Text="{Binding FileName,ElementName=Root}"
diff --git a/.Source/GTweak/Assets/UserControls/ToolsetCard.xaml b/.Source/GTweak/Assets/UserControls/ToolsetCard.xaml
index 07e2588f..ae41d3c6 100644
--- a/.Source/GTweak/Assets/UserControls/ToolsetCard.xaml
+++ b/.Source/GTweak/Assets/UserControls/ToolsetCard.xaml
@@ -59,7 +59,7 @@
</Style>
</Border.Style>
<Border.Background>
- <ImageBrush ImageSource="{Binding AuthorIcon,ElementName=Root}" Stretch="Uniform"/>
+ <ImageBrush ImageSource="{Binding AuthorIcon,ElementName=Root, TargetNullValue={StaticResource Icon_Website}}" Stretch="Uniform"/>
</Border.Background>
</Border>
diff --git a/.Source/GTweak/Core/Model/ToolsetModel.cs b/.Source/GTweak/Core/Model/ToolsetModel.cs
index 6f0fd3ca..bdbb82f2 100644
--- a/.Source/GTweak/Core/Model/ToolsetModel.cs
+++ b/.Source/GTweak/Core/Model/ToolsetModel.cs
@@ -1,13 +1,16 @@
-using System.Xml.Linq;
+using System.Windows;
+using System.Windows.Media;
+using Newtonsoft.Json.Linq;
namespace GTweak.Core.Models
{
internal class ToolsetModel
{
+ public ImageSource AppIcon { get; }
public string AppName { get; }
- public string AuthorName { get; }
public string Group { get; }
- public string IconResourceName { get; }
+ public ImageSource PlaceholderIcon { get; }
+ public string AuthorName { get; }
public string AuthorIconUrl { get; }
public string SourceUrl { get; }
public string DownloadPath { get; }
@@ -15,18 +18,31 @@ namespace GTweak.Core.Models
public string UrlPattern { get; }
public string FileName { get; }
- public ToolsetModel(XElement appElement)
+ public (bool IsDirectUrl, bool IsSquareIcon) AuthorIconInfo
+ {
+ get
+ {
+ return Group?.ToLowerInvariant() switch
+ {
+ "github" => (IsDirectUrl: true, IsSquareIcon: false),
+ _ => (IsDirectUrl: false, IsSquareIcon: true)
+ };
+ }
+ }
+
+ public ToolsetModel(JObject appObject)
{
- AppName = appElement.Element("Name")?.Value ?? string.Empty;
- AuthorName = appElement.Element("Author")?.Value ?? string.Empty;
- Group = appElement.Element("Group")?.Value ?? string.Empty;
- IconResourceName = appElement.Element("Icon")?.Value ?? string.Empty;
- AuthorIconUrl = appElement.Element("AuthorIcon")?.Value ?? string.Empty;
- SourceUrl = appElement.Element("Source")?.Value ?? string.Empty;
- DownloadPath = appElement.Element("DownloadPath")?.Value ?? string.Empty;
- FilePattern = appElement.Element("FilePattern")?.Value ?? string.Empty;
- UrlPattern = appElement.Element("UrlPattern")?.Value ?? string.Empty;
- FileName = appElement.Element("FileName")?.Value ?? string.Empty;
+ AppIcon = Application.Current?.TryFindResource(appObject["icon"]?.ToString() ?? string.Empty) as ImageSource;
+ AppName = appObject["name"]?.ToString() ?? string.Empty;
+ Group = appObject["group"]?.ToString() ?? string.Empty;
+ PlaceholderIcon = Application.Current?.TryFindResource(appObject["placeholderIcon"]?.ToString() ?? string.Empty) as ImageSource;
+ AuthorName = appObject["author"]?.ToString() ?? string.Empty;
+ AuthorIconUrl = appObject["authorIcon"]?.ToString() ?? string.Empty;
+ SourceUrl = appObject["source"]?.ToString() ?? string.Empty;
+ DownloadPath = appObject["downloadPath"]?.ToString() ?? string.Empty;
+ FilePattern = appObject["filePattern"]?.ToString() ?? string.Empty;
+ UrlPattern = appObject["urlPattern"]?.ToString() ?? string.Empty;
+ FileName = appObject["fileName"]?.ToString() ?? string.Empty;
}
}
}
\ No newline at end of file
diff --git a/.Source/GTweak/Core/Services/ToolsetIconService.cs b/.Source/GTweak/Core/Services/ToolsetIconService.cs
index fc074d59..fbaf3bbe 100644
--- a/.Source/GTweak/Core/Services/ToolsetIconService.cs
+++ b/.Source/GTweak/Core/Services/ToolsetIconService.cs
@@ -3,7 +3,6 @@ using System.Collections.Concurrent;
using System.IO;
using System.Net.Http;
using System.Threading.Tasks;
-using System.Windows;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using GTweak.Modules.Common;
@@ -15,59 +14,37 @@ namespace GTweak.Core.Services
private static readonly ConcurrentDictionary<string, ImageSource> _imageCache = new ConcurrentDictionary<string, ImageSource>();
private static readonly HttpClient _httpClient = new HttpClient();
- internal static ImageSource GetPlaceholder(string group) => Application.Current.TryFindResource($"Icon_{(string.Equals(group, "github", StringComparison.OrdinalIgnoreCase) ? "Git" : "Website")}") as ImageSource;
-
- internal static async Task<(ImageSource Image, bool IsFallback)> GetAuthorIcon(string group, string iconSource)
+ internal static async Task<ImageSource> GetAuthorIcon(string iconSource, bool isDirectUrl)
{
if (string.IsNullOrWhiteSpace(iconSource))
{
- return (GetPlaceholder(group), true);
+ return null;
}
if (_imageCache.TryGetValue(iconSource, out ImageSource cachedImage))
{
- return (cachedImage, false);
- }
-
- string urlToDownload = iconSource;
- bool isWebBased = !string.Equals(group, "github", StringComparison.OrdinalIgnoreCase);
-
- if (isWebBased)
- {
- urlToDownload = PathTargets.Links.Favicons.Google(iconSource);
+ return cachedImage;
}
- try
- {
- byte[] imageBytes = await _httpClient.GetByteArrayAsync(urlToDownload);
- ImageSource image = LoadImage(imageBytes);
+ string[] urlsToDownload = isDirectUrl ? new[] { iconSource } : new[] { PathTargets.Links.Favicons.Google(iconSource), PathTargets.Links.Favicons.DuckDuckGo(iconSource) };
- if (image != null)
- {
- _imageCache.TryAdd(iconSource, image);
- return (image, false);
- }
- }
- catch
+ foreach (string url in urlsToDownload)
{
- if (isWebBased)
+ try
{
- try
- {
- byte[] imageBytes = await _httpClient.GetByteArrayAsync(PathTargets.Links.Favicons.DuckDuckGo(iconSource));
- ImageSource image = LoadImage(imageBytes);
+ byte[] imageBytes = await _httpClient.GetByteArrayAsync(url);
+ ImageSource image = LoadImage(imageBytes);
- if (image != null)
- {
- _imageCache.TryAdd(iconSource, image);
- return (image, false);
- }
+ if (image != null)
+ {
+ _imageCache.TryAdd(iconSource, image);
+ return image;
}
- catch (Exception ex) { ErrorLogger.LogDebug(ex); }
}
+ catch (Exception ex) { ErrorLogger.LogDebug(ex); }
}
- return (GetPlaceholder(group), true);
+ return null;
}
private static ImageSource LoadImage(byte[] imageData)
diff --git a/.Source/GTweak/Core/ViewModel/AddonsViewModel.cs b/.Source/GTweak/Core/ViewModel/AddonsViewModel.cs
index 9ff3b800..f88b3f6d 100644
--- a/.Source/GTweak/Core/ViewModel/AddonsViewModel.cs
+++ b/.Source/GTweak/Core/ViewModel/AddonsViewModel.cs
@@ -148,11 +148,10 @@ namespace GTweak.Core.ViewModel
string iconRes = Path.GetExtension(file).ToLowerInvariant() switch
{
- ".ps1" => "Img_PowershellFile",
- ".reg" => "Img_RegistryFile",
- ".bat" => "Img_BatFile",
- ".cmd" => "Img_CmdFile",
- _ => "Img_BatFile"
+ ".ps1" => "Img_PowerShell",
+ ".reg" => "Img_Registry",
+ ".cmd" => "Img_Cmd",
+ _ => "Img_Bat"
};
ImageSource iconImage = null;
diff --git a/.Source/GTweak/Core/ViewModel/Components/ToolsetItem.cs b/.Source/GTweak/Core/ViewModel/Components/ToolsetItem.cs
index 09baa3eb..cc276640 100644
--- a/.Source/GTweak/Core/ViewModel/Components/ToolsetItem.cs
+++ b/.Source/GTweak/Core/ViewModel/Components/ToolsetItem.cs
@@ -1,7 +1,6 @@
using System;
using System.ComponentModel;
using System.Threading.Tasks;
-using System.Windows;
using System.Windows.Input;
using System.Windows.Media;
using GTweak.Core.Base;
@@ -67,15 +66,16 @@ namespace GTweak.Core.Item
{
try
{
- IsSquareIcon = false;
+ AppIconSource = _model.AppIcon;
+ AuthorIconSource = _model.PlaceholderIcon;
- AppIconSource = Application.Current.TryFindResource(_model.IconResourceName) as ImageSource;
- AuthorIconSource = ToolsetIconService.GetPlaceholder(_model.Group);
+ ImageSource imageSource = await ToolsetIconService.GetAuthorIcon(_model.AuthorIconUrl, _model.AuthorIconInfo.IsDirectUrl);
- (ImageSource Image, bool IsFallback) = await ToolsetIconService.GetAuthorIcon(_model.Group, _model.AuthorIconUrl);
-
- AuthorIconSource = Image;
- IsSquareIcon = !string.Equals(_model.Group, "github", StringComparison.OrdinalIgnoreCase) && !IsFallback;
+ if (imageSource != null)
+ {
+ AuthorIconSource = imageSource;
+ IsSquareIcon = _model.AuthorIconInfo.IsSquareIcon;
+ }
}
catch (Exception ex) { ErrorLogger.LogDebug(ex); }
}
diff --git a/.Source/GTweak/Core/ViewModel/ToolsetViewModel.cs b/.Source/GTweak/Core/ViewModel/ToolsetViewModel.cs
index 2da7bebe..ca6888ab 100644
--- a/.Source/GTweak/Core/ViewModel/ToolsetViewModel.cs
+++ b/.Source/GTweak/Core/ViewModel/ToolsetViewModel.cs
@@ -3,14 +3,15 @@ using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
+using System.Linq;
using System.Windows.Data;
using System.Windows.Input;
-using System.Xml.Linq;
using GTweak.Core.Base;
using GTweak.Core.Item;
using GTweak.Core.Models;
using GTweak.Core.Services;
using GTweak.Modules.Common;
+using Newtonsoft.Json.Linq;
using Ookii.Dialogs.Wpf;
namespace GTweak.Core.ViewModel
@@ -57,15 +58,15 @@ namespace GTweak.Core.ViewModel
{
try
{
- string xmlContent = Properties.Resources.AppsCatalog;
+ string jsonContent = Properties.Resources.ToolsetStore;
- if (!string.IsNullOrWhiteSpace(xmlContent))
+ if (!string.IsNullOrWhiteSpace(jsonContent))
{
- XDocument doc = XDocument.Parse(xmlContent);
+ JArray apps = JArray.Parse(jsonContent);
- foreach (XElement appElement in doc.Descendants("App"))
+ foreach (JObject appObject in apps.Cast<JObject>())
{
- ToolsetModel model = new ToolsetModel(appElement);
+ ToolsetModel model = new ToolsetModel(appObject);
Tools.Add(new ToolsetItem(model));
}
}
diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csproj
index 60876249..babab10f 100644
--- a/.Source/GTweak/GTweak.csproj
+++ b/.Source/GTweak/GTweak.csproj
@@ -132,7 +132,7 @@
</ItemGroup>
<ItemGroup>
<None Include=".editorconfig" />
- <None Include="Resources\AppsCatalog.xml" />
+ <None Include="Resources\ToolsetStore.json" />
<None Include="Resources\*.gz" />
<None Include="Resources\Blocklist.txt" />
<None Include="Resources\Tickets.xml" />
@@ -525,6 +525,7 @@
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ <SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
diff --git a/.Source/GTweak/Properties/Resources.Designer.cs b/.Source/GTweak/Properties/Resources.Designer.cs
index e732df3d..1f9a25d8 100644
--- a/.Source/GTweak/Properties/Resources.Designer.cs
+++ b/.Source/GTweak/Properties/Resources.Designer.cs
@@ -1,24 +1,7 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-// Этот код создан программой.
-// Исполняемая версия:4.0.30319.42000
-//
-// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-// повторной генерации кода.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
namespace GTweak.Properties {
using System;
- /// <summary>
- /// Класс ресурса со строгой типизацией для поиска локализованных строк и т.д.
- /// </summary>
- // Этот класс создан автоматически классом StronglyTypedResourceBuilder
- // с помощью такого средства, как ResGen или Visual Studio.
- // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen
- // с параметром /str или перестройте свой проект VS.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
@@ -31,10 +14,7 @@ namespace GTweak.Properties {
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
-
- /// <summary>
- /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом.
- /// </summary>
+
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
get {
@@ -46,10 +26,6 @@ namespace GTweak.Properties {
}
}
- /// <summary>
- /// Перезаписывает свойство CurrentUICulture текущего потока для всех
- /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
- /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
@@ -60,28 +36,13 @@ namespace GTweak.Properties {
}
}
- /// <summary>
- /// Ищет локализованную строку, похожую на &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
- ///&lt;Apps&gt;
- /// &lt;App&gt;
- /// &lt;Icon&gt;Img_Nvidia&lt;/Icon&gt;
- /// &lt;Name&gt;NVIDIA App&lt;/Name&gt;
- /// &lt;Group&gt;web&lt;/Group&gt;
- /// &lt;Author&gt;(C) NVIDIA Corporation&lt;/Author&gt;
- /// &lt;AuthorIcon&gt;nvidia.com&lt;/AuthorIcon&gt;
- /// &lt;Source&gt;https://www.nvidia.com/en-eu/software/nvidia-app/&lt;/Source&gt;
- /// &lt;DownloadPath&gt;https://www.nvidia.com/en-us/software/nvidia-app/&lt;/DownloadPath&gt;
- /// &lt;UrlPattern&gt;&lt;![CDATA[https://.*?download\.nvidia\.com/nvapp/client/.*?/NVIDIA_app_.*?\.exe]]&gt; [остаток строки не уместился]&quot;;.
- /// </summary>
- internal static string AppsCatalog {
+ internal static string ToolsetStore
+ {
get {
- return ResourceManager.GetString("AppsCatalog", resourceCulture);
+ return ResourceManager.GetString("ToolsetStore", resourceCulture);
}
}
- /// <summary>
- /// Поиск локализованного ресурса типа System.Byte[].
- /// </summary>
internal static byte[] Blank {
get {
object obj = ResourceManager.GetObject("Blank", resourceCulture);
@@ -89,34 +50,12 @@ namespace GTweak.Properties {
}
}
- /// <summary>
- /// Ищет локализованную строку, похожую на 0.0.0.0 1oavsblobprodcus350.blob.core.windows.net
- ///0.0.0.0 2539951.r.bat.bing.com
- ///0.0.0.0 37bvsblobprodcus311.blob.core.windows.net
- ///0.0.0.0 a.ads1.msn.com
- ///0.0.0.0 a.ads2.msads.net
- ///0.0.0.0 a.ads2.msn.com
- ///0.0.0.0 a.rad.msn.com
- ///0.0.0.0 a-0001.a-msedge.net
- ///0.0.0.0 a-0001.dc-msedge.net
- ///0.0.0.0 a-0002.a-msedge.net
- ///0.0.0.0 a-0003.a-msedge.net
- ///0.0.0.0 a-0003.dc-msedge.net
- ///0.0.0.0 a-0004.a-msedge.net
- ///0.0.0.0 a-0005.a-msedge.net
- ///0.0.0.0 a-0006.a-msedge.net
- ///0.0.0.0 a-0007.a-msedge.net
- ///0.0.0.0 a-0008.a-m [остаток строки не уместился]&quot;;.
- /// </summary>
internal static string Blocklist {
get {
return ResourceManager.GetString("Blocklist", resourceCulture);
}
}
- /// <summary>
- /// Поиск локализованного ресурса типа System.Byte[].
- /// </summary>
internal static byte[] DisablingWD {
get {
object obj = ResourceManager.GetObject("DisablingWD", resourceCulture);
@@ -124,9 +63,7 @@ namespace GTweak.Properties {
}
}
- /// <summary>
- /// Поиск локализованного ресурса типа System.Byte[].
- /// </summary>
+
internal static byte[] NSudoLC {
get {
object obj = ResourceManager.GetObject("NSudoLC", resourceCulture);
@@ -134,24 +71,12 @@ namespace GTweak.Properties {
}
}
- /// <summary>
- /// Поиск локализованного ресурса типа System.IO.UnmanagedMemoryStream, аналогичного System.IO.MemoryStream.
- /// </summary>
internal static System.IO.UnmanagedMemoryStream Sound {
get {
return ResourceManager.GetStream("Sound", resourceCulture);
}
}
- /// <summary>
- /// Ищет локализованную строку, похожую на &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
- ///&lt;Tickets&gt;
- /// &lt;Ticket&gt;
- /// &lt;product&gt;KMS&lt;/product&gt;
- /// &lt;content&gt;
- /// &lt;![CDATA[
- /// &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;&lt;genuineAuthorization xmlns=&quot;http://www.microsoft.com/DRM/SL/GenuineAuthorization/1.0&quot;&gt;&lt;version&gt;1.0&lt;/version&gt;&lt;genuineProperties origin=&quot;sppclient&quot;&gt;&lt;properties&gt;OA3xOriginalProductId=;OA3xOriginalProductKey=;SessionId=TwBTAE0AYQBqAG8AcgBWAGUAcgBzAGkAbwBuAD0ANQA7AE8AUwBNAGkAbgBvAHIAVgBlAHIAcwBpAG8AbgA9ADEAOwBPAFMAUABsAGEAdABmAG8AcgBtAEkAZAA9ADIAOwBQAFAAPQAw [остаток строки не уместился]&quot;;.
- /// </summary>
internal static string Tickets {
get {
return ResourceManager.GetString("Tickets", resourceCulture);
diff --git a/.Source/GTweak/Properties/Resources.resx b/.Source/GTweak/Properties/Resources.resx
index bef04984..bdd76a36 100644
--- a/.Source/GTweak/Properties/Resources.resx
+++ b/.Source/GTweak/Properties/Resources.resx
@@ -118,8 +118,8 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="AppsCatalog" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\AppsCatalog.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+ <data name="ToolsetStore" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\ToolsetStore.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="Blank" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Blank.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
diff --git a/.Source/GTweak/Resources/AppsCatalog.xml b/.Source/GTweak/Resources/AppsCatalog.xml
deleted file mode 100644
index f2020e43..00000000
--- a/.Source/GTweak/Resources/AppsCatalog.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Apps>
- <App>
- <Icon>Img_Nvidia</Icon>
- <Name>NVIDIA App</Name>
- <Group>web</Group>
- <Author>(C) NVIDIA Corporation</Author>
- <AuthorIcon>nvidia.com</AuthorIcon>
- <Source>https://www.nvidia.com/en-eu/software/nvidia-app/</Source>
- <DownloadPath>https://www.nvidia.com/en-us/software/nvidia-app/</DownloadPath>
- <UrlPattern><![CDATA[https://.*?download\.nvidia\.com/nvapp/client/.*?/NVIDIA_app_.*?\.exe]]></UrlPattern>
- </App>
-
- <App>
- <Icon>Img_Amd</Icon>
- <Name>AMD Software: Adrenalin Edition™</Name>
- <Group>web</Group>
- <Author>Advanced Micro Devices, Inc</Author>
- <AuthorIcon>amd.com</AuthorIcon>
- <Source>https://www.amd.com/en/support/download/drivers.html</Source>
- <DownloadPath>https://www.amd.com/en/support/download/drivers.html</DownloadPath>
- <UrlPattern><![CDATA[https://drivers\.amd\.com/drivers/installer/.*?/whql/.*?minimalsetup.*?\.exe]]></UrlPattern>
- </App>
-
- <App>
- <Icon>Img_FirstEverTech</Icon>
- <Name>Universal Intel Chipset Device Updater</Name>
- <Group>github</Group>
- <Author>FirstEverTech</Author>
- <AuthorIcon>https://github.com/FirstEverTech.png</AuthorIcon>
- <Source>https://github.com/FirstEverTech/Universal-Intel-Chipset-Updater</Source>
- <DownloadPath>FirstEverTech/Universal-Intel-Chipset-Updater</DownloadPath>
- <FilePattern><![CDATA[.*\.exe$]]></FilePattern>
- </App>
-
- <App>
- <Icon>Img_FirstEverTech</Icon>
- <Name>Universal Intel Wi-Fi and Bluetooth Drivers Updater</Name>
- <Group>github</Group>
- <Author>FirstEverTech</Author>
- <AuthorIcon>https://github.com/FirstEverTech.png</AuthorIcon>
- <Source>https://github.com/FirstEverTech/Universal-Intel-WiFi-BT-Updater</Source>
- <DownloadPath>FirstEverTech/Universal-Intel-WiFi-BT-Updater</DownloadPath>
- <FilePattern><![CDATA[.*\.exe$]]></FilePattern>
- </App>
-
- <App>
- <Icon>Img_Rapr</Icon>
- <Name>Driver Store Explorer</Name>
- <Group>github</Group>
- <Author>lostindark</Author>
- <AuthorIcon>https://github.com/lostindark.png</AuthorIcon>
- <Source>https://github.com/lostindark/DriverStoreExplorer</Source>
- <DownloadPath>lostindark/DriverStoreExplorer</DownloadPath>
- <FilePattern><![CDATA[(?i)DriverStoreExplorer.*\.zip$]]></FilePattern>
- </App>
-
- <App>
- <Icon>Img_NvidiaPI</Icon>
- <Name>NVIDIA Profile Inspector</Name>
- <Group>github</Group>
- <Author>Orbmu2k</Author>
- <AuthorIcon>https://github.com/Orbmu2k.png</AuthorIcon>
- <Source>https://github.com/Orbmu2k/nvidiaProfileInspector</Source>
- <DownloadPath>Orbmu2k/nvidiaProfileInspector</DownloadPath>
- <FilePattern><![CDATA[(?i)nvidiaProfileInspector.*\.zip$]]></FilePattern>
- </App>
-
- <App>
- <Icon>Img_DeviceTweaker</Icon>
- <Name>DEVICE TWEAKER</Name>
- <Group>github</Group>
- <Author>arsenzaaa</Author>
- <AuthorIcon>https://github.com/arsenzaaa.png</AuthorIcon>
- <Source>https://github.com/arsenzaaa/DEVICE-TWEAKER</Source>
- <DownloadPath>arsenzaaa/DEVICE-TWEAKER</DownloadPath>
- <FilePattern><![CDATA[(?i)DEVICE.*NET.*FRAMEWORK.*\.exe$]]></FilePattern>
- </App>
-
- <App>
- <Icon>Img_Autoruns</Icon>
- <Name>Autoruns</Name>
- <Group>web</Group>
- <Author>Mark Russinovich</Author>
- <AuthorIcon>microsoft.com</AuthorIcon>
- <Source>https://learn.microsoft.com/en-us/sysinternals/downloads/autoruns</Source>
- <DownloadPath>https://download.sysinternals.com/files/Autoruns.zip</DownloadPath>
- </App>
-
- <App>
- <Icon>Img_Rufus</Icon>
- <Name>Rufus</Name>
- <Group>github</Group>
- <Author>pbatard</Author>
- <AuthorIcon>https://github.com/pbatard.png</AuthorIcon>
- <Source>https://github.com/pbatard/rufus</Source>
- <DownloadPath>pbatard/rufus</DownloadPath>
- <FilePattern><![CDATA[(?i)rufus-.*?p\.exe$]]></FilePattern>
- </App>
-
- <App>
- <Icon>Img_SystemInfo</Icon>
- <Name>SystemInformer</Name>
- <Group>github</Group>
- <Author>Winsider Seminars &amp; Solutions, Inc</Author>
- <AuthorIcon>https://github.com/winsiderss.png</AuthorIcon>
- <Source>https://github.com/winsiderss/systeminformer</Source>
- <DownloadPath>winsiderss/systeminformer</DownloadPath>
- <FilePattern><![CDATA[(?i)systeminformer.*bin.*\.zip]]></FilePattern>
- </App>
-
- <App>
- <Icon>Img_CPUz</Icon>
- <Name>CPU-Z</Name>
- <Group>sourceforge</Group>
- <Author>CPUID</Author>
- <AuthorIcon>cpuid.com</AuthorIcon>
- <Source>https://sourceforge.net/projects/cpu-z/</Source>
- <DownloadPath>https://sourceforge.net/projects/cpu-z/files/latest/download</DownloadPath>
- </App>
-
- <App>
- <Icon>Img_GPUz</Icon>
- <Name>GPU-Z</Name>
- <Group>techpowerup</Group>
- <Author>TechPowerUp</Author>
- <AuthorIcon>techpowerup.com</AuthorIcon>
- <Source>https://www.techpowerup.com/gpuz/</Source>
- <DownloadPath>https://www.techpowerup.com/download/techpowerup-gpu-z/</DownloadPath>
- </App>
-
- <App>
- <Icon>Img_PCIz</Icon>
- <Name>PCI-Z</Name>
- <Group>web</Group>
- <Author>Bruno Banelli</Author>
- <AuthorIcon>pci-z.com</AuthorIcon>
- <Source>https://www.pci-z.com/#download</Source>
- <DownloadPath>https://www.pci-z.com/current/PCI-Z.zip</DownloadPath>
- </App>
-
- <App>
- <Icon>Img_DiskInfo</Icon>
- <Name>Crystal Disk Info</Name>
- <Group>sourceforge</Group>
- <Author>hiyohiyo</Author>
- <AuthorIcon>crystalmark.info</AuthorIcon>
- <Source>https://sourceforge.net/projects/crystaldiskinfo/</Source>
- <DownloadPath>https://sourceforge.net/projects/crystaldiskinfo/files/latest/download</DownloadPath>
- </App>
-
- <App>
- <Icon>Img_DiskMark</Icon>
- <Name>Crystal Disk Mark</Name>
- <Group>sourceforge</Group>
- <Author>hiyohiyo</Author>
- <AuthorIcon>crystalmark.info</AuthorIcon>
- <Source>https://sourceforge.net/projects/crystaldiskmark/</Source>
- <DownloadPath>https://sourceforge.net/projects/crystaldiskmark/files/latest/download</DownloadPath>
- </App>
-
- <App>
- <Icon>Img_Occt</Icon>
- <Name>OCCT</Name>
- <Group>web</Group>
- <Author>OCCT/OCBASE</Author>
- <AuthorIcon>ocbase.com</AuthorIcon>
- <Source>https://www.ocbase.com/download</Source>
- <DownloadPath>https://www.ocbase.com/download/edition:Personal/os:Windows</DownloadPath>
- <FileName>OCCT.exe</FileName>
- </App>
-</Apps>
\ No newline at end of file
diff --git a/.Source/GTweak/Resources/ToolsetStore.json b/.Source/GTweak/Resources/ToolsetStore.json
new file mode 100644
index 00000000..c992377d
--- /dev/null
+++ b/.Source/GTweak/Resources/ToolsetStore.json
@@ -0,0 +1,182 @@
+[
+ {
+ "icon": "Img_Nvidia",
+ "name": "NVIDIA App",
+ "group": "web",
+ "placeholderIcon": "Icon_Website",
+ "author": "(C) NVIDIA Corporation",
+ "authorIcon": "nvidia.com",
+ "source": "https://www.nvidia.com/en-eu/software/nvidia-app/",
+ "downloadPath": "https://www.nvidia.com/en-us/software/nvidia-app/",
+ "urlPattern": "https://.*?download\\.nvidia\\.com/nvapp/client/.*?/NVIDIA_app_.*?\\.exe"
+ },
+ {
+ "icon": "Img_Amd",
+ "name": "AMD Software: Adrenalin Edition™",
+ "group": "web",
+ "placeholderIcon": "Icon_Website",
+ "author": "Advanced Micro Devices, Inc",
+ "authorIcon": "amd.com",
+ "source": "https://www.amd.com/en/support/download/drivers.html",
+ "downloadPath": "https://www.amd.com/en/support/download/drivers.html",
+ "urlPattern": "https://drivers\\.amd\\.com/drivers/installer/.*?/whql/.*?minimalsetup.*?\\.exe"
+ },
+ {
+ "icon": "Img_FirstEverTech",
+ "name": "Universal Intel Chipset Device Updater",
+ "group": "github",
+ "placeholderIcon": "Icon_Git",
+ "author": "FirstEverTech",
+ "authorIcon": "https://github.com/FirstEverTech.png",
+ "source": "https://github.com/FirstEverTech/Universal-Intel-Chipset-Updater",
+ "downloadPath": "FirstEverTech/Universal-Intel-Chipset-Updater",
+ "filePattern": ".*\\.exe$"
+ },
+ {
+ "icon": "Img_FirstEverTech",
+ "name": "Universal Intel Wi-Fi and Bluetooth Drivers Updater",
+ "group": "github",
+ "placeholderIcon": "Icon_Git",
+ "author": "FirstEverTech",
+ "authorIcon": "https://github.com/FirstEverTech.png",
+ "source": "https://github.com/FirstEverTech/Universal-Intel-WiFi-BT-Updater",
+ "downloadPath": "FirstEverTech/Universal-Intel-WiFi-BT-Updater",
+ "filePattern": ".*\\.exe$"
+ },
+ {
+ "icon": "Img_Rapr",
+ "name": "Driver Store Explorer",
+ "group": "github",
+ "placeholderIcon": "Icon_Git",
+ "author": "lostindark",
+ "authorIcon": "https://github.com/lostindark.png",
+ "source": "https://github.com/lostindark/DriverStoreExplorer",
+ "downloadPath": "lostindark/DriverStoreExplorer",
+ "filePattern": "(?i)DriverStoreExplorer.*\\.zip$"
+ },
+ {
+ "icon": "Img_NvidiaPI",
+ "name": "NVIDIA Profile Inspector",
+ "group": "github",
+ "placeholderIcon": "Icon_Git",
+ "author": "Orbmu2k",
+ "authorIcon": "https://github.com/Orbmu2k.png",
+ "source": "https://github.com/Orbmu2k/nvidiaProfileInspector",
+ "downloadPath": "Orbmu2k/nvidiaProfileInspector",
+ "filePattern": "(?i)nvidiaProfileInspector.*\\.zip$"
+ },
+ {
+ "icon": "Img_DeviceTweaker",
+ "name": "DEVICE TWEAKER",
+ "group": "github",
+ "placeholderIcon": "Icon_Git",
+ "author": "arsenzaaa",
+ "authorIcon": "https://github.com/arsenzaaa.png",
+ "source": "https://github.com/arsenzaaa/DEVICE-TWEAKER",
+ "downloadPath": "arsenzaaa/DEVICE-TWEAKER",
+ "filePattern": "(?i)DEVICE.*NET.*FRAMEWORK.*\\.exe$"
+ },
+ {
+ "icon": "Img_Autoruns",
+ "name": "Autoruns",
+ "group": "web",
+ "placeholderIcon": "Icon_Website",
+ "author": "Mark Russinovich",
+ "authorIcon": "microsoft.com",
+ "source": "https://learn.microsoft.com/en-us/sysinternals/downloads/autoruns",
+ "downloadPath": "https://download.sysinternals.com/files/Autoruns.zip"
+ },
+ {
+ "icon": "Img_Rufus",
+ "name": "Rufus",
+ "group": "github",
+ "placeholderIcon": "Icon_Git",
+ "author": "pbatard",
+ "authorIcon": "https://github.com/pbatard.png",
+ "source": "https://github.com/pbatard/rufus",
+ "downloadPath": "pbatard/rufus",
+ "filePattern": "(?i)rufus-.*?p\\.exe$"
+ },
+ {
+ "icon": "Img_SystemInfo",
+ "name": "SystemInformer",
+ "group": "github",
+ "placeholderIcon": "Icon_Git",
+ "author": "Winsider Seminars & Solutions, Inc",
+ "authorIcon": "https://github.com/winsiderss.png",
+ "source": "https://github.com/winsiderss/systeminformer",
+ "downloadPath": "winsiderss/systeminformer",
+ "filePattern": "(?i)systeminformer.*bin.*\\.zip"
+ },
+ {
+ "icon": "Img_CPUz",
+ "name": "CPU-Z",
+ "group": "sourceforge",
+ "placeholderIcon": "Icon_Website",
+ "author": "CPUID",
+ "authorIcon": "cpuid.com",
+ "source": "https://sourceforge.net/projects/cpu-z/",
+ "downloadPath": "https://sourceforge.net/projects/cpu-z/files/latest/download"
+ },
+ {
+ "icon": "Img_GPUz",
+ "name": "GPU-Z",
+ "group": "techpowerup",
+ "placeholderIcon": "Icon_Website",
+ "author": "TechPowerUp",
+ "authorIcon": "techpowerup.com",
+ "source": "https://www.techpowerup.com/download/techpowerup-gpu-z/",
+ "downloadPath": "https://www.techpowerup.com/download/techpowerup-gpu-z/"
+ },
+ {
+ "icon": "Img_PCIz",
+ "name": "PCI-Z",
+ "group": "web",
+ "placeholderIcon": "Icon_Website",
+ "author": "Bruno Banelli",
+ "authorIcon": "pci-z.com",
+ "source": "https://www.pci-z.com/#download",
+ "downloadPath": "https://www.pci-z.com/current/PCI-Z.zip"
+ },
+ {
+ "icon": "Img_DiskInfo",
+ "name": "Crystal Disk Info",
+ "group": "sourceforge",
+ "placeholderIcon": "Icon_Website",
+ "author": "hiyohiyo",
+ "authorIcon": "crystalmark.info",
+ "source": "https://sourceforge.net/projects/crystaldiskinfo/",
+ "downloadPath": "https://sourceforge.net/projects/crystaldiskinfo/files/latest/download"
+ },
+ {
+ "icon": "Img_DiskMark",
+ "name": "Crystal Disk Mark",
+ "group": "sourceforge",
+ "placeholderIcon": "Icon_Website",
+ "author": "hiyohiyo",
+ "authorIcon": "crystalmark.info",
+ "source": "https://sourceforge.net/projects/crystaldiskmark/",
+ "downloadPath": "https://sourceforge.net/projects/crystaldiskmark/files/latest/download"
+ },
+ {
+ "icon": "Img_ThrottleStop",
+ "name": "ThrottleStop",
+ "group": "techpowerup",
+ "placeholderIcon": "Icon_Website",
+ "author": "TechPowerUp",
+ "authorIcon": "techpowerup.com",
+ "source": "https://www.techpowerup.com/download/techpowerup-throttlestop/",
+ "downloadPath": "https://www.techpowerup.com/download/techpowerup-throttlestop/"
+ },
+ {
+ "icon": "Img_Occt",
+ "name": "OCCT",
+ "group": "web",
+ "placeholderIcon": "Icon_Website",
+ "author": "OCCT/OCBASE",
+ "authorIcon": "ocbase.com",
+ "source": "https://www.ocbase.com/download",
+ "downloadPath": "https://www.ocbase.com/download/edition:Personal/os:Windows",
+ "fileName": "OCCT.exe"
+ }
+]