Frequency navigation

src/AppCommon/FileTime.App.FrequencyNavigation.Abstractions/FileTime.App.FrequencyNavigation.Abstractions.csproj

@@ -11,4 +11,8 @@
     <ProjectReference Include="..\FileTime.App.Core.Abstraction\FileTime.App.Core.Abstraction.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Avalonia" Version="11.0.0-preview5" />
+  </ItemGroup>
+
 </Project>

src/AppCommon/FileTime.App.FrequencyNavigation.Abstractions/ViewModels/IFrequencyNavigationViewModel.cs

@@ -1,3 +1,4 @@
+using Avalonia.Input;
 using FileTime.App.Core.ViewModels;
 
 namespace FileTime.App.FrequencyNavigation.ViewModels;
@@ -9,4 +10,5 @@ public interface IFrequencyNavigationViewModel : IModalViewModel
     string SearchText { get; set; }
     string SelectedItem { get; set; }
     void Close();
+    void HandleKeyDown(KeyEventArgs keyEventArgs);
 }

src/AppCommon/FileTime.App.FrequencyNavigation/Services/FrequencyNavigationService.cs

@@ -89,7 +89,7 @@ public partial class FrequencyNavigationService : IFrequencyNavigationService, I
             if (TryAgeContainerScores() || DateTime.Now - _lastSave > TimeSpan.FromMinutes(5))
             {
             }
-
+            //TODO: move to if above
             await SaveStateAsync();
         }
         catch (Exception e)
@@ -113,7 +113,7 @@ public partial class FrequencyNavigationService : IFrequencyNavigationService, I
         var itemsToRemove = new List<string>();
         foreach (var container in _containerScores)
         {
-            var newScore = (int) Math.Floor(container.Value.Score * 0.9);
+            var newScore = (int)Math.Floor(container.Value.Score * 0.9);
             if (newScore > 0)
             {
                 container.Value.Score = newScore;
@@ -136,14 +136,18 @@ public partial class FrequencyNavigationService : IFrequencyNavigationService, I
             return new List<string>();
 
         _saveLock.Wait();
-        var matchingContainers = _containerScores
+        try
-            .Where(c => c.Key.Contains(searchText, StringComparison.OrdinalIgnoreCase))
+        {
-            .OrderBy(c => GetWeightedScore(c.Value.Score, c.Value.LastAccessed))
+            return _containerScores
-            .Select(c => c.Key)
+                .Where(c => c.Key.Contains(searchText, StringComparison.OrdinalIgnoreCase))
-            .ToList();
+                .OrderBy(c => GetWeightedScore(c.Value.Score, c.Value.LastAccessed))
-
+                .Select(c => c.Key)
-        _saveLock.Release();
+                .ToList();
-        return matchingContainers;
+        }
+        finally
+        {
+            _saveLock.Release();
+        }
     }
 
     private int GetWeightedScore(int score, DateTime lastAccess)
@@ -159,36 +163,48 @@ public partial class FrequencyNavigationService : IFrequencyNavigationService, I
         };
     }
 
-    public async Task InitAsync()
+    public async Task InitAsync() => await LoadStateAsync();
-    {
-        await LoadStateAsync();
-    }
 
     private async Task LoadStateAsync()
     {
         if (!File.Exists(_dbPath))
             return;
 
-        await _saveLock.WaitAsync();
+        try
-        await using var dbStream = File.OpenRead(_dbPath);
+        {
-        var containerScores = await JsonSerializer.DeserializeAsync<Dictionary<string, ContainerFrequencyData>>(dbStream);
+            await _saveLock.WaitAsync();
-        if (containerScores is null) return;
+            _logger.LogTrace("Loading frequency navigation state from file '{DbPath}'", _dbPath);
+            await using var dbStream = File.OpenRead(_dbPath);
+            var containerScores = await JsonSerializer.DeserializeAsync<Dictionary<string, ContainerFrequencyData>>(dbStream);
+            if (containerScores is null) return;
 
-        _containerScores = containerScores;
+            _containerScores = containerScores;
-        _saveLock.Release();
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "Error loading frequency navigation state");
+        }
+        finally
+        {
+            _saveLock.Release();
+        }
     }
 
-    public async Task ExitAsync()
+    public async Task ExitAsync() => await SaveStateAsync();
-    {
-        await SaveStateAsync();
-    }
 
     private async Task SaveStateAsync()
     {
         await _saveLock.WaitAsync();
-        _lastSave = DateTime.Now;
+        try
-        await using var dbStream = File.OpenWrite(_dbPath);
+        {
-        await JsonSerializer.SerializeAsync(dbStream, _containerScores);
+            _lastSave = DateTime.Now;
-        _saveLock.Release();
+            await using var dbStream = File.Create(_dbPath);
+            await JsonSerializer.SerializeAsync(dbStream, _containerScores);
+            dbStream.Flush();
+        }
+        finally
+        {
+            _saveLock.Release();
+        }
     }
 }

src/AppCommon/FileTime.App.FrequencyNavigation/ViewModels/FrequencyNavigationViewModel.cs

@@ -1,15 +1,22 @@
+using Avalonia.Input;
+using FileTime.App.Core.Services;
+using FileTime.App.Core.UserCommand;
 using FileTime.App.Core.ViewModels;
 using FileTime.App.FrequencyNavigation.Services;
+using FileTime.Core.Models;
+using FileTime.Core.Timeline;
 using MvvmGen;
 
 namespace FileTime.App.FrequencyNavigation.ViewModels;
 
 [ViewModel]
 [Inject(typeof(IFrequencyNavigationService), "_frequencyNavigationService")]
+[Inject(typeof(IUserCommandHandlerService), "_userCommandHandlerService")]
+[Inject(typeof(ITimelessContentProvider), "_timelessContentProvider")]
 public partial class FrequencyNavigationViewModel : IFrequencyNavigationViewModel
 {
     private string _searchText;
-    
+
     [Property] private IObservable<bool> _showWindow;
     [Property] private List<string> _filteredMatches;
     [Property] private string _selectedItem;
@@ -20,7 +27,7 @@ public partial class FrequencyNavigationViewModel : IFrequencyNavigationViewMode
         set
         {
             if (_searchText == value) return;
-            
+
             _searchText = value;
             OnPropertyChanged();
 
@@ -29,18 +36,48 @@ public partial class FrequencyNavigationViewModel : IFrequencyNavigationViewMode
     }
 
     public void Close()
+        => _frequencyNavigationService.CloseNavigationWindow();
+
+    public async void HandleKeyDown(KeyEventArgs keyEventArgs)
     {
-        _frequencyNavigationService.CloseNavigationWindow();
+        if (keyEventArgs.Key == Key.Down)
+        {
+            var nextItem = FilteredMatches.SkipWhile(i => i != SelectedItem).Skip(1).FirstOrDefault();
+
+            if (nextItem is not null)
+            {
+                SelectedItem = nextItem;
+            }
+        }
+        else if (keyEventArgs.Key == Key.Up)
+        {
+            var previousItem = FilteredMatches.TakeWhile(i => i != SelectedItem).LastOrDefault();
+
+            if (previousItem is not null)
+            {
+                SelectedItem = previousItem;
+            }
+        }
+        else if (keyEventArgs.Key == Key.Enter)
+        {
+            var targetContainer = await _timelessContentProvider.GetItemByFullNameAsync(new FullName(SelectedItem), PointInTime.Present);
+            var openContainerCommand = new OpenContainerCommand(new AbsolutePath(_timelessContentProvider, targetContainer));
+            await _userCommandHandlerService.HandleCommandAsync(openContainerCommand);
+            Close();
+        }
     }
 
     partial void OnInitialize()
-    {
+        => _showWindow = _frequencyNavigationService.ShowWindow;
-        _showWindow = _frequencyNavigationService.ShowWindow;
-    }
 
     private void UpdateFilteredMatches()
     {
         FilteredMatches = new List<string>(_frequencyNavigationService.GetMatchingContainers(_searchText));
+        if (FilteredMatches.Contains(SelectedItem)) return;
+
+        SelectedItem = FilteredMatches.Count > 0
+            ? FilteredMatches[0]
+            : null;
     }
 
     string IModalViewModel.Name => "FrequencyNavigation";

src/GuiApp/Avalonia/FileTime.GuiApp.App/appsettings.Development.json

@@ -1,7 +1,7 @@
 {
   "Serilog": {
     "MinimumLevel": {
-      "Default": "Debug",
+      "Default": "Verbose",
       "Override": {
         "Microsoft": "Information",
         "System": "Warning"

src/GuiApp/Avalonia/FileTime.GuiApp/Logging/ToastMessageSink.cs

@@ -18,6 +18,8 @@ public class ToastMessageSink : ILogEventSink
         if (logEvent.Level >= LogEventLevel.Error)
         {
             var message = logEvent.RenderMessage();
+            if (logEvent.Exception is not null)
+                message += $" {logEvent.Exception.Message}";
             dialogService.ShowToastMessage(message);
         }
     }

src/GuiApp/Avalonia/FileTime.GuiApp/Resources/Styles.axaml

@@ -40,6 +40,21 @@
         </Setter>
     </Style>
 
+    <Style Selector="ListBox.CommandPalette">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+    </Style>
+    <Style Selector="ListBox.CommandPalette &gt; ListBoxItem">
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+    </Style>
+    <Style Selector="ListBox.CommandPalette &gt; ListBoxItem[IsSelected=true] TextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource SelectedItemForegroundBrush}" />
+    </Style>
+
     <Style Selector="Grid.SidebarContainerPresenter">
         <Setter Property="Background" Value="#01000000" />
     </Style>

src/GuiApp/Avalonia/FileTime.GuiApp/Views/FrequencyNavigation.axaml

@@ -9,21 +9,28 @@
     d:DesignWidth="800"
     x:CompileBindings="True"
     x:DataType="viewModels:IFrequencyNavigationViewModel"
+    Background="{DynamicResource ContainerBackgroundColor}"
     mc:Ignorable="d">
+    <UserControl.Styles>
+        <StyleInclude Source="avares://FileTime.GuiApp/Resources/Styles.axaml" />
+    </UserControl.Styles>
     <Grid RowDefinitions="Auto,*">
         <TextBox
+            Focusable="True"
             KeyDown="Search_OnKeyDown"
             Text="{Binding SearchText, Mode=TwoWay}" />
-        <ItemsRepeater
+        <ListBox
             Grid.Row="1"
-            Items="{Binding FilteredMatches}">
+            Classes="CommandPalette"
-            <ItemsRepeater.ItemTemplate>
+            Items="{Binding FilteredMatches}"
+            SelectedItem="{Binding SelectedItem}">
+            <ListBox.ItemTemplate>
                 <DataTemplate x:DataType="x:String">
                     <Grid Margin="5">
                         <TextBlock Text="{Binding}" />
                     </Grid>
                 </DataTemplate>
-            </ItemsRepeater.ItemTemplate>
+            </ListBox.ItemTemplate>
-        </ItemsRepeater>
+        </ListBox>
     </Grid>
 </UserControl>

src/GuiApp/Avalonia/FileTime.GuiApp/Views/FrequencyNavigation.axaml.cs

@@ -26,5 +26,9 @@ public partial class FrequencyNavigation : UserControl
         {
             viewModel.Close();
         }
+        else
+        {
+            viewModel.HandleKeyDown(e);
+        }
     }
 }

src/GuiApp/Avalonia/FileTime.GuiApp/Views/MainWindow.axaml

@@ -719,12 +719,13 @@
 
             <Border
                 DataContext="{Binding FrequencyNavigationService.CurrentModal}"
-                Margin="100"
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch"
                 Background="{DynamicResource BarelyTransparentBackgroundColor}"
                 IsVisible="{Binding ShowWindow^, FallbackValue=False}">
-                <local:FrequencyNavigation />
+                <Grid Margin="100">
+                    <local:FrequencyNavigation />
+                </Grid>
             </Border>
         </Grid>