ADIX7/FileTime2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Navigation commands

Browse Source
This commit is contained in:
Ádám Kovács
2022-05-24 20:37:12 +02:00
parent cb5260da5d
commit d94d198344
10 changed files with 206 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/AppCommon/FileTime.App.Core.Abstraction/UserCommand/GoToHomeCommand.cs Normal file
View File

@@ -0,0 +1,13 @@
namespace FileTime.App.Core.UserCommand;
public class GoToHomeCommand : IIdentifiableUserCommand
{
public const string CommandName = "go_to_home";
public static GoToHomeCommand Instance { get; } = new GoToHomeCommand();
private GoToHomeCommand()
{
}
public string UserCommandID => CommandName;
}

13
src/AppCommon/FileTime.App.Core.Abstraction/UserCommand/GoToProviderCommand.cs Normal file
View File

@@ -0,0 +1,13 @@
namespace FileTime.App.Core.UserCommand;
public class GoToProviderCommand : IIdentifiableUserCommand
{
public const string CommandName = "go_to_provider";
public static GoToProviderCommand Instance { get; } = new GoToProviderCommand();
private GoToProviderCommand()
{
}
public string UserCommandID => CommandName;
}

13
src/AppCommon/FileTime.App.Core.Abstraction/UserCommand/GoToRootCommand.cs Normal file
View File

@@ -0,0 +1,13 @@
namespace FileTime.App.Core.UserCommand;
public class GoToRootCommand : IIdentifiableUserCommand
{
public const string CommandName = "go_to_root";
public static GoToRootCommand Instance { get; } = new GoToRootCommand();
private GoToRootCommand()
{
}
public string UserCommandID => CommandName;
}

13
src/AppCommon/FileTime.App.Core.Abstraction/UserCommand/MoveCursorDownPageCommand.cs Normal file
View File

@@ -0,0 +1,13 @@
namespace FileTime.App.Core.UserCommand;
public class MoveCursorDownPageCommand : IIdentifiableUserCommand
{
public const string CommandName = "move_cursor_down_page";
public static MoveCursorDownPageCommand Instance { get; } = new MoveCursorDownPageCommand();
private MoveCursorDownPageCommand()
{
}
public string UserCommandID => CommandName;
}

13
src/AppCommon/FileTime.App.Core.Abstraction/UserCommand/MoveCursorToFirstCommand.cs Normal file
View File

@@ -0,0 +1,13 @@
namespace FileTime.App.Core.UserCommand;
public class MoveCursorToFirstCommand : IIdentifiableUserCommand
{
public const string CommandName = "move_cursor_to_first";
public static MoveCursorToFirstCommand Instance { get; } = new MoveCursorToFirstCommand();
private MoveCursorToFirstCommand()
{
}
public string UserCommandID => CommandName;
}

13
src/AppCommon/FileTime.App.Core.Abstraction/UserCommand/MoveCursorToLastCommand.cs Normal file
View File

@@ -0,0 +1,13 @@
namespace FileTime.App.Core.UserCommand;
public class MoveCursorToLastCommand : IIdentifiableUserCommand
{
public const string CommandName = "move_cursor_to_last";
public static MoveCursorToLastCommand Instance { get; } = new MoveCursorToLastCommand();
private MoveCursorToLastCommand()
{
}
public string UserCommandID => CommandName;
}

13
src/AppCommon/FileTime.App.Core.Abstraction/UserCommand/MoveCursorUpPageCommand.cs Normal file
View File

@@ -0,0 +1,13 @@
namespace FileTime.App.Core.UserCommand;
public class MoveCursorUpPageCommand : IIdentifiableUserCommand
{
public const string CommandName = "move_cursor_up_page";
public static MoveCursorUpPageCommand Instance { get; } = new MoveCursorUpPageCommand();
private MoveCursorUpPageCommand()
{
}
public string UserCommandID => CommandName;
}

92
src/AppCommon/FileTime.App.Core/Services/UserCommandHandler/NavigationUserCommandHandlerService.cs
View File

@@ -13,6 +13,7 @@ namespace FileTime.App.Core.Services.UserCommandHandler;
public class NavigationUserCommandHandlerService : UserCommandHandlerServiceBase
{
private const int PageSize = 8;
private readonly IAppState _appState;
private readonly IServiceProvider _serviceProvider;
private readonly ILocalContentProvider _localContentProvider;
@@ -49,9 +50,16 @@ public class NavigationUserCommandHandlerService : UserCommandHandlerServiceBase
new TypeUserCommandHandler<CloseTabCommand>(CloseTab),
new TypeUserCommandHandler<EnterRapidTravelCommand>(EnterRapidTravel),
new TypeUserCommandHandler<ExitRapidTravelCommand>(ExitRapidTravel),
new TypeUserCommandHandler<GoToHomeCommand>(GoToHome),
new TypeUserCommandHandler<GoToProviderCommand>(GoToProvider),
new TypeUserCommandHandler<GoToRootCommand>(GoToRoot),
new TypeUserCommandHandler<GoUpCommand>(GoUp),
new TypeUserCommandHandler<MoveCursorDownCommand>(MoveCursorDown),
new TypeUserCommandHandler<MoveCursorDownPageCommand>(MoveCursorDownPage),
new TypeUserCommandHandler<MoveCursorToFirstCommand>(MoveCursorToFirst),
new TypeUserCommandHandler<MoveCursorToLastCommand>(MoveCursorToLast),
new TypeUserCommandHandler<MoveCursorUpCommand>(MoveCursorUp),
new TypeUserCommandHandler<MoveCursorUpPageCommand>(MoveCursorUpPage),
new TypeUserCommandHandler<OpenContainerCommand>(OpenContainer),
new TypeUserCommandHandler<OpenSelectedCommand>(OpenSelected),
new TypeUserCommandHandler<RefreshCommand>(Refresh),
@@ -59,10 +67,48 @@ public class NavigationUserCommandHandlerService : UserCommandHandlerServiceBase
});
}
private async Task Refresh(RefreshCommand command)
private async Task GoToHome()
{
var path = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
var resolvedPath =
await _localContentProvider.GetItemByNativePathAsync(new NativePath(path), PointInTime.Present);
if (resolvedPath is IContainer homeFolder)
{
await _userCommandHandlerService.HandleCommandAsync(
new OpenContainerCommand(new AbsolutePath(_timelessContentProvider, homeFolder)));
}
}
private async Task GoToRoot()
{
var root = _currentLocation;
if (root is null) return;
while (true)
{
var parent = root.Parent;
if (parent is null || string.IsNullOrWhiteSpace(parent.Path.Path)) break;
if (await parent.ResolveAsync() is not IContainer next) break;
root = next;
}
await _userCommandHandlerService.HandleCommandAsync(
new OpenContainerCommand(new AbsolutePath(_timelessContentProvider, root)));
}
private async Task GoToProvider()
{
if (_currentLocation is null) return;
await _userCommandHandlerService.HandleCommandAsync(
new OpenContainerCommand(new AbsolutePath(_timelessContentProvider, _currentLocation.Provider)));
}
private async Task Refresh()
{
if (_currentLocation?.FullName is null) return;
var refreshedItem = await _timelessContentProvider.GetItemByFullNameAsync(_currentLocation.FullName, PointInTime.Present);
var refreshedItem =
await _timelessContentProvider.GetItemByFullNameAsync(_currentLocation.FullName, PointInTime.Present);
if (refreshedItem is not IContainer refreshedContainer) return;
@@ -95,13 +141,51 @@ public class NavigationUserCommandHandlerService : UserCommandHandlerServiceBase
private Task MoveCursorDown()
{
SelectNewSelectedItem(i => i.SkipWhile(i => !i.EqualsTo(_currentSelectedItem)).Skip(1).FirstOrDefault());
SelectNewSelectedItem(items =>
items.SkipWhile(i => !i.EqualsTo(_currentSelectedItem)).Skip(1).FirstOrDefault());
return Task.CompletedTask;
}
private Task MoveCursorUp()
{
SelectNewSelectedItem(i => i.TakeWhile(i => !i.EqualsTo(_currentSelectedItem)).LastOrDefault());
SelectNewSelectedItem(items => items.TakeWhile(i => !i.EqualsTo(_currentSelectedItem)).LastOrDefault());
return Task.CompletedTask;
}
private Task MoveCursorDownPage()
{
SelectNewSelectedItem(items =>
{
var relevantItems = items.SkipWhile(i => !i.EqualsTo(_currentSelectedItem)).ToList();
var fallBackItems = relevantItems.Take(PageSize + 1).Reverse();
var preferredItems = relevantItems.Skip(PageSize + 1);
return preferredItems.Concat(fallBackItems).FirstOrDefault();
});
return Task.CompletedTask;
}
private Task MoveCursorUpPage()
{
SelectNewSelectedItem(items =>
{
var relevantItems = items.TakeWhile(i => !i.EqualsTo(_currentSelectedItem)).Reverse().ToList();
var fallBackItems = relevantItems.Take(PageSize).Reverse();
var preferredItems = relevantItems.Skip(PageSize);
return preferredItems.Concat(fallBackItems).FirstOrDefault();
});
return Task.CompletedTask;
}
private Task MoveCursorToFirst()
{
SelectNewSelectedItem(items => items.FirstOrDefault());
return Task.CompletedTask;
}
private Task MoveCursorToLast()
{
SelectNewSelectedItem(items => items.LastOrDefault());
return Task.CompletedTask;
}

7
src/AppCommon/FileTime.App.Core/StartupServices/DefaultIdentifiableCommandHandlerRegister.cs
View File

@@ -17,10 +17,17 @@ public class DefaultIdentifiableCommandHandlerRegister : IStartupHandler
AddUserCommand(CreateElement.Instance);
AddUserCommand(EnterRapidTravelCommand.Instance);
AddUserCommand(ExitRapidTravelCommand.Instance);
AddUserCommand(GoToHomeCommand.Instance);
AddUserCommand(GoToProviderCommand.Instance);
AddUserCommand(GoToRootCommand.Instance);
AddUserCommand(GoUpCommand.Instance);
AddUserCommand(MarkCommand.Instance);
AddUserCommand(MoveCursorDownCommand.Instance);
AddUserCommand(MoveCursorDownPageCommand.Instance);
AddUserCommand(MoveCursorToFirstCommand.Instance);
AddUserCommand(MoveCursorToLastCommand.Instance);
AddUserCommand(MoveCursorUpCommand.Instance);
AddUserCommand(MoveCursorUpPageCommand.Instance);
AddUserCommand(OpenSelectedCommand.Instance);
AddUserCommand(PasteCommand.Merge);
AddUserCommand(PasteCommand.Overwrite);

33
src/GuiApp/Avalonia/FileTime.GuiApp.Abstractions/Configuration/MainConfiguration.cs
View File

@@ -13,16 +13,19 @@ public static class MainConfiguration
{
Configuration = new();
PopulateDefaultEditorPrograms(Configuration);
PopulateDefaultKeyBindings(Configuration, _defaultKeybindings.Value, SectionNames.KeybindingSectionName + ":" + nameof(KeyBindingConfiguration.DefaultKeyBindings));
PopulateDefaultKeyBindings(Configuration, _defaultKeybindings.Value,
SectionNames.KeybindingSectionName + ":" + nameof(KeyBindingConfiguration.DefaultKeyBindings));
}
private static void PopulateDefaultKeyBindings(Dictionary<string, string> configuration, List<CommandBindingConfiguration> commandBindingConfigs, string basePath)
private static void PopulateDefaultKeyBindings(Dictionary<string, string> configuration,
List<CommandBindingConfiguration> commandBindingConfigs, string basePath)
{
for (var i = 0; i < commandBindingConfigs.Count; i++)
{
var baseKey = basePath + $":[{i}]:";
var commandBindingConfig = commandBindingConfigs[i];
configuration.Add(baseKey + nameof(CommandBindingConfiguration.Command), commandBindingConfig.Command.ToString());
configuration.Add(baseKey + nameof(CommandBindingConfiguration.Command),
commandBindingConfig.Command.ToString());
for (var j = 0; j < commandBindingConfig.Keys.Count; j++)
{
@@ -52,18 +55,18 @@ public static class MainConfiguration
new CommandBindingConfiguration(CreateElement.CommandName, new[] { Key.C, Key.E }),
//new CommandBindingConfiguration(ConfigCommand.Cut, new[] { Key.D, Key.D }),
//new CommandBindingConfiguration(ConfigCommand.Edit, new KeyConfig(Key.F4)),
new CommandBindingConfiguration(EnterRapidTravelCommand.CommandName, new KeyConfig(Key.OemComma, shift: true)),
new CommandBindingConfiguration(EnterRapidTravelCommand.CommandName,new KeyConfig(Key.OemComma, shift: true)),
//new CommandBindingConfiguration(ConfigCommand.FindByName, new[] { Key.F, Key.N }),
//new CommandBindingConfiguration(ConfigCommand.FindByNameRegex, new[] { Key.F, Key.R }),
//new CommandBindingConfiguration(ConfigCommand.GoToHome, new[] { Key.G, Key.H }),
new CommandBindingConfiguration(GoToHomeCommand.CommandName, new[] { Key.G, Key.H }),
//new CommandBindingConfiguration(ConfigCommand.GoToPath, new KeyConfig(Key.L, ctrl: true)),
//new CommandBindingConfiguration(ConfigCommand.GoToPath, new[] { Key.G, Key.P }),
//new CommandBindingConfiguration(ConfigCommand.GoToProvider, new[] { Key.G, Key.T }),
//new CommandBindingConfiguration(ConfigCommand.GoToRoot, new[] { Key.G, Key.R }),
new CommandBindingConfiguration(GoToProviderCommand.CommandName, new[] { Key.G, Key.T }),
new CommandBindingConfiguration(GoToRootCommand.CommandName, new[] { Key.G, Key.R }),
//new CommandBindingConfiguration(ConfigCommand.HardDelete, new[] { new KeyConfig(Key.D,shift: true), new KeyConfig(Key.D, shift: true) }),
new CommandBindingConfiguration(MarkCommand.CommandName, Key.Space),
//new CommandBindingConfiguration(ConfigCommand.MoveToLast, new KeyConfig(Key.G, shift: true)),
//new CommandBindingConfiguration(ConfigCommand.MoveToFirst, new[] { Key.G, Key.G }),
new CommandBindingConfiguration(MoveCursorToLastCommand.CommandName, new KeyConfig(Key.G, shift: true)),
new CommandBindingConfiguration(MoveCursorToFirstCommand.CommandName, new[] { Key.G, Key.G }),
//new CommandBindingConfiguration(ConfigCommand.NextTimelineBlock, Key.L ),
//new CommandBindingConfiguration(ConfigCommand.NextTimelineCommand, Key.J ),
//new CommandBindingConfiguration(ConfigCommand.OpenInFileBrowser, new[] { Key.O, Key.E }),
@@ -98,8 +101,8 @@ public static class MainConfiguration
//new CommandBindingConfiguration(ConfigCommand.OpenOrRun, Key.Enter),
new CommandBindingConfiguration(MoveCursorUpCommand.CommandName, Key.Up),
new CommandBindingConfiguration(MoveCursorDownCommand.CommandName, Key.Down),
//new CommandBindingConfiguration(ConfigCommand.MoveCursorUpPage, Key.PageUp),
//new CommandBindingConfiguration(ConfigCommand.MoveCursorDownPage, Key.PageDown),
new CommandBindingConfiguration(MoveCursorUpPageCommand.CommandName, Key.PageUp),
new CommandBindingConfiguration(MoveCursorDownPageCommand.CommandName, Key.PageDown),
};
}
@@ -114,11 +117,15 @@ public static class MainConfiguration
for (var i = 0; i < editorPrograms.Count; i++)
{
if (editorPrograms[i].Path is not string path) continue;
configuration.Add($"{SectionNames.ProgramsSectionName}:{nameof(ProgramsConfiguration.DefaultEditorPrograms)}:[{i}]:{nameof(ProgramConfiguration.Path)}", path);
configuration.Add(
$"{SectionNames.ProgramsSectionName}:{nameof(ProgramsConfiguration.DefaultEditorPrograms)}:[{i}]:{nameof(ProgramConfiguration.Path)}",
path);
if (editorPrograms[i].Arguments is string arguments)
{
configuration.Add($"{SectionNames.ProgramsSectionName}:{nameof(ProgramsConfiguration.DefaultEditorPrograms)}:[{i}]:{nameof(ProgramConfiguration.Arguments)}", arguments);
configuration.Add(
$"{SectionNames.ProgramsSectionName}:{nameof(ProgramsConfiguration.DefaultEditorPrograms)}:[{i}]:{nameof(ProgramConfiguration.Arguments)}",
arguments);
}
}
}