Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-03-17 13:53:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve profile matching for Subscription, remove old option

Browse source
This commit is contained in:
2dust 2026-03-12 14:56:01 +08:00
parent 5e18567ce6
commit 17ed26cd06
15 changed files with 82 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -95,10 +95,7 @@ public static class ConfigHandler
config.GuiItem ??= new();
config.MsgUIItem ??= new();
config.UiItem ??= new UIItem()
{
EnableUpdateSubOnlyRemarksExist = true
};
config.UiItem ??= new();
config.UiItem.MainColumnItem ??= new();
config.UiItem.WindowSizeItem ??= new();
@ -1132,6 +1129,84 @@ public static class ConfigHandler
}
}
/// <summary>
/// Searches the specified collection for a profile item that matches the target profile item based on a series of
/// criteria.
/// </summary>
/// <remarks>The method attempts to find a match by comparing the target's remarks, address, port, and
/// password in various combinations. The search is performed in order of specificity, starting with the most
/// detailed comparison. If no match is found at any stage, the method returns null.</remarks>
/// <param name="source">An enumerable collection of profile items to search. This parameter can be null.</param>
/// <param name="target">The profile item to match against items in the source collection. This parameter can be null.</param>
/// <returns>A profile item from the source collection that matches the target item according to defined criteria; otherwise,
/// null if no match is found or if either parameter is null.</returns>
private static ProfileItem? FindMatchedProfileItem(IEnumerable<ProfileItem>? source, ProfileItem? target)
{
if (source == null || target == null)
{
return null;
}
var matchedItem = source.FirstOrDefault(t => CompareProfileItem(t, target, true));
if (matchedItem != null)
{
return matchedItem;
}
if (target.Remarks.IsNotEmpty())
{
matchedItem = source.FirstOrDefault(t => t.Remarks == target.Remarks);
if (matchedItem != null)
{
return matchedItem;
}
}
if (target.Address.IsNotEmpty() && target.Port > 0 && target.Password.IsNotEmpty())
{
matchedItem = source.FirstOrDefault(t =>
IsSameText(t.Address, target.Address) &&
t.Port == target.Port &&
IsSameText(t.Password, target.Password));
if (matchedItem != null)
{
return matchedItem;
}
}
if (target.Address.IsNotEmpty() && target.Port > 0)
{
matchedItem = source.FirstOrDefault(t =>
IsSameText(t.Address, target.Address) &&
t.Port == target.Port);
if (matchedItem != null)
{
return matchedItem;
}
}
if (target.Address.IsNotEmpty())
{
matchedItem = source.FirstOrDefault(t => IsSameText(t.Address, target.Address));
if (matchedItem != null)
{
return matchedItem;
}
}
return null;
static bool IsSameText(string? left, string? right)
{
if (left.IsNullOrEmpty() || right.IsNullOrEmpty())
{
return false;
}
return string.Equals(left.TrimEx(), right.TrimEx(), StringComparison.OrdinalIgnoreCase);
}
}
/// <summary>
/// Remove a single server profile by its index ID
/// Deletes the configuration file if it's a custom config
@ -1636,7 +1711,7 @@ public static class ConfigHandler
if (activeProfile != null)
{
var lstSub = await AppManager.Instance.ProfileItems(subid);
var existItem = lstSub?.FirstOrDefault(t => config.UiItem.EnableUpdateSubOnlyRemarksExist ? t.Remarks == activeProfile.Remarks : CompareProfileItem(t, activeProfile, true));
var existItem = FindMatchedProfileItem(lstSub, activeProfile);
if (existItem != null)
{
await ConfigHandler.SetDefaultServerIndex(config, existItem.IndexId);
@ -1649,7 +1724,7 @@ public static class ConfigHandler
var lstSub = await AppManager.Instance.ProfileItems(subid);
foreach (var item in lstSub)
{
var existItem = lstOriSub?.FirstOrDefault(t => config.UiItem.EnableUpdateSubOnlyRemarksExist ? t.Remarks == item.Remarks : CompareProfileItem(t, item, true));
var existItem = FindMatchedProfileItem(lstOriSub, item);
if (existItem != null)
{
await StatisticsManager.Instance.CloneServerStatItem(existItem.IndexId, item.IndexId);

1
v2rayN/ServiceLib/Models/ConfigItems.cs
View file

@ -87,7 +87,6 @@ public class MsgUIItem
public class UIItem
{
public bool EnableAutoAdjustMainLvColWidth { get; set; }
public bool EnableUpdateSubOnlyRemarksExist { get; set; }
public int MainGirdHeight1 { get; set; }
public int MainGirdHeight2 { get; set; }
public EGirdOrientation MainGirdOrientation { get; set; } = EGirdOrientation.Vertical;

9
v2rayN/ServiceLib/Resx/ResUI.Designer.cs generated
View file

@ -3816,15 +3816,6 @@ namespace ServiceLib.Resx {
}
}
/// <summary>
/// 查找类似 Updating subscription, only determining if remarks exist 的本地化字符串。
/// </summary>
public static string TbSettingsEnableUpdateSubOnlyRemarksExist {
get {
return ResourceManager.GetString("TbSettingsEnableUpdateSubOnlyRemarksExist", resourceCulture);
}
}
/// <summary>
/// 查找类似 Exception 的本地化字符串。
/// </summary>

3
v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
View file

@ -1098,9 +1098,6 @@
<data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
<value>آدرس اینترنتی تست پینگ سرعت</value>
</data>
<data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
<value>اشتراک در حال به‌روزرسانی، فقط مشخص کنید که ملاحظاتی آیا وجود دارد!</value>
</data>
<data name="SpeedtestingStop" xml:space="preserve">
<value>پایان تست...</value>
</data>

3
v2rayN/ServiceLib/Resx/ResUI.fr.resx
View file

@ -1095,9 +1095,6 @@
<data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
<value>Adresse de test de connexion réelle</value>
</data>
<data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
<value>Ne vérifier l’existence de l’alias qu’à la maj. des abonnements</value>
</data>
<data name="SpeedtestingStop" xml:space="preserve">
<value>Arrêt du test en cours...</value>
</data>

3
v2rayN/ServiceLib/Resx/ResUI.hu.resx
View file

@ -1098,9 +1098,6 @@
<data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
<value>Sebesség Ping Teszt URL</value>
</data>
<data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
<value>Előfizetés frissítése, csak a megjegyzések létezésének ellenőrzése</value>
</data>
<data name="SpeedtestingStop" xml:space="preserve">
<value>Teszt megszakítása...</value>
</data>

3
v2rayN/ServiceLib/Resx/ResUI.resx
View file

@ -1098,9 +1098,6 @@
<data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
<value>Speed Ping Test URL</value>
</data>
<data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
<value>Updating subscription, only determining if remarks exist</value>
</data>
<data name="SpeedtestingStop" xml:space="preserve">
<value>Test terminating...</value>
</data>

3
v2rayN/ServiceLib/Resx/ResUI.ru.resx
View file

@ -1098,9 +1098,6 @@
<data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
<value>URL для быстрой проверки реальной задержки</value>
</data>
<data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
<value>Обновляя подписку, проверять лишь наличие примечаний</value>
</data>
<data name="SpeedtestingStop" xml:space="preserve">
<value>Отмена тестирования...</value>
</data>

3
v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
View file

@ -1095,9 +1095,6 @@
<data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
<value>真连接测试地址</value>
</data>
<data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
<value>更新订阅时只判断别名已存在否</value>
</data>
<data name="SpeedtestingStop" xml:space="preserve">
<value>测试终止中...</value>
</data>

3
v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
View file

@ -1095,9 +1095,6 @@
<data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
<value>真連線測試位址</value>
</data>
<data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
<value>更新訂閱時只判斷別名是否存在</value>
</data>
<data name="SpeedtestingStop" xml:space="preserve">
<value>測試終止中...</value>
</data>

3
v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs
View file

@ -47,7 +47,6 @@ public class OptionSettingViewModel : MyReactiveObject
[Reactive] public bool KeepOlderDedupl { get; set; }
[Reactive] public bool DisplayRealTimeSpeed { get; set; }
[Reactive] public bool EnableAutoAdjustMainLvColWidth { get; set; }
[Reactive] public bool EnableUpdateSubOnlyRemarksExist { get; set; }
[Reactive] public bool AutoHideStartup { get; set; }
[Reactive] public bool Hide2TrayWhenClose { get; set; }
[Reactive] public bool MacOSShowInDock { get; set; }
@ -180,7 +179,6 @@ public class OptionSettingViewModel : MyReactiveObject
DisplayRealTimeSpeed = _config.GuiItem.DisplayRealTimeSpeed;
KeepOlderDedupl = _config.GuiItem.KeepOlderDedupl;
EnableAutoAdjustMainLvColWidth = _config.UiItem.EnableAutoAdjustMainLvColWidth;
EnableUpdateSubOnlyRemarksExist = _config.UiItem.EnableUpdateSubOnlyRemarksExist;
AutoHideStartup = _config.UiItem.AutoHideStartup;
Hide2TrayWhenClose = _config.UiItem.Hide2TrayWhenClose;
MacOSShowInDock = _config.UiItem.MacOSShowInDock;
@ -345,7 +343,6 @@ public class OptionSettingViewModel : MyReactiveObject
_config.GuiItem.DisplayRealTimeSpeed = DisplayRealTimeSpeed;
_config.GuiItem.KeepOlderDedupl = KeepOlderDedupl;
_config.UiItem.EnableAutoAdjustMainLvColWidth = EnableAutoAdjustMainLvColWidth;
_config.UiItem.EnableUpdateSubOnlyRemarksExist = EnableUpdateSubOnlyRemarksExist;
_config.UiItem.AutoHideStartup = AutoHideStartup;
_config.UiItem.Hide2TrayWhenClose = Hide2TrayWhenClose;
_config.UiItem.MacOSShowInDock = MacOSShowInDock;

13
v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
View file

@ -410,19 +410,6 @@
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" />
<TextBlock
Grid.Row="6"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Text="{x:Static resx:ResUI.TbSettingsEnableUpdateSubOnlyRemarksExist}" />
<ToggleSwitch
x:Name="togEnableUpdateSubOnlyRemarksExist"
Grid.Row="6"
Grid.Column="1"
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" />
<TextBlock
Grid.Row="8"
Grid.Column="0"

1
v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
View file

@ -86,7 +86,6 @@ public partial class OptionSettingWindow : WindowBase<OptionSettingViewModel>
this.Bind(ViewModel, vm => vm.DisplayRealTimeSpeed, v => v.togDisplayRealTimeSpeed.IsChecked).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.KeepOlderDedupl, v => v.togKeepOlderDedupl.IsChecked).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.EnableAutoAdjustMainLvColWidth, v => v.togEnableAutoAdjustMainLvColWidth.IsChecked).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.EnableUpdateSubOnlyRemarksExist, v => v.togEnableUpdateSubOnlyRemarksExist.IsChecked).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.AutoHideStartup, v => v.togAutoHideStartup.IsChecked).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.Hide2TrayWhenClose, v => v.togHide2TrayWhenClose.IsChecked).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.MacOSShowInDock, v => v.togMacOSShowInDock.IsChecked).DisposeWith(disposables);

14
v2rayN/v2rayN/Views/OptionSettingWindow.xaml
View file

@ -630,20 +630,6 @@
Margin="{StaticResource Margin8}"
HorizontalAlignment="Left" />
<TextBlock
Grid.Row="6"
Grid.Column="0"
Margin="{StaticResource Margin8}"
VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}"
Text="{x:Static resx:ResUI.TbSettingsEnableUpdateSubOnlyRemarksExist}" />
<ToggleButton
x:Name="togEnableUpdateSubOnlyRemarksExist"
Grid.Row="6"
Grid.Column="1"
Margin="{StaticResource Margin8}"
HorizontalAlignment="Left" />
<TextBlock
Grid.Row="8"
Grid.Column="0"

1
v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
View file

@ -91,7 +91,6 @@ public partial class OptionSettingWindow
this.Bind(ViewModel, vm => vm.DisplayRealTimeSpeed, v => v.togDisplayRealTimeSpeed.IsChecked).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.KeepOlderDedupl, v => v.togKeepOlderDedupl.IsChecked).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.EnableAutoAdjustMainLvColWidth, v => v.togEnableAutoAdjustMainLvColWidth.IsChecked).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.EnableUpdateSubOnlyRemarksExist, v => v.togEnableUpdateSubOnlyRemarksExist.IsChecked).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.AutoHideStartup, v => v.togAutoHideStartup.IsChecked).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.EnableDragDropSort, v => v.togEnableDragDropSort.IsChecked).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.DoubleClick2Activate, v => v.togDoubleClick2Activate.IsChecked).DisposeWith(disposables);