Skip to content

Commit 13606fc

Browse files
committed
Move server to Rdx; Rdx v1.0.8
1 parent 836246c commit 13606fc

15 files changed

+350
-297
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@ private async Task<IDocument> GetDocumentAsync(SearchQuery query, CancellationTo
115115
// goto ret;
116116

117117
}
118+
else {
119+
// Debugger.Break();
120+
}
118121

119122
response?.Dispose();
120123

SmartImage.Lib/Resources.Designer.cs

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

SmartImage.Lib/Resources.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,4 +207,7 @@
207207
<data name="Url_GitHubApi" xml:space="preserve">
208208
<value>https://api.github.com/repos/Decimation/SmartImage/releases</value>
209209
</data>
210+
<data name="Err_Content" xml:space="preserve">
211+
<value>Invalid content: missing data</value>
212+
</data>
210213
</root>
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Author: Deci | Project: SmartImage.Lib | Name: DefaultCookiesProvider.cs
2+
// Date: 2025/02/04 @ 12:02:26
3+
4+
using Kantan.Net.Web;
5+
6+
namespace SmartImage.Lib.Results.Data;
7+
8+
public class DefaultCookiesProvider : ICookiesProvider
9+
{
10+
11+
public List<IBrowserCookie> Cookies { get; }
12+
13+
public DefaultCookiesProvider()
14+
{
15+
Cookies = new List<IBrowserCookie>();
16+
}
17+
18+
public ValueTask<IList<IBrowserCookie>> GetOrLoadCookiesAsync(CancellationToken ct = default)
19+
{
20+
return ValueTask.FromResult<IList<IBrowserCookie>>(Cookies);
21+
}
22+
23+
public void Dispose()
24+
{
25+
Cookies.Clear();
26+
}
27+
28+
}

SmartImage.Lib/Results/Data/ICookiesProvider.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@ public interface ICookiesProvider : IDisposable
1313

1414
public ValueTask<IList<IBrowserCookie>> GetOrLoadCookiesAsync(CancellationToken ct = default);
1515

16-
public static ICookiesProvider Default { get; set; }
1716

1817
public static ICookiesProvider GetProvider()
1918
{
2019
if (BaseOSIntegration.Integration.IsFirefoxInstalled) {
2120
return new BrowserCookiesProvider(new FirefoxCookieReader());
2221
}
2322

24-
return null;
23+
return new DefaultCookiesProvider();
2524
}
2625

2726
}

SmartImage.Lib/SearchClient.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,12 +297,14 @@ public async ValueTask LoadEnginesAsync(CancellationToken token = default)
297297
if (Config.ReadCookies) {
298298

299299
try {
300-
await ((BrowserCookiesProvider) ICookiesProvider.Default).OpenAsync();
300+
Config.CookiesProvider = ICookiesProvider.GetProvider();
301+
302+
await ((BrowserCookiesProvider) Config.CookiesProvider).OpenAsync();
301303
}
302304
catch (Exception e) {
303305
Trace.WriteLine($"{e}");
304306
Config.ReadCookies = false;
305-
ICookiesProvider.Default.Dispose();
307+
Config.CookiesProvider.Dispose();
306308
}
307309
}
308310

@@ -324,7 +326,6 @@ public async ValueTask LoadEnginesAsync(CancellationToken token = default)
324326

325327
if (Config.FlareSolverr && !FlareSolverrClient.Value.IsInitialized) {
326328

327-
328329
var ok = FlareSolverrClient.Value.Configure(Config.FlareSolverrApiUrl);
329330

330331
if (!ok) {

SmartImage.Lib/SearchConfig.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,7 @@ public bool ReadCookies
163163
// TODO: cookies.txt support
164164
// TODO: specify cookies source
165165

166-
[CBN]
167-
public ICookiesProvider CookiesProvider { get; set; } = ICookiesProvider.Default;
166+
public ICookiesProvider CookiesProvider { get; set; }
168167

169168
/// <remarks>
170169
///

SmartImage.Lib/SearchQuery.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,13 @@ public async Task<Url> UploadAsync(BaseUploadEngine engine = null, CancellationT
9090

9191
string fu;
9292

93-
if (Source.IsFile)
93+
if (Source.IsFile) {
9494
fu = Source.ValueString;
95-
else
95+
}
96+
else {
9697
fu = Source.WriteToFile();
98+
Trace.WriteLine($"Wrote to file {fu}");
99+
}
97100

98101
engine ??= BaseUploadEngine.Default;
99102

SmartImage.Lib/SearchServer.cs

Lines changed: 0 additions & 224 deletions
This file was deleted.

0 commit comments

Comments
 (0)