LITW-Refined/minecraft-modpack-updater
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove allow extras from option -> controlled by update config

Browse Source
This commit is contained in:
Pascal
2024-06-20 22:40:19 +02:00
parent ee46f7272e
commit 87cfacfdbb
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ModpackUpdater.Manager/ModpackInstaller.cs
View File

@@ -56,7 +56,7 @@ public class ModpackInstaller(ModpackConfig updateConfig, ModpackInfo modpackInf
if (installInfos is not null && installInfos.Actions.Count != 0) if (installInfos is not null && installInfos.Actions.Count != 0)
{ {
var actions = installInfos.Actions.Where(n => n.Side.IsSide(options.Side) && (!n.IsExtra || options.IncludeExtraActions)); var actions = installInfos.Actions.Where(n => n.Side.IsSide(options.Side) && (!n.IsExtra || updateConfig.IncludeExtras));
if (actions.Any()) if (actions.Any())
{ {
result.Actions.AddRange(installInfos.Actions); result.Actions.AddRange(installInfos.Actions);
@@ -88,7 +88,7 @@ public class ModpackInstaller(ModpackConfig updateConfig, ModpackInfo modpackInf
foreach (var action in checkingVersion.Actions) foreach (var action in checkingVersion.Actions)
{ {
if (action.Side.IsSide(options.Side) && (!action.IsExtra || options.IncludeExtraActions) && !result.Actions.Any(n => n.DestPath == action.DestPath)) if (action.Side.IsSide(options.Side) && (!action.IsExtra || updateConfig.IncludeExtras) && !result.Actions.Any(n => n.DestPath == action.DestPath))
actionsToAdd.Add(action); actionsToAdd.Add(action);
} }

1
ModpackUpdater.Manager/UpdateCheckOptions.cs
View File

@@ -7,5 +7,4 @@ public class UpdateCheckOptions
public bool IgnoreMaintenance { get; set; } public bool IgnoreMaintenance { get; set; }
public bool AllowUpdaterAfterInstall { get; set; } = true; public bool AllowUpdaterAfterInstall { get; set; } = true;
public Side Side { get; set; } = Side.Client; public Side Side { get; set; } = Side.Client;
public bool IncludeExtraActions { get; set; }
} }

1
ModpackUpdater.Model/ModpackConfig.cs
View File

@@ -8,6 +8,7 @@ public class ModpackConfig
public string Name { get; set; } public string Name { get; set; }
public string UpdateUrl { get; set; } public string UpdateUrl { get; set; }
public string InstallUrl { get; set; } public string InstallUrl { get; set; }
public bool IncludeExtras { get; set; }
[JsonIgnore] [JsonIgnore]
public string ConfigUrl { get; set; } public string ConfigUrl { get; set; }

1
ModpackUpdater/Options.cs
View File

@@ -24,7 +24,6 @@ internal class Options
{ "uai", "Allow an update directly after install. This only has affect if there is no existing installation.", uai => UpdateOptions.AllowUpdaterAfterInstall = uai != null}, { "uai", "Allow an update directly after install. This only has affect if there is no existing installation.", uai => UpdateOptions.AllowUpdaterAfterInstall = uai != null},
{ "noupdate", "Skip the update check.", noupdate => UpdateOptions.NoUpdate = noupdate != null}, { "noupdate", "Skip the update check.", noupdate => UpdateOptions.NoUpdate = noupdate != null},
{ "m|maintenance", "Ignores the maintenance mode.", m => UpdateOptions.IgnoreMaintenance = m != null}, { "m|maintenance", "Ignores the maintenance mode.", m => UpdateOptions.IgnoreMaintenance = m != null},
{ "e|extraactions", "Include extra actions.", e => UpdateOptions.IncludeExtraActions = e != null},
}; };
additionals.AddRange(options.Parse(args)); additionals.AddRange(options.Parse(args));