Skip to content

Commit 1360051

Browse files
committed
Improve and optimize
1 parent 42c4f9a commit 1360051

5 files changed

Lines changed: 16 additions & 6 deletions

File tree

v2rayN/ServiceLib/Global.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,5 +528,12 @@ public class Global
528528
@""
529529
];
530530

531+
public static readonly List<string> OutboundTags =
532+
[
533+
ProxyTag,
534+
DirectTag,
535+
BlockTag
536+
];
537+
531538
#endregion const
532539
}

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1369,7 +1369,7 @@ private bool ParseV2Address(string address, Rule4Sbox rule)
13691369

13701370
private async Task<string?> GenRoutingUserRuleOutbound(string outboundTag, SingboxConfig singboxConfig)
13711371
{
1372-
if (outboundTag is Global.ProxyTag or Global.DirectTag or Global.BlockTag)
1372+
if (Global.OutboundTags.Contains(outboundTag))
13731373
{
13741374
return outboundTag;
13751375
}

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ private async Task<int> GenRoutingUserRule(RulesItem4Ray? rule, V2rayConfig v2ra
631631

632632
private async Task<string?> GenRoutingUserRuleOutbound(string outboundTag, V2rayConfig v2rayConfig)
633633
{
634-
if (outboundTag is Global.ProxyTag or Global.DirectTag or Global.BlockTag)
634+
if (Global.OutboundTags.Contains(outboundTag))
635635
{
636636
return outboundTag;
637637
}

v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ public RoutingRuleDetailsWindow(RulesItem rulesItem)
2323
clbInboundTag.SelectionChanged += ClbInboundTag_SelectionChanged;
2424

2525
ViewModel = new RoutingRuleDetailsViewModel(rulesItem, UpdateViewHandler);
26-
cmbOutboundTag.ItemsSource = new List<string> { Global.ProxyTag, Global.DirectTag, Global.BlockTag };
26+
27+
cmbOutboundTag.ItemsSource = Global.OutboundTags;
2728
Global.RuleProtocols.ForEach(it =>
2829
{
2930
clbProtocol.Items.Add(it);

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ public RoutingRuleDetailsWindow(RulesItem rulesItem)
1616
clbInboundTag.SelectionChanged += ClbInboundTag_SelectionChanged;
1717

1818
ViewModel = new RoutingRuleDetailsViewModel(rulesItem, UpdateViewHandler);
19-
cmbOutboundTag.Items.Add(Global.ProxyTag);
20-
cmbOutboundTag.Items.Add(Global.DirectTag);
21-
cmbOutboundTag.Items.Add(Global.BlockTag);
19+
20+
Global.OutboundTags.ForEach(it =>
21+
{
22+
cmbOutboundTag.Items.Add(it);
23+
});
2224
Global.RuleProtocols.ForEach(it =>
2325
{
2426
clbProtocol.Items.Add(it);

0 commit comments

Comments
 (0)