From b6d57869b1dfd78ef3be7e737a1e6e9020078fd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81d=C3=A1m=20Kov=C3=A1cs?= Date: Mon, 7 Feb 2022 13:03:01 +0100 Subject: [PATCH] Timeline commands --- .../Command/CreateContainerCommand.cs | 3 +- .../Command/CreateElementCommand.cs | 3 +- src/Core/FileTime.Core/FileTime.Core.csproj | 4 + .../FileTime.Core/Timeline/CommandRunner.cs | 14 ++ src/Core/FileTime.Core/Timeline/TimeRunner.cs | 63 ++++--- .../FileTime.Avalonia.csproj | 5 + .../ViewModels/MainPageViewModel.cs | 159 ++++++++++++++++-- .../FileTime.Avalonia/Views/MainWindow.axaml | 28 +-- .../appsettings.Development.json | 2 +- 9 files changed, 221 insertions(+), 60 deletions(-) create mode 100644 src/Core/FileTime.Core/Timeline/CommandRunner.cs diff --git a/src/Core/FileTime.Core/Command/CreateContainerCommand.cs b/src/Core/FileTime.Core/Command/CreateContainerCommand.cs index bfe2448..8c118e2 100644 --- a/src/Core/FileTime.Core/Command/CreateContainerCommand.cs +++ b/src/Core/FileTime.Core/Command/CreateContainerCommand.cs @@ -12,13 +12,14 @@ namespace FileTime.Core.Command public int Progress => 100; public AsyncEventHandler ProgressChanged { get; } = new(); - public string DisplayLabel { get; } = "CreateContainer"; + public string DisplayLabel { get; } public IReadOnlyList CanRunMessages { get; } = new List().AsReadOnly(); public CreateContainerCommand(AbsolutePath container, string newContainerName) { Container = container; NewContainerName = newContainerName; + DisplayLabel = $"Create container {newContainerName}"; } public async Task Execute(TimeRunner timeRunner) diff --git a/src/Core/FileTime.Core/Command/CreateElementCommand.cs b/src/Core/FileTime.Core/Command/CreateElementCommand.cs index f006120..defea1a 100644 --- a/src/Core/FileTime.Core/Command/CreateElementCommand.cs +++ b/src/Core/FileTime.Core/Command/CreateElementCommand.cs @@ -11,13 +11,14 @@ namespace FileTime.Core.Command public int Progress => 100; public AsyncEventHandler ProgressChanged { get; } = new(); - public string DisplayLabel { get; } = "CreateElement"; + public string DisplayLabel { get; } public IReadOnlyList CanRunMessages { get; } = new List().AsReadOnly(); public CreateElementCommand(AbsolutePath container, string newElementName) { Container = container; NewElementName = newElementName; + DisplayLabel = $"Create element {newElementName}"; } public async Task Execute(TimeRunner timeRunner) diff --git a/src/Core/FileTime.Core/FileTime.Core.csproj b/src/Core/FileTime.Core/FileTime.Core.csproj index 94ede9b..4af6e49 100644 --- a/src/Core/FileTime.Core/FileTime.Core.csproj +++ b/src/Core/FileTime.Core/FileTime.Core.csproj @@ -1,5 +1,9 @@ + + + + diff --git a/src/Core/FileTime.Core/Timeline/CommandRunner.cs b/src/Core/FileTime.Core/Timeline/CommandRunner.cs new file mode 100644 index 0000000..fb05f8b --- /dev/null +++ b/src/Core/FileTime.Core/Timeline/CommandRunner.cs @@ -0,0 +1,14 @@ +namespace FileTime.Core.Timeline +{ + public class CommandRunner + { + public Thread Thread { get; } + public CommandTimeState Command { get; } + + public CommandRunner(Thread thread, CommandTimeState command) + { + Thread = thread; + Command = command; + } + } +} \ No newline at end of file diff --git a/src/Core/FileTime.Core/Timeline/TimeRunner.cs b/src/Core/FileTime.Core/Timeline/TimeRunner.cs index 3df058f..717647b 100644 --- a/src/Core/FileTime.Core/Timeline/TimeRunner.cs +++ b/src/Core/FileTime.Core/Timeline/TimeRunner.cs @@ -1,6 +1,7 @@ using AsyncEvent; using FileTime.Core.Command; using FileTime.Core.Models; +using Microsoft.Extensions.Logging; namespace FileTime.Core.Timeline { @@ -9,10 +10,11 @@ namespace FileTime.Core.Timeline private readonly CommandExecutor _commandExecutor; private readonly List _commandsToRun = new(); private readonly object _guard = new(); + private readonly ILogger _logger; private bool _resourceIsInUse; - private readonly List _commandRunners = new(); - private bool _enableRunning; //= true; + private readonly List _commandRunners = new(); + private bool _enableRunning = true; private IReadOnlyList _parallelCommands = new List(); @@ -41,14 +43,15 @@ namespace FileTime.Core.Timeline public AsyncEventHandler RefreshContainer { get; } = new AsyncEventHandler(); - public AsyncEventHandler CommandsChangedAsync { get; } = new(); + public AsyncEventHandler> CommandsChangedAsync { get; } = new(); - public TimeRunner(CommandExecutor commandExecutor) + public TimeRunner(CommandExecutor commandExecutor, ILogger logger) { _commandExecutor = commandExecutor; + _logger = logger; } - public async Task AddCommand(ICommand command, ParallelCommands? batch = null, bool toNewBatch = false) + public async Task AddCommand(ICommand command, int? batchId = null, bool toNewBatch = false) { await RunWithLockAsync(async () => { @@ -64,9 +67,9 @@ namespace FileTime.Core.Timeline batchToAdd = new ParallelCommands(_commandsToRun.Last().Result); _commandsToRun.Add(batchToAdd); } - else if (batch != null && _commandsToRun.Contains(batch)) + else if (batchId != null && _commandsToRun.Find(b => b.Id == batchId) is ParallelCommands parallelCommands) { - batchToAdd = batch; + batchToAdd = parallelCommands; } else { @@ -80,20 +83,14 @@ namespace FileTime.Core.Timeline { StartCommandRunner(); } - }); - await UpdateReadOnlyCommands(); + await UpdateReadOnlyCommands(); + }); } public async Task TryStartCommandRunner() { - await RunWithLockAsync(() => - { - if (_commandRunners.Count == 0 && _commandsToRun.Count > 0) - { - StartCommandRunner(); - } - }); + await RunWithLockAsync(() => StartCommandRunner()); } private void StartCommandRunner() @@ -112,9 +109,15 @@ namespace FileTime.Core.Timeline { foreach (var command in _commandsToRun[0].Commands) { - if (command.CanRun == CanCommandRun.True || (command.CanRun == CanCommandRun.Forceable && command.ForceRun)) + if (_commandRunners.Find(r => r.Command == command) != null) { + continue; + } + else if (command.CanRun == CanCommandRun.True || (command.CanRun == CanCommandRun.Forceable && command.ForceRun)) + { + _logger.LogDebug("Starting command: {0}", command.Command.DisplayLabel); var thread = new Thread(new ParameterizedThreadStart(RunCommand)); + _commandRunners.Add(new CommandRunner(thread, command)); thread.Start(command); } else @@ -144,28 +147,33 @@ namespace FileTime.Core.Timeline private async Task DisposeCommandThread(Thread thread, CommandTimeState? command) { - await RunWithLockAsync(() => + await RunWithLockAsync(async () => { if (command != null) { + _logger.LogDebug("Command finished running: {0}", command.Command.DisplayLabel); _commandsToRun[0].Remove(command); if (_commandsToRun[0].Commands.Count == 0) { + _logger.LogDebug("Removing empty command array. {0} batch left.", _commandsToRun.Count - 1); _commandsToRun.RemoveAt(0); } } - _commandRunners.Remove(thread); + var currentCommandRunner = _commandRunners.Find(r => r.Thread == thread); + if (currentCommandRunner != null) _commandRunners.Remove(currentCommandRunner); + await UpdateReadOnlyCommands(); + StartCommandRunner(); }); - await UpdateReadOnlyCommands(); - - await TryStartCommandRunner(); } public async Task Refresh() { - await RunWithLockAsync(async () => await RefreshCommands(PointInTime.CreateEmpty())); - await UpdateReadOnlyCommands(); + await RunWithLockAsync(async () => + { + await RefreshCommands(PointInTime.CreateEmpty()); + await UpdateReadOnlyCommands(); + }); } private async Task RefreshCommands(PointInTime? fullStartTime = null) @@ -181,11 +189,10 @@ namespace FileTime.Core.Timeline private async Task UpdateReadOnlyCommands() { - var wait = false; - await RunWithLockAsync(() => wait = _commandsToRun.Count == 1); + var wait = _commandsToRun.Count == 1; if (wait) await Task.Delay(100); - await RunWithLockAsync(() => _parallelCommands = _commandsToRun.ConvertAll(c => new ReadOnlyParallelCommands(c)).AsReadOnly()); - await CommandsChangedAsync.InvokeAsync(this, AsyncEventArgs.Empty); + _parallelCommands = _commandsToRun.ConvertAll(c => new ReadOnlyParallelCommands(c)).AsReadOnly(); + await CommandsChangedAsync.InvokeAsync(this, _parallelCommands); } private async Task RunWithLockAsync(Action action) diff --git a/src/GuiApp/FileTime.Avalonia/FileTime.Avalonia.csproj b/src/GuiApp/FileTime.Avalonia/FileTime.Avalonia.csproj index 36ce53b..3554aea 100644 --- a/src/GuiApp/FileTime.Avalonia/FileTime.Avalonia.csproj +++ b/src/GuiApp/FileTime.Avalonia/FileTime.Avalonia.csproj @@ -46,4 +46,9 @@ MainWindow.axaml + + + PreserveNewest + + diff --git a/src/GuiApp/FileTime.Avalonia/ViewModels/MainPageViewModel.cs b/src/GuiApp/FileTime.Avalonia/ViewModels/MainPageViewModel.cs index fe0e4da..16b69eb 100644 --- a/src/GuiApp/FileTime.Avalonia/ViewModels/MainPageViewModel.cs +++ b/src/GuiApp/FileTime.Avalonia/ViewModels/MainPageViewModel.cs @@ -51,6 +51,7 @@ namespace FileTime.Avalonia.ViewModels private TimeRunner _timeRunner; private IEnumerable _contentProviders; private IIconProvider _iconProvider; + private bool _addCommandToNextBatch; private Func? _inputHandler; @@ -101,7 +102,7 @@ namespace FileTime.Avalonia.ViewModels App.ServiceProvider.GetService(); await StatePersistence.LoadStatesAsync(); - _timeRunner.CommandsChangedAsync.Add(UpdateParalellCommands); + _timeRunner.CommandsChangedAsync.Add(UpdateParallelCommands); InitCommandBindings(); _keysToSkip.Add(new KeyWithModifiers[] { new KeyWithModifiers(Key.Up) }); @@ -213,10 +214,8 @@ namespace FileTime.Avalonia.ViewModels _logger?.LogInformation($"{nameof(MainPageViewModel)} initialized."); } - private async Task UpdateParalellCommands(object? sender, AsyncEventArgs e, CancellationToken token) + private Task UpdateParallelCommands(object? sender, IReadOnlyList parallelCommands, CancellationToken token) { - var parallelCommands = await _timeRunner.GetParallelCommandsAsync(); - foreach (var parallelCommand in parallelCommands) { if (!TimelineCommands.Any(c => c.Id == parallelCommand.Id)) @@ -265,6 +264,8 @@ namespace FileTime.Avalonia.ViewModels parallelCommandsVM.ParallelCommands.Remove(commandVMsToRemove[i]); } } + + return Task.CompletedTask; } private async Task GetContainerForWindowsDrive(DriveInfo drive) @@ -441,7 +442,7 @@ namespace FileTime.Avalonia.ViewModels { var container = AppState.SelectedTab.CurrentLocation.Container; var createContainerCommand = new CreateContainerCommand(new Core.Models.AbsolutePath(container), Inputs[0].Value); - await _timeRunner.AddCommand(createContainerCommand); + await AddCommand(createContainerCommand); Inputs = null; } }; @@ -459,7 +460,7 @@ namespace FileTime.Avalonia.ViewModels { var container = AppState.SelectedTab.CurrentLocation.Container; var createElementCommand = new CreateElementCommand(new Core.Models.AbsolutePath(container), Inputs[0].Value); - await _timeRunner.AddCommand(createElementCommand); + await AddCommand(createElementCommand); Inputs = null; } }; @@ -516,12 +517,14 @@ namespace FileTime.Avalonia.ViewModels var askForDelete = false; var questionText = ""; var shouldDelete = false; + var shouldClearMarkedItems = false; var currentSelectedItems = await AppState.SelectedTab.TabState.GetCurrentMarkedItems(); var currentSelectedItem = AppState.SelectedTab.SelectedItem?.Item; if (currentSelectedItems.Count > 0) { - itemsToDelete = currentSelectedItems.Cast().ToList(); + itemsToDelete = new List(currentSelectedItems); + shouldClearMarkedItems = true; //FIXME: check 'is Container' if (currentSelectedItems.Count == 1) @@ -545,9 +548,9 @@ namespace FileTime.Avalonia.ViewModels } else if (currentSelectedItem != null) { - itemsToDelete = new List() + itemsToDelete = new List() { - new Core.Models.AbsolutePath(currentSelectedItem) + new AbsolutePath(currentSelectedItem) }; if (currentSelectedItem is IContainer container && (await container.GetItems())?.Count > 0) @@ -575,16 +578,22 @@ namespace FileTime.Avalonia.ViewModels async Task HandleDelete() { - var deleteCommand = new DeleteCommand(); - deleteCommand.HardDelete = hardDelete; + var deleteCommand = new DeleteCommand + { + HardDelete = hardDelete + }; foreach (var itemToDelete in itemsToDelete!) { deleteCommand.ItemsToDelete.Add(itemToDelete); } - await _timeRunner.AddCommand(deleteCommand); + await AddCommand(deleteCommand); _clipboard.Clear(); + if (shouldClearMarkedItems) + { + await AppState.SelectedTab.TabState.ClearCurrentMarkedItems(); + } } } @@ -621,7 +630,7 @@ namespace FileTime.Avalonia.ViewModels ? virtualContainer.BaseContainer : currentLocation; - await _timeRunner.AddCommand(command); + await AddCommand(command); _clipboard.Clear(); } @@ -637,7 +646,7 @@ namespace FileTime.Avalonia.ViewModels if (Inputs != null) { var renameCommand = new RenameCommand(new Core.Models.AbsolutePath(selectedItem), Inputs[0].Value); - await _timeRunner.AddCommand(renameCommand); + await AddCommand(renameCommand); } }; @@ -669,6 +678,21 @@ namespace FileTime.Avalonia.ViewModels await _timeRunner.Refresh(); } + private Task ChangeTimelineMode() + { + _addCommandToNextBatch = !_addCommandToNextBatch; + var text = "Timeline mode: " + (_addCommandToNextBatch ? "Continuous" : "Parallel"); + _popupTexts.Add(text); + + Task.Run(async () => + { + await Task.Delay(5000); + await Dispatcher.UIThread.InvokeAsync(() => _popupTexts.Remove(text)); + }); + + return Task.CompletedTask; + } + private Task GoToContainer() { var handler = async () => @@ -804,6 +828,34 @@ namespace FileTime.Avalonia.ViewModels private Task SelectPreviousTimelineBlock() { + var currentSelected = GetSelectedTimelineCommandOrSelectFirst(); + if (currentSelected == null) return Task.CompletedTask; + + ParallelCommandsViewModel? newBlockVM = null; + ParallelCommandsViewModel? previousBlockVM = null; + + foreach (var timelineBlock in TimelineCommands) + { + + foreach (var command in timelineBlock.ParallelCommands) + { + if (command.IsSelected) + { + newBlockVM = previousBlockVM; + break; + } + } + + previousBlockVM = timelineBlock; + } + + if (newBlockVM == null) return Task.CompletedTask; + + foreach (var val in TimelineCommands.Select(t => t.ParallelCommands.Select((c, i) => (ParalellCommandVM: t, CommandVM: c, Index: i))).SelectMany(t => t)) + { + val.CommandVM.IsSelected = val.ParalellCommandVM == newBlockVM && val.Index == 0; + } + return Task.CompletedTask; } @@ -845,6 +897,35 @@ namespace FileTime.Avalonia.ViewModels private Task SelectNextTimelineBlock() { + var currentSelected = GetSelectedTimelineCommandOrSelectFirst(); + if (currentSelected == null) return Task.CompletedTask; + + ParallelCommandsViewModel? newBlockVM = null; + var select = false; + foreach (var timelineBlock in TimelineCommands) + { + if (select) + { + newBlockVM = timelineBlock; + break; + } + foreach (var command in timelineBlock.ParallelCommands) + { + if (command.IsSelected) + { + select = true; + break; + } + } + } + + if (newBlockVM == null) return Task.CompletedTask; + + foreach (var val in TimelineCommands.Select(t => t.ParallelCommands.Select((c, i) => (ParalellCommandVM: t, CommandVM: c, Index: i))).SelectMany(t => t)) + { + val.CommandVM.IsSelected = val.ParalellCommandVM == newBlockVM && val.Index == 0; + } + return Task.CompletedTask; } @@ -862,6 +943,35 @@ namespace FileTime.Avalonia.ViewModels return null; } + private async Task AddCommand(ICommand command) + { + if (_addCommandToNextBatch) + { + await _timeRunner.AddCommand(command, toNewBatch: true); + } + else + { + ParallelCommandsViewModel? batchToAdd = null; + foreach (var val in TimelineCommands.Select(t => t.ParallelCommands.Select(c => (ParalellCommandVM: t, CommandVM: c))).SelectMany(t => t)) + { + if (val.CommandVM.IsSelected) + { + batchToAdd = val.ParalellCommandVM; + break; + } + } + + if (batchToAdd != null) + { + await _timeRunner.AddCommand(command, batchToAdd.Id); + } + else + { + await _timeRunner.AddCommand(command); + } + } + } + [Command] public async void ProcessInputs() { @@ -882,7 +992,7 @@ namespace FileTime.Avalonia.ViewModels } [Command] - public void ProcessMessageBoxCommand() + public void ProcessMessageBox() { _inputHandler?.Invoke(); @@ -891,7 +1001,7 @@ namespace FileTime.Avalonia.ViewModels } [Command] - public void CancelMessageBoxCommand() + public void CancelMessageBox() { MessageBoxText = null; _inputHandler = null; @@ -923,10 +1033,18 @@ namespace FileTime.Avalonia.ViewModels if (key == Key.Escape) { IsAllShortcutVisible = false; + MessageBoxText = null; _previousKeys.Clear(); PossibleCommands = new(); setHandled(true); } + else if (key == Key.Enter + && MessageBoxText != null) + { + _previousKeys.Clear(); + ProcessMessageBox(); + setHandled(true); + } else if (selectedCommandBinding != null) { setHandled(true); @@ -975,6 +1093,10 @@ namespace FileTime.Avalonia.ViewModels { IsAllShortcutVisible = false; } + else if (MessageBoxText != null) + { + MessageBoxText = null; + } else { await ExitRapidTravelMode(); @@ -1311,6 +1433,11 @@ namespace FileTime.Avalonia.ViewModels FileTime.App.Core.Command.Commands.Dummy, new KeyWithModifiers[] { new KeyWithModifiers(Key.L) }, SelectNextTimelineBlock), + new CommandBinding( + "command running mode", + FileTime.App.Core.Command.Commands.Dummy, + new KeyWithModifiers[] { new KeyWithModifiers(Key.T), new KeyWithModifiers(Key.M) }, + ChangeTimelineMode), //TODO REMOVE new CommandBinding( "open in default file browser", diff --git a/src/GuiApp/FileTime.Avalonia/Views/MainWindow.axaml b/src/GuiApp/FileTime.Avalonia/Views/MainWindow.axaml index 61026a0..49ef781 100644 --- a/src/GuiApp/FileTime.Avalonia/Views/MainWindow.axaml +++ b/src/GuiApp/FileTime.Avalonia/Views/MainWindow.axaml @@ -157,19 +157,21 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/src/GuiApp/FileTime.Avalonia/appsettings.Development.json b/src/GuiApp/FileTime.Avalonia/appsettings.Development.json index d9ffaae..bfd4587 100644 --- a/src/GuiApp/FileTime.Avalonia/appsettings.Development.json +++ b/src/GuiApp/FileTime.Avalonia/appsettings.Development.json @@ -1,6 +1,6 @@ { "Serilog": { - "MinimalLevel": { + "MinimumLevel": { "Default": "Debug", "Override": { "Microsoft": "Information",