Specify extensions to file picker

MRmlik12 · Jun 8, 2024 · 2854ee8 · 2854ee8
1 parent 607f0d5
commit 2854ee8
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 12 deletions.
diff --git a/src/NoteSHR.Browser/AppBundle/fileUtils.js b/src/NoteSHR.Browser/AppBundle/fileUtils.js
@@ -1,7 +1,8 @@
-export function openFilePicker() {
+export function openFilePicker(fileTypes) {
     return new Promise((resolve, reject) => {
         const input = document.createElement('input');
         input.type = 'file';
+        input.accept = fileTypes.join(',');
 
         input.addEventListener('change', () => {
             if (input.files.length > 0) {

diff --git a/src/NoteSHR.Browser/BrowserFileService.cs b/src/NoteSHR.Browser/BrowserFileService.cs
@@ -11,9 +11,9 @@ public BrowserFileService()
         Task.Run(async () => await JSHost.ImportAsync("FileUtils", "./fileUtils.js"));
     }
 
-    public async Task<string?> GetFileUrl()
+    public async Task<string?> GetFileUrl(string[] fileTypes)
     {
-        var url = await FileUtilsEmbed.OpenFilePicker();
+        var url = await FileUtilsEmbed.OpenFilePicker(fileTypes);
 
         return url;
     }
@@ -27,7 +27,7 @@ public async Task SaveFile(string fileName, byte[] content)
 internal partial class FileUtilsEmbed
 {
     [JSImport("openFilePicker", "FileUtils")]
-    public static partial Task<string?> OpenFilePicker();
+    public static partial Task<string?> OpenFilePicker(string[] fileTypes);
 
     [JSImport("saveFile", "FileUtils")]
     public static partial Task SaveFile(string fileName, byte[] contents); 

diff --git a/src/NoteSHR.Core/FileTypeFilters.cs b/src/NoteSHR.Core/FileTypeFilters.cs
@@ -0,0 +1,11 @@
+using Avalonia.Platform.Storage;
+
+namespace NoteSHR.Core;
+
+public class FileTypeFilters
+{
+    public static FilePickerFileType Board = new ("NoteSHR Board File")
+    {
+        Patterns = new[] { "*.shr" }
+    };
+}
diff --git a/src/NoteSHR.Core/Services/IFileService.cs b/src/NoteSHR.Core/Services/IFileService.cs
@@ -2,6 +2,6 @@ namespace NoteSHR.Core.Services;
 
 public interface IFileService
 {
-    Task<string?> GetFileUrl();
+    Task<string?> GetFileUrl(string[] fileTypes);
     Task SaveFile(string fileName, byte[] content);
 }
diff --git a/src/NoteSHR/Components/Image/ImageComponentViewModel.cs b/src/NoteSHR/Components/Image/ImageComponentViewModel.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Reactive;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
@@ -24,7 +25,7 @@ public ImageComponentViewModel()
         {
             if (OperatingSystem.IsBrowser())
             {
-                var url = await App.FileService.GetFileUrl();
+                var url = await App.FileService.GetFileUrl(FilePickerFileTypes.ImageAll.Patterns!.Select(x => x.Remove(0, 1)).ToArray());
                 if (string.IsNullOrEmpty(url)) return;
 
                 Image = await HttpUtils.GetBitmapFromUrl(url);

diff --git a/src/NoteSHR/ViewModels/BoardViewModel.cs b/src/NoteSHR/ViewModels/BoardViewModel.cs
@@ -12,6 +12,7 @@
 using NoteSHR.Components.List;
 using NoteSHR.Components.NoteNode.EventArgs;
 using NoteSHR.Components.Text;
+using NoteSHR.Core;
 using NoteSHR.Core.EventArgs;
 using NoteSHR.Core.Helpers;
 using NoteSHR.Core.Models;
@@ -31,7 +32,6 @@ public BoardViewModel()
     {
         CreateNoteCommand = ReactiveCommand.Create((BoardPointerEventArgs e) =>
         {
-            LastMousePosition = e.Args.GetPosition(e.Source);
             if (e.Args.Source is not Canvas)
             {
                 if (e.Args.Source is not Grid header)
@@ -159,18 +159,19 @@ public BoardViewModel()
 
         ImportBoardCommand = ReactiveCommand.CreateFromTask(async (RoutedEventArgs args) =>
         {
-            string path;
-            if (OperatingSystem.IsBrowser())
+            string path; if (OperatingSystem.IsBrowser())
             {
-                path = await App.FileService.GetFileUrl();
+                path = await App.FileService.GetFileUrl(FileTypeFilters.Board.Patterns!.Select(x => x.Remove(0, 1)).ToArray());
                 if (string.IsNullOrEmpty(path)) return;
             }
             else
             {
                 var topLevel = TopLevel.GetTopLevel(args.Source as Visual);
+
                 var openFilePickerOptions = new FilePickerOpenOptions()
                 {
                     Title = Translations.SelectFile,
+                    FileTypeFilter = new [] { FileTypeFilters.Board },
                     AllowMultiple = false
                 };
 
@@ -192,8 +193,6 @@ public BoardViewModel()
     [Reactive] public bool DeleteMode { get; set; }
     [Reactive] public bool EditMode { get; set; }
 
-    private Point LastMousePosition { get; set; }
-
     public ReactiveCommand<BoardPointerEventArgs, Unit> CreateNoteCommand { get; set; }
     public ReactiveCommand<Guid, Unit> RemoveNote { get; set; }
     public ReactiveCommand<BoardPointerEventArgs, Unit> UpdateNoteLocation { get; set; }