Skip to content

Commit 76b05de

Browse files
committed
Fix Yandex; work on image scanning
1 parent 1f8b071 commit 76b05de

5 files changed

Lines changed: 10 additions & 16 deletions

File tree

SmartImage.Lib/Engines/Results/SearchResultItem.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,15 +223,15 @@ public async ValueTask<bool> ScanAsync(CancellationToken ct = default)
223223

224224
var scr = await ScannedResultItem.FromSourceAsync(this, ct: ct);
225225

226-
if (scr is { HasImage: true }) {
226+
/*if (scr is { HasImage: true }) {
227227
ScannedItems.Add(scr);
228228
229229
// scr.Index = ScannedItems.IndexOf(scr);
230230
231231
await cw.Writer.WriteAsync(scr, ct);
232232
cw.Writer.TryComplete();
233233
return true;
234-
}
234+
}*/
235235

236236
var task = scr.ScanAsync(cw, url => new ScannedResultItem(url, this), ct);
237237

SmartImage.Lib/Engines/Search/YandexEngine.cs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
8686
req.Headers.AddOrReplace(HeaderNames.AcceptEncoding, Serialization.Yandex_Hdr_AcceptEncoding);
8787
req.Headers.AddOrReplace(HeaderNames.AcceptLanguage, Serialization.Yandex_Hdr_AcceptLanguage);
8888

89-
if (query.Source.IsFile) {
90-
res = await req.PostMultipartAsync(content =>
91-
{
92-
//
93-
content.AddFile("file", query.Source.GetSource(), query.Source.Name);
94-
}, cancellationToken: ct);
95-
}
96-
else {
97-
res = await req.GetAsync(cancellationToken: ct);
98-
}
89+
res = await req.GetAsync(cancellationToken: ct);
9990

10091
string str = await res.GetStringAsync().ConfigureAwait(false);
10192

SmartImage.Lib/Images/Uni/UniImage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace SmartImage.Lib.Images.Uni;
3232
public abstract class UniImage : IUniImage, IEquatable<UniImage>, IFromSource<UniImage>
3333
{
3434

35-
private static readonly ILogger s_logger = AppSupport.Factory.CreateLogger(nameof(UniImage));
35+
private protected static readonly ILogger s_logger = AppSupport.Factory.CreateLogger(nameof(UniImage));
3636

3737
internal static readonly RecyclableMemoryStreamManager MemMgr = new(new RecyclableMemoryStreamManager.Options { });
3838

SmartImage.Lib/Images/Uni/UniImageUrl.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Kantan.Net.Utilities;
66
using SmartImage.Lib.Model;
77
using System.Threading.Channels;
8+
using Microsoft.Extensions.Logging;
89
using SmartImage.Lib.Engines.Results;
910

1011
namespace SmartImage.Lib.Images.Uni;
@@ -37,7 +38,7 @@ public override async Task<bool> AllocSourceAsync(CancellationToken ct = default
3738

3839
response = await ImageScanner.GetResponseAsync(Url, ct);
3940

40-
if (response == null) {
41+
if (response is null or {StatusCode: 403}) {
4142
goto ret;
4243
}
4344

@@ -86,7 +87,9 @@ public virtual async ValueTask<bool> ScanAsync(ChannelWriter<IUniImage> cw, Func
8687
using var sr = new StreamReader(stream);
8788
var str = await sr.ReadToEndAsync(ct);
8889

89-
var urls = ImageScanner.ParseImageUrls(str, Url);
90+
var urls = ImageScanner.ParseImageUrls(str, Url).ToArray();
91+
s_logger.LogInformation("Parsed {Cnt} urls from {Url}", urls.Length, Url);
92+
9093

9194
await cw.WaitToWriteAsync(ct);
9295

SmartImage.Lib/SearchConfig.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public sealed class SearchConfig : INotifyPropertyChanged
5858
/// <summary>
5959
/// Default value for <see cref="UploadEngine"/>
6060
/// </summary>
61-
public const UploadEngineOptions UE_DEFAULT = UploadEngineOptions.TmpFiles;
61+
public const UploadEngineOptions UE_DEFAULT = UploadEngineOptions.Catbox;
6262

6363
#endregion
6464

0 commit comments

Comments
 (0)