Skip to content

Update to SearchAPIRequest.cs #8

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

Open
BenYarbro wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to SearchAPIRequest.cs #8

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
32 changes: 27 additions & 5 deletions Piplapis/Search/SearchAPIRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Net;
using Newtonsoft.Json;
Expand All @@ -16,7 +16,9 @@

namespace Pipl.APIs.Search
{
/**
using System.Threading;

/**
* A request to Pipl's Search API.
* <p/>
* Sending the request and getting the response is very simple and can be done
Expand Down Expand Up @@ -326,20 +328,22 @@ public SearchAPIResponse Send(bool strictValidation = true)
* Send the request and return the response or raise SearchAPIError.
* <p/>
*
* @param cancellationToken A CancellationToken to be used to cancel the operation.
* @param strictValidation A bool argument that's passed to the
* validateQueryParams method.
* @return A task that runs the request asyncronously
* @throws ArgumentException Raises ArgumentException (raised from validateQueryParams)
* @throws IOException IOException
*/
public Task<SearchAPIResponse> SendAsync(bool strictValidation = true)
public Task<SearchAPIResponse> SendAsync(CancellationToken cancellationToken, bool strictValidation = true)
{
ValidateQueryParams(strictValidation);
ValidateQueryParams(strictValidation);
TaskCompletionSource<SearchAPIResponse> taskCompletionSource = new TaskCompletionSource<SearchAPIResponse>();

using (WebClient client = new WebClient())
{
client.Headers.Add("User-Agent", ClientUserAgent);
cancellationToken.Register(client.CancelAsync);
client.Headers.Add("User-Agent", ClientUserAgent);
Uri uri = new Uri(Url);
client.UploadValuesCompleted += (s, e) =>
{
Expand All @@ -350,6 +354,24 @@ public Task<SearchAPIResponse> SendAsync(bool strictValidation = true)

return taskCompletionSource.Task;
}

/**
* Overload of SendAsync() to support older code without CancellationToken.
* <p/>
*
* @param strictValidation A bool argument that's passed to the
* validateQueryParams method.
* @return A task that runs the request asyncronously
* @throws ArgumentException Raises ArgumentException (raised from validateQueryParams)
* @throws IOException IOException
*/
public Task<SearchAPIResponse> SendAsync(bool strictValidation = true)
{
using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
{
return SendAsync(cancellationTokenSource.Token, strictValidation);
}
}

private void _searchUploadValuesCompletedEventHandler(WebClient client, UploadValuesCompletedEventArgs e, TaskCompletionSource<SearchAPIResponse> taskCompletionSource)
{
Expand Down