Skip to content

Commit f4db044

Browse files
DecimationDecimation
committed
Refactoring pt 2
1 parent b844f6c commit f4db044

File tree

13 files changed

+101
-76
lines changed

13 files changed

+101
-76
lines changed

‎SmartImage.Lib/Engines/Results/Model/ISourceItemParseable.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@
33

44
namespace SmartImage.Lib.Engines.Results.Model;
55

6-
public interface ISearchResultItems<T> where T : SearchResultItem
7-
{
8-
9-
public static abstract T Parse(T[] t, SearchResult r);
10-
11-
}
12-
136
public interface ISourceItemParseable<in TSource, out TItem>
147
where TItem : SearchResultItem
158
{

‎SmartImage.Lib/Engines/Search/Ascii2DEngine.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public async ValueTask<bool> ApplyCookiesAsync(ICookiesSource source, Cancellati
5959
return false;
6060
}
6161

62-
var cookies = await source.GetOrLoadCookiesAsync(ct);
62+
var cookies = await source.GetOrLoadCookiesAsync(ct).ConfigureAwait(false);
6363

6464
foreach (var bck in cookies)
6565
{
@@ -141,7 +141,7 @@ protected override ValueTask<IList<INode>> GetSource(IDocument d)
141141
return ValueTask.FromResult<IList<INode>>(nodes);
142142
}
143143

144-
protected override async ValueTask<IEnumerable<Ascii2DItem>> GetItems(IList<INode> rs, SearchResult r)
144+
protected override ValueTask<IEnumerable<Ascii2DItem>> GetItems(IList<INode> rs, SearchResult r)
145145
{
146146
var buf = new List<Ascii2DItem>(rs.Count);
147147

@@ -151,7 +151,7 @@ protected override async ValueTask<IEnumerable<Ascii2DItem>> GetItems(IList<INod
151151
buf.Add(item);
152152
}
153153

154-
return buf;
154+
return ValueTask.FromResult<IEnumerable<Ascii2DItem>>(buf);
155155
}
156156

157157
protected override async Task<IDocument> GetDocumentAsync(SearchResult sr, SearchQuery query,
@@ -184,7 +184,7 @@ protected override async Task<IDocument> GetDocumentAsync(SearchResult sr, Searc
184184

185185
var msg = new HttpRequestMessage(HttpMethod.Get, origin);
186186

187-
var fsr = await FlareSolverrClient.Value.Clearance.Solverr.SolveAsync(msg);
187+
var fsr = await FlareSolverrClient.Value.Clearance.Solverr.SolveAsync(msg).ConfigureAwait(false);
188188
var cookies = fsr.Solution.Cookies;
189189
var newUrl = fsr.Solution.Url;
190190

@@ -205,27 +205,27 @@ protected override async Task<IDocument> GetDocumentAsync(SearchResult sr, Searc
205205
s.ExceptionHandled = true;
206206
207207
})*/
208-
.GetAsync(cancellationToken: token);
208+
.GetAsync(cancellationToken: token).ConfigureAwait(false);
209209

210210

211211
// var res1 = await FlareSolverrClient.Client.SendAsync(msg, token);
212212
// str = await res1.Content.ReadAsStringAsync(token);
213-
str = await res.GetStringAsync();
213+
str = await res.GetStringAsync().ConfigureAwait(false);
214214

215215
}
216216
else
217217
{
218-
using var res = await GetResponseByUrlAsync(origin, token);
218+
using var res = await GetResponseByUrlAsync(origin, token).ConfigureAwait(false);
219219

220220
if (res.StatusCode == (int) HttpStatusCode.BadGateway)
221221
{
222222
return null;
223223
}
224224

225-
str = await res.GetStringAsync();
225+
str = await res.GetStringAsync().ConfigureAwait(false);
226226
}
227227

228-
var document = await parser.ParseDocumentAsync(str, token);
228+
var document = await parser.ParseDocumentAsync(str, token).ConfigureAwait(false);
229229

230230
return document;
231231
}
@@ -266,7 +266,7 @@ private async Task<IFlurlResponse> GetResponseByUrlAsync(Url origin, Cancellatio
266266
s.ExceptionHandled = true;
267267
268268
})*/
269-
.GetAsync(cancellationToken: token);
269+
.GetAsync(cancellationToken: token).ConfigureAwait(false);
270270
return res;
271271
}
272272

‎SmartImage.Lib/Engines/Search/EHentaiEngine.cs‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ protected override async Task<IDocument> GetDocumentAsync(SearchResult sr, Searc
133133
}
134134
};
135135

136-
using var flurlRes = await Client.SendAsync(req, cancellationToken: token);
136+
using var flurlRes = await Client.SendAsync(req, cancellationToken: token).ConfigureAwait(false);
137137
using var httpRes = flurlRes.ResponseMessage;
138138

139139
/*using var flurlRes = await LookupUrl.
@@ -156,7 +156,7 @@ protected override async Task<IDocument> GetDocumentAsync(SearchResult sr, Searc
156156
Debug.Assert(old == sr.Results[0]);
157157

158158
// Debug.WriteLine($"{sr.RawUrl}");
159-
var content = await httpRes.Content.ReadAsStringAsync(token);
159+
var content = await httpRes.Content.ReadAsStringAsync(token).ConfigureAwait(false);
160160

161161
// var content2 = await sr.RawUrl.GetStringAsync(cancellationToken: token);
162162

@@ -169,7 +169,7 @@ protected override async Task<IDocument> GetDocumentAsync(SearchResult sr, Searc
169169
}
170170

171171
var parser = new HtmlParser();
172-
return await parser.ParseDocumentAsync(content, token);
172+
return await parser.ParseDocumentAsync(content, token).ConfigureAwait(false);
173173
}
174174

175175
protected override ValueTask<IList<INode>> GetSource(IDocument d)
@@ -186,7 +186,7 @@ protected override ValueTask<IList<INode>> GetSource(IDocument d)
186186
return ValueTask.FromResult((IList<INode>) array);
187187
}
188188

189-
protected override async ValueTask<IEnumerable<EhResult>> GetItems(IList<INode> n, SearchResult r)
189+
protected override ValueTask<IEnumerable<EhResult>> GetItems(IList<INode> n, SearchResult r)
190190
{
191191
var buf = new List<EhResult>(n.Count);
192192

@@ -196,7 +196,7 @@ protected override async ValueTask<IEnumerable<EhResult>> GetItems(IList<INode>
196196
buf.Add(eh);
197197
}
198198

199-
return buf;
199+
return ValueTask.FromResult<IEnumerable<EhResult>>(buf);
200200
}
201201
/*
202202
* Default result layout is [Compact]
@@ -254,7 +254,7 @@ public async ValueTask<bool> ApplyCookiesAsync(ICookiesSource source, Cancellati
254254
}
255255
}
256256

257-
var response = await GetSessionAsync();
257+
var response = await GetSessionAsync().ConfigureAwait(false);
258258
return IsLoggedIn = response.ResponseMessage.IsSuccessStatusCode;
259259

260260
return true;
@@ -290,7 +290,7 @@ public async Task<bool> LoginAsync(string username, string password)
290290
User_Agent = HttpUtilities.UserAgent
291291
})
292292
.WithCookies(out var cj)
293-
.PostAsync(content);
293+
.PostAsync(content).ConfigureAwait(false);
294294

295295
/*foreach (var fc in fcc) {
296296
Cookies.Add(fc.AsCookie());
@@ -301,7 +301,7 @@ public async Task<bool> LoginAsync(string username, string password)
301301
Jar.AddOrReplace(fc);
302302
}
303303

304-
var res2 = await GetSessionAsync();
304+
var res2 = await GetSessionAsync().ConfigureAwait(false);
305305

306306
return IsLoggedIn = res2.ResponseMessage.IsSuccessStatusCode;
307307
}
@@ -492,6 +492,7 @@ public static EhResult ParseResultItem(INode n, SearchResult sr)
492492
var sb = eh.Tags.Select(t => $"{t.Key}: {t.Value.QuickJoin()}").QuickJoin(" | ");
493493

494494
eh.Description = sb;
495+
eh.Artist = eh.Author;
495496

496497
/*var gl1c = n.ChildNodes[0];
497498
var gl2c = n.ChildNodes[1];

‎SmartImage.Lib/Engines/Search/FluffleEngine.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
7272

7373
// c.AddString("platforms", null)
7474
// c.AddString("createLink", false)
75-
}, cancellationToken: token);
75+
}, cancellationToken: token).ConfigureAwait(false);
7676

7777
if (response is { ResponseMessage: { IsSuccessStatusCode: false } }) {
78-
var er = await response.GetJsonAsync<FluffleErrorCode>();
78+
var er = await response.GetJsonAsync<FluffleErrorCode>().ConfigureAwait(false);
7979

8080
sr.ErrorMessage = $"{er.Message}: {er.Code}";
8181
sr.Status = SearchResultStatus.UnknownError;
@@ -89,7 +89,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
8989
goto ret;
9090
}
9191

92-
var fr = await response.GetJsonAsync<FluffleResponse>();
92+
var fr = await response.GetJsonAsync<FluffleResponse>().ConfigureAwait(false);
9393
sr.Results.EnsureCapacity(sr.Results.Count + fr.Results.Count);
9494
foreach (FluffleResult result in fr.Results) {
9595
var item = await result.ToItem(sr);

‎SmartImage.Lib/Engines/Search/GoogleLensEngine.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,12 @@ protected override async Task<IDocument> GetDocumentAsync(SearchResult sr, Searc
164164
{
165165

166166
req = SearchUrlAsync(query, token);
167-
res = await req;
167+
res = await req.ConfigureAwait(false);
168168
}
169169
else if (query.Source.IsFile)
170170
{
171171
req = SearchFileAsync(query, token);
172-
res = await req;
172+
res = await req.ConfigureAwait(false);
173173
}
174174
else
175175
{
@@ -189,9 +189,9 @@ protected override async Task<IDocument> GetDocumentAsync(SearchResult sr, Searc
189189
.GetAsync(cancellationToken: token);
190190
191191
var resData = await res2.GetStreamAsync();*/
192-
var str = await res.GetStringAsync();
192+
var str = await res.GetStringAsync().ConfigureAwait(false);
193193

194-
var resData = await res.GetStreamAsync();
194+
var resData = await res.GetStreamAsync().ConfigureAwait(false);
195195

196196
var parser = new HtmlParser(new HtmlParserOptions()
197197
{
@@ -201,7 +201,7 @@ protected override async Task<IDocument> GetDocumentAsync(SearchResult sr, Searc
201201
IsEmbedded = true
202202
});
203203

204-
var doc = await parser.ParseDocumentAsync(resData);
204+
var doc = await parser.ParseDocumentAsync(resData).ConfigureAwait(false);
205205

206206
// BrowsingContext.New(Configuration.Default.WithCookies().WithCss());
207207

@@ -251,7 +251,7 @@ public async ValueTask<bool> ApplyCookiesAsync(ICookiesSource source, Cancellati
251251
return false;
252252
}
253253

254-
var ck = await source.GetOrLoadCookiesAsync(token);
254+
var ck = await source.GetOrLoadCookiesAsync(token).ConfigureAwait(false);
255255
var nids = ck.OfType<FirefoxCookie>().Where(x => x.Name == "NID" && x.Host.Contains("google.com"));
256256
var nid = nids.FirstOrDefault();
257257

‎SmartImage.Lib/Engines/Search/IqdbEngine.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ private async Task<IDocument> GetDocumentAsync(SearchQuery query, CancellationTo
116116

117117
if (response != null)
118118
{
119-
var s = await response.GetStringAsync();
119+
var s = await response.GetStringAsync().ConfigureAwait(false);
120120

121121
var parser = new HtmlParser();
122122
document = await parser.ParseDocumentAsync(s, ct).ConfigureAwait(false);

‎SmartImage.Lib/Engines/Search/RepostSleuthEngine.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
6767
target_match_percent = 90,
6868
filter_dead_matches = false,
6969
target_days_old = 0
70-
}).GetAsync(cancellationToken: token);
70+
}).GetAsync(cancellationToken: token).ConfigureAwait(false);
7171

72-
var s = await response.GetStreamAsync();
72+
var s = await response.GetStreamAsync().ConfigureAwait(false);
7373
obj = JsonSerializer.Deserialize<RepostSleuthResult>(s, JsOptions);
7474
}
7575
catch (JsonException e) {

‎SmartImage.Lib/Engines/Search/SauceNaoEngine.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
7474
if (UsingAPI) {
7575
Logger.LogInformation("[{Name}] API key: {Auth}", Name, Authentication);
7676

77-
await GetAPIResultsAsync(query, result);
77+
await GetAPIResultsAsync(query, result).ConfigureAwait(false);
7878
}
7979
else {
80-
await GetWebResultsAsync(query, result);
80+
await GetWebResultsAsync(query, result).ConfigureAwait(false);
8181
}
8282
}
8383
catch (Exception e) {
@@ -161,9 +161,9 @@ private async ValueTask GetWebResultsAsync(SearchQuery query, SearchResult sr)
161161

162162
}
163163

164-
});
164+
}).ConfigureAwait(false);
165165

166-
html = await response.GetStringAsync();
166+
html = await response.GetStringAsync().ConfigureAwait(false);
167167

168168
/*
169169
* Daily Search Limit Exceeded.
@@ -187,7 +187,7 @@ private async ValueTask GetWebResultsAsync(SearchQuery query, SearchResult sr)
187187
/*var raw=await GetRawUrlAsync(query);
188188
var html2=await raw.GetStringAsync();*/
189189

190-
var doc = await docp.ParseDocumentAsync(html);
190+
var doc = await docp.ParseDocumentAsync(html).ConfigureAwait(false);
191191

192192
var results = doc.Body.SelectNodes("//div[@class='result']");
193193

@@ -231,9 +231,9 @@ private async ValueTask GetAPIResultsAsync(SearchQuery url, SearchResult sr)
231231

232232
var res = await Client.Request(URL_API)
233233
.WithTimeout(Timeout)
234-
.PostAsync(content);
234+
.PostAsync(content).ConfigureAwait(false);
235235

236-
var c = await res.GetStringAsync();
236+
var c = await res.GetStringAsync().ConfigureAwait(false);
237237

238238
if (res.ResponseMessage.StatusCode == HttpStatusCode.Forbidden) {
239239
// return;

‎SmartImage.Lib/Engines/Search/TinEyeEngine.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public override ValueTask<bool> ApplyConfigAsync(SearchConfig cfg, CancellationT
3030
}
3131
public override async ValueTask<bool> VerifyQueryAsync(SearchQuery q)
3232
{
33-
var ok = await q.Source.AllocImageAsync();
33+
var ok = await q.Source.AllocImageAsync().ConfigureAwait(false);
3434

3535
if (ok) {
3636
if (q.Source.Image.Width >= 10000) {
@@ -39,7 +39,7 @@ public override async ValueTask<bool> VerifyQueryAsync(SearchQuery q)
3939

4040
}
4141

42-
return await base.VerifyQueryAsync(q);
42+
return await base.VerifyQueryAsync(q).ConfigureAwait(false);
4343
}
4444

4545
public override async Task<SearchResult> GetResultAsync(SearchQuery query, CancellationToken token = default)
@@ -57,12 +57,12 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
5757
{
5858
//
5959
b.AddString("url", query.Upload);
60-
}, cancellationToken: token);
60+
}, cancellationToken: token).ConfigureAwait(false);
6161

6262
TinEyeRoot tinEyeRoot = null;
6363

6464
try {
65-
var str = await response.GetStringAsync();
65+
var str = await response.GetStringAsync().ConfigureAwait(false);
6666

6767
tinEyeRoot = (TinEyeRoot) JsonSerializer.Deserialize(str, typeof(TinEyeRoot), Search.TinEyeContext.Default);
6868

‎SmartImage.Lib/Engines/Search/TraceMoeEngine.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
5555

5656
TraceMoeRootObject tm = null;
5757

58-
var sr = await base.GetResultAsync(query, token);
58+
var sr = await base.GetResultAsync(query, token).ConfigureAwait(false);
5959

6060
try
6161
{
6262
IFlurlRequest request = Client.Request(Endpoint, "/search")
6363
.WithTimeout(Timeout)
6464
.SetQueryParam("url", query.Upload, true);
6565

66-
using var response = await request.GetAsync(cancellationToken: token);
66+
using var response = await request.GetAsync(cancellationToken: token).ConfigureAwait(false);
6767

68-
tm = await response.GetJsonAsync<TraceMoeRootObject>();
68+
tm = await response.GetJsonAsync<TraceMoeRootObject>().ConfigureAwait(false);
6969
}
7070
catch (Exception e)
7171
{
@@ -87,7 +87,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
8787

8888
foreach (var doc in tm.Result)
8989
{
90-
var tr = await doc.ToItem(sr);
90+
var tr = await doc.ToItem(sr).ConfigureAwait(false);
9191
sr.Results.Add(tr);
9292
}
9393

@@ -214,7 +214,7 @@ public async ValueTask<SearchResultItem> ToItem(SearchResult sr)
214214
{
215215
var sim = Math.Round(Similarity * 100.0f, 2);
216216

217-
string name = await AnilistClient.Instance.GetTitleAsync((int) Anilist);
217+
string name = await AnilistClient.Instance.GetTitleAsync((int) Anilist).ConfigureAwait(false);
218218

219219
var result = new SearchResultItem(sr)
220220
{

0 commit comments

Comments
 (0)