Merge pull request #2457 from Flow-Launcher/browserbookmark-fix

add a safety check for getproperty
Flow-Launcher · Feb 4, 2024 · 15dc94b · 15dc94b
2 parents d63d176 + c2ff04f
commit 15dc94b
Showing 1 changed file with 28 additions and 16 deletions.
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs
@@ -2,12 +2,14 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text.Json;
+using Flow.Launcher.Infrastructure.Logger;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark
 {
     public abstract class ChromiumBookmarkLoader : IBookmarkLoader
     {
         public abstract List<Bookmark> GetBookmarks();
+
         protected List<Bookmark> LoadBookmarks(string browserDataPath, string name)
         {
             var bookmarks = new List<Bookmark>();
@@ -19,53 +21,63 @@ protected List<Bookmark> LoadBookmarks(string browserDataPath, string name)
                 var bookmarkPath = Path.Combine(profile, "Bookmarks");
                 if (!File.Exists(bookmarkPath))
                     continue;
-                
+
                 Main.RegisterBookmarkFile(bookmarkPath);
 
                 var source = name + (Path.GetFileName(profile) == "Default" ? "" : $" ({Path.GetFileName(profile)})");
                 bookmarks.AddRange(LoadBookmarksFromFile(bookmarkPath, source));
             }
+
             return bookmarks;
         }
 
         protected List<Bookmark> LoadBookmarksFromFile(string path, string source)
         {
             if (!File.Exists(path))
-                return new();
+                return new List<Bookmark>();
 
             var bookmarks = new List<Bookmark>();
             using var jsonDocument = JsonDocument.Parse(File.ReadAllText(path));
             if (!jsonDocument.RootElement.TryGetProperty("roots", out var rootElement))
-                return new();
+                return new List<Bookmark>();
             foreach (var folder in rootElement.EnumerateObject())
             {
                 if (folder.Value.ValueKind == JsonValueKind.Object)
                     EnumerateFolderBookmark(folder.Value, bookmarks, source);
             }
+
             return bookmarks;
         }
 
-        private void EnumerateFolderBookmark(JsonElement folderElement, List<Bookmark> bookmarks, string source)
+        private void EnumerateFolderBookmark(JsonElement folderElement, ICollection<Bookmark> bookmarks,
+            string source)
         {
             if (!folderElement.TryGetProperty("children", out var childrenElement))
                 return;
             foreach (var subElement in childrenElement.EnumerateArray())
             {
-                switch (subElement.GetProperty("type").GetString())
+                if (subElement.TryGetProperty("type", out var type))
                 {
-                    case "folder":
-                    case "workspace": // Edge Workspace
-                        EnumerateFolderBookmark(subElement, bookmarks, source);
-                        break;
-                    default:
-                        bookmarks.Add(new Bookmark(
-                            subElement.GetProperty("name").GetString(),
-                            subElement.GetProperty("url").GetString(),
-                            source));
-                        break;
+                    switch (type.GetString())
+                    {
+                        case "folder":
+                        case "workspace": // Edge Workspace
+                            EnumerateFolderBookmark(subElement, bookmarks, source);
+                            break;
+                        default:
+                            bookmarks.Add(new Bookmark(
+                                subElement.GetProperty("name").GetString(),
+                                subElement.GetProperty("url").GetString(),
+                                source));
+                            break;
+                    }
+                }
+                else
+                {
+                    Log.Error(
+                        $"ChromiumBookmarkLoader: EnumerateFolderBookmark: type property not found for {subElement.GetString()}");
                 }
             }
-
         }
     }
 }