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

Code cleanup: pattern matching and minor fixes

Browse source
This commit is contained in:
2dust 2026-03-10 17:19:21 +08:00
parent 0c2114d2e1
commit 26f65dd3b2
8 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
v2rayN/ServiceLib/Global.cs
View file

@ -95,7 +95,7 @@ public class Global
public const string PolicyGroupDefaultAllFilter = $"^(?!.*(?:{PolicyGroupExcludeKeywords})).*$"; public const string PolicyGroupDefaultAllFilter = $"^(?!.*(?:{PolicyGroupExcludeKeywords})).*$";
public static readonly List<string> PolicyGroupDefaultFilterList = public static readonly List<string> PolicyGroupDefaultFilterList =
[ [
// All nodes (exclude traffic/expiry info) // All nodes (exclude traffic/expiry info)
PolicyGroupDefaultAllFilter, PolicyGroupDefaultAllFilter,

2
v2rayN/ServiceLib/Handler/Builder/NodeValidator.cs
View file

@ -81,7 +81,9 @@ public class NodeValidator
{ {
var transportError = ValidateSingboxTransport(item.ConfigType, net); var transportError = ValidateSingboxTransport(item.ConfigType, net);
if (transportError != null) if (transportError != null)
{
v.Error(transportError); v.Error(transportError);
}
if (!Global.SingboxSupportConfigType.Contains(item.ConfigType)) if (!Global.SingboxSupportConfigType.Contains(item.ConfigType))
{ {

4
v2rayN/ServiceLib/Handler/ConfigHandler.cs
View file

@ -1040,8 +1040,8 @@ public static class ConfigHandler
if (profileItem.StreamSecurity.IsNotEmpty()) if (profileItem.StreamSecurity.IsNotEmpty())
{ {
if (profileItem.StreamSecurity != Global.StreamSecurity if (profileItem.StreamSecurity is not Global.StreamSecurity
&& profileItem.StreamSecurity != Global.StreamSecurityReality) and not Global.StreamSecurityReality)
{ {
profileItem.StreamSecurity = string.Empty; profileItem.StreamSecurity = string.Empty;
} }

2
v2rayN/ServiceLib/Models/ServerTestItem.cs
View file

@ -9,6 +9,6 @@ public class ServerTestItem
public EConfigType ConfigType { get; set; } public EConfigType ConfigType { get; set; }
public bool AllowTest { get; set; } public bool AllowTest { get; set; }
public int QueueNum { get; set; } public int QueueNum { get; set; }
public required ProfileItem Profile { get; set; } public ProfileItem Profile { get; set; }
public ECoreType CoreType { get; set; } public ECoreType CoreType { get; set; }
} }

1
v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs
View file

@ -243,7 +243,6 @@ public partial class CoreConfigSingboxService
if (Utils.IsIpv6(predefined)) if (Utils.IsIpv6(predefined))
{ {
rule.answer = new List<string> { $"*. IN AAAA {predefined}" }; rule.answer = new List<string> { $"*. IN AAAA {predefined}" };
} }
else else
{ {

6
v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml.cs
View file

@ -8,9 +8,9 @@ public partial class ClashConnectionsView : ReactiveUserControl<ClashConnections
public ClashConnectionsView() public ClashConnectionsView()
{ {
InitializeComponent(); InitializeComponent();
_config = AppManager.Instance.Config; _config = AppManager.Instance.Config;
ViewModel = new ClashConnectionsViewModel(UpdateViewHandler); ViewModel = new ClashConnectionsViewModel(UpdateViewHandler);
btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click; btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click;
@ -65,7 +65,7 @@ public partial class ClashConnectionsView : ReactiveUserControl<ClashConnections
{ {
ViewModel?.ClashConnectionClose(false); ViewModel?.ClashConnectionClose(false);
} }
#region UI #region UI
private void RestoreUI() private void RestoreUI()

3
v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs
View file

@ -97,8 +97,7 @@ public partial class ProfilesSelectWindow
private void LstProfiles_ColumnHeader_Click(object sender, RoutedEventArgs e) private void LstProfiles_ColumnHeader_Click(object sender, RoutedEventArgs e)
{ {
var colHeader = sender as DataGridColumnHeader; if (sender is not DataGridColumnHeader colHeader || colHeader.TabIndex < 0 || colHeader.Column == null)
if (colHeader == null || colHeader.TabIndex < 0 || colHeader.Column == null)
{ {
return; return;
} }

3
v2rayN/v2rayN/Views/ProfilesView.xaml.cs
View file

@ -233,8 +233,7 @@ public partial class ProfilesView
private void LstProfiles_ColumnHeader_Click(object sender, RoutedEventArgs e) private void LstProfiles_ColumnHeader_Click(object sender, RoutedEventArgs e)
{ {
var colHeader = sender as DataGridColumnHeader; if (sender is not DataGridColumnHeader colHeader || colHeader.TabIndex < 0 || colHeader.Column == null)
if (colHeader == null || colHeader.TabIndex < 0 || colHeader.Column == null)
{ {
return; return;
} }