Skip to content

Commit c08e5fb

Browse files
DecimationDecimation
committed
Generational commit
1 parent ec08f24 commit c08e5fb

29 files changed

Lines changed: 538 additions & 556 deletions

‎SmartImage.Lib/Engines/BaseSearchEngine.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
using SmartImage.Lib.Utilities.Diagnostics;
1313
using SmartImage.Lib.Model;
1414
using SmartImage.Lib.Utilities;
15+
using SmartImage.Shared;
1516

16-
[assembly: InternalsVisibleTo(SearchQuery.PROJ_SMARTIMAGE_TEST)]
17-
[assembly: InternalsVisibleTo(SearchQuery.PROJ_SMARTIMAGE_UI2)]
17+
[assembly: InternalsVisibleTo(Common.PROJ_SMARTIMAGE_TEST)]
18+
[assembly: InternalsVisibleTo(Common.PROJ_SMARTIMAGE_UI2)]
1819

1920
namespace SmartImage.Lib.Engines;
2021

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ protected override async Task<IDocument> GetSourceAsync(SearchResult sr, SearchQ
9999
}
100100
else {
101101
fileName = SFILE_NAME_DEFAULT;
102-
var ok = query.Source.TryWriteToFile(fileName);
102+
var ok = query.Source.TryWriteOrGetFile(fileName);
103103

104104
if (ok) {
105105
filePath = query.Source.LocalFilePath;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using Flurl.Http;
44
using Microsoft.Extensions.Logging;
55
using SmartImage.Lib.Engines.Results;
6+
using SmartImage.Lib.Utilities;
67

78
namespace SmartImage.Lib.Engines.Search;
89

@@ -367,7 +368,7 @@ public class TinEyeBacklink
367368
public string CrawlDate { get; set; }
368369

369370
[JPN("source_id")]
370-
public long SourceId { get; set; }
371+
public long? SourceId { get; set; }
371372

372373
[JPN("image_name")]
373374
public string ImageName { get; set; }

‎SmartImage.Lib/Engines/Upload/PomfEngine.cs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
namespace SmartImage.Lib.Engines.Upload;
1212

13-
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
1413
public sealed class PomfEngine : BaseUploadEngine
1514
{
1615

@@ -51,28 +50,24 @@ protected override async Task<UploadResult> ProcessResultAsync(IFlurlResponse re
5150
// var pr = await response.GetJsonAsync<PomfResult>();
5251
var sz = await response.GetStringAsync();
5352

54-
var pr = JsonSerializer.Deserialize<PomfResult>(sz, SearchUtil.DefaultSerializerOptions);
53+
var pr = JsonSerializer.Deserialize<PomfResult>(sz, SearchUtil.DefaultSerializerOptions);
5554
var file0 = pr.Files.First();
56-
55+
5756
return new UploadResult(file0.Url, file0.Length);
5857
}
5958

6059
}
6160

6261
public sealed class PomfResult
6362
{
64-
6563
public bool Success { get; set; }
6664

6765
public PomfFileResult[] Files { get; set; }
68-
6966
}
7067

7168
public sealed class PomfFileResult : UploadResult
7269
{
73-
7470
public string Hash { get; set; }
7571

7672
public string Name { get; set; }
77-
7873
}

‎SmartImage.Lib/Images/Uni/UniImage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ public static bool IsValidSourceType(object str)
267267

268268
#endregion
269269

270-
public bool TryWriteToFile(string fn = null)
270+
public bool TryWriteOrGetFile(string fn = null)
271271
{
272272
if (!HasFilePath) {
273273
LocalFilePath = WriteImageToFile(fn);

‎SmartImage.Lib/SearchQuery.cs‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,14 @@
4747
using SmartImage.Lib.Engines.Upload;
4848
using SmartImage.Lib.Images.Uni;
4949
using System.ComponentModel;
50+
using SmartImage.Shared;
5051

5152
#region
5253

53-
[assembly: InternalsVisibleTo(SearchQuery.PROJ_SMARTIMAGE)]
54-
[assembly: InternalsVisibleTo(SearchQuery.PROJ_SMARTIMAGE_UI)]
55-
[assembly: InternalsVisibleTo(SearchQuery.PROJ_SMARTIMAGE_RDX)]
56-
[assembly: InternalsVisibleTo(SearchQuery.PROJ_SMARTIMAGE_LIB_UNITTEST)]
54+
[assembly: InternalsVisibleTo(Common.PROJ_SMARTIMAGE)]
55+
[assembly: InternalsVisibleTo(Common.PROJ_SMARTIMAGE_UI)]
56+
[assembly: InternalsVisibleTo(Common.PROJ_SMARTIMAGE_RDX)]
57+
[assembly: InternalsVisibleTo(Common.PROJ_SMARTIMAGE_LIB_UNITTEST)]
5758

5859
#endregion
5960

@@ -62,19 +63,6 @@ namespace SmartImage.Lib;
6263
public sealed class SearchQuery : IDisposable, IEquatable<SearchQuery>, INotifyPropertyChanged
6364
{
6465

65-
#region Project names
66-
67-
internal const string PROJ_SMARTIMAGE = "SmartImage";
68-
internal const string PROJ_SMARTIMAGE_TEST = $"{PROJ_SMARTIMAGE}.Test";
69-
internal const string PROJ_SMARTIMAGE_UI = $"{PROJ_SMARTIMAGE}.UI";
70-
internal const string PROJ_SMARTIMAGE_UI2 = $"{PROJ_SMARTIMAGE_UI}2";
71-
internal const string PROJ_SMARTIMAGE_RDX = $"{PROJ_SMARTIMAGE}.Rdx";
72-
internal const string PROJ_SMARTIMAGE_LIB = $"{PROJ_SMARTIMAGE}.Lib";
73-
internal const string PROJ_SMARTIMAGE_LIB_UNITTEST = $"{PROJ_SMARTIMAGE_LIB}.UnitTest";
74-
75-
#endregion
76-
77-
7866
// [MN]
7967
// public Url Upload { get; private set; }
8068

‎SmartImage.Lib/SmartImage.Lib.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,6 @@
129129
</EmbeddedResource>
130130
</ItemGroup>
131131

132+
<Import Project="..\..\..\VSProjects\SmartImage.Shared\SmartImage.Shared.projitems" Label="Shared" />
133+
132134
</Project>

‎SmartImage.Lib/Utilities/Integration/BaseOSIntegration.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,16 @@ static BaseOSIntegration()
7676

7777
internal const string OS_LINUX = "linux";
7878

79-
public const int EC_ERROR = -1;
79+
internal const int EC_ERROR = -1;
8080

81-
public const int EC_OK = 0;
81+
internal const int EC_OK = 0;
8282

8383
[SupportedOSPlatformGuard(OS_LINUX)]
8484
public static readonly bool IsLinux = OperatingSystem.IsLinux();
8585

8686
[SupportedOSPlatformGuard(OS_WIN)]
8787
public static readonly bool IsWindows = OperatingSystem.IsWindows();
8888

89-
9089
public static BaseOSIntegration Integration { get; }
9190

9291
public static string ExecutableDirectory { get; }

SmartImage.Rdx/Commands/CommonAsyncCommand.cs renamed to SmartImage.Rdx/Commands/Common/CommonAsyncCommand.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Author: Deci | Project: SmartImage.Rdx | Name: BaseAsyncCommand.cs
22
// Date: 2025/09/24 @ 02:09:59
33

4+
#nullable disable
45
using SmartImage.Lib;
56
using Spectre.Console.Cli;
67

7-
#nullable disable
8-
namespace SmartImage.Rdx.Commands;
8+
namespace SmartImage.Rdx.Commands.Common;
99

1010
public abstract partial class CommonAsyncCommand<TCommandSettings> : AsyncCommand<TCommandSettings>, IDisposable
1111
where TCommandSettings : CommonCommandSettings

SmartImage.Rdx/Commands/CommonCommandSettings.cs renamed to SmartImage.Rdx/Commands/Common/CommonCommandSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using SmartImage.Lib.Engines;
77
using Spectre.Console.Cli;
88

9-
namespace SmartImage.Rdx.Commands;
9+
namespace SmartImage.Rdx.Commands.Common;
1010

1111
public class CommonCommandSettings : CommandSettings
1212
{

0 commit comments

Comments
 (0)