Skip to content

Commit 1373015

Browse files
committed
Move all InstallationOptions instances to SerializableInstallationOptions
1 parent a3bbdfa commit 1373015

42 files changed

Lines changed: 335 additions & 440 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/UniGetUI.Core.LanguageEngine/LanguageData.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using UniGetUI.Core.Data;
66
using UniGetUI.Core.Logging;
77
using UniGetUI.PackageEngine.Enums;
8+
using Architecture = UniGetUI.PackageEngine.Enums.Architecture;
89

910
namespace UniGetUI.Core.Language
1011
{
@@ -151,41 +152,41 @@ private static Person[] LoadLanguageTranslatorList()
151152

152153
public static class CommonTranslations
153154
{
154-
public static readonly Dictionary<Architecture, string> ArchNames = new()
155+
public static readonly Dictionary<string, string> ArchNames = new()
155156
{
156157
{ Architecture.X64, "x64" },
157158
{ Architecture.X86, "x86" },
158159
{ Architecture.Arm64, "arm64" },
159160
{ Architecture.Arm, "arm32" },
160161
};
161162

162-
public static readonly Dictionary<string, Architecture> InvertedArchNames = new()
163+
public static readonly Dictionary<string, string> InvertedArchNames = new()
163164
{
164165
{ "x64", Architecture.X64 },
165166
{ "x86", Architecture.X86 },
166167
{ "arm64", Architecture.Arm64 },
167168
{ "arm32", Architecture.Arm },
168169
};
169170

170-
public static readonly Dictionary<PackageScope, string> ScopeNames = new()
171+
public static readonly Dictionary<string, string> ScopeNames = new()
171172
{
172173
{ PackageScope.Global, "Machine | Global" },
173174
{ PackageScope.Local, "User | Local" },
174175
};
175176

176-
public static readonly Dictionary<string, PackageScope> InvertedScopeNames = new()
177+
public static readonly Dictionary<string, string> InvertedScopeNames = new()
177178
{
178179
{ "Machine | Global", PackageScope.Global },
179180
{ "User | Local", PackageScope.Local },
180181
};
181182

182-
public static readonly Dictionary<PackageScope, string> ScopeNames_NonLang = new()
183+
public static readonly Dictionary<string, string> ScopeNames_NonLang = new()
183184
{
184185
{ PackageScope.Global, "machine" },
185186
{ PackageScope.Local, "user" },
186187
};
187188

188-
public static readonly Dictionary<string, PackageScope> InvertedScopeNames_NonLang = new()
189+
public static readonly Dictionary<string, string> InvertedScopeNames_NonLang = new()
189190
{
190191
{ "machine", PackageScope.Global },
191192
{ "user", PackageScope.Local },

src/UniGetUI.PAckageEngine.Interfaces/IInstallationOptions.cs

Lines changed: 0 additions & 42 deletions
This file was deleted.

src/UniGetUI.PAckageEngine.Interfaces/IPackage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public interface IPackage : INotifyPropertyChanged, IEquatable<IPackage>
149149
/// <returns>False if the update is a major update or the update doesn't exist, true if it's a minor update</returns>
150150
public bool IsUpdateMinor();
151151

152-
public SerializablePackage AsSerializable();
152+
public Task<SerializablePackage> AsSerializableAsync();
153153

154154
public SerializableIncompatiblePackage AsSerializable_Incompatible();
155155
}

src/UniGetUI.PAckageEngine.Interfaces/ManagerHelpers/IPackageOperationHelper.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using UniGetUI.PackageEngine.Enums;
2+
using UniGetUI.PackageEngine.Serializable;
23

34
namespace UniGetUI.PackageEngine.Interfaces.ManagerProviders
45
{
@@ -12,11 +13,9 @@ public interface IPackageOperationHelper
1213
/// that the requested operation is performed over the given package, with its corresponding
1314
/// installation options.
1415
/// </summary>
15-
public IReadOnlyList<string> GetParameters(
16-
IPackage package,
17-
IInstallationOptions options,
18-
OperationType operation
19-
);
16+
public IReadOnlyList<string> GetParameters(IPackage package,
17+
SerializableInstallationOptions options,
18+
OperationType operation);
2019

2120
/// <summary>
2221
/// Returns the veredict of the given package operation, given the package, the operation type,

src/UniGetUI.PackageEngine.Enums/Enums.cs

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,20 @@ namespace UniGetUI.PackageEngine.Enums
33
/// <summary>
44
/// Represents the installation scope of a package
55
/// </summary>
6-
public enum PackageScope
6+
public static class PackageScope
77
{
8-
Global = 1,
9-
Machine = 1,
10-
Local = 0,
11-
User = 0,
8+
public const string Global = "machine";
9+
public const string Machine = "machine";
10+
public const string Local = "user";
11+
public const string User = "user";
12+
}
13+
14+
public static class Architecture
15+
{
16+
public const string X86 = "x86";
17+
public const string X64 = "x64";
18+
public const string Arm = "arm32";
19+
public const string Arm64 = "arm64";
1220
}
1321

1422
public enum DeserializedPackageStatus

src/UniGetUI.PackageEngine.Enums/ManagerCapabilities.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public struct ManagerCapabilities
2828
public bool CanDownloadInstaller = false;
2929
public bool SupportsCustomVersions = false;
3030
public bool SupportsCustomArchitectures = false;
31-
public Architecture[] SupportedCustomArchitectures = [];
31+
public string[] SupportedCustomArchitectures = [];
3232
public bool SupportsCustomScopes = false;
3333
public bool SupportsPreRelease = false;
3434
public bool SupportsCustomLocations = false;

src/UniGetUI.PackageEngine.Enums/OverridenInstallationOptions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
namespace UniGetUI.PackageEngine.Structs;
44
public struct OverridenInstallationOptions
55
{
6-
public PackageScope? Scope;
6+
public string? Scope;
77
public bool? RunAsAdministrator;
88
public bool PowerShell_DoNotSetScopeParameter = false;
99
public bool? WinGet_SpecifyVersion = null;
1010

11-
public OverridenInstallationOptions(PackageScope? scope = null, bool? runAsAdministrator = null)
11+
public OverridenInstallationOptions(string? scope = null, bool? runAsAdministrator = null)
1212
{
1313
Scope = scope;
1414
RunAsAdministrator = runAsAdministrator;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
using UniGetUI.PackageEngine.Classes.Manager.BaseProviders;
22
using UniGetUI.PackageEngine.Enums;
33
using UniGetUI.PackageEngine.Interfaces;
4+
using UniGetUI.PackageEngine.Serializable;
45

56
namespace UniGetUI.PackageEngine.Managers.CargoManager;
67

78
internal sealed class CargoPkgOperationHelper(Cargo cargo) : BasePkgOperationHelper(cargo)
89
{
9-
protected override IReadOnlyList<string> _getOperationParameters(IPackage package, IInstallationOptions options, OperationType operation)
10+
protected override IReadOnlyList<string> _getOperationParameters(IPackage package,
11+
SerializableInstallationOptions options, OperationType operation)
1012
{
1113
var version = options.Version == string.Empty ? package.VersionString : options.Version;
1214
List<string> parameters = operation switch

src/UniGetUI.PackageEngine.Managers.Chocolatey/Chocolatey.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
using UniGetUI.PackageEngine.Managers.Choco;
1414
using UniGetUI.PackageEngine.Managers.PowerShellManager;
1515
using UniGetUI.PackageEngine.PackageClasses;
16+
using Architecture = UniGetUI.PackageEngine.Enums.Architecture;
1617

1718
namespace UniGetUI.PackageEngine.Managers.ChocolateyManager
1819
{

src/UniGetUI.PackageEngine.Managers.Chocolatey/Helpers/ChocolateyPkgOperationHelper.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
using UniGetUI.PackageEngine.Classes.Manager.BaseProviders;
33
using UniGetUI.PackageEngine.Enums;
44
using UniGetUI.PackageEngine.Interfaces;
5+
using UniGetUI.PackageEngine.Serializable;
6+
using Architecture = UniGetUI.PackageEngine.Enums.Architecture;
57

68
namespace UniGetUI.PackageEngine.Managers.ChocolateyManager;
79
internal sealed class ChocolateyPkgOperationHelper : BasePkgOperationHelper
810
{
911
public ChocolateyPkgOperationHelper(Chocolatey manager) : base(manager) { }
1012

11-
protected override IReadOnlyList<string> _getOperationParameters(
12-
IPackage package,
13-
IInstallationOptions options,
13+
protected override IReadOnlyList<string> _getOperationParameters(IPackage package,
14+
SerializableInstallationOptions options,
1415
OperationType operation)
1516
{
1617
List<string> parameters = [operation switch {

0 commit comments

Comments
 (0)