gnh1201/welsonjs
1
0
Fork 0
mirror of https://github.com/gnh1201/welsonjs.git synced 2025-11-27 18:11:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix thread-safety issue with concurrent list access.

Browse Source
This commit is contained in:
Namhyeon Go 2025-05-24 15:51:37 +09:00
parent d9f9d3e38b
commit 9b64204771
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
WelsonJS.Toolkit/WelsonJS.Launcher/ResourceTools/Completion.cs
View File

@ -9,6 +9,7 @@ using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Xml.Linq; using System.Xml.Linq;
using System.Net.Http; using System.Net.Http;
using System.Collections.Concurrent;
namespace WelsonJS.Launcher.ResourceTools namespace WelsonJS.Launcher.ResourceTools
{ {
@ -17,7 +18,7 @@ namespace WelsonJS.Launcher.ResourceTools
private readonly ResourceServer Server; private readonly ResourceServer Server;
private readonly HttpClient _httpClient; private readonly HttpClient _httpClient;
private const string Prefix = "completion/"; private const string Prefix = "completion/";
private List<string> DiscoverdExecutables = new List<string>(); private readonly ConcurrentBag<string> DiscoveredExecutables = new ConcurrentBag<string>();
public Completion(ResourceServer server, HttpClient httpClient) public Completion(ResourceServer server, HttpClient httpClient)
{ {
@ -42,7 +43,7 @@ namespace WelsonJS.Launcher.ResourceTools
try try
{ {
CompletionItem[] completionItems = DiscoverdExecutables List<CompletionItem> completionItems = DiscoveredExecutables.ToList()
.Where(exec => exec.IndexOf(word, 0, StringComparison.OrdinalIgnoreCase) > -1) .Where(exec => exec.IndexOf(word, 0, StringComparison.OrdinalIgnoreCase) > -1)
.Take(100) // Limit the number of results .Take(100) // Limit the number of results
.Select(exec => new CompletionItem .Select(exec => new CompletionItem
@ -52,7 +53,7 @@ namespace WelsonJS.Launcher.ResourceTools
Documentation = $"An executable file: {exec}", Documentation = $"An executable file: {exec}",
InsertText = exec InsertText = exec
}) })
.ToArray(); .ToList();
XElement response = new XElement("suggestions", XElement response = new XElement("suggestions",
completionItems.Select(item => new XElement("item", completionItems.Select(item => new XElement("item",
@ -98,7 +99,7 @@ namespace WelsonJS.Launcher.ResourceTools
var match = Regex.Match(uninstallString, @"(?<=""|^)([a-zA-Z]:\\[^""]+\.exe)", RegexOptions.IgnoreCase); var match = Regex.Match(uninstallString, @"(?<=""|^)([a-zA-Z]:\\[^""]+\.exe)", RegexOptions.IgnoreCase);
if (match.Success && File.Exists(match.Value)) if (match.Success && File.Exists(match.Value))
{ {
DiscoverdExecutables.Add(match.Value); AddDiscoveredExecutables(new List<string> { match.Value });
} }
} }
} }
@ -154,7 +155,7 @@ namespace WelsonJS.Launcher.ResourceTools
{ {
if (!Directory.Exists(path)) if (!Directory.Exists(path))
{ {
Trace.TraceWarning("Directory does not exist: {0}", path); Trace.TraceInformation("Directory does not exist: {0}", path);
return; return;
} }
@ -164,11 +165,19 @@ namespace WelsonJS.Launcher.ResourceTools
.OrderByDescending(f => new FileInfo(f).Length) .OrderByDescending(f => new FileInfo(f).Length)
.ToList(); .ToList();
DiscoverdExecutables.AddRange(executableFiles); AddDiscoveredExecutables(executableFiles);
} }
catch (Exception ex) catch (Exception ex)
{ {
Trace.TraceWarning("Error enumerating executables in '{0}': {1}", path, ex.Message); Trace.TraceInformation("Error enumerating executables in '{0}': {1}", path, ex.Message);
}
}
private void AddDiscoveredExecutables(List<string> executableFiles)
{
foreach (var executableFile in executableFiles)
{
DiscoveredExecutables.Add(executableFile);
} }
} }
} }