Merge branch '2dust:master' into patch-1

v2rayN/ServiceLib/Common/QueryableExtension.cs

@@ -1,50 +0,0 @@
-using System.Linq.Expressions;
-using System.Reflection;
-
-namespace ServiceLib.Common
-{
-    public static class QueryableExtension
-    {
-        public static IOrderedQueryable<T> OrderBy<T>(this IQueryable<T> query, string propertyName)
-        {
-            return _OrderBy<T>(query, propertyName, false);
-        }
-
-        public static IOrderedQueryable<T> OrderByDescending<T>(this IQueryable<T> query, string propertyName)
-        {
-            return _OrderBy<T>(query, propertyName, true);
-        }
-
-        private static IOrderedQueryable<T> _OrderBy<T>(IQueryable<T> query, string propertyName, bool isDesc)
-        {
-            var methodname = (isDesc) ? "OrderByDescendingInternal" : "OrderByInternal";
-
-            var memberProp = typeof(T).GetProperty(propertyName);
-
-            var method = typeof(QueryableExtension).GetMethod(methodname)
-                                       .MakeGenericMethod(typeof(T), memberProp.PropertyType);
-
-            return (IOrderedQueryable<T>)method.Invoke(null, new object[] { query, memberProp });
-        }
-
-        public static IOrderedQueryable<T> OrderByInternal<T, TProp>(IQueryable<T> query, PropertyInfo memberProperty)
-        {//public
-            return query.OrderBy(_GetLambda<T, TProp>(memberProperty));
-        }
-
-        public static IOrderedQueryable<T> OrderByDescendingInternal<T, TProp>(IQueryable<T> query, PropertyInfo memberProperty)
-        {//public
-            return query.OrderByDescending(_GetLambda<T, TProp>(memberProperty));
-        }
-
-        private static Expression<Func<T, TProp>> _GetLambda<T, TProp>(PropertyInfo memberProperty)
-        {
-            if (memberProperty.PropertyType != typeof(TProp)) throw new Exception();
-
-            var thisArg = Expression.Parameter(typeof(T));
-            var lambda = Expression.Lambda<Func<T, TProp>>(Expression.Property(thisArg, memberProperty), thisArg);
-
-            return lambda;
-        }
-    }
-}

v2rayN/ServiceLib/Enums/EMsgCommand.cs

@@ -6,6 +6,7 @@
         SendMsgView,
         SendSnackMsg,
         RefreshProfiles,
-        StopSpeedtest
+        StopSpeedtest,
+        AppExit
     }
 }

v2rayN/ServiceLib/Global.cs

@@ -78,6 +78,7 @@
         public const string SpeedUnit = "";
         public const int MinFontSize = 10;
         public const string RebootAs = "rebootas";
+        public const string AvaAssets = "avares://v2rayN/Assets/";
 
         public static readonly List<string> IEProxyProtocols = new() {
                         "{ip}:{http_port}",
@@ -196,7 +197,7 @@
         public static readonly List<string> SingboxDomainStrategy4Out = new() { "ipv4_only", "prefer_ipv4", "prefer_ipv6", "ipv6_only", "" };
         public static readonly List<string> DomainDNSAddress = ["223.5.5.5", "223.6.6.6", "localhost"];
         public static readonly List<string> SingboxDomainDNSAddress = ["223.5.5.5", "223.6.6.6", "dhcp://auto"];
-        public static readonly List<string> Languages = new() { "zh-Hans", "zh-Hant", "en", "fa-Ir", "ru" };
+        public static readonly List<string> Languages = new() { "zh-Hans", "zh-Hant", "en", "fa-Ir", "ru", "hu" };
         public static readonly List<string> Alpns = new() { "h3", "h2", "http/1.1", "h3,h2", "h2,http/1.1", "h3,h2,http/1.1", "" };
         public static readonly List<string> LogLevels = new() { "debug", "info", "warning", "error", "none" };
         public static readonly List<string> InboundTags = new() { "socks", "socks2" };

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -766,69 +766,66 @@ namespace ServiceLib.Handler
                               }).ToList();
 
             Enum.TryParse(colName, true, out EServerColName name);
-            var propertyName = string.Empty;
-            switch (name)
-            {
-                case EServerColName.ConfigType:
-                case EServerColName.Remarks:
-                case EServerColName.Address:
-                case EServerColName.Port:
-                case EServerColName.Network:
-                case EServerColName.StreamSecurity:
-                    propertyName = name.ToString();
-                    break;
-
-                case EServerColName.DelayVal:
-                    propertyName = "Delay";
-                    break;
-
-                case EServerColName.SpeedVal:
-                    propertyName = "Speed";
-                    break;
-
-                case EServerColName.SubRemarks:
-                    propertyName = "Subid";
-                    break;
-
-                default:
-                    return -1;
-            }
-
-            var items = lstProfile.AsQueryable();
 
             if (asc)
             {
-                lstProfile = items.OrderBy(propertyName).ToList();
+                lstProfile = name switch
+                {
+                    EServerColName.ConfigType => lstProfile.OrderBy(t => t.ConfigType).ToList(),
+                    EServerColName.Remarks => lstProfile.OrderBy(t => t.Remarks).ToList(),
+                    EServerColName.Address => lstProfile.OrderBy(t => t.Address).ToList(),
+                    EServerColName.Port => lstProfile.OrderBy(t => t.Port).ToList(),
+                    EServerColName.Network => lstProfile.OrderBy(t => t.Network).ToList(),
+                    EServerColName.StreamSecurity => lstProfile.OrderBy(t => t.StreamSecurity).ToList(),
+                    EServerColName.DelayVal => lstProfile.OrderBy(t => t.Delay).ToList(),
+                    EServerColName.SpeedVal => lstProfile.OrderBy(t => t.Speed).ToList(),
+                    EServerColName.SubRemarks => lstProfile.OrderBy(t => t.Subid).ToList(),
+                    _ => lstProfile
+                };
             }
             else
             {
-                lstProfile = items.OrderByDescending(propertyName).ToList();
+                lstProfile = name switch
+                {
+                    EServerColName.ConfigType => lstProfile.OrderByDescending(t => t.ConfigType).ToList(),
+                    EServerColName.Remarks => lstProfile.OrderByDescending(t => t.Remarks).ToList(),
+                    EServerColName.Address => lstProfile.OrderByDescending(t => t.Address).ToList(),
+                    EServerColName.Port => lstProfile.OrderByDescending(t => t.Port).ToList(),
+                    EServerColName.Network => lstProfile.OrderByDescending(t => t.Network).ToList(),
+                    EServerColName.StreamSecurity => lstProfile.OrderByDescending(t => t.StreamSecurity).ToList(),
+                    EServerColName.DelayVal => lstProfile.OrderByDescending(t => t.Delay).ToList(),
+                    EServerColName.SpeedVal => lstProfile.OrderByDescending(t => t.Speed).ToList(),
+                    EServerColName.SubRemarks => lstProfile.OrderByDescending(t => t.Subid).ToList(),
+                    _ => lstProfile
+                };
             }
-            for (int i = 0; i < lstProfile.Count; i++)
+
+            for (var i = 0; i < lstProfile.Count; i++)
             {
                 ProfileExHandler.Instance.SetSort(lstProfile[i].IndexId, (i + 1) * 10);
             }
-            if (name == EServerColName.DelayVal)
+            switch (name)
             {
-                var maxSort = lstProfile.Max(t => t.Sort) + 10;
+                case EServerColName.DelayVal:
-                foreach (var item in lstProfile)
-                {
-                    if (item.Delay <= 0)
                     {
-                        ProfileExHandler.Instance.SetSort(item.IndexId, maxSort);
+                        var maxSort = lstProfile.Max(t => t.Sort) + 10;
+                        foreach (var item in lstProfile.Where(item => item.Delay <= 0))
+                        {
+                            ProfileExHandler.Instance.SetSort(item.IndexId, maxSort);
+                        }
+
+                        break;
                     }
-                }
+                case EServerColName.SpeedVal:
-            }
-            if (name == EServerColName.SpeedVal)
-            {
-                var maxSort = lstProfile.Max(t => t.Sort) + 10;
-                foreach (var item in lstProfile)
-                {
-                    if (item.Speed <= 0)
                     {
-                        ProfileExHandler.Instance.SetSort(item.IndexId, maxSort);
+                        var maxSort = lstProfile.Max(t => t.Sort) + 10;
+                        foreach (var item in lstProfile.Where(item => item.Speed <= 0))
+                        {
+                            ProfileExHandler.Instance.SetSort(item.IndexId, maxSort);
+                        }
+
+                        break;
                     }
-                }
             }
 
             return 0;

v2rayN/ServiceLib/ServiceLib.csproj

@@ -60,6 +60,9 @@
 	    <SubType>Designer</SubType>
 	    <Generator>PublicResXFileCodeGenerator</Generator>
 	  </EmbeddedResource>
+	  <EmbeddedResource Update="Resx\ResUI.hu.resx">
+	    <Generator>PublicResXFileCodeGenerator</Generator>
+	  </EmbeddedResource>
 	  <EmbeddedResource Update="Resx\ResUI.resx">
 	    <SubType>Designer</SubType>
 	    <LastGenOutput>ResUI.Designer.cs</LastGenOutput>

v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs

@@ -160,9 +160,9 @@ namespace ServiceLib.ViewModels
             var configDirZipTemp = Utils.GetTempPath($"v2rayN_{DateTime.Now:yyyyMMddHHmmss}");
             var configDirTemp = Path.Combine(configDirZipTemp, _guiConfigs);
 
-            await Task.Run(() => FileManager.CopyDirectory(configDir, configDirTemp, false, "cache.db"));
+            FileManager.CopyDirectory(configDir, configDirTemp, false, "cache.db");
-            var ret = await Task.Run(() => FileManager.CreateFromDirectory(configDirZipTemp, fileName));
+            var ret = FileManager.CreateFromDirectory(configDirZipTemp, fileName);
-            await Task.Run(() => Directory.Delete(configDirZipTemp, true));
+            Directory.Delete(configDirZipTemp, true);
             return ret;
         }
     }

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -283,6 +283,7 @@ namespace ServiceLib.ViewModels
             try
             {
                 Logging.SaveLog("MyAppExitAsync Begin");
+                MessageBus.Current.SendMessage("", EMsgCommand.AppExit.ToString());
 
                 await ConfigHandler.SaveConfig(_config);
                 await SysProxyHandler.UpdateSysProxy(_config, true);

v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs

@@ -1,6 +1,5 @@
 using Avalonia;
 using Avalonia.Media;
-using System.Reflection;
 
 namespace v2rayN.Desktop.Common
 {
@@ -8,7 +7,7 @@ namespace v2rayN.Desktop.Common
     {
         public static AppBuilder WithFontByDefault(this AppBuilder appBuilder)
         {
-            var uri = $"avares://{Assembly.GetExecutingAssembly().GetName().Name}/Assets/Fonts#Noto Sans SC";
+            var uri = Path.Combine(Global.AvaAssets, "Fonts#Noto Sans SC");
             return appBuilder.With(new FontManagerOptions()
             {
                 DefaultFamilyName = uri,

v2rayN/v2rayN.Desktop/Common/AvaUtils.cs

@@ -3,7 +3,6 @@ using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
-using System.Reflection;
 
 namespace v2rayN.Desktop.Common
 {
@@ -41,7 +40,7 @@ namespace v2rayN.Desktop.Common
         public static WindowIcon GetAppIcon(ESysProxyType sysProxyType)
         {
             var index = (int)sysProxyType + 1;
-            var uri = new Uri($"avares://{Assembly.GetExecutingAssembly().GetName().Name}/Assets/NotifyIcon{index}.ico");
+            var uri = new Uri(Path.Combine(Global.AvaAssets, $"NotifyIcon{index}.ico"));
             using var bitmap = new Bitmap(AssetLoader.Open(uri));
             return new(bitmap);
         }

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs

@@ -156,6 +156,7 @@ namespace v2rayN.Desktop.Views
             RestoreUI();
             AddHelpMenuItem();
             //WindowsHandler.Instance.RegisterGlobalHotkey(_config, OnHotkeyHandler, null);
+            MessageBus.Current.Listen<string>(EMsgCommand.AppExit.ToString()).Subscribe(StorageUI);
         }
 
         #region Event
@@ -441,7 +442,7 @@ namespace v2rayN.Desktop.Views
             }
         }
 
-        private void StorageUI()
+        private void StorageUI(string? n = null)
         {
             _config.UiItem.MainWidth = Utils.ToInt(this.Width);
             _config.UiItem.MainHeight = Utils.ToInt(this.Height);
@@ -456,7 +457,6 @@ namespace v2rayN.Desktop.Views
                 _config.UiItem.MainGirdHeight1 = Math.Ceiling(gridMain1.RowDefinitions[0].ActualHeight + 0.1);
                 _config.UiItem.MainGirdHeight2 = Math.Ceiling(gridMain1.RowDefinitions[2].ActualHeight + 0.1);
             }
-            ConfigHandler.SaveConfig(_config);
         }
 
         private void AddHelpMenuItem()

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml

@@ -56,28 +56,23 @@
                             Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
                     </Button.Content>
                 </Button>
-                <SplitButton
+
+                <Button
                     x:Name="btnAutofitColumnWidth"
-                    Width="54"
+                    Width="30"
                     Height="30"
-                    Margin="20,0"
+                    Margin="4,0"
-                    Padding="2"
+                    Classes="Success"
-                    Classes="Tertiary"
+                    Theme="{DynamicResource BorderlessButton}"
-                    Theme="{DynamicResource BorderlessSplitButton}"
                     ToolTip.Tip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
-                    <SplitButton.Content>
+                    <Button.Content>
                         <PathIcon
                             Width="24"
                             Height="24"
                             Data="{StaticResource building_fit}"
                             Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
-                    </SplitButton.Content>
+                    </Button.Content>
-                    <SplitButton.Flyout>
+                </Button>
-                        <MenuFlyout>
-                            <MenuItem Name="menuStorageUI" Header="{x:Static resx:ResUI.menuStorageUI}" />
-                        </MenuFlyout>
-                    </SplitButton.Flyout>
-                </SplitButton>
 
                 <TextBox
                     x:Name="txtServerFilter"

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs

@@ -27,7 +27,6 @@ namespace v2rayN.Desktop.Views
             menuSelectAll.Click += menuSelectAll_Click;
             btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click;
             txtServerFilter.KeyDown += TxtServerFilter_KeyDown;
-            menuStorageUI.Click += MenuStorageUI_Click;
             lstProfiles.KeyDown += LstProfiles_KeyDown;
             lstProfiles.SelectionChanged += lstProfiles_SelectionChanged;
             lstProfiles.DoubleTapped += LstProfiles_DoubleTapped;
@@ -91,6 +90,7 @@ namespace v2rayN.Desktop.Views
 
             RestoreUI();
             ViewModel?.RefreshServers();
+            MessageBus.Current.Listen<string>(EMsgCommand.AppExit.ToString()).Subscribe(StorageUI);
         }
 
         private async void LstProfiles_Sorting(object? sender, DataGridColumnEventArgs e)
@@ -324,11 +324,6 @@ namespace v2rayN.Desktop.Views
             }
         }
          
-        private void MenuStorageUI_Click(object? sender, RoutedEventArgs e)
-        {
-            StorageUI();
-        }
-
         //#endregion Event
 
         //#region UI
@@ -368,7 +363,7 @@ namespace v2rayN.Desktop.Views
             }
         }
 
-        private void StorageUI()
+        private void StorageUI(string? n = null)
         {
             List<ColumnItem> lvColumnItem = new();
             for (int k = 0; k < lstProfiles.Columns.Count; k++)
@@ -386,7 +381,6 @@ namespace v2rayN.Desktop.Views
                 });
             }
             _config.UiItem.MainColumnItem = lvColumnItem;
-            ConfigHandler.SaveConfig(_config);
         }
 
         //#endregion UI

v2rayN/v2rayN/App.xaml.cs

@@ -14,7 +14,6 @@ namespace v2rayN
 
         public App()
         {
-            // Locator.CurrentMutable.RegisterViewsForViewModels(Assembly.GetCallingAssembly());
             this.DispatcherUnhandledException += App_DispatcherUnhandledException;
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
             TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException;

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -26,7 +26,6 @@ namespace v2rayN.Views
             _config = AppHandler.Instance.Config;
             ThreadPool.RegisterWaitForSingleObject(App.ProgramStarted, OnProgramStarted, null, -1, false);
 
-            Application.Current.Exit += Current_Exit;
             App.Current.SessionEnding += Current_SessionEnding;
             this.Closing += MainWindow_Closing;
             this.PreviewKeyDown += MainWindow_PreviewKeyDown;
@@ -142,6 +141,7 @@ namespace v2rayN.Views
             RestoreUI();
             AddHelpMenuItem();
             WindowsHandler.Instance.RegisterGlobalHotkey(_config, OnHotkeyHandler, null);
+            MessageBus.Current.Listen<string>(EMsgCommand.AppExit.ToString()).Subscribe(StorageUI);
         }
 
         #region Event
@@ -265,11 +265,6 @@ namespace v2rayN.Views
             ShowHideWindow(false);
         }
 
-        private void Current_Exit(object sender, ExitEventArgs e)
-        {
-            StorageUI();
-        }
-
         private async void Current_SessionEnding(object sender, SessionEndingCancelEventArgs e)
         {
             Logging.SaveLog("Current_SessionEnding");
@@ -402,7 +397,7 @@ namespace v2rayN.Views
             }
         }
 
-        private void StorageUI()
+        private void StorageUI(string? n = null)
         {
             _config.UiItem.MainWidth = Utils.ToInt(this.Width);
             _config.UiItem.MainHeight = Utils.ToInt(this.Height);

v2rayN/v2rayN/Views/ProfilesView.xaml.cs

@@ -1,6 +1,7 @@
 using MaterialDesignThemes.Wpf;
 using ReactiveUI;
 using Splat;
+using System;
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Controls;
@@ -24,7 +25,6 @@ namespace v2rayN.Views
 
             _config = AppHandler.Instance.Config;
 
-            Application.Current.Exit += Current_Exit;
             btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click;
             txtServerFilter.PreviewKeyDown += TxtServerFilter_PreviewKeyDown;
             lstProfiles.PreviewKeyDown += LstProfiles_PreviewKeyDown;
@@ -90,15 +90,11 @@ namespace v2rayN.Views
 
             RestoreUI();
             ViewModel?.RefreshServers();
+            MessageBus.Current.Listen<string>(EMsgCommand.AppExit.ToString()).Subscribe(StorageUI);
         }
 
         #region Event
 
-        private void Current_Exit(object sender, ExitEventArgs e)
-        {
-            StorageUI();
-        }
-
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
         {
             switch (action)
@@ -356,7 +352,7 @@ namespace v2rayN.Views
             }
         }
 
-        private void StorageUI()
+        private void StorageUI(string? n = null)
         {
             List<ColumnItem> lvColumnItem = new();
             for (int k = 0; k < lstProfiles.Columns.Count; k++)
@@ -370,7 +366,6 @@ namespace v2rayN.Views
                 });
             }
             _config.UiItem.MainColumnItem = lvColumnItem;
-            ConfigHandler.SaveConfig(_config);
         }
 
         #endregion UI