falloutcollab/FCP-Mod-Updater
0
0
Fork 0
mirror of https://github.com/FalloutCollaborationProject/FCP-Mod-Updater.git synced 2026-07-27 17:04:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add Cancellation Tokens and ProgressTask.Tag

Browse Source
This commit is contained in:
Canon
2026-04-10 05:49:46 +08:00
parent 99ffe7d179
commit 9e28435848
2 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/InteractiveMenu.cs
+23 -23
View File
@@ -56,7 +56,7 @@ public class InteractiveMenu
AnsiConsole.WriteLine();
var choice = AnsiConsole.Prompt(
var choice = await AnsiConsole.PromptAsync(
new SelectionPrompt<string>()
.Title("[bold]What would you like to do?[/]")
.PageSize(10)
@@ -68,7 +68,7 @@ public class InteractiveMenu
"Mod Version Selector",
"Refresh Status",
"Exit"
));
), ct);
try
{
@@ -110,7 +110,7 @@ public class InteractiveMenu
private async Task<bool> HandleUpdateAsync(CancellationToken ct)
{
var updateableMods = _mods
.Where(m => m.Source == ModSource.Git && m.Status == ModStatus.Behind)
.Where(mod => mod.Source == ModSource.Git && mod.Status == ModStatus.Behind)
.ToList();
if (updateableMods.Count == 0)
@@ -124,14 +124,14 @@ public class InteractiveMenu
.Title("[bold]Select mods to update:[/]")
.PageSize(15)
.Required(false)
.UseConverter(m => $"{m.Name} [grey]({m.CommitsBehind} commits behind)[/]");
.UseConverter(mod => $"{mod.Name} [grey]({mod.CommitsBehind} commits behind)[/]");
foreach (InstalledMod mod in updateableMods)
{
prompt.AddChoice(mod).Select();
}
List<InstalledMod> selected = AnsiConsole.Prompt(prompt);
List<InstalledMod> selected = await AnsiConsole.PromptAsync(prompt, ct);
if (selected.Count == 0)
return false;
@@ -194,7 +194,7 @@ public class InteractiveMenu
return false;
}
List<RemoteRepo> selectedRepos = AnsiConsole.Prompt(
List<RemoteRepo> selectedRepos = await AnsiConsole.PromptAsync(
new MultiSelectionPrompt<RemoteRepo>()
.Title("[bold]Select mods to install:[/]")
.InstructionsText("[grey](Press <space> to mark a mod for install, <enter> to confirm)[/]")
@@ -204,7 +204,7 @@ public class InteractiveMenu
.UseConverter(r => string.IsNullOrEmpty(r.Description)
? r.Name
: $"{r.Name} [grey]— {Truncate(r.Description, 50)}[/]")
.AddChoices(availableRepos));
.AddChoices(availableRepos), ct);
if (selectedRepos.Count == 0)
return false;
@@ -240,7 +240,7 @@ public class InteractiveMenu
return false;
}
List<InstalledMod> selected = AnsiConsole.Prompt(
List<InstalledMod> selected = await AnsiConsole.PromptAsync(
new MultiSelectionPrompt<InstalledMod>()
.Title("[bold red]Select mods to uninstall:[/]")
.InstructionsText("[grey](Press <space> to mark a mod for uninstallation, <enter> to confirm)[/]")
@@ -248,7 +248,7 @@ public class InteractiveMenu
.NotRequired()
.WrapAround()
.UseConverter(m => m.Name)
.AddChoices(installedMods));
.AddChoices(installedMods), ct);
if (selected.Count == 0)
return false;
@@ -269,7 +269,7 @@ public class InteractiveMenu
}
// Double confirmation
var confirmText = AnsiConsole.Ask<string>("Type [red]DELETE[/] to confirm:");
var confirmText = await AnsiConsole.AskAsync<string>("Type [red]DELETE[/] to confirm:", ct);
if (confirmText != "DELETE")
{
AnsiConsole.MarkupLine("[grey]Uninstall cancelled.[/]");
@@ -312,13 +312,13 @@ public class InteractiveMenu
return false;
}
var selected = AnsiConsole.Prompt(
var selected = await AnsiConsole.PromptAsync(
new MultiSelectionPrompt<InstalledMod>()
.Title("[bold]Select mods to convert to Git:[/]")
.PageSize(15)
.Required(false)
.UseConverter(m => $"{m.Name} [grey]→ will clone from {m.MatchedRepoName}[/]")
.AddChoices(nonGitMods));
.AddChoices(nonGitMods), ct);
if (selected.Count == 0)
{
@@ -377,13 +377,13 @@ public class InteractiveMenu
return false;
}
InstalledMod mod = AnsiConsole.Prompt(
InstalledMod mod = await AnsiConsole.PromptAsync(
new SelectionPrompt<InstalledMod>()
.Title("[bold]Select a mod to manage:[/]")
.PageSize(15)
.UseConverter(m =>
$"{m.Name} [grey]({m.Branch ?? "detached"} @ {m.CurrentCommit?.ShortHash ?? "unknown"})[/]")
.AddChoices(gitMods));
.AddChoices(gitMods), ct);
// Show current state
AnsiConsole.WriteLine();
@@ -398,14 +398,14 @@ public class InteractiveMenu
AnsiConsole.WriteLine();
var action = AnsiConsole.Prompt(
var action = await AnsiConsole.PromptAsync(
new SelectionPrompt<string>()
.Title("What would you like to do?")
.AddChoices(
"Switch Branch",
"Checkout Specific Commit",
"Back to Main Menu"
));
), ct);
if (action == "Back to Main Menu")
{
@@ -452,11 +452,11 @@ public class InteractiveMenu
return;
}
var branch = AnsiConsole.Prompt(
var branch = await AnsiConsole.PromptAsync(
new SelectionPrompt<string>()
.Title("Select branch:")
.PageSize(15)
.AddChoices(branches));
.AddChoices(branches), ct);
var success = await ProgressReporter.WithStatusAsync(
$"Switching to {branch}...",
@@ -482,17 +482,17 @@ public class InteractiveMenu
return;
}
var method = AnsiConsole.Prompt(
var method = await AnsiConsole.PromptAsync(
new SelectionPrompt<string>()
.Title("How would you like to select a commit?")
.AddChoices(
"Pick from history",
"Enter commit hash manually"
));
), ct);
if (method == "Enter commit hash manually")
{
var manualHash = AnsiConsole.Ask<string>("Enter commit hash:").Trim();
var manualHash = (await AnsiConsole.AskAsync<string>("Enter commit hash:", ct)).Trim();
if (string.IsNullOrEmpty(manualHash))
{
AnsiConsole.MarkupLine("[yellow]No commit hash provided.[/]");
@@ -518,13 +518,13 @@ public class InteractiveMenu
}
else
{
GitCommitInfo commit = AnsiConsole.Prompt(
GitCommitInfo commit = await AnsiConsole.PromptAsync(
new SelectionPrompt<GitCommitInfo>()
.Title("Select commit:")
.PageSize(15)
.UseConverter(c =>
$"[yellow]{c.ShortHash}[/] [grey]{c.Date.ToLocalTime():yyyy-MM-dd}[/] {Markup.Escape(Truncate(c.Message, 50))}")
.AddChoices(commits));
.AddChoices(commits), ct);
var currentBranch = mod.Branch ?? "HEAD";
var success = await ProgressReporter.WithStatusAsync(
UI/ProgressReporter.cs
+12 -6
View File
@@ -51,7 +51,7 @@ public static class ProgressReporter
Func<T, string> nameSelector,
Func<T, IProgress<double>, Task<(bool Success, string? Error)>> action)
{
var results = new List<(string Name, bool Success, string? Error)>();
var itemTasks = new List<ProgressTask>();
await AnsiConsole.Progress()
.Columns(
@@ -67,22 +67,23 @@ public static class ProgressReporter
{
var name = nameSelector(item);
ProgressTask itemTask = ctx.AddTask($" {name}");
itemTasks.Add(itemTask);
var progress = new Progress<double>(p => itemTask.Value = p);
try
{
var (success, error) = await action(item, progress);
results.Add((name, success, error));
itemTask.Tag(new BatchResult(name, success, error));
itemTask.Value = 100;
itemTask.Description = success
? $" [green]{name}[/]"
itemTask.Description = success
? $" [green]{name}[/]"
: $" [red]{name}[/]";
}
catch (Exception ex)
{
results.Add((name, false, ex.Message));
itemTask.Tag(new BatchResult(name, false, ex.Message));
itemTask.Value = 100;
itemTask.Description = $" [red]{name}[/]";
}
@@ -91,6 +92,11 @@ public static class ProgressReporter
}
});
return results;
return itemTasks
.Select(t => (BatchResult)t.Tag!)
.Select(r => (r.Name, r.Success, r.Error))
.ToList();
}
private record BatchResult(string Name, bool Success, string? Error);
}