Skip to content

Commit 4cd1246

Browse files
committed
Encoding fix
1 parent 37a26bb commit 4cd1246

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

SmartImage.Lib/Engines/BaseSearchEngine.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public virtual SearchResult GetResult(ImageQuery query)
4949
return sr;
5050
}
5151

52-
5352

5453
public async Task<SearchResult> GetResultAsync(ImageQuery query)
5554
{
@@ -72,18 +71,18 @@ public Uri GetRawResultUri(ImageQuery query)
7271
{
7372
var uri = new Uri(BaseUrl + query.UploadUri);
7473

75-
var reply = Network.Ping(uri, (long)Timeout.TotalMilliseconds);
74+
var reply = Network.Ping(uri, (long) Timeout.TotalMilliseconds);
7675

7776
//var b = Network.IsAlive(uri, (long) Timeout.TotalMilliseconds);
7877

7978
//var b1 = ok.Status != IPStatus.Success || ok.Status == IPStatus.TimedOut;
8079

81-
82-
80+
8381
if (reply.Status != IPStatus.Success) {
8482
Debug.WriteLine($"{Name} is unavailable or timed out after {Timeout:g} ({reply.Status})", C_WARN);
8583
return null;
8684
}
85+
8786
return uri;
8887
}
8988
}

SmartImage.Lib/Engines/Impl/YandexEngine.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Diagnostics;
44
using System.Drawing;
55
using System.Linq;
6+
using System.Text;
67
using AngleSharp.Dom;
78
using AngleSharp.Html.Dom;
89
using AngleSharp.XPath;
@@ -213,7 +214,10 @@ protected override SearchResult Process(IDocument doc, SearchResult sr)
213214

214215

215216
if (looksLike != null) {
216-
sr.PrimaryResult.Description = looksLike;
217+
//todo
218+
219+
sr.PrimaryResult.Description = Encoding.Unicode.GetString(
220+
Encoding.Convert(Encoding.UTF8, Encoding.Unicode, Encoding.UTF8.GetBytes(looksLike)));
217221
}
218222

219223
sr.OtherResults.AddRange(images);

SmartImage/Program.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,9 @@ private static async Task Main(string[] args)
8585
* Check compatibility
8686
*/
8787

88-
Native.SetConsoleOutputCP(Native.CP_WIN32_UNITED_STATES);
89-
88+
Native.SetConsoleOutputCP((uint) Encoding.Unicode.CodePage);
89+
Native.SetConsoleCP((uint) Encoding.Unicode.CodePage);
90+
9091
Console.Title = $"{AppInfo.NAME}";
9192

9293
NConsole.Init();

0 commit comments

Comments
 (0)