Skip to content

Commit a2bb4d5

Browse files
committed
Quick update
1 parent bd76034 commit a2bb4d5

File tree

4 files changed

+26
-7
lines changed

4 files changed

+26
-7
lines changed

SmartImage.Lib/Engines/BaseSearchEngine.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ protected BaseSearchEngine(string baseUrl)
3333

3434
public virtual TimeSpan Timeout { get; set; } = TimeSpan.FromSeconds(3);
3535

36-
protected virtual bool Redirect { get; set; } = true;
37-
3836
public virtual SearchResult GetResult(ImageQuery query)
3937
{
4038
var rawUrl = GetRawResultUri(query, out var r);
@@ -73,7 +71,9 @@ public async Task<SearchResult> GetResultAsync(ImageQuery query)
7371
return await task;
7472
}
7573

76-
public Uri GetRawResultUri(ImageQuery query, out IRestResponse res)
74+
75+
76+
public virtual Uri GetRawResultUri(ImageQuery query, out IRestResponse res)
7777
{
7878
var uri = new Uri(BaseUrl + query.UploadUri);
7979

@@ -82,7 +82,7 @@ public Uri GetRawResultUri(ImageQuery query, out IRestResponse res)
8282
return null;
8383
}*/
8484

85-
res = Network.GetResponse(uri.ToString(), (int) Timeout.TotalMilliseconds, Method.GET, Redirect);
85+
res = Network.GetResponse(uri.ToString(), (int) Timeout.TotalMilliseconds, Method.GET, true);
8686

8787
if (!res.IsSuccessful && res.StatusCode!= HttpStatusCode.Redirect) {
8888
Debug.WriteLine($"{Name} is unavailable or timed out after {Timeout:g} | {uri} {res.StatusCode}", C_WARN);

SmartImage.Lib/Engines/ClientSearchEngine.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected ClientSearchEngine(string baseUrl, string endpointUrl) : base(baseUrl)
3030

3131
protected RestClient Client { get; }
3232

33-
protected override bool Redirect { get; set; }
33+
3434

3535
[DebuggerHidden]
3636
public override SearchResult GetResult(ImageQuery query)

SmartImage.Lib/Engines/Impl/Ascii2DEngine.cs

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,27 @@ public Ascii2DEngine() : base("https://ascii2d.net/search/url/")
3131

3232
public override string Name => EngineOption.ToString();
3333

34-
protected override bool Redirect => false;
34+
public override Uri GetRawResultUri(ImageQuery query, out IRestResponse res)
35+
{
36+
// todo
37+
38+
var uri = new Uri(BaseUrl + query.UploadUri);
39+
40+
/*if (!Network.IsAlive(uri, (int) Timeout.TotalMilliseconds)) {
41+
Debug.WriteLine($"{Name} is unavailable or timed out after {Timeout:g} | {uri}", C_WARN);
42+
return null;
43+
}*/
44+
45+
res = Network.GetResponse(uri.ToString(), (int)Timeout.TotalMilliseconds, Method.GET, false);
46+
47+
if (!res.IsSuccessful && res.StatusCode != HttpStatusCode.Redirect)
48+
{
49+
Debug.WriteLine($"{Name} is unavailable or timed out after {Timeout:g} | {uri} {res.StatusCode}", LogCategories.C_WARN);
50+
return null;
51+
}
52+
53+
return uri;
54+
}
3555

3656
private Uri ConvertToDetailUri(Uri url)
3757
{

SmartImage.Lib/Engines/InterpretedSearchEngine.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ protected InterpretedSearchEngine(string baseUrl) : base(baseUrl) { }
1818
public abstract override string Name { get; }
1919

2020

21-
protected override bool Redirect { get; set; }
2221
[DebuggerHidden]
2322
public override SearchResult GetResult(ImageQuery query)
2423
{

0 commit comments

Comments
 (0)