From 18acea332159e95859868badd555c3fcac430166 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Mon, 7 Feb 2022 08:47:28 +1100 Subject: [PATCH] remove dup RegisterBookmarkFile & update condition --- .../ChromiumBookmarkLoader.cs | 2 -- .../Commands/BookmarkLoader.cs | 4 ---- .../FirefoxBookmarkLoader.cs | 4 ++-- Plugins/Flow.Launcher.Plugin.Program/Main.cs | 4 ++-- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs index c32f60af3..a49f8cb94 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs @@ -34,8 +34,6 @@ namespace Flow.Launcher.Plugin.BrowserBookmark if (!File.Exists(path)) return new(); - Main.RegisterBookmarkFile(path); - var bookmarks = new List(); 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 index 284255498..40d10b26f 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/BookmarkLoader.cs +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/BookmarkLoader.cs @@ -3,10 +3,6 @@ using System.Linq; using Flow.Launcher.Infrastructure; using Flow.Launcher.Plugin.BrowserBookmark.Models; using Flow.Launcher.Plugin.SharedModels; -using Microsoft.AspNetCore.Authentication; -using System.IO; -using System.Threading.Channels; -using System.Threading.Tasks; namespace Flow.Launcher.Plugin.BrowserBookmark.Commands { diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs index 9d29b9c41..892e18ddd 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs @@ -9,7 +9,7 @@ namespace Flow.Launcher.Plugin.BrowserBookmark { public class FirefoxBookmarkLoader : IBookmarkLoader { - private const string QueryAllBookmarks = @"SELECT moz_places.url, moz_bookmarks.title + private const string queryAllBookmarks = @"SELECT moz_places.url, moz_bookmarks.title FROM moz_places INNER JOIN moz_bookmarks ON ( moz_bookmarks.fk NOT NULL AND moz_bookmarks.title NOT NULL AND moz_bookmarks.fk = moz_places.id @@ -37,7 +37,7 @@ namespace Flow.Launcher.Plugin.BrowserBookmark using var dbConnection = new SQLiteConnection(dbPath); // Open connection to the database file and execute the query dbConnection.Open(); - var reader = new SQLiteCommand(QueryAllBookmarks, dbConnection).ExecuteReader(); + var reader = new SQLiteCommand(queryAllBookmarks, dbConnection).ExecuteReader(); // return results in List format bookmarkList = reader.Select( diff --git a/Plugins/Flow.Launcher.Plugin.Program/Main.cs b/Plugins/Flow.Launcher.Plugin.Program/Main.cs index 3f89d63d3..cf5d68a18 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Main.cs +++ b/Plugins/Flow.Launcher.Plugin.Program/Main.cs @@ -212,11 +212,11 @@ namespace Flow.Launcher.Plugin.Program return; if (_uwps.Any(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier)) - _uwps.FirstOrDefault(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier)! + _uwps.FirstOrDefault(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier) .Enabled = false; if (_win32s.Any(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier)) - _win32s.FirstOrDefault(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier)! + _win32s.FirstOrDefault(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier) .Enabled = false; _settings.DisabledProgramSources