Merge branch 'BrowserBookmark-big-bug-fix' of https://github.com/dcog989/Flow.Launcher into BrowserBookmark-big-bug-fix

Author: dcog989

Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj

@@ -27,6 +27,7 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <PackageReadmeFile>Readme.md</PackageReadmeFile>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(APPVEYOR)' == 'True'">

Flow.Launcher/MainWindow.xaml.cs

@@ -44,6 +44,9 @@ public partial class MainWindow : IDisposable
 
         #region Private Fields
 
+        // Class Name
+        private static readonly string ClassName = nameof(MainWindow);
+
         // Dependency Injection
         private readonly Settings _settings;
         private readonly Theme _theme;
@@ -1256,14 +1259,21 @@ private void QueryTextBox_OnCopy(object sender, ExecutedRoutedEventArgs e)
 
         private void QueryTextBox_OnPaste(object sender, DataObjectPastingEventArgs e)
         {
-            var isText = e.SourceDataObject.GetDataPresent(DataFormats.UnicodeText, true);
-            if (isText)
-            {
-                var text = e.SourceDataObject.GetData(DataFormats.UnicodeText) as string;
-                text = text.Replace(Environment.NewLine, " ");
-                DataObject data = new DataObject();
-                data.SetData(DataFormats.UnicodeText, text);
-                e.DataObject = data;
+            try
+            {
+                var isText = e.SourceDataObject.GetDataPresent(DataFormats.UnicodeText, true);
+                if (isText)
+                {
+                    var text = e.SourceDataObject.GetData(DataFormats.UnicodeText) as string;
+                    text = text.Replace(Environment.NewLine, " ");
+                    DataObject data = new DataObject();
+                    data.SetData(DataFormats.UnicodeText, text);
+                    e.DataObject = data;
+                }
+            }
+            catch (Exception ex)
+            {
+                App.API.LogException(ClassName, "Failed to paste text", ex);
             }
         }
 

Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs

@@ -6,7 +6,6 @@
 using System.Threading.Tasks;
 using Flow.Launcher.Plugin.BrowserBookmark.Helper;
 using Flow.Launcher.Plugin.BrowserBookmark.Models;
-using Microsoft.Data.Sqlite;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark;
 
@@ -121,7 +120,7 @@ private static void EnumerateFolderBookmark(JsonElement folderElement, ICollecti
             }
             else
             {
-                Main._context.API.LogError(ClassName, $"type property not found for {subElement.ToString()}");
+                Main._context.API.LogError(ClassName, $"type property not found for {subElement.GetString() ?? string.Empty}");
             }
         }
     }

Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs

@@ -61,6 +61,7 @@ protected List<Bookmark> GetBookmarksFromPath(string placesPath)
             using var command = new SqliteCommand(QueryAllBookmarks, dbConnection);
             using var reader = command.ExecuteReader();
 
+            // Put results in list
             while (reader.Read())
             {
                 bookmarks.Add(new Bookmark(
@@ -70,7 +71,6 @@ protected List<Bookmark> GetBookmarksFromPath(string placesPath)
                 ));
             }
 
-
             // Load favicons after loading bookmarks
             if (Main._settings.EnableFavicons)
             {
@@ -238,6 +238,33 @@ public static string MsixPlacesPath
         }
     }
 
+    /*
+        Current profiles.ini structure example as of Firefox version 69.0.1
+
+        [Install736426B0AF4A39CB]
+        Default=Profiles/7789f565.default-release   <== this is the default profile this plugin will get the bookmarks from. When opened Firefox will load the default profile
+        Locked=1
+
+        [Profile2]
+        Name=dummyprofile
+        IsRelative=0
+        Path=C:\t6h2yuq8.dummyprofile  <== Note this is a custom location path for the profile user can set, we need to cater for this in code.
+
+        [Profile1]
+        Name=default
+        IsRelative=1
+        Path=Profiles/cydum7q4.default
+        Default=1
+
+        [Profile0]
+        Name=default-release
+        IsRelative=1
+        Path=Profiles/7789f565.default-release
+
+        [General]
+        StartWithLastProfile=1
+        Version=2
+    */
     private static string GetProfileIniPath(string profileFolderPath)
     {
         var profileIni = Path.Combine(profileFolderPath, @"profiles.ini");

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs

@@ -1,13 +1,12 @@
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Input;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Flow.Launcher.Plugin.BrowserBookmark.Models;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Views;
 
 [INotifyPropertyChanged]
-public partial class SettingsControl : UserControl
+public partial class SettingsControl
 {
     public Settings Settings { get; }
     public CustomBrowser SelectedCustomBrowser { get; set; }
@@ -73,7 +72,8 @@ private void NewCustomBrowser(object sender, RoutedEventArgs e)
     {
         var newBrowser = new CustomBrowser();
         var window = new CustomBrowserSettingWindow(newBrowser);
-        if (window.ShowDialog() == true)
+        var result = window.ShowDialog() ?? false;
+        if (result)
         {
             Settings.CustomChromiumBrowsers.Add(newBrowser);
             _ = Main.ReloadAllBookmarksAsync();