ydeng/props
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added response to cancellation token to AliExpressShop.

Browse Source
This commit is contained in:
Harrison Deng 2021-05-10 20:03:08 -05:00
parent 3218fbf4e3
commit 04d4caf2bd
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AliExpressShop/Shop.cs
View File

@ -64,7 +64,7 @@ namespace AliExpressShop
public IAsyncEnumerator<ProductListing> GetAsyncEnumerator(CancellationToken cancellationToken = default) public IAsyncEnumerator<ProductListing> GetAsyncEnumerator(CancellationToken cancellationToken = default)
{ {
return new ShopEnumerator(query, currency, http, UseProxy); return new ShopEnumerator(cancellationToken, query, currency, http, UseProxy);
} }
} }
} }

16
src/AliExpressShop/ShopEnumerator.cs
View File

@ -4,6 +4,7 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Net.Http; using System.Net.Http;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using GameServiceWarden.Core.Collection; using GameServiceWarden.Core.Collection;
using MultiShop.ShopFramework; using MultiShop.ShopFramework;
@ -13,6 +14,7 @@ namespace AliExpressShop
{ {
class ShopEnumerator : IAsyncEnumerator<ProductListing> class ShopEnumerator : IAsyncEnumerator<ProductListing>
{ {
private CancellationToken cancellationToken;
private LRUCache<(string, Currency), float> conversionCache = new LRUCache<(string, Currency), float>(); private LRUCache<(string, Currency), float> conversionCache = new LRUCache<(string, Currency), float>();
private string query; private string query;
private Currency currency; private Currency currency;
@ -24,8 +26,9 @@ namespace AliExpressShop
public ProductListing Current {get; private set;} public ProductListing Current {get; private set;}
public ShopEnumerator(string query, Currency currency, HttpClient http, bool useProxy = true) public ShopEnumerator(CancellationToken cancellationToken, string query, Currency currency, HttpClient http, bool useProxy = true)
{ {
this.cancellationToken = cancellationToken;
this.query = query; this.query = query;
this.currency = currency; this.currency = currency;
this.http = http; this.http = http;
@ -64,19 +67,20 @@ namespace AliExpressShop
double waitTime = DELAY - (DateTime.Now - start).TotalMilliseconds; double waitTime = DELAY - (DateTime.Now - start).TotalMilliseconds;
if (waitTime > 0) { if (waitTime > 0) {
Logger.Log($"Delaying next page by {waitTime}ms.", LogLevel.Debug); Logger.Log($"Delaying next page by {waitTime}ms.", LogLevel.Debug);
await Task.Delay((int)Math.Ceiling(waitTime)); await Task.Delay((int)Math.Ceiling(waitTime), cancellationToken);
} }
Logger.Log($"Sending GET request with uri: {request.RequestUri}", LogLevel.Debug); Logger.Log($"Sending GET request with uri: {request.RequestUri}", LogLevel.Debug);
HttpResponseMessage response = await http.SendAsync(request); HttpResponseMessage response = await http.SendAsync(request, cancellationToken);
start = DateTime.Now; start = DateTime.Now;
string data = null; string data = null;
using (StreamReader reader = new StreamReader(await response.Content.ReadAsStreamAsync())) using (StreamReader reader = new StreamReader(await response.Content.ReadAsStreamAsync(cancellationToken)))
{ {
string line = null; string line = null;
while ((line = await reader.ReadLineAsync()) != null && data == null) while ((line = await reader.ReadLineAsync()) != null && data == null)
{ {
if (cancellationToken.IsCancellationRequested) throw new OperationCanceledException();
if (dataLineRegex.IsMatch(line)) { if (dataLineRegex.IsMatch(line)) {
data = line.Trim(); data = line.Trim();
Logger.Log($"Found line with listing data.", LogLevel.Debug); Logger.Log($"Found line with listing data.", LogLevel.Debug);
@ -229,9 +233,9 @@ namespace AliExpressShop
private async Task<float> FetchConversion(string from, Currency to) { private async Task<float> FetchConversion(string from, Currency to) {
if (from.Equals(to.ToString())) return 1; if (from.Equals(to.ToString())) return 1;
HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, string.Format("https://api.exchangerate.host/convert?from={0}&to={1}", from, to)); HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, string.Format("https://api.exchangerate.host/convert?from={0}&to={1}", from, to));
HttpResponseMessage response = await http.SendAsync(request); HttpResponseMessage response = await http.SendAsync(request, cancellationToken);
string results = null; string results = null;
using (StreamReader reader = new StreamReader(await response.Content.ReadAsStreamAsync())) using (StreamReader reader = new StreamReader(await response.Content.ReadAsStreamAsync(cancellationToken)))
{ {
results = await reader.ReadToEndAsync(); results = await reader.ReadToEndAsync();
} }