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

Fix group

Browse source
This commit is contained in:
DHR60 2026-02-05 16:23:50 +08:00
parent fa8c3f337c
commit 1b79d2f560
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
v2rayN/ServiceLib/Manager/GroupProfileManager.cs
View file

@ -72,21 +72,30 @@ public class GroupProfileManager
public static async Task<(List<ProfileItem> Items, ProtocolExtraItem? Extra)> GetChildProfileItems(ProfileItem profileItem) public static async Task<(List<ProfileItem> Items, ProtocolExtraItem? Extra)> GetChildProfileItems(ProfileItem profileItem)
{ {
var protocolExtra = profileItem?.GetProtocolExtra(); var protocolExtra = profileItem?.GetProtocolExtra();
var items = await GetChildProfileItems(protocolExtra); return (await GetChildProfileItemsByProtocolExtra(protocolExtra), protocolExtra);
}
public static async Task<List<ProfileItem>> GetChildProfileItemsByProtocolExtra(ProtocolExtraItem? protocolExtra)
{
if (protocolExtra == null)
{
return new();
}
var items = await GetSelectedChildProfileItems(protocolExtra);
var subItems = await GetSubChildProfileItems(protocolExtra); var subItems = await GetSubChildProfileItems(protocolExtra);
items.AddRange(subItems); items.AddRange(subItems);
return (items, protocolExtra); return items;
} }
public static async Task<List<ProfileItem>> GetChildProfileItems(ProtocolExtraItem? extra) public static async Task<List<ProfileItem>> GetSelectedChildProfileItems(ProtocolExtraItem? extra)
{ {
if (extra == null || extra.ChildItems.IsNullOrEmpty()) if (extra == null || extra.ChildItems.IsNullOrEmpty())
{ {
return new(); return new();
} }
var childProfiles = (await Task.WhenAll( var childProfiles = (await Task.WhenAll(
Utils.String2List(extra.ChildItems) (Utils.String2List(extra.ChildItems) ?? new())
.Where(p => !p.IsNullOrEmpty()) .Where(p => !p.IsNullOrEmpty())
.Select(AppManager.Instance.GetProfileItem) .Select(AppManager.Instance.GetProfileItem)
)) ))
@ -101,19 +110,19 @@ public class GroupProfileManager
public static async Task<List<ProfileItem>> GetSubChildProfileItems(ProtocolExtraItem? extra) public static async Task<List<ProfileItem>> GetSubChildProfileItems(ProtocolExtraItem? extra)
{ {
if (extra == null || extra.Filter.IsNullOrEmpty()) if (extra == null || extra.SubChildItems.IsNullOrEmpty())
{ {
return new(); return new();
} }
var childProfiles = await AppManager.Instance.ProfileItems(extra.SubChildItems ?? string.Empty); var childProfiles = await AppManager.Instance.ProfileItems(extra.SubChildItems ?? string.Empty);
return childProfiles.Where(p => return childProfiles?.Where(p =>
p != null && p != null &&
p.IsValid() && p.IsValid() &&
!p.ConfigType.IsComplexType() && !p.ConfigType.IsComplexType() &&
(extra.Filter.IsNullOrEmpty() || Regex.IsMatch(p.Remarks, extra.Filter)) (extra.Filter.IsNullOrEmpty() || Regex.IsMatch(p.Remarks, extra.Filter))
) )
.ToList(); .ToList() ?? new();
} }
public static async Task<HashSet<string>> GetAllChildDomainAddresses(ProfileItem profileItem) public static async Task<HashSet<string>> GetAllChildDomainAddresses(ProfileItem profileItem)