Skip to content

Commit 4388c03

Browse files
mrixnermrixner
authored
Merge branch 'main' into winget-code-correction
2 parents 2666773 + 414b839 commit 4388c03

5 files changed

Lines changed: 42 additions & 30 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# <img src="https://raw.githubusercontent.com/marticliment/UniGetUI/main/media/icon.png" height="40">UniGetUI (formerly WingetUI)
22

3-
[![Downloads@latest](https://img.shields.io/github/downloads/marticliment/UniGetUI/3.1.1/total?style=for-the-badge)](https://github.com/marticliment/UniGetUI/releases/latest/download/UniGetUI.Installer.exe)
3+
[![Downloads@latest](https://img.shields.io/github/downloads/marticliment/UniGetUI/3.1.6/total?style=for-the-badge)](https://github.com/marticliment/UniGetUI/releases/latest/download/UniGetUI.Installer.exe)
44
[![Release Version Badge](https://img.shields.io/github/v/release/marticliment/UniGetUI?style=for-the-badge)](https://github.com/marticliment/UniGetUI/releases)
55
[![Issues Badge](https://img.shields.io/github/issues/marticliment/UniGetUI?style=for-the-badge)](https://github.com/marticliment/UniGetUI/issues)
66
[![Closed Issues Badge](https://img.shields.io/github/issues-closed/marticliment/UniGetUI?color=%238256d0&style=for-the-badge)](https://github.com/marticliment/UniGetUI/issues?q=is%3Aissue+is%3Aclosed)<br>

‎WebBasedData/screenshot-database-v2.json‎

Lines changed: 39 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"package_count": {
3-
"total": 11788,
4-
"done": 5244,
5-
"packages_with_icon": 5244,
3+
"total": 11793,
4+
"done": 5251,
5+
"packages_with_icon": 5251,
66
"packages_with_screenshot": 625,
77
"total_screenshots": 1957
88
},
@@ -8262,7 +8262,7 @@
82628262
"images": []
82638263
},
82648264
"compass-full": {
8265-
"icon": "https://cdn.meowcat285.com/public/UnigetIcons%2Fmongodb-compass-logo-stable.png",
8265+
"icon": "https://cdn.meowcat285.com/unigeticons/mongodb-compass-logo-stable.png",
82668266
"images": [
82678267
"https://raw.githubusercontent.com/mongodb-js/compass/main/packages/compass/compass-screenshot.png"
82688268
]
@@ -10267,7 +10267,7 @@
1026710267
"images": []
1026810268
},
1026910269
"devhome": {
10270-
"icon": "https://cdn.meowcat285.com/public/UnigetIcons/DevHome.png",
10270+
"icon": "https://cdn.meowcat285.com/unigeticons/DevHome.png",
1027110271
"images": [
1027210272
"https://github.com/microsoft/devhome/blob/main/src/Assets/Preview/StoreDisplay-150.png",
1027310273
"https://i.postimg.cc/6qBmSkFB/devhome-machine-config.png",
@@ -13517,7 +13517,7 @@
1351713517
]
1351813518
},
1351913519
"everything-alpha": {
13520-
"icon": "",
13520+
"icon": "https://cdn.meowcat285.com/unigeticons/EverythingAlpha.png",
1352113521
"images": []
1352213522
},
1352313523
"everything-beta": {
@@ -16171,7 +16171,7 @@
1617116171
"images": []
1617216172
},
1617316173
"git": {
16174-
"icon": "https://cdn.meowcat285.com/public/UnigetIcons/git.2.46.2.png",
16174+
"icon": "https://cdn.meowcat285.com/unigeticons/git.2.46.2.png",
1617516175
"images": [
1617616176
"https://i.postimg.cc/QMmHqPP9/git1.png",
1617716177
"https://i.postimg.cc/cHJ6khyD/git2.png",
@@ -16758,7 +16758,7 @@
1675816758
"images": []
1675916759
},
1676016760
"go": {
16761-
"icon": "https://community.chocolatey.org/content/packageimages/go.1.20.1.png",
16761+
"icon": "https://cdn.meowcat285.com/unigeticons/Go-Logo_Blue.png",
1676216762
"images": []
1676316763
},
1676416764
"go-contact-sync-mod": {
@@ -21104,7 +21104,7 @@
2110421104
"images": []
2110521105
},
2110621106
"kalilinux": {
21107-
"icon": "https://cdn.meowcat285.com/public/UnigetIcons/KaliLinux.png",
21107+
"icon": "https://cdn.meowcat285.com/unigeticons/KaliLinux.png",
2110821108
"images": []
2110921109
},
2111021110
"kalk": {
@@ -23402,7 +23402,7 @@
2340223402
"images": []
2340323403
},
2340423404
"llvm": {
23405-
"icon": "",
23405+
"icon": "https://cdn.meowcat285.com/unigeticons/LLVM-Logo-Derivative-4.png",
2340623406
"images": []
2340723407
},
2340823408
"lmath": {
@@ -25812,11 +25812,11 @@
2581225812
"images": []
2581325813
},
2581425814
"mountain-duck": {
25815-
"icon": "https://community.chocolatey.org/content/packageimages/mountain-duck.4.0.1.16800.png",
25815+
"icon": "https://cdn.meowcat285.com/unigeticons/MountainDuck.png",
2581625816
"images": []
2581725817
},
2581825818
"mountainduck": {
25819-
"icon": "https://community.chocolatey.org/content/packageimages/mountainduck.4.13.5.20986.png",
25819+
"icon": "https://cdn.meowcat285.com/unigeticons/MountainDuck.png",
2582025820
"images": []
2582125821
},
2582225822
"mouse-jiggler": {
@@ -26124,7 +26124,7 @@
2612426124
"images": []
2612526125
},
2612626126
"msedgeredirect": {
26127-
"icon": "https://cdn.meowcat285.com/public/UnigetIcons/msedgeredirect.0.7.5.3.png",
26127+
"icon": "https://cdn.meowcat285.com/unigeticons/msedgeredirect.0.7.5.3.png",
2612826128
"images": []
2612926129
},
2613026130
"mseries": {
@@ -26649,7 +26649,7 @@
2664926649
"images": []
2665026650
},
2665126651
"mysql-workbench": {
26652-
"icon": "https://cdn.meowcat285.com/public/UnigetIcons/MySQLWorkbench.png",
26652+
"icon": "https://cdn.meowcat285.com/unigeticons/MySQLWorkbench.png",
2665326653
"images": []
2665426654
},
2665526655
"mysqlnotifier": {
@@ -32132,7 +32132,7 @@
3213232132
"images": []
3213332133
},
3213432134
"prismlauncher": {
32135-
"icon": "https://cdn.meowcat285.com/public/UnigetIcons/prismlauncher.8.4.20240820.png",
32135+
"icon": "https://cdn.meowcat285.com/unigeticons/prismlauncher.8.4.20240820.png",
3213632136
"images": []
3213732137
},
3213832138
"pritunl-client": {
@@ -39493,7 +39493,7 @@
3949339493
"images": []
3949439494
},
3949539495
"streamer": {
39496-
"icon": "https://cdn.meowcat285.com/public/UnigetIcons/VirtualDesktop.png",
39496+
"icon": "https://cdn.meowcat285.com/unigeticons/VirtualDesktop.png",
3949739497
"images": []
3949839498
},
3949939499
"streaming-video-downloader": {
@@ -41926,7 +41926,7 @@
4192641926
"images": []
4192741927
},
4192841928
"tortoisegit": {
41929-
"icon": "https://cdn.meowcat285.com/public/UnigetIcons/tortoisegit.png",
41929+
"icon": "https://cdn.meowcat285.com/unigeticons/tortoisegit.png",
4193041930
"images": []
4193141931
},
4193241932
"tortoisegit-latest": {
@@ -44584,10 +44584,18 @@
4458444584
"icon": "https://pics.computerbase.de/9/9/2/3/0-e36f805671c3b980/logo-256.png",
4458544585
"images": []
4458644586
},
44587+
"visualstudio.2022.buildtools": {
44588+
"icon": "https://i.postimg.cc/rwGzh5vf/Visual-Studio-Icon-2022.png",
44589+
"images": []
44590+
},
4458744591
"visualstudio-2022-commun\u2026": {
4458844592
"icon": "https://pics.computerbase.de/9/9/2/3/0-e36f805671c3b980/logo-256.png",
4458944593
"images": []
4459044594
},
44595+
"visualstudio.2022.community": {
44596+
"icon": "https://i.postimg.cc/rwGzh5vf/Visual-Studio-Icon-2022.png",
44597+
"images": []
44598+
},
4459144599
"visualstudio-2022-enterp\u2026": {
4459244600
"icon": "https://pics.computerbase.de/9/9/2/3/0-e36f805671c3b980/logo-256.png",
4459344601
"images": []
@@ -49734,11 +49742,23 @@
4973449742
"images": []
4973549743
},
4973649744
"bambustudio": {
49737-
"icon": "https://cdn.meowcat285.com/public/UnigetIcons/BambuStudio.png",
49745+
"icon": "https://cdn.meowcat285.com/unigeticons/BambuStudio.png",
4973849746
"images": []
4973949747
},
4974049748
"dbbrowserforsqlite": {
49741-
"icon": "https://cdn.meowcat285.com/public/UnigetIcons/DBBrowser.png",
49749+
"icon": "https://cdn.meowcat285.com/unigeticons/DBBrowser.png",
49750+
"images": []
49751+
},
49752+
"inimanager": {
49753+
"icon": "https://cdn.meowcat285.com/unigeticons/iniManager.png",
49754+
"images": []
49755+
},
49756+
"mysqlworkbench": {
49757+
"icon": "https://cdn.meowcat285.com/unigeticons/MySQLWorkbench.png",
49758+
"images": []
49759+
},
49760+
"orcaslicer": {
49761+
"icon": "https://cdn.meowcat285.com/unigeticons/OrcaSlicer.png",
4974249762
"images": []
4974349763
}
4974449764
}

‎src/UniGetUI.PackageEngine.Managers.Vcpkg/Vcpkg.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ public override void RefreshPackageIndexes()
345345
var (vcpkgRootFound, vcpkgRoot) = GetVcpkgRoot();
346346
var (gitFound, gitPath) = CoreTools.Which("git");
347347

348-
if (!found || !gitFound || !vcpkgRootFound || Settings.Get("DisableUpdateVcpkgGitPorts"))
348+
if (!found || !gitFound || !vcpkgRootFound)
349349
{
350350
INativeTaskLogger logger = TaskLogger.CreateNew(LoggableTaskType.RefreshIndexes);
351351
if (Settings.Get("DisableUpdateVcpkgGitPorts")) logger.Error("User has disabled updating sources");

‎src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Package.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public Package(
102102
{
103103
"Winget" => Source.Name switch
104104
{
105-
"Steam" => id.ToLower().Split("\\")[^1].Replace("steam app ", "steam:").Trim(),
105+
"Steam" => id.ToLower().Split("\\")[^1].Replace("steam app ", "steam-").Trim(),
106106
"Local PC" => id.ToLower().Split("\\")[^1],
107107
"Microsoft Store" => id.IndexOf('_') < id.IndexOf('.') ? // If the first underscore is before the period, this ID has no publisher
108108
string.Join('_', id.ToLower().Split("\\")[1].Split("_")[0..^4]) : // no publisher: remove `MSIX\`, then the standard ending _version_arch__{random id}

‎src/UniGetUI/Pages/SettingsPage.xaml.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -252,14 +252,6 @@ public SettingsPage()
252252

253253
// ----------------------------------------------------------------------------------------
254254

255-
CheckboxCard Vcpkg_UpdateGitPorts = new()
256-
{
257-
Text = CoreTools.Translate(
258-
"Update vcpkg's Git portfiles automatically (requires Git installed)"),
259-
SettingName = "DisableUpdateVcpkgGitPorts"
260-
};
261-
ExtraSettingsCards[PEInterface.Vcpkg].Add(Vcpkg_UpdateGitPorts);
262-
263255
// GetDefaultTriplet factors in the `DefaultVcpkgTriplet` setting as its first priority
264256
Settings.SetValue("DefaultVcpkgTriplet", Vcpkg.GetDefaultTriplet());
265257
ComboboxCard Vcpkg_DefaultTriplet = new()

0 commit comments

Comments
 (0)