Skip to content

Commit 075b08f

Browse files
DecimationDecimation
committed
v4.0.8 GUI
1 parent 49b6e82 commit 075b08f

File tree

9 files changed

+74
-82
lines changed

9 files changed

+74
-82
lines changed

‎SmartImage.Lib/Engines/BaseSearchEngine.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ protected BaseSearchEngine([NN] Url baseUrl)
7979
public virtual Url BaseUrl { get; }
8080

8181
[JI]
82-
public virtual TimeSpan Timeout { get; set; } = TimeSpan.FromSeconds(15);
82+
public virtual TimeSpan Timeout { get; set; } = TimeSpan.FromSeconds(30);
8383

8484
[JI]
8585
protected long? MaxSize { get; set; }

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ protected override Url GetRawUrl(SearchQuery query)
127127
protected override async Task<IDocument> GetDocumentAsync(SearchResult sr, SearchQuery query,
128128
CancellationToken token = default)
129129
{
130-
131130
var parser = new HtmlParser();
132131

133132
try {

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

Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Text.Json;
33
using System.Text.Json.Serialization;
44
using System.Text.Json.Serialization.Metadata;
5+
using AngleSharp.Css.Values;
56
using Flurl.Http;
67
using SmartImage.Lib.Results;
78
using SmartImage.Lib.Results.Data;
@@ -49,20 +50,20 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
4950

5051
try {
5152
using var response = await Client.Request(EndpointUrl)
52-
.SetQueryParams(new
53-
{
54-
55-
filter = true,
56-
url = query.Upload,
57-
same_sub = false,
58-
filter_author = true,
59-
only_older = false,
60-
include_crossposts = false,
61-
meme_filter = false,
62-
target_match_percent = 90,
63-
filter_dead_matches = false,
64-
target_days_old = 0
65-
}).GetAsync(cancellationToken: token);
53+
.WithTimeout(Timeout)
54+
.SetQueryParams(new
55+
{
56+
filter = true,
57+
url = query.Upload,
58+
same_sub = false,
59+
filter_author = true,
60+
only_older = false,
61+
include_crossposts = false,
62+
meme_filter = false,
63+
target_match_percent = 90,
64+
filter_dead_matches = false,
65+
target_days_old = 0
66+
}).GetAsync(cancellationToken: token);
6667

6768
var s = await response.GetStreamAsync();
6869
obj = JsonSerializer.Deserialize<RepostSleuthResult>(s, JsOptions);
@@ -91,6 +92,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
9192
if (sr.HasResults) {
9293
sr.Status = SearchResultStatus.Success;
9394
}
95+
9496
ret:
9597
sr.Update();
9698
return sr;
@@ -99,19 +101,6 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
99101

100102
#region API Objects
101103

102-
private class RepostSleuthClosestMatch
103-
{
104-
105-
public int hamming_distance;
106-
public double annoy_distance;
107-
public double hamming_match_percent;
108-
public int hash_size;
109-
public string searched_url;
110-
public RepostSleuthPost post;
111-
public int title_similarity;
112-
113-
}
114-
115104
private class RepostSleuthMatch : ISearchResultItemConvertable
116105
{
117106

@@ -160,7 +149,7 @@ private class RepostSleuthResult
160149
{
161150

162151
public object meme_template;
163-
public RepostSleuthClosestMatch closest_match;
152+
public RepostSleuthMatch closest_match;
164153
public string checked_url;
165154
public object checked_post;
166155
public RepostSleuthSearchSettings search_settings;

‎SmartImage.Lib/Engines/Impl/Search/YandexEngine.cs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,12 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
9595
sr.Results.Add(sr.RawResultItem);
9696
}
9797

98-
IDocument doc = null;
98+
IDocument doc = null;
9999

100-
IFlurlResponse res = null;
100+
IFlurlResponse res = null;
101+
102+
Stream str = null;
101103

102-
Stream str = null;
103104

104105
try {
105106
res = await Client.Request(sr.RawUrl)
@@ -117,9 +118,10 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
117118
var jsonNode = JsonNode.Parse(json);
118119
var sites = jsonNode["initialState"]["cbirSites"]["sites"];
119120
var sitesObj = sites.Deserialize<YandexSite[]>();
120-
var sri = sitesObj.AsParallel().Select(e => e.ToItem(sr));
121-
sr.Results.AddRange(sri);
122121

122+
foreach (var ys in sitesObj) {
123+
sr.Results.Add(ys.ToItem(sr));
124+
}
123125

124126
}
125127
catch (Exception e) {
@@ -137,7 +139,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
137139
ret:
138140
sr.Update();
139141
res?.Dispose();
140-
str?.Dispose();
142+
// str?.Dispose();
141143
doc?.Dispose();
142144
return sr;
143145
}

‎SmartImage.Lib/SearchClient.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@ public async Task<SearchResult[]> RunSearchAsync(SearchQuery query,
166166

167167
SearchResult result = await task;
168168

169+
s_logger.LogInformation("{Task} complete", result);
170+
169171
results[i] = result;
170172
i++;
171173
}

‎SmartImage.Lib/SmartImage.Lib.csproj‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,40 +37,40 @@
3737
<DefineConstants>DEBUG;TRACE;JETBRAINS_ANNOTATIONS;TEST</DefineConstants>
3838
</PropertyGroup>
3939
<ItemGroup>
40-
<PackageReference Include="AngleSharp" Version="1.2.0" />
40+
<PackageReference Include="AngleSharp" Version="1.3.0" />
4141
<PackageReference Include="AngleSharp.Css" Version="1.0.0-alpha-99" />
4242
<PackageReference Include="AngleSharp.Io" Version="1.0.0" />
4343
<PackageReference Include="AngleSharp.XPath" Version="2.0.5" />
44-
<PackageReference Include="CliWrap" Version="3.8.2" />
44+
<PackageReference Include="CliWrap" Version="3.9.0" />
4545
<PackageReference Include="CoenM.ImageSharp.ImageHash" Version="1.3.6" />
4646
<PackageReference Include="CommunityToolkit.Common" Version="8.4.0" />
4747
<PackageReference Include="Flurl.Http" Version="4.0.2" />
4848
<PackageReference Include="HttpMultipartParser" Version="9.0.0" />
4949
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
50-
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.4" />
51-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.4" />
52-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.4" />
53-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.4" />
54-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
55-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
56-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
57-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.4" />
58-
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.4" />
59-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.4" />
60-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.4" />
61-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.4" />
62-
<PackageReference Include="Microsoft.Extensions.Logging.TraceSource" Version="9.0.4" />
63-
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.4" />
64-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.4" />
50+
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.5" />
51+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.5" />
52+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.5" />
53+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.5" />
54+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
55+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
56+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.5" />
57+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.5" />
58+
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.5" />
59+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.5" />
60+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.5" />
61+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.5" />
62+
<PackageReference Include="Microsoft.Extensions.Logging.TraceSource" Version="9.0.5" />
63+
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.5" />
64+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.5" />
6565
<PackageReference Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
6666
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
67-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
68-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.4" />
69-
<PackageReference Include="System.Drawing.Common" Version="9.0.4" />
67+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.9" />
68+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.5" />
69+
<PackageReference Include="System.Drawing.Common" Version="9.0.5" />
7070
<PackageReference Include="System.Net.Primitives" Version="4.3.1" />
7171
<PackageReference Include="System.Reactive" Version="6.0.1" />
72-
<PackageReference Include="System.Runtime.Caching" Version="9.0.4" />
73-
<PackageReference Include="System.Text.Json" Version="9.0.4" />
72+
<PackageReference Include="System.Runtime.Caching" Version="9.0.5" />
73+
<PackageReference Include="System.Text.Json" Version="9.0.5" />
7474
<PackageReference Include="Verify.Flurl" Version="1.0.1" />
7575
</ItemGroup>
7676

‎SmartImage.Rdx/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public static async Task<int> Main(string[] args)
8282
finally {
8383

8484
if (x != BaseOSIntegration.EC_OK) {
85-
AnsiConsole.Confirm("Press any key to continue");
85+
await AnsiConsole.ConfirmAsync("Press any key to continue");
8686
}
8787
}
8888

‎SmartImage.Rdx/SmartImage.Rdx.csproj‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,39 +45,39 @@
4545
<Content Include="Icon.ico" />
4646
</ItemGroup>
4747
<ItemGroup>
48-
<PackageReference Include="CliWrap" Version="3.8.2" />
48+
<PackageReference Include="CliWrap" Version="3.9.0" />
4949
<PackageReference Include="CoenM.ImageSharp.ImageHash" Version="1.3.6" />
5050
<PackageReference Include="CommunityToolkit.Common" Version="8.4.0" />
5151
<PackageReference Include="Flurl.Http" Version="4.0.2" />
5252
<PackageReference Include="HttpMultipartParser" Version="9.0.0" />
5353
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
54-
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.4" />
55-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.4" />
56-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.4" />
57-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.4" />
58-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
59-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
60-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
61-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.4" />
62-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.4" />
63-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.4" />
64-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.4" />
65-
<PackageReference Include="Microsoft.Extensions.Logging.TraceSource" Version="9.0.4" />
54+
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.5" />
55+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.5" />
56+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.5" />
57+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.5" />
58+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
59+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
60+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.5" />
61+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.5" />
62+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.5" />
63+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.5" />
64+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.5" />
65+
<PackageReference Include="Microsoft.Extensions.Logging.TraceSource" Version="9.0.5" />
6666
<PackageReference Include="Microsoft.NETCore.Platforms" Version="8.0.0-preview.7.23375.6" />
6767
<PackageReference Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
6868
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
69-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
69+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.9" />
7070
<PackageReference Include="Spectre.Console" Version="0.50.0" />
7171
<PackageReference Include="Spectre.Console.Analyzer" Version="1.0.0">
7272
<PrivateAssets>all</PrivateAssets>
7373
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
7474
</PackageReference>
7575
<PackageReference Include="Spectre.Console.Cli" Version="0.50.0" />
7676
<PackageReference Include="Spectre.Console.ImageSharp" Version="0.50.0" />
77-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.4" />
77+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.5" />
7878
<PackageReference Include="System.Net.Primitives" Version="4.3.1" />
7979
<PackageReference Include="System.Reactive" Version="6.0.1" />
80-
<PackageReference Include="System.Text.Json" Version="9.0.4" />
80+
<PackageReference Include="System.Text.Json" Version="9.0.5" />
8181
<PackageReference Include="Verify.Flurl" Version="1.0.1" />
8282
</ItemGroup>
8383

‎SmartImage.UI/SmartImage.UI.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<AssemblyName>SmartImage</AssemblyName>
1414
<ApplicationIcon>Icon.ico</ApplicationIcon>
1515
<FileVersion></FileVersion>
16-
<AssemblyVersion>4.0.7.0</AssemblyVersion>
16+
<AssemblyVersion>4.0.8.0</AssemblyVersion>
1717
<NoWarn>IDE0290</NoWarn>
1818
<EnableSourceControlManagerQueries>True</EnableSourceControlManagerQueries>
1919
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
@@ -67,16 +67,16 @@
6767
<PackageReference Include="CommunityToolkit.Common" Version="8.4.0" />
6868
<PackageReference Include="Flurl.Http" Version="4.0.2" />
6969
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
70-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.4" />
71-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.4" />
72-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.4" />
70+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.5" />
71+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.5" />
72+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.5" />
7373
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
7474
<!-- <PackageReference Include="ReactiveUI.WPF" Version="20.1.63" /> -->
75-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
76-
<PackageReference Include="System.Drawing.Common" Version="9.0.4" />
75+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.9" />
76+
<PackageReference Include="System.Drawing.Common" Version="9.0.5" />
7777
<PackageReference Include="System.Net.Primitives" Version="4.3.1" />
7878
<PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
79-
<PackageReference Include="System.Text.Json" Version="9.0.4" />
79+
<PackageReference Include="System.Text.Json" Version="9.0.5" />
8080
<PackageReference Include="Verify.Flurl" Version="1.0.1" />
8181
</ItemGroup>
8282

0 commit comments

Comments
 (0)