prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Resolved: a few issues reported by coderabbitai

Browse source
This commit is contained in:
Andrzej Martyna 2025-12-29 09:13:35 +01:00
parent b390645718
commit 876cbfd006
2 changed files with 68 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Plugins/Flow.Launcher.Plugin.BrowserBookmark/Tabs/TabsCache.cs
View file

@ -12,7 +12,16 @@ internal class TabsCache
private readonly HashSet<string> _knownTabs = new();
private readonly object sync = new();
private static string RuntimeIdToKey(AutomationElement elem) => elem != null ? string.Join("-", elem.GetRuntimeId()) : "NULL";
private static string RuntimeIdToKey(AutomationElement elem) {
try
{
return elem != null ? string.Join("-", elem.GetRuntimeId()) : null;
}
catch (ElementNotAvailableException)
{
return null;
}
}
public bool Empty()
{
@ -26,18 +35,19 @@ internal class TabsCache
{
lock (sync)
{
_knownTabs.Add(RuntimeIdToKey(tab));
var key = RuntimeIdToKey(tab);
if (key != null)
{
_knownTabs.Add(key);
}
}
}
public void Add(IEnumerable<AutomationElement> tabs)
{
lock (sync)
foreach (var tab in tabs)
{
foreach (var tab in tabs)
{
_knownTabs.Add(RuntimeIdToKey(tab));
}
Add(tab);
}
}
@ -45,7 +55,12 @@ internal class TabsCache
{
lock (sync)
{
return _knownTabs.Contains(RuntimeIdToKey(tab));
var key = RuntimeIdToKey(tab);
if (key != null)
{
return _knownTabs.Contains(key);
}
}
return false;
}
}

74
Plugins/Flow.Launcher.Plugin.BrowserBookmark/Tabs/TabsTracker.cs
View file

@ -48,7 +48,8 @@ public class TabsTracker : IDisposable
foreach (var r in results)
{
var bookmarkUrl = ((BookmarkAttributes)r.ContextData).Url;
if (UrlToBrowserTab.TryGetValue(bookmarkUrl, out var existingTab))
var existingTab = GetExistingTab(bookmarkUrl);
if (existingTab != null)
{
Context.API.LogDebug(ClassName, $"Mapped {bookmarkUrl}");
@ -96,6 +97,18 @@ public class TabsTracker : IDisposable
}
}
private BrowserTab GetExistingTab(string url)
{
lock (_sync)
{
if (UrlToBrowserTab.TryGetValue(url, out var existingTab))
{
return existingTab;
}
}
return null;
}
private void Remove(string url)
{
lock (_sync)
@ -122,38 +135,41 @@ public class TabsTracker : IDisposable
return;
int pid = element.Current.ProcessId;
Process? process = null;
try { process = Process.GetProcessById(pid); }
catch { /* could disappear */ }
if (process is null)
return;
var chromium = chromiumProcessNames.Contains(process.ProcessName);
var firefox = firefoxProcessNames.Contains(process.ProcessName);
if (!chromium && !firefox)
return; // not a browser
Context.API.LogDebug(ClassName, $"The active browser is {process.ProcessName}");
var rootElement = AutomationElement.FromHandle(process.MainWindowHandle);
if (rootElement == null)
return;
Context.API.LogDebug(ClassName, $"The root element is {rootElement.Current.Name}");
var currentTab = _walker.GetCurrentTabFromWindow(rootElement, process, CancellationToken.None);
if (currentTab != null)
try
{
lock (_sync)
{
Context.API.LogDebug(ClassName, $"Registering {urlToBind} as tab: {currentTab.Title}");
UrlToBrowserTab[urlToBind] = currentTab;
_expectedUrl = null;
using var process = Process.GetProcessById(pid);
var chromium = chromiumProcessNames.Contains(process.ProcessName);
var firefox = firefoxProcessNames.Contains(process.ProcessName);
if (!chromium && !firefox)
return; // not a browser
// required to take the tab into account by Flow Launcher main UI search window
Context.API.ReQuery();
Context.API.LogDebug(ClassName, $"The active browser is {process.ProcessName}");
var rootElement = AutomationElement.FromHandle(process.MainWindowHandle);
if (rootElement == null)
return;
Context.API.LogDebug(ClassName, $"The root element is {rootElement.Current.Name}");
var currentTab = _walker.GetCurrentTabFromWindow(rootElement, process, CancellationToken.None);
if (currentTab != null)
{
lock (_sync)
{
Context.API.LogDebug(ClassName, $"Registering {urlToBind} as tab: {currentTab.Title}");
UrlToBrowserTab[urlToBind] = currentTab;
_expectedUrl = null;
// required to take the tab into account by Flow Launcher main UI search window
Context.API.ReQuery();
}
}
}
catch (ArgumentException)
{
// No such process / not running
return;
}
}
catch (Exception ex)
{