[Peek] Implementation of a performant and reliable Neighboring Files Query

src/modules/peek/Peek.Common/Helpers/MathHelper.cs

@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Peek.Common.Helpers
+{
+    public static class MathHelper
+    {
+        public static int Modulo(int a, int b)
+        {
+            return a < 0 ? ((a % b) + b) % b : a % b;
+        }
+    }
+}

src/modules/peek/Peek.FilePreviewer/FilePreview.xaml.cs

@@ -16,8 +16,8 @@
 using Peek.Common.Models;
 using Peek.FilePreviewer.Models;
 using Peek.FilePreviewer.Previewers;
+using Peek.FilePreviewer.Previewers.Interfaces;
 using Windows.ApplicationModel.Resources;
-using Windows.Foundation;
 
 namespace Peek.FilePreviewer
 {
@@ -33,7 +33,7 @@ public sealed partial class FilePreview : UserControl
             nameof(Item),
             typeof(IFileSystemItem),
             typeof(FilePreview),
-            new PropertyMetadata(false, async (d, e) => await ((FilePreview)d).OnFilePropertyChanged()));
+            new PropertyMetadata(false, async (d, e) => await ((FilePreview)d).OnItemPropertyChanged()));
 
         public static readonly DependencyProperty ScalingFactorProperty =
             DependencyProperty.Register(
@@ -80,12 +80,8 @@ private async void Previewer_PropertyChanged(object? sender, System.ComponentMod
 
         public IBrowserPreviewer? BrowserPreviewer => Previewer as IBrowserPreviewer;
 
-        public bool IsImageVisible => ImagePreviewer != null;
-
         public IUnsupportedFilePreviewer? UnsupportedFilePreviewer => Previewer as IUnsupportedFilePreviewer;
 
-        public bool IsUnsupportedPreviewVisible => UnsupportedFilePreviewer != null;
-
         public IFileSystemItem Item
         {
             get => (IFileSystemItem)GetValue(ItemProperty);
@@ -117,7 +113,7 @@ public Visibility IsPreviewVisible(IPreviewer? previewer, PreviewState? state)
             return isValidPreview ? Visibility.Visible : Visibility.Collapsed;
         }
 
-        private async Task OnFilePropertyChanged()
+        private async Task OnItemPropertyChanged()
         {
             // Cancel previous loading task
             _cancellationTokenSource.Cancel();
@@ -258,11 +254,6 @@ private async Task UpdateImageTooltipAsync(CancellationToken cancellationToken)
             string dateModifiedFormatted = string.IsNullOrEmpty(dateModified) ? string.Empty : "\n" + ReadableStringHelper.FormatResourceString("PreviewTooltip_DateModified", dateModified);
             sb.Append(dateModifiedFormatted);
 
-            cancellationToken.ThrowIfCancellationRequested();
-            Size? dimensions = await Task.Run(Item.GetImageSize);
-            string dimensionsFormatted = dimensions == null ? string.Empty : "\n" + ReadableStringHelper.FormatResourceString("PreviewTooltip_Dimensions", dimensions.Value.Width, dimensions.Value.Height);
-            sb.Append(dimensionsFormatted);
-
             cancellationToken.ThrowIfCancellationRequested();
             ulong bytes = await Task.Run(Item.GetSizeInBytes);
             string fileSize = ReadableStringHelper.BytesToReadableString(bytes);

src/modules/peek/Peek.FilePreviewer/Peek.FilePreviewer.csproj

@@ -44,4 +44,8 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Previewers\DrivePreviewer\" />
+  </ItemGroup>
 </Project>

src/modules/peek/Peek.FilePreviewer/Previewers/ImagePreviewer/ImagePreviewer.cs

@@ -16,6 +16,7 @@
 using Peek.Common.Helpers;
 using Peek.Common.Models;
 using Peek.FilePreviewer.Previewers.Helpers;
+using Peek.FilePreviewer.Previewers.Interfaces;
 using Windows.Foundation;
 
 namespace Peek.FilePreviewer.Previewers

src/modules/peek/Peek.FilePreviewer/Previewers/IImagePreviewer.cs → src/modules/peek/Peek.FilePreviewer/Previewers/Interfaces/IImagePreviewer.cs

@@ -3,10 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Media.Imaging;
 using Windows.Foundation;
 
-namespace Peek.FilePreviewer.Previewers
+namespace Peek.FilePreviewer.Previewers.Interfaces
 {
     public interface IImagePreviewer : IPreviewer
     {

src/modules/peek/Peek.UI/App.xaml.cs

@@ -4,7 +4,11 @@
 
 using System;
 using ManagedCommon;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.UI.Xaml;
+using Peek.FilePreviewer;
+using Peek.UI.Views;
 using WinUIEx;
 
 namespace Peek.UI
@@ -16,14 +20,49 @@ public partial class App : Application
     {
         public static int PowerToysPID { get; set; }
 
+        public IHost Host
+        {
+            get;
+        }
+
+        private Window? Window { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="App"/> class.
         /// Initializes the singleton application object.  This is the first line of authored code
         /// executed, and as such is the logical equivalent of main() or WinMain().
         /// </summary>
         public App()
         {
-            this.InitializeComponent();
+            InitializeComponent();
+
+            Host = Microsoft.Extensions.Hosting.Host.
+            CreateDefaultBuilder().
+            UseContentRoot(AppContext.BaseDirectory).
+            ConfigureServices((context, services) =>
+            {
+                // Core Services
+                services.AddTransient<NeighboringItemsQuery>();
+
+                // Views and ViewModels
+                services.AddTransient<TitleBar>();
+                services.AddTransient<FilePreview>();
+                services.AddTransient<MainWindowViewModel>();
+            }).
+            Build();
+
+            UnhandledException += App_UnhandledException;
+        }
+
+        public static T GetService<T>()
+            where T : class
+        {
+            if ((App.Current as App)!.Host.Services.GetService(typeof(T)) is not T service)
+            {
+                throw new ArgumentException($"{typeof(T)} needs to be registered in ConfigureServices within App.xaml.cs.");
+            }
+
+            return service;
         }
 
         /// <summary>
@@ -44,12 +83,14 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
                 }
             }
 
-            window = new MainWindow();
+            Window = new MainWindow();
 
-            window.Activate();
-            window.Hide();
+            Window.Activate();
+            Window.Hide();
         }
 
-        private Window? window;
+        private void App_UnhandledException(object sender, Microsoft.UI.Xaml.UnhandledExceptionEventArgs e)
+        {
+        }
     }
 }

src/modules/peek/Peek.UI/Extensions/IShellItemExtensions.cs

@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.IO;
+using Peek.Common.Models;
+
+namespace Peek.UI.Extensions
+{
+    public static class IShellItemExtensions
+    {
+        public static IFileSystemItem ToIFileSystemItem(this IShellItem shellItem)
+        {
+            string path = string.Empty;
+            try
+            {
+                path = shellItem.GetDisplayName(Windows.Win32.UI.Shell.SIGDN.SIGDN_FILESYSPATH);
+            }
+            catch (Exception)
+            {
+                // TODO: Handle cases that do not have a file system path like Recycle Bin.
+            }
+
+            return File.Exists(path) ? new FileItem(path) : new FolderItem(path);
+        }
+    }
+}