Further Refactor & add CustomBrowsers UI

taooceros · taooceros · commit d51579967bad · 2021-09-22T18:09:30.000-05:00
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromeBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromeBookmarkLoader.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using Flow.Launcher.Plugin.BrowserBookmark.Models;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs
@@ -1,4 +1,5 @@
-﻿using Microsoft.AspNetCore.Authentication;
+﻿using Flow.Launcher.Plugin.BrowserBookmark.Models;
+using Microsoft.AspNetCore.Authentication;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.Json;
@@ -28,6 +29,8 @@ protected List<Bookmark> LoadBookmarks(string browserDataPath, string name)
         
         protected List<Bookmark> LoadBookmarksFromFile(string path, string source)
         {
+            if (!File.Exists(path))
+                return new();
             var bookmarks = new List<Bookmark>();
             using var jsonDocument = JsonDocument.Parse(File.ReadAllText(path));
             if (!jsonDocument.RootElement.TryGetProperty("roots", out var rootElement))
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/BookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/BookmarkLoader.cs
@@ -1,11 +1,12 @@
 ﻿using System.Collections.Generic;
 using System.Linq;
 using Flow.Launcher.Infrastructure;
+using Flow.Launcher.Plugin.BrowserBookmark.Models;
 using Flow.Launcher.Plugin.SharedModels;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Commands
 {
-    internal static class Bookmarks
+    internal static class BookmarkLoader
     {
         internal static MatchResult MatchProgram(Bookmark bookmark, string queryString)
         {
@@ -18,23 +19,24 @@ internal static MatchResult MatchProgram(Bookmark bookmark, string queryString)
 
         internal static List<Bookmark> LoadAllBookmarks()
         {
-            var allbookmarks = new List<Bookmark>();
 
             var chromeBookmarks = new ChromeBookmarkLoader();
             var mozBookmarks = new FirefoxBookmarkLoader();
             var edgeBookmarks = new EdgeBookmarkLoader();
 
+            var allBookmarks = new List<Bookmark>();
+
             //TODO: Let the user select which browser's bookmarks are displayed
             // Add Firefox bookmarks
-            mozBookmarks.GetBookmarks().ForEach(x => allbookmarks.Add(x));
+            allBookmarks.AddRange(mozBookmarks.GetBookmarks());
 
             // Add Chrome bookmarks
-            chromeBookmarks.GetBookmarks().ForEach(x => allbookmarks.Add(x));
+            allBookmarks.AddRange(chromeBookmarks.GetBookmarks());
 
             // Add Edge (Chromium) bookmarks
-            edgeBookmarks.GetBookmarks().ForEach(x => allbookmarks.Add(x));
+            allBookmarks.AddRange(edgeBookmarks.GetBookmarks());
 
-            return allbookmarks.Distinct().ToList();
+            return allBookmarks.Distinct().ToList();
         }
     }
-}
+}
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/CustomChromiumBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/CustomChromiumBookmarkLoader.cs
@@ -0,0 +1,14 @@
+﻿using Flow.Launcher.Plugin.BrowserBookmark.Models;
+using System.Collections.Generic;
+
+namespace Flow.Launcher.Plugin.BrowserBookmark
+{
+    public class CustomChromiumBookmarkLoader : ChromiumBookmarkLoader
+    {
+        public string BrowserDataPath { get; init; }
+        public string BookmarkFilePath { get; init; }
+        public string BrowserName { get; init; }
+
+        public override List<Bookmark> GetBookmarks() => BrowserDataPath != null ? LoadBookmarks(BrowserDataPath, BrowserName) : LoadBookmarksFromFile(BookmarkFilePath, BrowserName);
+    }
+}
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/EdgeBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/EdgeBookmarkLoader.cs
@@ -1,3 +1,4 @@
+using Flow.Launcher.Plugin.BrowserBookmark.Models;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs
@@ -1,3 +1,4 @@
+using Flow.Launcher.Plugin.BrowserBookmark.Models;
 using System;
 using System.Collections.Generic;
 using System.Data.SQLite;
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
@@ -69,4 +69,8 @@
     <PackageReference Include="UnidecodeSharp" Version="1.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Remove="Bookmark.cs" />
+  </ItemGroup>
+
 </Project>
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/IBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/IBookmarkLoader.cs
@@ -1,4 +1,5 @@
-﻿using System.Collections.Generic;
+﻿using Flow.Launcher.Plugin.BrowserBookmark.Models;
+using System.Collections.Generic;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark
 {
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs
@@ -26,7 +26,7 @@ public void Init(PluginInitContext context)
             
             _settings = context.API.LoadSettingJsonStorage<Settings>();
 
-            cachedBookmarks = Bookmarks.LoadAllBookmarks();
+            cachedBookmarks = BookmarkLoader.LoadAllBookmarks();
         }
 
         public List<Result> Query(Query query)
@@ -45,7 +45,7 @@ public List<Result> Query(Query query)
                     Title = c.Name,
                     SubTitle = c.Url,
                     IcoPath = @"Images\bookmark.png",
-                    Score = Bookmarks.MatchProgram(c, param).Score,
+                    Score = BookmarkLoader.MatchProgram(c, param).Score,
                     Action = _ =>
                     {
                         if (_settings.OpenInNewBrowserWindow)
@@ -93,7 +93,7 @@ public void ReloadData()
         {
             cachedBookmarks.Clear();
 
-            cachedBookmarks = Bookmarks.LoadAllBookmarks();
+            cachedBookmarks = BookmarkLoader.LoadAllBookmarks();
         }
 
         public string GetTranslatedPluginTitle()
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/Bookmark.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/Bookmark.cs
@@ -1,11 +1,6 @@
-﻿using BinaryAnalysis.UnidecodeSharp;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+﻿using System.Collections.Generic;
 
-
-namespace Flow.Launcher.Plugin.BrowserBookmark
+namespace Flow.Launcher.Plugin.BrowserBookmark.Models
 {
     // Source may be important in the future
     public record Bookmark(string Name, string Url, string Source = "")
@@ -21,5 +16,7 @@ public virtual bool Equals(Bookmark other)
         {
             return other != null && Name == other.Name && Url == other.Url;
         }
+
+        public List<CustomBrowser> CustomBrowsers { get; set; }= new();
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/CustomBrowser.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/CustomBrowser.cs
@@ -0,0 +1,8 @@
+﻿namespace Flow.Launcher.Plugin.BrowserBookmark.Models
+{
+    public class CustomBrowser : BaseModel
+    {
+        public string Name { get; set; }
+        public string Path { get; set; }
+    }
+}
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/Settings.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/Settings.cs
@@ -1,9 +1,27 @@
-﻿namespace Flow.Launcher.Plugin.BrowserBookmark.Models
+﻿using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Text.Json.Serialization;
+
+namespace Flow.Launcher.Plugin.BrowserBookmark.Models
 {
     public class Settings : BaseModel
     {
         public bool OpenInNewBrowserWindow { get; set; } = true;
 
         public string BrowserPath { get; set; }
+
+        public ObservableCollection<CustomBrowser> CustomBrowsers { get; set; } = new()
+        {
+            new CustomBrowser
+            {
+                Name="awefawef",
+                Path="awefawef"
+            },
+            new CustomBrowser
+            {
+                Name = "awefawefawefawef",
+                Path = "aweawefawfawef"
+            }
+        };
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
@@ -0,0 +1,36 @@
+﻿<Window x:Class="Flow.Launcher.Plugin.BrowserBookmark.Views.CustomBrowserSettingWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Flow.Launcher.Plugin.BrowserBookmark.Models"
+        mc:Ignorable="d"
+        Title="CustomBrowserSetting" Height="300" Width="400"
+        >
+    <Window.DataContext>
+        <local:CustomBrowser/>
+    </Window.DataContext>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+            <RowDefinition/>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="4*"/>
+            <ColumnDefinition Width="6*"/>
+        </Grid.ColumnDefinitions>
+        <TextBlock Grid.Row="0" Grid.Column="0" Text="Browser Name" FontSize="15" 
+                   HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        <TextBlock Grid.Row="1" Grid.Column="0" Text="Browser Path" FontSize="15" 
+                   HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding Name}"
+                   HorizontalAlignment="Center" VerticalAlignment="Center" Width="100" Height="30"/>
+        <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Path}"
+                   HorizontalAlignment="Center" VerticalAlignment="Center" Width="200" Height="30"/>
+        <StackPanel HorizontalAlignment="Right" Grid.Row="2" Orientation="Horizontal" Grid.Column="1" Height="60">
+            <Button Content="Confirm" Margin="15" Click="ConfirmEditCustomBrowser"/>
+            <Button Content="Cancel" Margin="15"/>
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs
@@ -0,0 +1,45 @@
+﻿using Flow.Launcher.Plugin.BrowserBookmark.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace Flow.Launcher.Plugin.BrowserBookmark.Views
+{
+    /// <summary>
+    /// Interaction logic for CustomBrowserSetting.xaml
+    /// </summary>
+    public partial class CustomBrowserSettingWindow : Window
+    {
+        private CustomBrowser currentCustomBrowser;
+        public CustomBrowserSettingWindow(CustomBrowser browser)
+        {
+            InitializeComponent();
+            currentCustomBrowser = browser;
+            DataContext = new CustomBrowser
+            {
+                Name = browser.Name,
+                Path = browser.Path
+            };
+        }
+
+        private void ConfirmEditCustomBrowser(object sender, RoutedEventArgs e)
+        {
+            if (DataContext is CustomBrowser editedBrowser)
+            {
+                currentCustomBrowser.Name = editedBrowser.Name;
+                currentCustomBrowser.Path = editedBrowser.Path;
+            }
+            Close();
+        }
+    }
+}
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
@@ -5,14 +5,16 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              mc:Ignorable="d"
              Background="White"
-             d:DesignHeight="300" d:DesignWidth="500">
+             d:DesignHeight="300" d:DesignWidth="500"
+             DataContext="{Binding RelativeSource={RelativeSource Self}, Path=Settings}">
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="90" />
-            <RowDefinition />
+            <RowDefinition Height="50" />
+            <RowDefinition Height="80"/>
+            <RowDefinition Height="auto"/>
         </Grid.RowDefinitions>
         <StackPanel>
-            <Grid Grid.Row="0" Margin="40 40 0 0">
+            <Grid Grid.Row="0" Margin="40 20 0 0">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="160" />
                     <ColumnDefinition Width="140"/>
@@ -28,12 +30,40 @@
                              Click="OnNewTabClick" />
             </Grid>
         </StackPanel>
-        <StackPanel VerticalAlignment="Top" Grid.Row="1" Height="106" Margin="41,13,0,0">
+        <StackPanel Orientation="Horizontal" VerticalAlignment="Top" Grid.Row="1" Height="60" Margin="25,13,0,0">
             <Label Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_setBrowserFromPath}"
-                   Height="28" Margin="0,0,155,0" HorizontalAlignment="Left" Width="290"/>
-            <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Height="34" TextWrapping="NoWrap" VerticalAlignment="Top" Width="311" RenderTransformOrigin="0.502,-1.668" TextChanged="OnBrowserPathTextChanged" />
+                   Height="28" Margin="10"/>
+            <TextBox x:Name="browserPathBox" 
+                     HorizontalAlignment="Left" 
+                     Height="30" 
+                     TextWrapping="NoWrap" 
+                     VerticalAlignment="Center"
+                     Text="{Binding BrowserPath}"
+                     Width="240"
+                     Margin="10"/>
             <Button x:Name="viewButton" Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_choose}"
-                    HorizontalAlignment="Left" Margin="340,-35,-1,0" Width="100" Height="34" Click="OnChooseClick" FontSize="14" />
+                    HorizontalAlignment="Left" Margin="10" Width="100" Height="30" Click="OnChooseClick" FontSize="14" />
+        </StackPanel>
+        <StackPanel Grid.Row="2" Orientation="Vertical">
+            <TextBlock Text="CustomBrowsers" Margin="10"/>
+            <ListView Grid.Row="2" ItemsSource="{Binding CustomBrowsers}"
+                      Margin="10"
+                      BorderBrush="DarkGray"
+                      BorderThickness="1"
+                      Style="{StaticResource {x:Static GridView.GridViewStyleKey}}"
+                      Height="auto"
+                      Name="CustomBrowsers">
+                <ListView.View>
+                    <GridView>
+                        <GridViewColumn DisplayMemberBinding="{Binding Name}" Header="Browser Name"/>
+                        <GridViewColumn DisplayMemberBinding="{Binding Path}" Header="Path"/>
+                    </GridView>
+                </ListView.View>
+            </ListView>
+            <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                <Button Content="Add Custom Browser" Margin="10" Click="NewCustomBrowser"/>
+                <Button Content="Delete Custom Browser" Margin="10" Click="DeleteCustomBrowser"/>
+            </StackPanel>
         </StackPanel>
     </Grid>
 </UserControl>
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using Flow.Launcher.Plugin.BrowserBookmark.Models;`
`1`	`2`	`using System;`
`2`	`3`	`using System.Collections.Generic;`
`3`	`4`	`using System.IO;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System.Collections.Generic;`
	`1`	`+using Flow.Launcher.Plugin.BrowserBookmark.Models;`
	`2`	`+using System.Collections.Generic;`
`2`	`3`
`3`	`4`	`namespace Flow.Launcher.Plugin.BrowserBookmark`
`4`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public void Init(PluginInitContext context)`
`26`	`26`
`27`	`27`	`_settings = context.API.LoadSettingJsonStorage<Settings>();`
`28`	`28`
`29`		`- cachedBookmarks = Bookmarks.LoadAllBookmarks();`
	`29`	`+ cachedBookmarks = BookmarkLoader.LoadAllBookmarks();`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public List<Result> Query(Query query)`
`@@ -45,7 +45,7 @@ public List<Result> Query(Query query)`
`45`	`45`	`Title = c.Name,`
`46`	`46`	`SubTitle = c.Url,`
`47`	`47`	`IcoPath = @"Images\bookmark.png",`
`48`		`- Score = Bookmarks.MatchProgram(c, param).Score,`
	`48`	`+ Score = BookmarkLoader.MatchProgram(c, param).Score,`
`49`	`49`	`Action = _ =>`
`50`	`50`	`{`
`51`	`51`	`if (_settings.OpenInNewBrowserWindow)`
`@@ -93,7 +93,7 @@ public void ReloadData()`
`93`	`93`	`{`
`94`	`94`	`cachedBookmarks.Clear();`
`95`	`95`
`96`		`- cachedBookmarks = Bookmarks.LoadAllBookmarks();`
	`96`	`+ cachedBookmarks = BookmarkLoader.LoadAllBookmarks();`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`public string GetTranslatedPluginTitle()`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,6 @@`
`1`		`-using BinaryAnalysis.UnidecodeSharp;`
`2`		`-using System;`
`3`		`-using System.Collections.Generic;`
`4`		`-using System.Linq;`
`5`		`-using System.Text;`
	`1`	`+using System.Collections.Generic;`
`6`	`2`
`7`		`-`
`8`		`-namespace Flow.Launcher.Plugin.BrowserBookmark`
	`3`	`+namespace Flow.Launcher.Plugin.BrowserBookmark.Models`
`9`	`4`	`{`
`10`	`5`	`// Source may be important in the future`
`11`	`6`	`public record Bookmark(string Name, string Url, string Source = "")`
`@@ -21,5 +16,7 @@ public virtual bool Equals(Bookmark other)`
`21`	`16`	`{`
`22`	`17`	`return other != null && Name == other.Name && Url == other.Url;`
`23`	`18`	`}`
	`19`	`+`
	`20`	`+ public List<CustomBrowser> CustomBrowsers { get; set; }= new();`
`24`	`21`	`}`
`25`	`22`	`}`