Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@
"et": "Estonian - Eesti",
"en": "English - English",
"es": "Spanish - Castellano",
"es-MX": "Spanish (Mexico)",
"fa": "Persian - فارسی‎",
"fi": "Finnish - Suomi",
"fil": "Filipino - Filipino",
"fr": "French - Français",
"gl": "Galician - Galego",
"gu": "Gujarati - ગુજરાતી",
"hi": "Hindi - हिंदी",
"hr": "Croatian - Hrvatski",
Expand Down
27 changes: 3 additions & 24 deletions src/UniGetUI.PAckageEngine.Interfaces/IInstallationOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,44 +17,23 @@ public interface IInstallationOptions
public bool RemoveDataOnUninstall { get; set; }
public bool PreRelease { get; set; }
public string CustomInstallLocation { get; set; }
public IPackage Package { get; }
public bool OverridesNextLevelOpts { get; set; }

/// <summary>
/// Loads and applies the options from the given SerializableInstallationOptions object to the current object.
/// </summary>
public void FromSerializable(SerializableInstallationOptions options);
public void GetValuesFromSerializable(SerializableInstallationOptions options);

/// <summary>
/// Returns a SerializableInstallationOptions object containing the options of the current instance.
/// </summary>
public SerializableInstallationOptions AsSerializable();

/// <summary>
/// Saves the current options to disk, asynchronously.
/// </summary>
public async Task SaveToDiskAsync()
{
await Task.Run(SaveToDisk);
}

/// <summary>
/// Loads the options from disk, asynchronously.
/// </summary>
public async Task LoadFromDiskAsync()
{
await Task.Run(LoadFromDisk);
}
public SerializableInstallationOptions ToSerializable();

/// <summary>
/// Saves the current options to disk.
/// </summary>
public void SaveToDisk();

/// <summary>
/// Loads the options from disk.
/// </summary>
protected void LoadFromDisk();

/// <summary>
/// Returns a string representation of the current options.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace UniGetUI.PackageEngine.Managers.CargoManager;

internal sealed class CargoPkgOperationHelper(Cargo cargo) : PackagePkgOperationHelper(cargo)
internal sealed class CargoPkgOperationHelper(Cargo cargo) : BasePkgOperationHelper(cargo)
{
protected override IReadOnlyList<string> _getOperationParameters(IPackage package, IInstallationOptions options, OperationType operation)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using UniGetUI.PackageEngine.Interfaces;

namespace UniGetUI.PackageEngine.Managers.ChocolateyManager;
internal sealed class ChocolateyPkgOperationHelper : PackagePkgOperationHelper
internal sealed class ChocolateyPkgOperationHelper : BasePkgOperationHelper
{
public ChocolateyPkgOperationHelper(Chocolatey manager) : base(manager) { }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using UniGetUI.PackageEngine.Interfaces;

namespace UniGetUI.PackageEngine.Managers.DotNetManager;
internal sealed class DotNetPkgOperationHelper : PackagePkgOperationHelper
internal sealed class DotNetPkgOperationHelper : BasePkgOperationHelper
{
public DotNetPkgOperationHelper(DotNet manager) : base(manager) { }

Expand Down
15 changes: 13 additions & 2 deletions src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,18 @@ protected sealed override IReadOnlyList<Package> FindPackages_UnSafe(string quer
sources = [ Properties.DefaultSource ];
}

bool canPrerelease = InstallationOptions.LoadForManager(this).PreRelease;

foreach(IManagerSource source in sources)
{
Uri? SearchUrl = new($"{source.Url}/Search()?$filter=IsLatestVersion&$orderby=Id&searchTerm='{HttpUtility.UrlEncode(query)}'&targetFramework=''&includePrerelease=false&$skip=0&$top=50&semVerLevel=2.0.0");
Uri? SearchUrl = new($"{source.Url}/Search()" +
$"?$filter=IsLatestVersion" +
$"&$orderby=Id&searchTerm='{HttpUtility.UrlEncode(query)}'" +
$"&targetFramework=''" +
$"&includePrerelease={(canPrerelease? "true": "false")}" +
$"&$skip=0" +
$"&$top=50" +
$"&semVerLevel=2.0.0");
// Uri SearchUrl = new($"{source.Url}/Search()?$filter=IsLatestVersion&searchTerm=%27{HttpUtility.UrlEncode(query)}%27&targetFramework=%27%27&includePrerelease=false");
logger.Log($"Begin package search with url={SearchUrl} on manager {Name}");
Dictionary<string, SearchResult> AlreadyProcessedPackages = [];
Expand Down Expand Up @@ -145,6 +154,7 @@ protected override IReadOnlyList<Package> GetAvailableUpdates_UnSafe()
if (!sourceMapping.ContainsKey(uri)) sourceMapping[uri] = new();
sourceMapping[uri].Add(package);
}
bool canPrerelease = InstallationOptions.LoadForManager(this).PreRelease;

foreach (var pair in sourceMapping)
{
Expand All @@ -161,7 +171,8 @@ protected override IReadOnlyList<Package> GetAvailableUpdates_UnSafe()
var SearchUrl = $"{pair.Key.Url.ToString().Trim('/')}/GetUpdates()" +
$"?packageIds=%27{HttpUtility.UrlEncode(packageIds.ToString().Trim('|'))}%27" +
$"&versions=%27{HttpUtility.UrlEncode(packageVers.ToString().Trim('|'))}%27" +
$"&includePrerelease=0&includeAllVersions=0";
$"&includePrerelease={(canPrerelease ? "true" : "false")}" +
$"&includeAllVersions=0";

using HttpClient client = new(CoreTools.GenericHttpClientParameters);
client.DefaultRequestHeaders.UserAgent.ParseAdd(CoreData.UserAgentString);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using UniGetUI.PackageEngine.Interfaces;

namespace UniGetUI.PackageEngine.Managers.NpmManager;
internal sealed class NpmPkgOperationHelper : PackagePkgOperationHelper
internal sealed class NpmPkgOperationHelper : BasePkgOperationHelper
{
public NpmPkgOperationHelper(Npm manager) : base(manager) { }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using UniGetUI.PackageEngine.Interfaces;

namespace UniGetUI.PackageEngine.Managers.PipManager;
internal sealed class PipPkgOperationHelper : PackagePkgOperationHelper
internal sealed class PipPkgOperationHelper : BasePkgOperationHelper
{
public PipPkgOperationHelper(Pip manager) : base(manager) { }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using UniGetUI.PackageEngine.Interfaces;

namespace UniGetUI.PackageEngine.Managers.PowerShellManager;
internal sealed class PowerShellPkgOperationHelper : PackagePkgOperationHelper
internal sealed class PowerShellPkgOperationHelper : BasePkgOperationHelper
{
public PowerShellPkgOperationHelper(PowerShell manager) : base(manager) { }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using UniGetUI.PackageEngine.Interfaces;

namespace UniGetUI.PackageEngine.Managers.PowerShell7Manager;
internal sealed class PowerShell7PkgOperationHelper : PackagePkgOperationHelper
internal sealed class PowerShell7PkgOperationHelper : BasePkgOperationHelper
{
public PowerShell7PkgOperationHelper(PowerShell7 manager) : base(manager) { }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using UniGetUI.PackageEngine.Interfaces;

namespace UniGetUI.PackageEngine.Managers.ScoopManager;
internal sealed class ScoopPkgOperationHelper : PackagePkgOperationHelper
internal sealed class ScoopPkgOperationHelper : BasePkgOperationHelper
{
public ScoopPkgOperationHelper(Scoop manager) : base(manager) { }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using UniGetUI.PackageEngine.Interfaces;

namespace UniGetUI.PackageEngine.Managers.VcpkgManager;
internal sealed class VcpkgPkgOperationHelper : PackagePkgOperationHelper
internal sealed class VcpkgPkgOperationHelper : BasePkgOperationHelper
{
public VcpkgPkgOperationHelper(Vcpkg manager) : base(manager) { }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using UniGetUI.PackageEngine.Interfaces;

namespace UniGetUI.PackageEngine.Managers.WingetManager;
internal sealed class WinGetPkgOperationHelper : PackagePkgOperationHelper
internal sealed class WinGetPkgOperationHelper : BasePkgOperationHelper
{
public static string GetIdNamePiece(IPackage package)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected override async Task<bool> IsPackageValid(IPackage package)
IgnoredPackages[package.Id] = package;
return false;
}
if ((await InstallationOptions.FromPackageAsync(package)).SkipMinorUpdates && package.IsUpdateMinor())
if ((await InstallationOptions.LoadApplicableAsync(package)).SkipMinorUpdates && package.IsUpdateMinor())
{
Logger.Info($"Ignoring package {package.Id} because it is a minor update ({package.VersionString} -> {package.NewVersionString}) and SkipMinorUpdates is set to true.");
return false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

namespace UniGetUI.PackageEngine.Classes.Manager.BaseProviders;

public abstract class PackagePkgOperationHelper : IPackageOperationHelper
public abstract class BasePkgOperationHelper : IPackageOperationHelper
{
protected IPackageManager Manager;

public PackagePkgOperationHelper(IPackageManager manager)
public BasePkgOperationHelper(IPackageManager manager)
{
Manager = manager;
}
Expand All @@ -30,10 +30,21 @@ public IReadOnlyList<string> GetParameters(
IInstallationOptions options,
OperationType operation)
{
var parameters = _getOperationParameters(package, options, operation);
Logger.Info(
$"Loaded operation parameters for package id={package.Id} on manager {Manager.Name} and operation {operation}: " +
string.Join(' ', parameters));
var parameters = _getOperationParameters(package, options, operation).ToArray();

for (int i = 0; i < parameters.Length; i++)
{
parameters[i] = parameters[i]
.Replace("&", "")
.Replace("|", "")
.Replace(";", "")
.Replace("<", "")
.Replace(">", "")
.Replace("\n", "");
}

Logger.Info($"Loaded operation parameters for package id={package.Id} on manager {Manager.Name} and operation {operation}: " +
string.Join(' ', parameters));
return parameters;

}
Expand Down
Loading
Loading