Skip to content

Commit 9c92fb3

Browse files
committed
Revame Version to VersionString
1 parent 26c58c1 commit 9c92fb3

23 files changed

Lines changed: 61 additions & 61 deletions

File tree

src/UniGetUI.Interface.BackgroundApi/BackgroundApi.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public void BuildV1WidgetsApi()
201201
continue; // Do not show already processed packages on queue
202202

203203
string icon = $"http://localhost:7058/widgets/v2/get_icon_for_package?packageId={HttpUtility.UrlEncode(package.Id)}&packageSource={HttpUtility.UrlEncode(package.Source.Name)}&token={ApiTokenHolder.Token}";
204-
packages.Append($"{package.Name.Replace('|', '-')}|{package.Id}|{package.Version}|{package.NewVersion}|{package.Source.AsString_DisplayName}|{package.Manager.Name}|{icon}&&");
204+
packages.Append($"{package.Name.Replace('|', '-')}|{package.Id}|{package.VersionString}|{package.NewVersionString}|{package.Source.AsString_DisplayName}|{package.Manager.Name}|{icon}&&");
205205
}
206206

207207
string pkgs_ = packages.ToString();

src/UniGetUI.PAckageEngine.Interfaces/IPackage.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ public interface IPackage : INotifyPropertyChanged, IEquatable<IPackage>
1313
public bool IsChecked { get; set; }
1414
public string Name { get; }
1515
public string Id { get; }
16-
public string Version { get; }
16+
public string VersionString { get; }
1717
public CoreTools.Version VersionAsFloat { get; }
1818
public CoreTools.Version NewVersionAsFloat { get; }
1919
public IManagerSource Source { get; }
2020
public IPackageManager Manager { get; }
21-
public string NewVersion { get; }
21+
public string NewVersionString { get; }
2222
public bool IsUpgradable { get; }
2323
public ref OverridenInstallationOptions OverridenOptions { get; }
2424
public string AutomationName { get; }

src/UniGetUI.PackageEngine.Managers.Cargo/Cargo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ protected override IReadOnlyList<Package> FindPackages_UnSafe(string query)
103103
var package = Packages[i];
104104
try
105105
{
106-
var versionInfo = CratesIOClient.GetManifestVersion(package.Id, package.Version);
106+
var versionInfo = CratesIOClient.GetManifestVersion(package.Id, package.VersionString);
107107
if (versionInfo.bin_names?.Length > 0)
108108
{
109109
BinPackages.Add(package);

src/UniGetUI.PackageEngine.Managers.Cargo/Helpers/CargoPkgDetailsHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ protected override void GetDetails_UnSafe(IPackageDetails details)
3838
var categories = manifest.categories?.Select(c => c.category);
3939
details.Tags = [.. keywords, .. categories];
4040

41-
var versionData = manifest.versions.Where((v) => v.num == details.Package.Version).First();
41+
var versionData = manifest.versions.Where((v) => v.num == details.Package.VersionString).First();
4242

4343
details.Author = versionData.published_by?.name;
4444
details.License = versionData.license;

src/UniGetUI.PackageEngine.Managers.Cargo/Helpers/CargoPkgOperationHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ internal sealed class CargoPkgOperationHelper(Cargo cargo) : PackagePkgOperation
88
{
99
protected override IReadOnlyList<string> _getOperationParameters(IPackage package, IInstallationOptions options, OperationType operation)
1010
{
11-
var version = options.Version == string.Empty ? package.Version : options.Version;
11+
var version = options.Version == string.Empty ? package.VersionString : options.Version;
1212
List<string> parameters = operation switch
1313
{
1414
OperationType.Install => [Manager.Properties.InstallVerb, "--version", version, package.Id],

src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGetDetailsHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ protected override void GetDetails_UnSafe(IPackageDetails details)
136136
}
137137

138138
// Logger.Debug($"A native icon with Url={possibleIconUrl.Groups[1].Value} was found");
139-
return new CacheableIcon(new Uri(possibleIconUrl.Groups[1].Value), package.Version);
139+
return new CacheableIcon(new Uri(possibleIconUrl.Groups[1].Value), package.VersionString);
140140
}
141141

142142
protected override IReadOnlyList<Uri> GetScreenshots_UnSafe(IPackage package)

src/UniGetUI.PackageEngine.Managers.Generic.NuGet/Internal/NuGetManifestLoader.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ internal static class NuGetManifestLoader
1515
/// <returns>A Uri object</returns>
1616
public static Uri GetManifestUrl(IPackage package)
1717
{
18-
return new Uri($"{package.Source.Url}/Packages(Id='{package.Id}',Version='{package.Version}')");
18+
return new Uri($"{package.Source.Url}/Packages(Id='{package.Id}',Version='{package.VersionString}')");
1919
}
2020

2121
/// <summary>
@@ -25,7 +25,7 @@ public static Uri GetManifestUrl(IPackage package)
2525
/// <returns>A Uri object</returns>
2626
public static Uri GetNuPkgUrl(IPackage package)
2727
{
28-
return new Uri($"{package.Source.Url}/package/{package.Id}/{package.Version}");
28+
return new Uri($"{package.Source.Url}/package/{package.Id}/{package.VersionString}");
2929
}
3030

3131
/// <summary>
@@ -49,7 +49,7 @@ public static Uri GetNuPkgUrl(IPackage package)
4949
{
5050
client.DefaultRequestHeaders.UserAgent.ParseAdd(CoreData.UserAgentString);
5151
HttpResponseMessage response = client.GetAsync(PackageManifestUrl).GetAwaiter().GetResult();
52-
if (!response.IsSuccessStatusCode && package.Version.EndsWith(".0"))
52+
if (!response.IsSuccessStatusCode && package.VersionString.EndsWith(".0"))
5353
{
5454
response = client.GetAsync(new Uri(PackageManifestUrl.ToString().Replace(".0')", "')"))).GetAwaiter().GetResult();
5555
}

src/UniGetUI.PackageEngine.Managers.Npm/Helpers/NpmPkgDetailsHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protected override void GetDetails_UnSafe(IPackageDetails details)
5151

5252
details.Publisher = (contents?["maintainers"] as JsonArray)?[0]?.ToString();
5353
details.Author = contents?["author"]?.ToString();
54-
details.UpdateDate = contents?["time"]?[contents?["dist-tags"]?["latest"]?.ToString() ?? details.Package.Version]?.ToString();
54+
details.UpdateDate = contents?["time"]?[contents?["dist-tags"]?["latest"]?.ToString() ?? details.Package.VersionString]?.ToString();
5555

5656
if (Uri.TryCreate(contents?["dist"]?["tarball"]?.ToString() ?? "", UriKind.RelativeOrAbsolute, out var installerUrl))
5757
details.InstallerUrl = installerUrl;

src/UniGetUI.PackageEngine.Managers.Npm/Helpers/NpmPkgOperationHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ public NpmPkgOperationHelper(Npm manager) : base(manager) { }
1010
protected override IReadOnlyList<string> _getOperationParameters(IPackage package, IInstallationOptions options, OperationType operation)
1111
{
1212
List<string> parameters = operation switch {
13-
OperationType.Install => [Manager.Properties.InstallVerb, $"{package.Id}@{(options.Version == string.Empty? package.Version: options.Version)}"],
14-
OperationType.Update => [Manager.Properties.UpdateVerb, $"{package.Id}@{package.NewVersion}"],
13+
OperationType.Install => [Manager.Properties.InstallVerb, $"{package.Id}@{(options.Version == string.Empty? package.VersionString: options.Version)}"],
14+
OperationType.Update => [Manager.Properties.UpdateVerb, $"{package.Id}@{package.NewVersionString}"],
1515
OperationType.Uninstall => [Manager.Properties.UninstallVerb, package.Id],
1616
_ => throw new InvalidDataException("Invalid package operation")
1717
};

src/UniGetUI.PackageEngine.Managers.Scoop/Scoop.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,9 @@ protected override IReadOnlyList<Package> GetAvailableUpdates_UnSafe()
185185
Dictionary<string, IPackage> InstalledPackages = [];
186186
foreach (IPackage InstalledPackage in GetInstalledPackages())
187187
{
188-
if (!InstalledPackages.ContainsKey(InstalledPackage.Id + "." + InstalledPackage.Version))
188+
if (!InstalledPackages.ContainsKey(InstalledPackage.Id + "." + InstalledPackage.VersionString))
189189
{
190-
InstalledPackages.Add(InstalledPackage.Id + "." + InstalledPackage.Version, InstalledPackage);
190+
InstalledPackages.Add(InstalledPackage.Id + "." + InstalledPackage.VersionString, InstalledPackage);
191191
}
192192
}
193193

0 commit comments

Comments
 (0)