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

work

Browse Source
This commit is contained in:
Pascal
2025-11-17 07:19:43 +01:00
parent 72a81e05ad
commit e584996043
29 changed files with 134 additions and 668 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ModpackUpdater.Apps.Manager/Features/CM/CheckSingleActionHealthyFeature.cs
View File

@@ -15,12 +15,12 @@ internal class CheckSingleActionHealthyFeature : PluginFunction, IPluginFeatureP
Icon = AppGlobals.Symbols.GetImage(AppSymbols.heart_with_pulse, SymbolSize.Small);
}
protected override object? ExecuteFunction(PluginFunctionParameter? @params)
protected override async Task<object?> ExecuteFunctionAsync(PluginFunctionParameter? @params)
{
if (@params is not MainApiParameters p || p.Api.Model.SelectedGridRow is not { } row)
return null;
Task.Run(() => SharedFunctions.CheckActionHealthy(p.Api, row)).Wait();
await SharedFunctions.CheckActionHealthy(p.Api, row);
return null;
}

15
ModpackUpdater.Apps.Manager/Features/CM/ClearDirectLinkFeature.cs
View File

@@ -1,8 +1,8 @@
using ModpackUpdater.Apps.Manager.Api;
using ModpackUpdater.Apps.Manager.Api.Plugins.Params;
using ModpackUpdater.Apps.Manager.LangRes;
using ModpackUpdater.Apps.Manager.Ui;
using Pilz.Features;
using Pilz.UI.Symbols;
namespace ModpackUpdater.Apps.Manager.Features.CM;
@@ -12,16 +12,13 @@ internal class ClearDirectLinkFeature : PluginFunction, IPluginFeatureProvider<C
public ClearDirectLinkFeature() : base(FeatureTypes.ActionsContextMenu, "origin.cleardirectlink", FeatureNamesLangRes.ClearDirectLinkFeature)
{
Icon = AppGlobals.Symbols.GetImage(AppSymbols.broom, Pilz.UI.Symbols.SymbolSize.Small);
Icon = AppGlobals.Symbols.GetImage(AppSymbols.broom, SymbolSize.Small);
}
protected override object? ExecuteFunction(PluginFunctionParameter? @params)
protected override Task<object?> ExecuteFunctionAsync(PluginFunctionParameter? @params)
{
if (@params is not MainApiParameters p || p.Api.Model.SelectedGridRow is not { } row)
return null;
SharedFunctions.ClearDirectLinks(row);
return null;
if (@params is MainApiParameters p && p.Api.Model.SelectedGridRow is { } row)
SharedFunctions.ClearDirectLinks(row);
return Task.FromResult<object?>(null);
}
}

4
ModpackUpdater.Apps.Manager/Features/CM/UpdateCollectorFeature.cs
View File

@@ -14,12 +14,12 @@ internal class UpdateCollectorFeature : PluginFunction, IPluginFeatureProvider<U
Icon = AppGlobals.Symbols.GetImage(AppSymbols.search, SymbolSize.Small);
}
protected override object? ExecuteFunction(PluginFunctionParameter? @params)
protected override async Task<object?> ExecuteFunctionAsync(PluginFunctionParameter? @params)
{
if (@params is not MainApiParameters p || p.Api.Model.SelectedGridRow is not { } row)
return null;
Task.Run(() => SharedFunctions.CollectUpdates(p.Api, row.Action)).Wait();
await SharedFunctions.CollectUpdates(p.Api, row.Action);
return null;
}

6
ModpackUpdater.Apps.Manager/Features/CM/UpdateDirectLinkFeature.cs
View File

@@ -1,7 +1,7 @@
using ModpackUpdater.Apps.Manager.Api;
using ModpackUpdater.Apps.Manager.Api.Plugins.Params;
using ModpackUpdater.Apps.Manager.LangRes;
using ModpackUpdater.Apps.Manager.Ui.Models;
using ModpackUpdater.Apps.Manager.Ui.Models.MainWindow;
using Pilz.Features;
using Pilz.UI.Symbols;
@@ -16,12 +16,12 @@ internal class UpdateDirectLinkFeature : PluginFunction, IPluginFeatureProvider<
Icon = AppGlobals.Symbols.GetImage(AppSymbols.renew, SymbolSize.Small);
}
protected override object? ExecuteFunction(PluginFunctionParameter? @params)
protected override async Task<object?> ExecuteFunctionAsync(PluginFunctionParameter? @params)
{
if (@params is not MainApiParameters p || p.Api.Model.SelectedGridRow is not MainWindowGridRow row)
return null;
Task.Run(() => SharedFunctions.FindNewDirectLinks(row)).Wait();
await SharedFunctions.FindNewDirectLinks(row);
return null;
}

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

@@ -1,8 +1,11 @@
using System.Text;
using Avalonia.Controls;
using ModpackUpdater.Apps.Manager.Api.Model;
using ModpackUpdater.Apps.Manager.LangRes;
using ModpackUpdater.Apps.Manager.Ui;
using ModpackUpdater.Apps.Manager.Ui.Models;
using ModpackUpdater.Apps.Manager.Ui.Models.MainWindow;
using ModpackUpdater.Apps.Manager.Ui.Models.UpdatesCollectorViewMode;
using ModpackUpdater.Manager;
using MsBox.Avalonia;
using OfficeOpenXml;
@@ -52,11 +55,11 @@ internal static class SharedFunctions
// Collect updates
var result = await AvaloniaFlyoutBase.Show(new UpdatesCollectorView(api.Model.CurrentWorkspace, actions), api.MainWindow);
if (result.Result is null || result.CurrentUpdates is null)
if (result.Result is not ModUpdates resultUpdates)
return false;
// Collect versions with changes
var updates = result.CurrentUpdates.List.Where(update => update.Origin.SourceTag != update.AvailableVersions[update.NewVersion].Key).ToList();
var updates = resultUpdates.List.Where(update => update.Origin.SourceTag != update.AvailableVersions[update.NewVersion].Key).ToList();
// Path install actions
foreach (var update in updates)

4
ModpackUpdater.Apps.Manager/Features/Tools/CheckAllActionsHealthyFeature.cs
View File

@@ -15,12 +15,12 @@ internal class CheckAllActionsHealthyFeature : PluginFunction, IPluginFeaturePro
Icon = AppGlobals.Symbols.GetImage(AppSymbols.heart_with_pulse, SymbolSize.Small);
}
protected override object? ExecuteFunction(PluginFunctionParameter? @params)
protected override async Task<object?> ExecuteFunctionAsync(PluginFunctionParameter? @params)
{
if (@params is not MainApiParameters p || p.Api.Model.CurrentGridRows is null)
return null;
Task.Run(() => SharedFunctions.CheckActionHealthy(p.Api, [.. p.Api.Model.CurrentGridRows])).Wait();
await SharedFunctions.CheckActionHealthy(p.Api, [.. p.Api.Model.CurrentGridRows]);
return null;
}

15
ModpackUpdater.Apps.Manager/Features/Tools/ClearDirectLinksFeature.cs
View File

@@ -1,8 +1,8 @@
using ModpackUpdater.Apps.Manager.Api;
using ModpackUpdater.Apps.Manager.Api.Plugins.Params;
using ModpackUpdater.Apps.Manager.LangRes;
using ModpackUpdater.Apps.Manager.Ui.Models;
using Pilz.Features;
using Pilz.UI.Symbols;
namespace ModpackUpdater.Apps.Manager.Features.Tools;
@@ -12,16 +12,13 @@ internal class ClearDirectLinksFeature : PluginFunction, IPluginFeatureProvider<
public ClearDirectLinksFeature() : base(FeatureTypes.Tools, "origin.cleardirectlinks", FeatureNamesLangRes.ClearDirectLinksFeature)
{
Icon = AppGlobals.Symbols.GetImage(AppSymbols.broom, Pilz.UI.Symbols.SymbolSize.Small);
Icon = AppGlobals.Symbols.GetImage(AppSymbols.broom, SymbolSize.Small);
}
protected override object? ExecuteFunction(PluginFunctionParameter? @params)
protected override Task<object?> ExecuteFunctionAsync(PluginFunctionParameter? @params)
{
if (@params is not MainApiParameters p || p.Api.Model.CurrentGridRows is null)
return null;
SharedFunctions.ClearDirectLinks([.. p.Api.Model.CurrentGridRows]);
return null;
if (@params is MainApiParameters p && p.Api.Model.CurrentGridRows is not null)
SharedFunctions.ClearDirectLinks([.. p.Api.Model.CurrentGridRows]);
return Task.FromResult<object?>(null);
}
}

8
ModpackUpdater.Apps.Manager/Features/Tools/GenerateChangelogFeature.cs
View File

@@ -1,7 +1,7 @@
using ModpackUpdater.Apps.Manager.Api;
using ModpackUpdater.Apps.Manager.Api.Plugins.Params;
using ModpackUpdater.Apps.Manager.LangRes;
using ModpackUpdater.Apps.Manager.Ui.Models;
using ModpackUpdater.Apps.Manager.Ui.Models.MainWindow;
using MsBox.Avalonia;
using MsBox.Avalonia.Enums;
using Pilz.Features;
@@ -18,7 +18,7 @@ internal class GenerateChangelogFeature : PluginFunction, IPluginFeatureProvider
Icon = AppGlobals.Symbols.GetImage(AppSymbols.time_machine, SymbolSize.Small);
}
protected override object? ExecuteFunction(PluginFunctionParameter? @params)
protected override async Task<object?> ExecuteFunctionAsync(PluginFunctionParameter? @params)
{
if (@params is not MainApiParameters p
|| p.Api.Model.CurrentWorkspace?.InstallInfos is null
@@ -30,8 +30,8 @@ internal class GenerateChangelogFeature : PluginFunction, IPluginFeatureProvider
if (string.IsNullOrWhiteSpace(changelog))
return null;
p.Api.MainWindow.Clipboard?.SetTextAsync(changelog);
MessageBoxManager.GetMessageBoxStandard(MsgBoxLangRes.ChangelogCopiedToClipboard_Title, MsgBoxLangRes.ChangelogCopiedToClipboard, ButtonEnum.Ok, MsBox.Avalonia.Enums.Icon.Info).ShowAsPopupAsync(p.Api.MainWindow);
await p.Api.MainWindow.Clipboard?.SetTextAsync(changelog);
await MessageBoxManager.GetMessageBoxStandard(MsgBoxLangRes.ChangelogCopiedToClipboard_Title, MsgBoxLangRes.ChangelogCopiedToClipboard, ButtonEnum.Ok, MsBox.Avalonia.Enums.Icon.Info).ShowAsPopupAsync(p.Api.MainWindow);
return null;
}

11
ModpackUpdater.Apps.Manager/Features/Tools/GenerateModlistAsExcelFeature.cs
View File

@@ -1,5 +1,4 @@
using Avalonia.Controls;
using Avalonia.Platform.Storage;
using ModpackUpdater.Apps.Manager.Api;
using ModpackUpdater.Apps.Manager.Api.Plugins.Params;
using ModpackUpdater.Apps.Manager.LangRes;
@@ -19,7 +18,7 @@ internal class GenerateModlistAsExcelFeature : PluginFunction, IPluginFeaturePro
Icon = AppGlobals.Symbols.GetImage(AppSymbols.list_view, SymbolSize.Small);
}
protected override object? ExecuteFunction(PluginFunctionParameter? @params)
protected override async Task<object?> ExecuteFunctionAsync(PluginFunctionParameter? @params)
{
if (@params is not MainApiParameters p || p.Api.Model.CurrentWorkspace?.InstallInfos is null)
return null;
@@ -28,16 +27,16 @@ internal class GenerateModlistAsExcelFeature : PluginFunction, IPluginFeaturePro
using var pkg = SharedFunctions.GenerateModlistAsExcel(p.Api.Model.CurrentWorkspace.InstallInfos);
// Ask for save
var file = Task.Run(() => TopLevel.GetTopLevel(p.Api.MainWindow)!.StorageProvider.SaveFilePickerAsync(new()
var file = await TopLevel.GetTopLevel(p.Api.MainWindow)!.StorageProvider.SaveFilePickerAsync(new()
{
FileTypeChoices = [MyFilePickerFileTypes.Excel]
})).Result;
});
if (file is null)
return null;
// Save file
pkg.SaveAs(file.Path.AbsolutePath);
MessageBoxManager.GetMessageBoxStandard(MsgBoxLangRes.ModlistGenerated_Title, MsgBoxLangRes.ModlistGenerated, ButtonEnum.Ok, MsBox.Avalonia.Enums.Icon.Info).ShowAsPopupAsync(p.Api.MainWindow);
await pkg.SaveAsAsync(file.Path.AbsolutePath);
await MessageBoxManager.GetMessageBoxStandard(MsgBoxLangRes.ModlistGenerated_Title, MsgBoxLangRes.ModlistGenerated, ButtonEnum.Ok, MsBox.Avalonia.Enums.Icon.Info).ShowAsPopupAsync(p.Api.MainWindow);
return null;
}

4
ModpackUpdater.Apps.Manager/Features/Tools/GenerateModlistAsMarkdownFeature.cs
View File

@@ -17,14 +17,14 @@ internal class GenerateModlistAsMarkdownFeature : PluginFunction, IPluginFeature
Icon = AppGlobals.Symbols.GetImage(AppSymbols.list_view, SymbolSize.Small);
}
protected override object? ExecuteFunction(PluginFunctionParameter? @params)
protected override async Task<object?> ExecuteFunctionAsync(PluginFunctionParameter? @params)
{
if (@params is not MainApiParameters p || p.Api.Model.CurrentWorkspace?.InstallInfos is null)
return null;
p.Api.MainWindow.Clipboard?.SetTextAsync(SharedFunctions.GenerateModlistAsMarkdown(p.Api.Model.CurrentWorkspace.InstallInfos));
MessageBoxManager.GetMessageBoxStandard(MsgBoxLangRes.ModlistCopiedToClipboard_Title, MsgBoxLangRes.ModlistCopiedToClipboard, ButtonEnum.Ok, MsBox.Avalonia.Enums.Icon.Info).ShowAsPopupAsync(p.Api.MainWindow);
await MessageBoxManager.GetMessageBoxStandard(MsgBoxLangRes.ModlistCopiedToClipboard_Title, MsgBoxLangRes.ModlistCopiedToClipboard, ButtonEnum.Ok, MsBox.Avalonia.Enums.Icon.Info).ShowAsPopupAsync(p.Api.MainWindow);
return null;
}

4
ModpackUpdater.Apps.Manager/Features/Tools/UpdateDirectLinksFeature.cs
View File

@@ -15,12 +15,12 @@ internal class UpdateDirectLinksFeature : PluginFunction, IPluginFeatureProvider
Icon = AppGlobals.Symbols.GetImage(AppSymbols.renew, SymbolSize.Small);
}
protected override object? ExecuteFunction(PluginFunctionParameter? @params)
protected override async Task<object?> ExecuteFunctionAsync(PluginFunctionParameter? @params)
{
if (@params is not MainApiParameters p || p.Api.Model.CurrentGridRows is null)
return null;
Task.Run(() => SharedFunctions.FindNewDirectLinks([.. p.Api.Model.CurrentGridRows])).Wait();
await SharedFunctions.FindNewDirectLinks([.. p.Api.Model.CurrentGridRows]);
return null;
}

4
ModpackUpdater.Apps.Manager/Features/Tools/UpdatesCollectorFeature.cs
View File

@@ -15,12 +15,12 @@ internal class UpdatesCollectorFeature : PluginFunction, IPluginFeatureProvider<
Icon = AppGlobals.Symbols.GetImage(AppSymbols.search, SymbolSize.Small);
}
protected override object? ExecuteFunction(PluginFunctionParameter? @params)
protected override async Task<object?> ExecuteFunctionAsync(PluginFunctionParameter? @params)
{
if (@params is not MainApiParameters p || p.Api.Model.CurrentWorkspace?.InstallInfos is null)
return null;
Task.Run(() => SharedFunctions.CollectUpdates(p.Api, [.. p.Api.Model.CurrentWorkspace.InstallInfos.Actions])).Wait();
await SharedFunctions.CollectUpdates(p.Api, [.. p.Api.Model.CurrentWorkspace.InstallInfos.Actions]);
return null;
}