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
11 changes: 6 additions & 5 deletions docs/provider-architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,12 @@ These are behavioural checks. Do not replace them with source-text searches or t

## TinkerGame successor integration

`TinkerGameContext` selects `TinkerGameWorkflow`. It specializes the archive
workflow's staged preparation and metadata hooks because directory staging,
promotion and backup restoration have identical requirements. It stages the
complete modular runtime and Steam manifests together; it does not reuse
SteamTinkerLaunch's external command or global executable-link lifecycle.
`InstallationService` selects `TinkerGameWorkflow` for jobs in `TINKER_GAME`
mode. The workflow specializes the archive workflow's staged preparation and
metadata hooks while sharing directory staging, promotion and backup
restoration. It stages the complete modular runtime and Steam manifests
together. SteamTinkerLaunch uses a separate external command and global
executable-link lifecycle.
See [TinkerGame](tinkergame.md) for automatic release discovery (including prereleases), ownership,
dependency policy, unsupported targets and explicit configuration migration.

Expand Down
3 changes: 0 additions & 3 deletions po/POTFILES
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ src/models/steam-profile.vala
src/models/steam-restart-operation.vala
src/models/steam-restart-target.vala
src/models/steam-runtime-repair-candidate.vala
src/models/steam/library-folder.vala
src/models/steam/steam-library-config.vala
src/models/tool-variant-preferences.vala
src/models/tool.vala
src/models/tools/provider-tool.vala
Expand Down Expand Up @@ -82,7 +80,6 @@ src/services/steam-session-service.vala
src/services/steam-tinker-launch-context.vala
src/services/steam-tinker-launch-workflow.vala
src/services/steam-tinker-launch-yad-compatibility.vala
src/services/tinker-game-context.vala
src/services/tinker-game-migration.vala
src/services/tinker-game-workflow.vala
src/utils/archive-helper.vala
Expand Down
576 changes: 288 additions & 288 deletions po/com.vysp3r.ProtonPlus.pot

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/cli/cli.vala
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ namespace ProtonPlus.CLI {
}

private void on_progress_updated (Services.InstallJob job) {
var speed = Utils.Filesystem.convert_bytes_to_string ((int64) (job.speed_kbps * 1024));
var speed = format_size ((int64) (job.speed_kbps * 1024));
var progress = job.progress ?? "";

string eta_text;
Expand Down
6 changes: 1 addition & 5 deletions src/models/assets/asset.vala
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,8 @@ namespace ProtonPlus.Models.Assets {
);
}

public static bool is_archive_name (string name) {
return Utils.ArchiveHelper.is_archive_name (name);
}

public bool is_archive () {
return is_archive_name (this.name);
return Utils.ArchiveHelper.is_archive_name (this.name);
}
}
}
1 change: 0 additions & 1 deletion src/models/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@ subdir('assets')
subdir('launchers')
subdir('providers')
subdir('tools')
subdir('steam')
23 changes: 5 additions & 18 deletions src/models/providers/built-in-provider-definitions.vala
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,11 @@ namespace ProtonPlus.Models.Providers {
internal class BuiltInProviderDefinitions : Object {
internal static ProviderDefinition[] create_all () {
var definitions = new Gee.ArrayList<ProviderDefinition> ();
append (definitions, DxvkDefinitions.create ());
append (definitions, Vkd3dDefinitions.create ());
append (definitions, ProtonDefinitions.create ());
append (definitions, WineDefinitions.create ());
return copy_definitions (definitions);
}

private static void append (Gee.ArrayList<ProviderDefinition> target, ProviderDefinition[] values) {
foreach (var value in values)
target.add (value);
}

private static ProviderDefinition[] copy_definitions (Gee.Collection<ProviderDefinition> values) {
var copied = new ProviderDefinition[values.size];
var index = 0;
foreach (var value in values)
copied[index++] = value;
return copied;
definitions.add_all_array (DxvkDefinitions.create ());
definitions.add_all_array (Vkd3dDefinitions.create ());
definitions.add_all_array (ProtonDefinitions.create ());
definitions.add_all_array (WineDefinitions.create ());
return definitions.to_array ();
}
}
}
71 changes: 15 additions & 56 deletions src/models/providers/provider-definition.vala
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ namespace ProtonPlus.Models.Providers {
private string[] alternate_format_values;

public string[] alternate_formats {
owned get { return copy_strings (alternate_format_values); }
owned get { return alternate_format_values; }
}

public VariantDefinition (
Expand All @@ -50,7 +50,7 @@ namespace ProtonPlus.Models.Providers {
this.format = format;
this.is_default = is_default;
this.compatibility = compatibility != null ? compatibility.copy () : VariantCompatibility.unspecified ();
this.alternate_format_values = copy_strings (alternate_formats);
this.alternate_format_values = alternate_formats ?? new string[0];
}

public string[] get_asset_formats () {
Expand All @@ -60,20 +60,6 @@ namespace ProtonPlus.Models.Providers {
formats[index + 1] = alternate_format_values[index];
return formats;
}

internal VariantDefinition copy () {
return new VariantDefinition (id, name, format, is_default, compatibility, alternate_formats);
}

private static string[] copy_strings (string[]? values) {
if (values == null)
return {};

var copied = new string[values.length];
for (var index = 0; index < values.length; index++)
copied[index] = values[index];
return copied;
}
}

// Ordered packaging generations. The first set with a named asset match
Expand All @@ -82,16 +68,11 @@ namespace ProtonPlus.Models.Providers {
private VariantDefinition[] variants;

public ReleaseVariantSet (VariantDefinition[] variants) {
this.variants = new VariantDefinition[variants.length];
for (var index = 0; index < variants.length; index++)
this.variants[index] = variants[index].copy ();
this.variants = variants;
}

public VariantDefinition[] get_variants () {
var copied = new VariantDefinition[variants.length];
for (var index = 0; index < variants.length; index++)
copied[index] = variants[index].copy ();
return copied;
return variants;
}
}

Expand Down Expand Up @@ -287,19 +268,19 @@ namespace ProtonPlus.Models.Providers {
public bool single_archive_releases { get; private set; }

public string[] asset_filters {
owned get { return copy_strings (asset_filter_values); }
owned get { return asset_filter_values; }
}

public string[] asset_exclusions {
owned get { return copy_strings (asset_exclusion_values); }
owned get { return asset_exclusion_values; }
}

public string[] legacy_endpoints {
owned get { return copy_strings (legacy_endpoint_values); }
owned get { return legacy_endpoint_values; }
}

public string[] legacy_titles {
owned get { return copy_strings (legacy_title_values); }
owned get { return legacy_title_values; }
}

public string source_id {
Expand All @@ -315,30 +296,18 @@ namespace ProtonPlus.Models.Providers {
this.endpoint = config.endpoint;
this.repository_url = config.repository_url;
this.sort_priority = config.sort_priority;
this.variants = copy_variants (config.variants);
this.variants = config.variants;
this.release_variant_sets = copy_variant_sets (config.release_variant_sets);
this.install_layouts = copy_install_layouts (config.install_layouts);
this.asset_filter_values = copy_strings (config.asset_filters);
this.asset_exclusion_values = copy_strings (config.asset_exclusions);
this.asset_filter_values = config.asset_filters ?? new string[0];
this.asset_exclusion_values = config.asset_exclusions ?? new string[0];
this.tag = config.tag;
this.legacy = config.legacy;
this.url_template = config.url_template;
this.archive_install_requirement = config.archive_install_requirement;
this.single_archive_releases = config.single_archive_releases;
this.legacy_endpoint_values = copy_strings (config.legacy_endpoints);
this.legacy_title_values = copy_strings (config.legacy_titles);
}

private static VariantDefinition[] copy_variants (VariantDefinition[] values) {
var copied = new VariantDefinition[values.length];
for (var index = 0; index < values.length; index++) {
var value = values[index];
copied[index] = new VariantDefinition (
value.id, value.name, value.format, value.is_default,
value.compatibility, value.alternate_formats
);
}
return copied;
this.legacy_endpoint_values = config.legacy_endpoints ?? new string[0];
this.legacy_title_values = config.legacy_titles ?? new string[0];
}

private static InstallLayout[] copy_install_layouts (InstallLayout[] values) {
Expand All @@ -350,23 +319,13 @@ namespace ProtonPlus.Models.Providers {
return copied;
}

private static string[] copy_strings (string[]? values) {
if (values == null)
return {};

var copied = new string[values.length];
for (var index = 0; index < values.length; index++)
copied[index] = values[index];
return copied;
}

public VariantDefinition[] get_variants () {
// Tools retain the entire identity/compatibility universe, while
// release composition selects one packaging generation below.
var all = new ArrayList<VariantDefinition> ();
var ids = new HashSet<string> ();
foreach (var variant in variants) {
all.add (variant.copy ());
all.add (variant);
ids.add (variant.id);
}
foreach (var set in release_variant_sets)
Expand All @@ -377,7 +336,7 @@ namespace ProtonPlus.Models.Providers {
}

public VariantDefinition[] get_fallback_variants () {
return copy_variants (variants);
return variants;
}

public ReleaseVariantSet[] get_release_variant_sets () {
Expand Down
45 changes: 6 additions & 39 deletions src/models/providers/provider-registry.vala
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,11 @@ namespace ProtonPlus.Models.Providers {

public ProviderDefinitionValidationResult (string provider_id, string[] messages) {
this.provider_id = provider_id;
this.messages = copy_messages (messages);
this.messages = messages;
}

public string[] get_messages () {
return copy_messages (messages);
}

private static string[] copy_messages (string[] values) {
var copied = new string[values.length];
for (var index = 0; index < values.length; index++)
copied[index] = values[index];
return copied;
return messages;
}
}

Expand Down Expand Up @@ -55,7 +48,7 @@ namespace ProtonPlus.Models.Providers {
var definitions = definitions_by_category.get (category);
if (definitions == null)
return {};
return copy_definitions (definitions);
return definitions.to_array ();
}

public ProviderDefinition[] get_all () {
Expand All @@ -66,11 +59,11 @@ namespace ProtonPlus.Models.Providers {
foreach (var definition in get (category))
copied.add (definition);
}
return copy_definitions (copied);
return copied.to_array ();
}

public ProviderDefinitionValidationResult[] get_validation_results () {
return copy_validation_results (validation_results);
return validation_results.to_array ();
}

private void initialize_categories () {
Expand Down Expand Up @@ -125,7 +118,7 @@ namespace ProtonPlus.Models.Providers {

if (messages.size > 0) {
validation_results.add (new ProviderDefinitionValidationResult (
definition.provider_id, copy_messages (messages)
definition.provider_id, messages.to_array ()
));
}
}
Expand Down Expand Up @@ -244,31 +237,5 @@ namespace ProtonPlus.Models.Providers {
messages.add ("legacy endpoint is duplicated: %s".printf (legacy_endpoint));
}
}

private static ProviderDefinition[] copy_definitions (Collection<ProviderDefinition> values) {
var copied = new ProviderDefinition[values.size];
var index = 0;
foreach (var value in values)
copied[index++] = value;
return copied;
}

private static ProviderDefinitionValidationResult[] copy_validation_results (
Collection<ProviderDefinitionValidationResult> values
) {
var copied = new ProviderDefinitionValidationResult[values.size];
var index = 0;
foreach (var value in values)
copied[index++] = value;
return copied;
}

private static string[] copy_messages (Collection<string> values) {
var copied = new string[values.size];
var index = 0;
foreach (var value in values)
copied[index++] = value;
return copied;
}
}
}
17 changes: 0 additions & 17 deletions src/models/steam/library-folder.vala

This file was deleted.

4 changes: 0 additions & 4 deletions src/models/steam/meson.build

This file was deleted.

12 changes: 0 additions & 12 deletions src/models/steam/steam-library-config.vala

This file was deleted.

13 changes: 2 additions & 11 deletions src/models/variant-compatibility.vala
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace ProtonPlus.Models {
bool architecture_independent = false,
Aarch64Level minimum_aarch64_level = Aarch64Level.UNKNOWN
) {
this.supported_architectures = copy_architectures (supported_architectures);
this.supported_architectures = supported_architectures ?? new CpuArchitecture[0];
this.minimum_x86_64_level = minimum_x86_64_level;
this.minimum_aarch64_level = minimum_aarch64_level == Aarch64Level.UNKNOWN &&
supports_architecture (CpuArchitecture.AARCH64)
Expand Down Expand Up @@ -59,7 +59,7 @@ namespace ProtonPlus.Models {
}

public CpuArchitecture[] get_supported_architectures () {
return copy_architectures (supported_architectures);
return supported_architectures;
}

public bool explicitly_supports_architecture (CpuArchitecture architecture) {
Expand Down Expand Up @@ -229,15 +229,6 @@ namespace ProtonPlus.Models {
return false;
}

private static CpuArchitecture[] copy_architectures (CpuArchitecture[]? values) {
if (values == null)
return {};
var copied = new CpuArchitecture[values.length];
for (var index = 0; index < values.length; index++)
copied[index] = values[index];
return copied;
}

private static string architecture_to_string (CpuArchitecture architecture) {
switch (architecture) {
case CpuArchitecture.X86_32:
Expand Down
Loading
Loading