ShrinkSDK/Installer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: compare installed package versions semantically

Browse Source
This commit is contained in:
cneicy
2026-09-05 02:33:59 +08:00
parent 012728ffac
commit 2abf367f36
12 changed files with 270 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/ShrinkSdkInstallerWindow.cs
+35 -17
View File
@@ -172,16 +172,16 @@ namespace ShrinkSDK.Installer
title.style.flexGrow = 1f;
titleRow.Add(title);
var exact = bundle.Packages.Count(IsExactInstalled);
var ready = bundle.Packages.Count(IsInstalledAtLeast);
var button = new Button(() => BeginInstall(bundle.InstallRoots));
if (exact == bundle.Packages.Count)
if (ready == bundle.Packages.Count)
{
button.text = "已完成";
button.SetEnabled(false);
}
else
{
button.text = exact > 0 ? "补齐组合" : "安装组合";
button.text = ready > 0 ? "补齐组合" : "安装组合";
button.SetEnabled(!IsBusy);
}
button.style.width = 100f;
@@ -193,9 +193,9 @@ namespace ShrinkSDK.Installer
summary.style.marginTop = 5f;
card.Add(summary);
var progress = new Label($"已就绪 {exact}/{bundle.Packages.Count}");
var progress = new Label($"已就绪 {ready}/{bundle.Packages.Count}");
progress.style.marginTop = 8f;
progress.style.color = exact == bundle.Packages.Count
progress.style.color = ready == bundle.Packages.Count
? new Color(0.35f, 0.75f, 0.45f)
: new Color(0.65f, 0.65f, 0.65f);
card.Add(progress);
@@ -266,7 +266,7 @@ namespace ShrinkSDK.Installer
row.Add(name);
var status = new Label(GetInstalledStatus(package));
status.style.fontSize = 10f;
status.style.color = IsExactInstalled(package)
status.style.color = IsInstalledAtLeast(package)
? new Color(0.35f, 0.75f, 0.45f)
: new Color(0.65f, 0.65f, 0.65f);
row.Add(status);
@@ -278,13 +278,26 @@ namespace ShrinkSDK.Installer
var button = new Button(() => BeginInstall(new[] { package }));
if (!_installed.TryGetValue(package.PackageName, out var installed))
button.text = "安装 " + package.Version;
else if (string.Equals(installed.version, package.Version, StringComparison.Ordinal))
{
button.text = "已安装 " + installed.version;
button.SetEnabled(false);
}
else
button.text = installed.version + " → " + package.Version;
{
switch (ShrinkPackageVersion.Classify(installed.version, package.Version))
{
case ShrinkPackageVersionRelation.Equal:
button.text = "已安装 " + installed.version;
button.SetEnabled(false);
break;
case ShrinkPackageVersionRelation.Newer:
button.text = "较新版本 " + installed.version;
button.SetEnabled(false);
break;
case ShrinkPackageVersionRelation.Older:
button.text = "升级 " + installed.version + " → " + package.Version;
break;
default:
button.text = installed.version + " → " + package.Version;
break;
}
}
if (IsBusy)
button.SetEnabled(false);
@@ -326,17 +339,22 @@ namespace ShrinkSDK.Installer
package.Summary.IndexOf(_searchText, StringComparison.OrdinalIgnoreCase) >= 0 ||
package.PackageName.IndexOf(_searchText, StringComparison.OrdinalIgnoreCase) >= 0;
private bool IsExactInstalled(ShrinkSdkPackageEntry package) =>
private bool IsInstalledAtLeast(ShrinkSdkPackageEntry package) =>
_installed.TryGetValue(package.PackageName, out var installed) &&
string.Equals(installed.version, package.Version, StringComparison.Ordinal);
ShrinkPackageVersion.Classify(installed.version, package.Version) is
ShrinkPackageVersionRelation.Equal or ShrinkPackageVersionRelation.Newer;
private string GetInstalledStatus(ShrinkSdkPackageEntry package)
{
if (!_installed.TryGetValue(package.PackageName, out var installed))
return "未安装 · " + package.Version;
return string.Equals(installed.version, package.Version, StringComparison.Ordinal)
? "已安装 " + installed.version
: "已安装 " + installed.version + " · 固定 " + package.Version;
return ShrinkPackageVersion.Classify(installed.version, package.Version) switch
{
ShrinkPackageVersionRelation.Equal => "已安装 " + installed.version,
ShrinkPackageVersionRelation.Newer => "已安装较新版本 " + installed.version,
ShrinkPackageVersionRelation.Older => "可升级 " + installed.version + " → " + package.Version,
_ => "已安装 " + installed.version + " · 目标 " + package.Version
};
}
private bool IsBusy => _listRequest != null || _resolvePending || _listRetryPending;