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

use modpack config for finding updates

Browse Source
This commit is contained in:
Pascal
2024-10-03 11:36:29 +02:00
parent 2a389ae5d4
commit 9694ba56fd
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ModpackUpdater.Apps.Manager/Features/SharedFunctions.cs
View File

@@ -73,7 +73,7 @@ internal static class SharedFunctions
return false;
// Collect updates
var ucDialog = new UpdatesCollectorUi(actions);
var ucDialog = new UpdatesCollectorUi(api.CurWorkspace, actions);
if (!ucDialog.ShowDialog(api.MainWindow).IsOk() || ucDialog.CurrentUpdates is null)
return false;

11
ModpackUpdater.Apps.Manager/Ui/UpdatesCollectorUi.cs
View File

@@ -1,4 +1,5 @@
using ModpackUpdater.Manager;
using ModpackUpdater.Apps.Manager.Api.Model;
using ModpackUpdater.Manager;
using Telerik.WinControls.UI;
namespace ModpackUpdater.Apps.Manager.Ui;
@@ -12,6 +13,7 @@ public partial class UpdatesCollectorUi : RadForm
public record ModUpdates(IEnumerable<ModUpdateInfo> List);
private readonly IWorkspace workspace;
private readonly ModpackFactory factory = new();
private readonly InstallAction[] actions;
@@ -21,10 +23,13 @@ public partial class UpdatesCollectorUi : RadForm
public int SelectedVersion => radListView_VersionTags.SelectedIndex;
public UpdatesCollectorUi(params InstallAction[] actions)
public UpdatesCollectorUi(IWorkspace workspace, params InstallAction[] actions)
{
this.workspace = workspace;
this.actions = actions;
InitializeComponent();
radListView_Updates.AutoSizeColumnsMode = ListViewAutoSizeColumnsMode.Fill;
radListView_VersionTags.AutoSizeColumnsMode = ListViewAutoSizeColumnsMode.Fill;
}
@@ -35,7 +40,7 @@ public partial class UpdatesCollectorUi : RadForm
foreach (var action in actions)
{
var updates = await factory.FindUpdates(action);
var updates = await factory.FindUpdates(action, workspace.ModpackConfig?.MinecraftVersion, workspace.ModpackConfig?.ModLoader ?? ModLoader.Any);
if (updates == null || updates.Length == 0 || updates[0].Value == action.SourceTag)
continue;

2
ModpackUpdater.Manager/ModpackFactory.cs
View File

@@ -56,7 +56,7 @@ public class ModpackFactory
return action.SourceUrl;
}
public async Task<KeyValuePair<string, string>[]> FindUpdates(InstallAction action, ModLoader modLoader = ModLoader.Any, string? gameVersion = null)
public async Task<KeyValuePair<string, string>[]> FindUpdates(InstallAction action, string? gameVersion, ModLoader modLoader)
{
if (action.SourceType == SourceType.GitHub)
{