Improve favicon resolution

Exarilo · Oct 8, 2024 · d312f21 · d312f21
1 parent 823055b
commit d312f21
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/Main.cs b/Main.cs
@@ -104,9 +104,16 @@ private async Task<Result> CreateResult(SettingItem settingItem, List<string> ar
             if (!Uri.TryCreate(updatedUrl, UriKind.Absolute, out Uri uri))
                 return null;
 
-            string iconPath = string.IsNullOrEmpty(settingItem.IconPath)
-                ? await GetFaviconUrl(uri) ?? "Images\\app.png"
-                : settingItem.IconPath;
+            string iconPath = settingItem.IconPath;
+
+            if (string.IsNullOrEmpty(iconPath))
+            {
+                string faviconUrl = $"https://www.google.com/s2/favicons?domain_url={uri.Host}&sz=48";
+                if (await IsFaviconAccessible(faviconUrl))
+                    iconPath = faviconUrl;
+                else
+                     iconPath = "Images\\app.png"; 
+            }
 
             return new Result
             {
@@ -122,25 +129,20 @@ private async Task<Result> CreateResult(SettingItem settingItem, List<string> ar
             };
         }
 
-        private async Task<string> GetFaviconUrl(Uri uri)
+        private async Task<bool> IsFaviconAccessible(string faviconUrl)
         {
             try
             {
-                string faviconUrl = $"{uri.Scheme}://{uri.Host}/favicon.ico";
-
                 using (HttpClient client = new HttpClient())
                 {
-                    var request = new HttpRequestMessage(HttpMethod.Head, faviconUrl);
-                    var response = await client.SendAsync(request);
-
-                    if (response.IsSuccessStatusCode)
-                    {
-                        return faviconUrl;
-                    }
+                    var response = await client.GetAsync(faviconUrl);
+                    return response.IsSuccessStatusCode;
                 }
             }
-            catch {}
-            return null;
+            catch
+            {
+                return false; 
+            }
         }
 
         private Result CreateBulkOpenResult(string searchTerm, IEnumerable<SettingItem> itemsToOpen, List<string> args)

diff --git a/plugin.json b/plugin.json
@@ -4,7 +4,7 @@
   "Name": "LinkOpener",
   "Description": "Allows you to open URLs using keywords set in the settings",
   "Author": "Exarilo",
-  "Version": "1.0.9",
+  "Version": "1.1.0",
   "Language": "csharp",
   "Website": "https://github.com/Exarilo/Flow.Launcher.Plugin.LinkOpener",
   "IcoPath": "Images\\app.png",