up 7.0.3

0efb0b5e3e

v2rayN/AmazTool/UpgradeApp.cs

@@ -11,7 +11,7 @@ namespace AmazTool
             Console.WriteLine(fileName);
             Console.WriteLine("In progress, please wait...(正在进行中，请等待)");
 
-            Thread.Sleep(5000);
+            Thread.Sleep(9000);
 
             if (!File.Exists(fileName))
             {
@@ -25,7 +25,7 @@ namespace AmazTool
                 var path = GetPath(V2rayN);
                 Console.WriteLine(path);
                 var existing = Process.GetProcessesByName(V2rayN);
-                var pp = existing.FirstOrDefault(p => p.MainModule?.FileName != null && p.MainModule?.FileName == path);
+                var pp = existing.FirstOrDefault(p => p.MainModule?.FileName != null && p.MainModule?.FileName.Contains(path) == true);
                 pp?.Kill();
                 pp?.WaitForExit(1000);
             }
@@ -54,6 +54,8 @@ namespace AmazTool
                             continue;
                         }
 
+                        Console.WriteLine(entry.FullName);
+
                         var lst = entry.FullName.Split(splitKey);
                         if (lst.Length == 1) continue;
                         string fullName = string.Join(splitKey, lst[1..lst.Length]);
@@ -78,12 +80,12 @@ namespace AmazTool
             catch (Exception ex)
             {
                 Console.WriteLine("Upgrade Failed(升级失败)." + ex.StackTrace);
-                return;
+                //return;
             }
             if (sb.Length > 0)
             {
                 Console.WriteLine("Upgrade Failed(升级失败)." + sb.ToString());
-                return;
+                //return;
             }
 
             Console.WriteLine("Start v2rayN, please wait...(正在重启，请等待)");
@@ -92,6 +94,7 @@ namespace AmazTool
             {
                 StartInfo = new()
                 {
+                    UseShellExecute = true,
                     FileName = V2rayN,
                     WorkingDirectory = StartupPath()
                 }

v2rayN/ServiceLib/Common/Utils.cs

@@ -818,6 +818,13 @@ namespace ServiceLib.Common
             return await GetCliWrapOutput("/bin/bash", arg);
         }
 
+        public static async Task<string?> GetLinuxFontFamily(string lang)
+        {
+           // var arg = new List<string>() { "-c", $"fc-list :lang={lang} family" };
+            var arg = new List<string>() { "-c", $"fc-list : family" };
+            return await GetCliWrapOutput("/bin/bash", arg);
+        }
+
         #endregion Platform
     }
 }

v2rayN/ServiceLib/Enums/EViewAction.cs

@@ -19,6 +19,7 @@
         Shutdown,
         BrowseServer,
         ImportRulesFromFile,
+        InitSettingFont,
         SubEditWindow,
         RoutingRuleSettingWindow,
         RoutingRuleDetailsWindow,

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -37,9 +37,9 @@ namespace ServiceLib.Handler
                         continue;
                     }
 
-                    foreach (var vName in it.CoreExes)
+                    foreach (var name in it.CoreExes)
                     {
-                        var exe = Utils.GetExeName(Utils.GetBinPath(vName, it.CoreType.ToString()));
+                        var exe = Utils.GetBinPath(Utils.GetExeName(name), it.CoreType.ToString());
                         if (File.Exists(exe))
                         {
                             await Utils.SetLinuxChmod(exe);
@@ -134,17 +134,12 @@ namespace ServiceLib.Handler
                         {
                             continue;
                         }
-                        foreach (string vName in it.CoreExes)
+                        foreach (var name in it.CoreExes)
                         {
-                            var existing = Process.GetProcessesByName(vName);
+                            var path = Utils.GetBinPath(Utils.GetExeName(name), it.CoreType.ToString());
-                            foreach (Process p in existing)
+                            var existing = Process.GetProcessesByName(name);
-                            {
+                            var pp = existing.FirstOrDefault(p => p.MainModule?.FileName != null && p.MainModule?.FileName.Contains(path) == true);
-                                string? path = p.MainModule?.FileName;
+                            await KillProcess(pp);
-                                if (path == Utils.GetExeName(Utils.GetBinPath(vName, it.CoreType.ToString())))
-                                {
-                                    await KillProcess(p);
-                                }
-                            }
                         }
                     }
                 }
@@ -173,10 +168,9 @@ namespace ServiceLib.Handler
         private string CoreFindExe(CoreInfo coreInfo)
         {
             string fileName = string.Empty;
-            foreach (string name in coreInfo.CoreExes)
+            foreach (var name in coreInfo.CoreExes)
             {
-                string vName = Utils.GetExeName(name);
+                var vName = Utils.GetBinPath(Utils.GetExeName(name), coreInfo.CoreType.ToString());
-                vName = Utils.GetBinPath(vName, coreInfo.CoreType.ToString());
                 if (File.Exists(vName))
                 {
                     fileName = vName;

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -2860,6 +2860,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Install the font to the system and restart the settings 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsCurrentFontFamilyLinuxTip {
+            get {
+                return ResourceManager.GetString("TbSettingsCurrentFontFamilyLinuxTip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Copy the font TTF/TTC file to the directory guiFonts, restart the settings 的本地化字符串。
         /// </summary>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -1360,4 +1360,7 @@
   <data name="InsecureUrlProtocol" xml:space="preserve">
     <value>Please do not use the insecure HTTP protocol subscription address</value>
   </data>
+  <data name="TbSettingsCurrentFontFamilyLinuxTip" xml:space="preserve">
+    <value>Install the font to the system and restart the settings</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx

@@ -1357,4 +1357,7 @@
   <data name="InsecureUrlProtocol" xml:space="preserve">
     <value>请不要使用不安全的HTTP协议订阅地址</value>
   </data>
+  <data name="TbSettingsCurrentFontFamilyLinuxTip" xml:space="preserve">
+    <value>安装字体到系统中，重启设置</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx

@@ -1237,4 +1237,7 @@
   <data name="InsecureUrlProtocol" xml:space="preserve">
     <value>請不要使用不安全的HTTP協定訂閱位址</value>
   </data>
+  <data name="TbSettingsCurrentFontFamilyLinuxTip" xml:space="preserve">
+    <value>安裝字體到系統中，重新啟動設定</value>
+  </data>
 </root>

v2rayN/ServiceLib/ServiceLib.csproj

@@ -4,7 +4,7 @@
 	<TargetFramework>net8.0</TargetFramework>
 	<ImplicitUsings>enable</ImplicitUsings>
 	<Nullable>enable</Nullable>
-	<Version>7.0.2</Version>
+	<Version>7.0.3</Version>
   </PropertyGroup>
 
 	<ItemGroup>

v2rayN/ServiceLib/Services/UpdateService.cs

@@ -309,10 +309,9 @@ namespace ServiceLib.Services
             {
                 var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(type);
                 string filePath = string.Empty;
-                foreach (string name in coreInfo.CoreExes)
+                foreach (var name in coreInfo.CoreExes)
                 {
-                    string vName = Utils.GetExeName(name);
+                    var vName = Utils.GetBinPath(Utils.GetExeName(name), coreInfo.CoreType.ToString());
-                    vName = Utils.GetBinPath(vName, coreInfo.CoreType.ToString());
                     if (File.Exists(vName))
                     {
                         filePath = vName;

v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

@@ -44,8 +44,6 @@ namespace ServiceLib.ViewModels
             _checkUpdateItem.Clear();
 
             if (RuntimeInformation.ProcessArchitecture != Architecture.X86)
-            {
-                if (Utils.IsWindows())
             {
                 _checkUpdateItem.Add(new CheckUpdateItem()
                 {
@@ -53,8 +51,6 @@ namespace ServiceLib.ViewModels
                     CoreType = _v2rayN,
                     Remarks = ResUI.menuCheckUpdate,
                 });
-                }
-
                 _checkUpdateItem.Add(new CheckUpdateItem()
                 {
                     IsSelected = true,

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -313,6 +313,7 @@ namespace ServiceLib.ViewModels
             {
                 StartInfo = new ProcessStartInfo
                 {
+                    UseShellExecute = true,
                     FileName = fileName,
                     Arguments = arg.AppendQuotes(),
                     WorkingDirectory = Utils.StartupPath()

v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs

@@ -117,6 +117,8 @@ namespace ServiceLib.ViewModels
 
         private async Task Init()
         {
+            await _updateView?.Invoke(EViewAction.InitSettingFont, null);
+
             #region Core
 
             var inbound = _config.Inbound[0];

v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs

@@ -1,5 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Media;
 using Avalonia.Styling;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
@@ -9,14 +11,11 @@ namespace v2rayN.Desktop.ViewModels
 {
     public class ThemeSettingViewModel : MyReactiveObject
     {
-        [Reactive]
+        [Reactive] public bool ColorModeDark { get; set; }
-        public bool ColorModeDark { get; set; }
 
-        [Reactive]
+        [Reactive] public int CurrentFontSize { get; set; }
-        public int CurrentFontSize { get; set; }
 
-        [Reactive]
+        [Reactive] public string CurrentLanguage { get; set; }
-        public string CurrentLanguage { get; set; }
 
         public ThemeSettingViewModel()
         {
@@ -29,6 +28,7 @@ namespace v2rayN.Desktop.ViewModels
         private void RestoreUI()
         {
             ModifyTheme(_config.UiItem.ColorModeDark);
+            ModifyFontFamily();
         }
 
         private void BindingUI()
@@ -89,53 +89,51 @@ namespace v2rayN.Desktop.ViewModels
 
         private void ModifyFontSize(double size)
         {
-            Style buttonStyle = new(x => x.OfType<Button>());
+            Style style = new(x => Selectors.Or(
-            buttonStyle.Add(new Setter()
+                x.OfType<Button>(),
+                x.OfType<TextBox>(),
+                x.OfType<TextBlock>(),
+                x.OfType<Menu>(),
+                x.OfType<DataGridRow>(),
+                x.OfType<ListBoxItem>()
+            ));
+            style.Add(new Setter()
             {
-                Property = Button.FontSizeProperty,
+                Property = TemplatedControl.FontSizeProperty,
                 Value = size,
             });
-            Application.Current?.Styles.Add(buttonStyle);
+            Application.Current?.Styles.Add(style);
+        }
 
-            Style textStyle = new(x => x.OfType<TextBox>());
+        private void ModifyFontFamily()
-            textStyle.Add(new Setter()
         {
-                Property = TextBox.FontSizeProperty,
+            var currentFontFamily = _config.UiItem.CurrentFontFamily;
-                Value = size,
+            if (currentFontFamily.IsNullOrEmpty())
-            });
+            {
-            Application.Current?.Styles.Add(textStyle);
+                return;
+            }
 
-            Style textBlockStyle = new(x => x.OfType<TextBlock>());
+            try
-            textBlockStyle.Add(new Setter()
             {
-                Property = TextBlock.FontSizeProperty,
+                Style style = new(x => Selectors.Or(
-                Value = size,
+                    x.OfType<Button>(),
-            });
+                    x.OfType<TextBox>(),
-            Application.Current?.Styles.Add(textBlockStyle);
+                    x.OfType<TextBlock>(),
-
+                    x.OfType<Menu>(),
-            Style menuStyle = new(x => x.OfType<Menu>());
+                    x.OfType<DataGridRow>(),
-            menuStyle.Add(new Setter()
+                    x.OfType<ListBoxItem>()
+                ));
+                style.Add(new Setter()
                 {
-                Property = Menu.FontSizeProperty,
+                    Property = TemplatedControl.FontFamilyProperty,
-                Value = size,
+                    Value = new FontFamily(currentFontFamily),
                 });
-            Application.Current?.Styles.Add(menuStyle);
+                Application.Current?.Styles.Add(style);
-
+            }
-            Style dataStyle = new(x => x.OfType<DataGridRow>());
+            catch (Exception ex)
-            dataStyle.Add(new Setter()
             {
-                Property = DataGridRow.FontSizeProperty,
+                Logging.SaveLog("ModifyFontFamily", ex);
-                Value = size,
+            }
-            });
-            Application.Current?.Styles.Add(dataStyle);
-
-            Style listStyle = new(x => x.OfType<ListBoxItem>());
-            listStyle.Add(new Setter()
-            {
-                Property = ListBoxItem.FontSizeProperty,
-                Value = size,
-            });
-            Application.Current?.Styles.Add(listStyle);
         }
     }
 }

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml

@@ -533,7 +533,6 @@
                             Grid.Column="0"
                             VerticalAlignment="Center"
                             Classes="Margin8"
-                            IsVisible="False"
                             Text="{x:Static resx:ResUI.TbSettingsCurrentFontFamily}" />
                         <ComboBox
                             x:Name="cmbcurrentFontFamily"
@@ -541,15 +540,13 @@
                             Grid.Column="1"
                             Width="200"
                             Classes="Margin8"
-                            IsVisible="False"
                             MaxDropDownHeight="1000" />
                         <TextBlock
                             Grid.Row="16"
                             Grid.Column="2"
                             VerticalAlignment="Center"
                             Classes="Margin8"
-                            IsVisible="False"
+                            Text="{x:Static resx:ResUI.TbSettingsCurrentFontFamilyLinuxTip}"
-                            Text="{x:Static resx:ResUI.TbSettingsCurrentFontFamilyTip}"
                             TextWrapping="Wrap" />
 
                         <TextBlock
@@ -677,7 +674,6 @@
                             Classes="Margin8"
                             Text="{x:Static resx:ResUI.TbSettingsChinaUserTip}"
                             TextWrapping="Wrap" />
-
                     </Grid>
                 </ScrollViewer>
             </TabItem>

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs

@@ -15,7 +15,6 @@ namespace v2rayN.Desktop.Views
 
             btnCancel.Click += (s, e) => this.Close();
             _config = AppHandler.Instance.Config;
-            // var lstFonts = GetFonts(Utils.GetFontsPath());
 
             ViewModel = new OptionSettingViewModel(UpdateViewHandler);
 
@@ -100,9 +99,6 @@ namespace v2rayN.Desktop.Views
                 cmbMainGirdOrientation.Items.Add(it.ToString());
             }
 
-            //lstFonts.ForEach(it => { cmbcurrentFontFamily.Items.Add(it); });
-            //cmbcurrentFontFamily.Items.Add(string.Empty);
-
             this.WhenActivated(disposables =>
             {
                 this.Bind(ViewModel, vm => vm.localPort, v => v.txtlocalPort.Text).DisposeWith(disposables);
@@ -182,58 +178,53 @@ namespace v2rayN.Desktop.Views
                     //  WindowsUtils.SetAutoRun(Global.AutoRunRegPath, Global.AutoRunName, togAutoRun.IsChecked ?? false);
                     this.Close(true);
                     break;
+
+                case EViewAction.InitSettingFont:
+                    await InitSettingFont();
+                    break;
             }
             return await Task.FromResult(true);
         }
 
-        //private List<string> GetFonts(string path)
+        private async Task InitSettingFont()
-        //{
+        {
-        //    var lstFonts = new List<string>();
+            var lstFonts = await GetFonts();
-        //    try
+            lstFonts.ForEach(it => { cmbcurrentFontFamily.Items.Add(it); });
-        //    {
+            cmbcurrentFontFamily.Items.Add(string.Empty);
-        //        string[] searchPatterns = { "*.ttf", "*.ttc" };
+        }
-        //        var files = new List<string>();
+
-        //        foreach (var pattern in searchPatterns)
+        private async Task<List<string>> GetFonts()
-        //        {
+        {
-        //            files.AddRange(Directory.GetFiles(path, pattern));
+            var lstFonts = new List<string>();
-        //        }
+            try
-        //        var culture = _config.uiItem.currentLanguage == Global.Languages[0] ? "zh-cn" : "en-us";
+            {
-        //        var culture2 = "en-us";
+                if (Utils.IsWindows())
-        //        foreach (var ttf in files)
+                {
-        //        {
+                    return lstFonts;
-        //            var families = Fonts.GetFontFamilies(Utils.GetFontsPath(ttf));
+                }
-        //            foreach (FontFamily family in families)
+                else if (Utils.IsLinux())
-        //            {
+                {
-        //                var typefaces = family.GetTypefaces();
+                    var result = await Utils.GetLinuxFontFamily("zh");
-        //                foreach (Typeface typeface in typefaces)
+                    if (result.IsNullOrEmpty())
-        //                {
+                    {
-        //                    typeface.TryGetGlyphTypeface(out GlyphTypeface glyph);
+                        return lstFonts;
-        //                    //var fontFace = glyph.Win32FaceNames[new CultureInfo("en-us")];
+                    }
-        //                    //if (!fontFace.Equals("Regular") && !fontFace.Equals("Normal"))
+
-        //                    //{
+                    var lst = result.Split(Environment.NewLine)
-        //                    //    continue;
+                        .Where(t => t.IsNotEmpty())
-        //                    //}
+                        .ToList()
-        //                    var fontFamily = glyph.Win32FamilyNames[new CultureInfo(culture)];
+                        .Select(t => t.Split(",").FirstOrDefault() ?? "")
-        //                    if (Utils.IsNullOrEmpty(fontFamily))
+                        .OrderBy(t => t)
-        //                    {
+                        .ToList();
-        //                        fontFamily = glyph.Win32FamilyNames[new CultureInfo(culture2)];
+                    return lst;
-        //                        if (Utils.IsNullOrEmpty(fontFamily))
+                }
-        //                        {
+            }
-        //                            continue;
+            catch (Exception ex)
-        //                        }
+            {
-        //                    }
+                Logging.SaveLog("fill fonts error", ex);
-        //                    lstFonts.Add(fontFamily);
+            }
-        //                    break;
+            return lstFonts;
-        //                }
+        }
-        //            }
-        //        }
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        Logging.SaveLog("fill fonts error", ex);
-        //    }
-        //    return lstFonts;
-        //}
 
         private void ClbdestOverride_SelectionChanged(object? sender, SelectionChangedEventArgs e)
         {

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

@@ -17,7 +17,6 @@ namespace v2rayN.Views
 
             this.Owner = Application.Current.MainWindow;
             _config = AppHandler.Instance.Config;
-            var lstFonts = GetFonts(Utils.GetFontsPath());
 
             ViewModel = new OptionSettingViewModel(UpdateViewHandler);
 
@@ -102,9 +101,6 @@ namespace v2rayN.Views
                 cmbMainGirdOrientation.Items.Add(it.ToString());
             }
 
-            lstFonts.ForEach(it => { cmbcurrentFontFamily.Items.Add(it); });
-            cmbcurrentFontFamily.Items.Add(string.Empty);
-
             this.WhenActivated(disposables =>
             {
                 this.Bind(ViewModel, vm => vm.localPort, v => v.txtlocalPort.Text).DisposeWith(disposables);
@@ -191,11 +187,22 @@ namespace v2rayN.Views
                     WindowsUtils.SetAutoRun(Global.AutoRunRegPath, Global.AutoRunName, togAutoRun.IsChecked ?? false);
                     this.DialogResult = true;
                     break;
+
+                case EViewAction.InitSettingFont:
+                    await InitSettingFont();
+                    break;
             }
             return await Task.FromResult(true);
         }
 
-        private List<string> GetFonts(string path)
+        private async Task InitSettingFont()
+        {
+            var lstFonts = await GetFonts(Utils.GetFontsPath());
+            lstFonts.ForEach(it => { cmbcurrentFontFamily.Items.Add(it); });
+            cmbcurrentFontFamily.Items.Add(string.Empty);
+        }
+
+        private async Task<List<string>> GetFonts(string path)
         {
             var lstFonts = new List<string>();
             try
@@ -241,7 +248,7 @@ namespace v2rayN.Views
             {
                 Logging.SaveLog("fill fonts error", ex);
             }
-            return lstFonts;
+            return lstFonts.OrderBy(t => t).ToList();
         }
 
         private void ClbdestOverride_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)