Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-11-29 11:12:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Update AppBuilderExtension.cs

Browse source
This commit is contained in:
JieXu 2025-11-17 20:12:19 +08:00 committed by GitHub
parent 12b6580819
commit faac943049
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs
View file

@ -2,7 +2,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using Avalonia;
using Avalonia.Media; using Avalonia.Media;
namespace v2rayN.Desktop.Common; namespace v2rayN.Desktop.Common;
@ -25,31 +24,23 @@ public static class AppBuilderExtension
var fallbacks = new List<FontFallback>(); var fallbacks = new List<FontFallback>();
string? zhPath = RunFcMatch("sans:lang=zh-cn"); string? zhFamily = RunFcMatchFamily("sans:lang=zh-cn");
if (zhPath != null) if (!string.IsNullOrWhiteSpace(zhFamily))
{
var (dir, family) = ConvertPathToFontFamily(zhPath);
if (dir != null && family != null)
{ {
fallbacks.Add(new FontFallback fallbacks.Add(new FontFallback
{ {
FontFamily = new FontFamily($"file://{dir}#{family}") FontFamily = new FontFamily(zhFamily)
}); });
} }
}
string? emojiPath = RunFcMatch("emoji"); string? emojiFamily = RunFcMatchFamily("emoji");
if (emojiPath != null) if (!string.IsNullOrWhiteSpace(emojiFamily))
{
var (dir, family) = ConvertPathToFontFamily(emojiPath);
if (dir != null && family != null)
{ {
fallbacks.Add(new FontFallback fallbacks.Add(new FontFallback
{ {
FontFamily = new FontFamily($"file://{dir}#{family}") FontFamily = new FontFamily(emojiFamily)
}); });
} }
}
var notoUri = Path.Combine(Global.AvaAssets, "Fonts#Noto Sans SC"); var notoUri = Path.Combine(Global.AvaAssets, "Fonts#Noto Sans SC");
fallbacks.Add(new FontFallback fallbacks.Add(new FontFallback
@ -63,20 +54,26 @@ public static class AppBuilderExtension
}); });
} }
private static string? RunFcMatch(string pattern) private static string? RunFcMatchFamily(string pattern)
{ {
try try
{ {
var psi = new ProcessStartInfo var psi = new ProcessStartInfo
{ {
FileName = "/bin/bash", FileName = "/bin/bash",
ArgumentList = { "-c", $"fc-match -f \"%{{file}}\\n\" \"{pattern}\" | head -n 1" }, ArgumentList =
{
"-c",
$"fc-match -f \"%{{family[0]}}\\n\" \"{pattern}\" | head -n 1"
},
RedirectStandardOutput = true, RedirectStandardOutput = true,
RedirectStandardError = false,
UseShellExecute = false UseShellExecute = false
}; };
using var p = Process.Start(psi); using var p = Process.Start(psi);
if (p == null) return null; if (p == null)
return null;
var output = p.StandardOutput.ReadToEnd().Trim(); var output = p.StandardOutput.ReadToEnd().Trim();
return string.IsNullOrWhiteSpace(output) ? null : output; return string.IsNullOrWhiteSpace(output) ? null : output;
@ -86,31 +83,4 @@ public static class AppBuilderExtension
return null; return null;
} }
} }
private static (string? Dir, string? Family) ConvertPathToFontFamily(string filePath)
{
try
{
string dir = Path.GetDirectoryName(filePath)!;
string file = Path.GetFileNameWithoutExtension(filePath);
if (file.StartsWith("NotoColorEmoji", StringComparison.OrdinalIgnoreCase))
return (dir, "Noto Color Emoji");
if (file.StartsWith("NotoEmoji", StringComparison.OrdinalIgnoreCase))
return (dir, "Noto Emoji");
if (file.StartsWith("NotoSansCJK", StringComparison.OrdinalIgnoreCase))
return (dir, "Noto Sans CJK SC");
if (file.StartsWith("DroidSansFallbackFull", StringComparison.OrdinalIgnoreCase))
return (dir, "Droid Sans Fallback");
return (dir, file);
}
catch
{
return (null, null);
}
}
} }