Skip to content

More idiomatic usage of ConcurrentDictionary #2221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 8, 2023
Merged

More idiomatic usage of ConcurrentDictionary #2221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lib/PuppeteerSharp/ChromeTargetManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,12 @@ private void OnTargetInfoChanged(TargetCreatedResponse e)
_discoveredTargetsByTargetId[e.TargetInfo.TargetId] = e.TargetInfo;

if (_ignoredTargets.Contains(e.TargetInfo.TargetId) ||
!_attachedTargetsByTargetId.ContainsKey(e.TargetInfo.TargetId) ||
!_attachedTargetsByTargetId.TryGetValue(e.TargetInfo.TargetId, out var target) ||
!e.TargetInfo.Attached)
{
return;
}

_attachedTargetsByTargetId.TryGetValue(e.TargetInfo.TargetId, out var target);
TargetChanged?.Invoke(this, new TargetChangedArgs { Target = target, TargetInfo = e.TargetInfo });
}

Expand Down
4 changes: 1 addition & 3 deletions lib/PuppeteerSharp/FirefoxTargetManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,11 @@ private void Connection_SessionDetached(object sender, SessionEventArgs e)

private void OnTargetCreated(TargetCreatedResponse e)
{
if (_discoveredTargetsByTargetId.ContainsKey(e.TargetInfo.TargetId))
if (!_discoveredTargetsByTargetId.TryAdd(e.TargetInfo.TargetId, e.TargetInfo))
{
return;
}

_discoveredTargetsByTargetId[e.TargetInfo.TargetId] = e.TargetInfo;

if (e.TargetInfo.Type == TargetType.Browser && e.TargetInfo.Attached)
{
var browserTarget = _targetFactoryFunc(e.TargetInfo, null);
Expand Down
30 changes: 3 additions & 27 deletions lib/PuppeteerSharp/NetworkEventManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,7 @@ internal void Forget(string requestId)
}

internal List<ResponseReceivedExtraInfoResponse> ResponseExtraInfo(string networkRequestId)
{
if (!_responseReceivedExtraInfoMap.ContainsKey(networkRequestId))
{
_responseReceivedExtraInfoMap.AddOrUpdate(
networkRequestId,
new List<ResponseReceivedExtraInfoResponse>(),
(_, __) => new List<ResponseReceivedExtraInfoResponse>());
}

_responseReceivedExtraInfoMap.TryGetValue(networkRequestId, out var result);
return result;
}
=> _responseReceivedExtraInfoMap.GetOrAdd(networkRequestId, static _ => new());

internal void QueueRedirectInfo(string fetchRequestId, RedirectInfo redirectInfo)
=> QueuedRedirectInfo(fetchRequestId).Add(redirectInfo);
Expand All @@ -59,12 +48,7 @@ internal RedirectInfo TakeQueuedRedirectInfo(string fetchRequestId)

internal ResponseReceivedExtraInfoResponse ShiftResponseExtraInfo(string networkRequestId)
{
if (!_responseReceivedExtraInfoMap.ContainsKey(networkRequestId))
{
_responseReceivedExtraInfoMap.TryAdd(networkRequestId, new List<ResponseReceivedExtraInfoResponse>());
}

_responseReceivedExtraInfoMap.TryGetValue(networkRequestId, out var list);
var list = _responseReceivedExtraInfoMap.GetOrAdd(networkRequestId, static _ => new());
var result = list.FirstOrDefault();

if (result != null)
Expand Down Expand Up @@ -125,14 +109,6 @@ internal void ForgetQueuedEventGroup(string networkRequestId)
=> _queuedEventGroupMap.TryRemove(networkRequestId, out _);

private List<RedirectInfo> QueuedRedirectInfo(string fetchRequestId)
{
if (!_queuedRedirectInfoMap.ContainsKey(fetchRequestId))
{
_queuedRedirectInfoMap.TryAdd(fetchRequestId, new List<RedirectInfo>());
}

_queuedRedirectInfoMap.TryGetValue(fetchRequestId, out var result);
return result;
}
=> _queuedRedirectInfoMap.GetOrAdd(fetchRequestId, static _ => new());
}
}
4 changes: 1 addition & 3 deletions lib/PuppeteerSharp/Page.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1700,13 +1700,11 @@ private async Task AddConsoleMessageAsync(ConsoleType type, IJSHandle[] values,

private async Task ExposeFunctionAsync(string name, Delegate puppeteerFunction)
{
if (_pageBindings.ContainsKey(name))
if (!_pageBindings.TryAdd(name, puppeteerFunction))
{
throw new PuppeteerException($"Failed to add page binding with name {name}: window['{name}'] already exists!");
}

_pageBindings.TryAdd(name, puppeteerFunction);

const string addPageBinding = @"function addPageBinding(type, bindingName) {
const binding = window[bindingName];
window[bindingName] = (...args) => {
Expand Down