Skip to content

Commit 07d2d09

Browse files
DecimationDecimation
committed
v4.0.7 GUI
1 parent bfbc83e commit 07d2d09

File tree

7 files changed

+18
-12
lines changed

7 files changed

+18
-12
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using Novus.Win32;
1616
using CoenM.ImageHash.HashAlgorithms;
1717
using CoenM.ImageHash;
18+
using Kantan.Diagnostics;
1819
using SixLabors.ImageSharp;
1920
using SixLabors.ImageSharp.Formats;
2021
using SixLabors.ImageSharp.Formats.Png;
@@ -347,7 +348,7 @@ protected string WriteStreamToFile(string fn = null)
347348

348349
public virtual void Dispose()
349350
{
350-
Trace.WriteLine($"Disposing {ValueString} w/ {Size}");
351+
Trace.WriteLine($"Disposing {ValueString} w/ {Size}", LogCategories.C_VERBOSE);
351352
Stream?.Dispose();
352353
Image?.Dispose();
353354

@@ -357,7 +358,7 @@ public virtual void Dispose()
357358

358359
public virtual async ValueTask DisposeAsync()
359360
{
360-
Trace.WriteLine($"Disposing {ValueString} w/ {Size}");
361+
Trace.WriteLine($"Disposing {ValueString} w/ {Size}", LogCategories.C_VERBOSE);
361362

362363
if (Stream != null)
363364
await Stream.DisposeAsync();

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ string s when Url.IsValid(s) => s,
4141

4242
var scheme = u.Scheme;
4343

44-
return Schemes.All(s => scheme != s);
44+
return LegalSchemes.Contains(scheme);
4545
}
4646

4747
public override async ValueTask<bool> AllocAsync(CancellationToken ct = default)
@@ -64,7 +64,8 @@ public async ValueTask<bool> AllocResponseAsync(CancellationToken ct = default)
6464
return HasResponse;
6565
}
6666

67-
public static readonly string[] Schemes = ["file", "javascript"];
67+
public static readonly List<string> RestrictedSchemes = ["file", "javascript", "cpu"];
68+
public static readonly List<string> LegalSchemes = ["http", "https"];
6869

6970
public static async ValueTask<IFlurlResponse> GetResponseAsync(Url value, CancellationToken ct)
7071
{

‎SmartImage.Lib/Results/SearchResult.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using System.Threading.Channels;
77
using AngleSharp.Html.Parser;
88
using Flurl.Http;
9+
using Kantan.Diagnostics;
910
using Kantan.Net.Utilities;
1011
using SmartImage.Lib.Engines;
1112
using SmartImage.Lib.Images;
@@ -193,7 +194,7 @@ public override string ToString()
193194

194195
public void Dispose()
195196
{
196-
Debug.WriteLine($"Disposing {Engine.Name} with {Results.Count}");
197+
Debug.WriteLine($"Disposing {Engine.Name} with {Results.Count}", LogCategories.C_VERBOSE);
197198

198199
foreach (SearchResultItem item in Results) {
199200
item.Dispose();

‎SmartImage.Lib/SmartImage.Lib.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,9 @@
3737
<DefineConstants>DEBUG;TRACE;JETBRAINS_ANNOTATIONS;TEST</DefineConstants>
3838
</PropertyGroup>
3939
<ItemGroup>
40-
<PackageReference Include="AngleSharp" Version="1.1.2" />
40+
<PackageReference Include="AngleSharp" Version="1.2.0" />
4141
<PackageReference Include="AngleSharp.Css" Version="1.0.0-alpha-99" />
4242
<PackageReference Include="AngleSharp.Io" Version="1.0.0" />
43-
<PackageReference Include="AngleSharp.Js" Version="0.15.0" />
4443
<PackageReference Include="AngleSharp.XPath" Version="2.0.4" />
4544
<PackageReference Include="CliWrap" Version="3.7.0" />
4645
<PackageReference Include="CoenM.ImageSharp.ImageHash" Version="1.3.6" />
@@ -62,9 +61,11 @@
6261
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
6362
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
6463
<PackageReference Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
64+
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
6565
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
6666
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
6767
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
68+
<PackageReference Include="System.Net.Primitives" Version="4.3.1" />
6869
<PackageReference Include="System.Reactive" Version="6.0.1" />
6970
<PackageReference Include="System.Runtime.Caching" Version="9.0.0" />
7071
<PackageReference Include="System.Text.Json" Version="9.0.0" />

‎SmartImage.Rdx/SmartImage.Rdx.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
6363
<PackageReference Include="Microsoft.NETCore.Platforms" Version="8.0.0-preview.7.23375.6" />
6464
<PackageReference Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
65+
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
6566
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
6667
<PackageReference Include="Spectre.Console" Version="0.49.1" />
6768
<PackageReference Include="Spectre.Console.Analyzer" Version="1.0.0">
@@ -71,6 +72,7 @@
7172
<PackageReference Include="Spectre.Console.Cli" Version="0.49.1" />
7273
<PackageReference Include="Spectre.Console.ImageSharp" Version="0.49.1" />
7374
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
75+
<PackageReference Include="System.Net.Primitives" Version="4.3.1" />
7476
<PackageReference Include="System.Reactive" Version="6.0.1" />
7577
<PackageReference Include="System.Text.Json" Version="9.0.0" />
7678
<PackageReference Include="Verify.Flurl" Version="1.0.0" />

‎SmartImage.UI/MainWindow.xaml.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
using Flurl.Http;
4949
using SmartImage.UI.Model;
5050
using Color = System.Drawing.Color;
51-
using Jint.Parser.Ast;
51+
// using Jint.Parser.Ast;
5252
using Novus.Win32;
5353
using Novus.Win32.Structures.Kernel32;
5454
using CancellationTokenSource = System.Threading.CancellationTokenSource;
@@ -205,7 +205,7 @@ public MainWindow()
205205

206206
public static SearchEngineOptions[] Engines { get; } = Enum.GetValues<SearchEngineOptions>();
207207

208-
private readonly object m_lock = new();
208+
private readonly Lock m_lock = new();
209209

210210
private readonly WindowInteropHelper m_wndInterop;
211211

@@ -659,7 +659,6 @@ private void ClipboardListenAsync(object? s, EventArgs e)
659659
AddToQueue(fn);
660660

661661
}
662-
663662
else if (cText) {
664663
string? txt = (string) Clipboard.GetData(DataFormats.UnicodeText);
665664
txt = txt.CleanString();
@@ -680,7 +679,6 @@ private void ClipboardListenAsync(object? s, EventArgs e)
680679
}
681680

682681
}
683-
684682
else if (cFile) {
685683
var files = Clipboard.GetFileDropList();
686684
var rg = new string[files.Count];

‎SmartImage.UI/SmartImage.UI.csproj

Lines changed: 3 additions & 1 deletion
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.6.0</AssemblyVersion>
16+
<AssemblyVersion>4.0.7.0</AssemblyVersion>
1717
<NoWarn>IDE0290</NoWarn>
1818
<EnableSourceControlManagerQueries>True</EnableSourceControlManagerQueries>
1919
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
@@ -70,9 +70,11 @@
7070
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
7171
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
7272
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
73+
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
7374
<!-- <PackageReference Include="ReactiveUI.WPF" Version="20.1.63" /> -->
7475
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
7576
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
77+
<PackageReference Include="System.Net.Primitives" Version="4.3.1" />
7678
<PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
7779
<PackageReference Include="System.Text.Json" Version="9.0.0" />
7880
<PackageReference Include="Verify.Flurl" Version="1.0.0" />

0 commit comments

Comments
 (0)