Code cleanup

Jack251970 · Jack251970 · commit b475396ac36d · 2025-09-28T18:25:14.000+08:00
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs
@@ -1,15 +1,15 @@
-#nullable enable
-using Flow.Launcher.Plugin.BrowserBookmark.Models;
+﻿#nullable enable
 using System;
 using System.Collections.Generic;
-using System.Windows.Controls;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Windows.Controls;
+using Flow.Launcher.Plugin.BrowserBookmark.Models;
 using Flow.Launcher.Plugin.BrowserBookmark.Services;
-using System.ComponentModel;
-using System.Linq;
-using System.Collections.Specialized;
-using System.IO;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark;
 
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/Settings.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/Settings.cs
@@ -23,7 +23,7 @@ public bool LoadChromeBookmark
             }
         }
     }
-    
+
     public bool LoadFirefoxBookmark
     {
         get => _loadFirefoxBookmark;
@@ -36,7 +36,7 @@ public bool LoadFirefoxBookmark
             }
         }
     }
-    
+
     public bool LoadEdgeBookmark
     {
         get => _loadEdgeBookmark;
@@ -75,7 +75,7 @@ public bool EnableFavicons
             }
         }
     }
-    
+
     public bool FetchMissingFavicons
     {
         get => _fetchMissingFavicons;
@@ -88,7 +88,7 @@ public bool FetchMissingFavicons
             }
         }
     }
-    
+
     private ObservableCollection<CustomBrowser> _customBrowsers = new();
 
     public ObservableCollection<CustomBrowser> CustomBrowsers
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Services/BookmarkLoaderService.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Services/BookmarkLoaderService.cs
@@ -1,12 +1,12 @@
-#nullable enable
-using Flow.Launcher.Plugin.BrowserBookmark.Models;
+﻿#nullable enable
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Flow.Launcher.Plugin.BrowserBookmark.Models;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Services;
 
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Services/BrowserDetector.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Services/BrowserDetector.cs
@@ -1,8 +1,8 @@
-#nullable enable
-using Flow.Launcher.Plugin.BrowserBookmark.Models;
+﻿#nullable enable
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Flow.Launcher.Plugin.BrowserBookmark.Models;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Services;
 
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Services/ChromiumBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Services/ChromiumBookmarkLoader.cs
@@ -1,12 +1,12 @@
-#nullable enable
-using Flow.Launcher.Plugin.BrowserBookmark.Models;
+﻿#nullable enable
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Text.Json;
 using System.Threading;
+using Flow.Launcher.Plugin.BrowserBookmark.Models;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Services;
 
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Services/FaviconService.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Services/FaviconService.cs
@@ -1,6 +1,5 @@
-#nullable enable
+﻿#nullable enable
 
-using Flow.Launcher.Plugin.BrowserBookmark.Models;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -11,6 +10,7 @@
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Flow.Launcher.Plugin.BrowserBookmark.Models;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Services;
 
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Services/FirefoxBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Services/FirefoxBookmarkLoader.cs
@@ -1,12 +1,12 @@
-#nullable enable
-using Flow.Launcher.Plugin.BrowserBookmark.Models;
-using Microsoft.Data.Sqlite;
+﻿#nullable enable
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
+using Flow.Launcher.Plugin.BrowserBookmark.Models;
+using Microsoft.Data.Sqlite;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Services;
 
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Services/FirefoxProfileFinder.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Services/FirefoxProfileFinder.cs
@@ -1,4 +1,4 @@
-#nullable enable
+﻿#nullable enable
 using System;
 using System.IO;
 using System.Linq;
@@ -13,20 +13,20 @@ public static class FirefoxProfileFinder
         // Standard MSI installer path
         var standardPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), @"Mozilla\Firefox");
         var placesPath = GetPlacesPathFromProfileDir(standardPath);
-        
+
         return !string.IsNullOrEmpty(placesPath) ? placesPath : null;
     }
 
     public static string? GetFirefoxMsixPlacesPath()
     {
         var packagesPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Packages");
-        if (!Directory.Exists(packagesPath)) 
+        if (!Directory.Exists(packagesPath))
             return null;
 
         try
         {
             var firefoxPackageFolder = Directory.EnumerateDirectories(packagesPath, "Mozilla.Firefox*", SearchOption.TopDirectoryOnly).FirstOrDefault();
-            if (firefoxPackageFolder == null) 
+            if (firefoxPackageFolder == null)
                 return null;
 
             var profileFolderPath = Path.Combine(firefoxPackageFolder, @"LocalCache\Roaming\Mozilla\Firefox");
@@ -75,7 +75,7 @@ public static class FirefoxProfileFinder
             targetSection = profileSections.FirstOrDefault(s =>
                 Regex.IsMatch(s, @"^Name\s*=\s*default-release", RegexOptions.Multiline | RegexOptions.IgnoreCase) &&
                 Regex.IsMatch(s, @"^Default\s*=\s*1", RegexOptions.Multiline | RegexOptions.IgnoreCase));
-            
+
             // Find any profile marked as default.
             if (targetSection == null)
             {
@@ -87,19 +87,19 @@ public static class FirefoxProfileFinder
             {
                 targetSection = profileSections.FirstOrDefault();
             }
-            
-            if (targetSection == null) 
+
+            if (targetSection == null)
                 return null;
-            
+
             var pathMatch = Regex.Match(targetSection, @"^Path\s*=\s*(.+)", RegexOptions.Multiline | RegexOptions.IgnoreCase);
-            if (!pathMatch.Success) 
+            if (!pathMatch.Success)
                 return null;
 
             var pathValue = pathMatch.Groups[1].Value.Trim();
-            
+
             // IsRelative=0 means it's an absolute path. The default is relative (IsRelative=1).
             var isRelative = !Regex.IsMatch(targetSection, @"^IsRelative\s*=\s*0", RegexOptions.Multiline | RegexOptions.IgnoreCase);
-            
+
             var finalProfilePath = isRelative ? Path.Combine(profileFolderPath, pathValue.Replace('/', Path.DirectorySeparatorChar)) : pathValue;
             var finalPlacesDb = Path.Combine(finalProfilePath, "places.sqlite");
 
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Services/HtmlFaviconParser.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Services/HtmlFaviconParser.cs
@@ -1,9 +1,8 @@
-#nullable enable
+﻿#nullable enable
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
-using static Flow.Launcher.Plugin.BrowserBookmark.Services.FaviconService;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Services;
 
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Services/IBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Services/IBookmarkLoader.cs
@@ -1,6 +1,6 @@
-using Flow.Launcher.Plugin.BrowserBookmark.Models;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using System.Threading;
+using Flow.Launcher.Plugin.BrowserBookmark.Models;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Services;
 
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Services/ImageConverter.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Services/ImageConverter.cs
@@ -1,12 +1,12 @@
-#nullable enable
-using SkiaSharp;
-using Svg.Skia;
+﻿#nullable enable
 using System;
 using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Media.Imaging;
+using SkiaSharp;
+using Svg.Skia;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Services;
 
@@ -37,7 +37,7 @@ public ImageConverter(PluginInitContext context)
         ms.Position = 0;
         (pngData, size) = TryConvertIcoToPng(ms);
         if (pngData is not null) return (pngData, size);
-        
+
         ms.Position = 0;
         (pngData, size) = TryConvertBitmapToPng(ms);
         return (pngData, size);
@@ -100,7 +100,7 @@ private static (byte[]? PngData, int Size) TryConvertIcoToPng(Stream stream)
 
         return (null, 0);
     }
-    
+
     private (byte[]? PngData, int Size) TryConvertBitmapToPng(Stream stream)
     {
         try
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Services/LocalFaviconExtractor.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Services/LocalFaviconExtractor.cs
@@ -1,11 +1,11 @@
-#nullable enable
-using Flow.Launcher.Plugin.BrowserBookmark.Models;
-using Microsoft.Data.Sqlite;
+﻿#nullable enable
 using System;
 using System.IO;
 using System.IO.Compression;
 using System.Threading;
 using System.Threading.Tasks;
+using Flow.Launcher.Plugin.BrowserBookmark.Models;
+using Microsoft.Data.Sqlite;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Services;
 
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ViewModels/CustomBrowserSettingViewModel.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ViewModels/CustomBrowserSettingViewModel.cs
@@ -1,11 +1,11 @@
-#nullable enable
+﻿#nullable enable
+using System;
+using System.ComponentModel;
+using System.IO;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Flow.Launcher.Plugin.BrowserBookmark.Models;
 using Flow.Launcher.Plugin.BrowserBookmark.Services;
-using System;
-using System.ComponentModel;
-using System.IO;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.ViewModels;
 
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs
@@ -1,7 +1,7 @@
-﻿using Flow.Launcher.Plugin.BrowserBookmark.Models;
-using Flow.Launcher.Plugin.BrowserBookmark.ViewModels;
-using System.Windows;
+﻿using System.Windows;
 using System.Windows.Input;
+using Flow.Launcher.Plugin.BrowserBookmark.Models;
+using Flow.Launcher.Plugin.BrowserBookmark.ViewModels;
 using KeyEventArgs = System.Windows.Input.KeyEventArgs;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Views;

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public bool LoadChromeBookmark`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`}`
`26`		`-`
	`26`	`+`
`27`	`27`	`public bool LoadFirefoxBookmark`
`28`	`28`	`{`
`29`	`29`	`get => _loadFirefoxBookmark;`
`@@ -36,7 +36,7 @@ public bool LoadFirefoxBookmark`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`	`}`
`39`		`-`
	`39`	`+`
`40`	`40`	`public bool LoadEdgeBookmark`
`41`	`41`	`{`
`42`	`42`	`get => _loadEdgeBookmark;`
`@@ -75,7 +75,7 @@ public bool EnableFavicons`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`	`}`
`78`		`-`
	`78`	`+`
`79`	`79`	`public bool FetchMissingFavicons`
`80`	`80`	`{`
`81`	`81`	`get => _fetchMissingFavicons;`
`@@ -88,7 +88,7 @@ public bool FetchMissingFavicons`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`	`}`
`91`		`-`
	`91`	`+`
`92`	`92`	`private ObservableCollection<CustomBrowser> _customBrowsers = new();`
`93`	`93`
`94`	`94`	`public ObservableCollection<CustomBrowser> CustomBrowsers`