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

Rename ProfileItems to ProfileModels and refactor

Browse source
This commit is contained in:
2dust 2026-02-06 13:50:47 +08:00
parent 7a58e78381
commit 6167624443
10 changed files with 53 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -844,7 +844,7 @@ public static class ConfigHandler
/// <returns>0 if successful, -1 if failed</returns>
public static async Task<int> SortServers(Config config, string subId, string colName, bool asc)
{
var lstModel = await AppManager.Instance.ProfileItems(subId, "");
var lstModel = await AppManager.Instance.ProfileModels(subId, "");
if (lstModel.Count <= 0)
{
return -1;
@ -1213,7 +1213,8 @@ public static class ConfigHandler
}
var extraItem = new ProtocolExtraItem
{
ChildItems = childProfileIndexId, MultipleLoad = multipleLoad,
ChildItems = childProfileIndexId,
MultipleLoad = multipleLoad,
};
profile.SetProtocolExtra(extraItem);
var ret = await AddServerCommon(config, profile, true);
@ -1277,7 +1278,7 @@ public static class ConfigHandler
/// <returns>Number of removed servers or -1 if failed</returns>
public static async Task<int> RemoveInvalidServerResult(Config config, string subid)
{
var lstModel = await AppManager.Instance.ProfileItems(subid, "");
var lstModel = await AppManager.Instance.ProfileModels(subid, "");
if (lstModel is { Count: <= 0 })
{
return -1;

2
v2rayN/ServiceLib/Helper/DownloaderHelper.cs
View file

@ -85,7 +85,7 @@ public class DownloaderHelper
{
maxSpeed = value.BytesPerSecondSpeed;
}
var ts = DateTime.Now - lastUpdateTime;
if (ts.TotalMilliseconds >= 1000)
{

13
v2rayN/ServiceLib/Manager/AppManager.cs
View file

@ -191,10 +191,17 @@ public sealed class AppManager
return (await ProfileItems(subid))?.Select(t => t.IndexId)?.ToList();
}
public async Task<List<ProfileItemModel>?> ProfileItems(string subid, string filter)
public async Task<List<ProfileItemModel>?> ProfileModels(string subid, string filter)
{
var sql = @$"select a.*
,b.remarks subRemarks
var sql = @$"select a.IndexId
,a.ConfigType
,a.Remarks
,a.Address
,a.Port
,a.Network
,a.StreamSecurity
,a.Subid
,b.remarks as subRemarks
from ProfileItem a
left join SubItem b on a.subid = b.id
where 1=1 ";

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

@ -99,7 +99,7 @@ public class UIItem
public bool EnableDragDropSort { get; set; }
public bool DoubleClick2Activate { get; set; }
public bool AutoHideStartup { get; set; }
public bool Hide2TrayWhenClose { get; set; }
public bool Hide2TrayWhenClose { get; set; }
public bool MacOSShowInDock { get; set; }
public List<ColumnItem> MainColumnItem { get; set; }
public List<WindowSizeItem> WindowSizeItem { get; set; }

16
v2rayN/ServiceLib/Models/ProfileItem.cs
View file

@ -1,7 +1,7 @@
namespace ServiceLib.Models;
[Serializable]
public class ProfileItem : ReactiveObject
public class ProfileItem
{
private ProtocolExtraItem? _protocolExtraCache;
@ -10,6 +10,7 @@ public class ProfileItem : ReactiveObject
IndexId = string.Empty;
ConfigType = EConfigType.VMess;
ConfigVersion = 3;
Subid = string.Empty;
Address = string.Empty;
Port = 0;
Password = string.Empty;
@ -21,7 +22,6 @@ public class ProfileItem : ReactiveObject
Path = string.Empty;
StreamSecurity = string.Empty;
AllowInsecure = string.Empty;
Subid = string.Empty;
}
#region function
@ -148,26 +148,26 @@ public class ProfileItem : ReactiveObject
public string IndexId { get; set; }
public EConfigType ConfigType { get; set; }
public ECoreType? CoreType { get; set; }
public int ConfigVersion { get; set; }
public string Subid { get; set; }
public bool IsSub { get; set; } = true;
public int? PreSocksPort { get; set; }
public bool DisplayLog { get; set; } = true;
public string Remarks { get; set; }
public string Address { get; set; }
public int Port { get; set; }
public string Password { get; set; }
public string Username { get; set; }
public string Network { get; set; }
public string Remarks { get; set; }
public string HeaderType { get; set; }
public string RequestHost { get; set; }
public string Path { get; set; }
public string StreamSecurity { get; set; }
public string AllowInsecure { get; set; }
public string Subid { get; set; }
public bool IsSub { get; set; } = true;
public string Sni { get; set; }
public string Alpn { get; set; } = string.Empty;
public ECoreType? CoreType { get; set; }
public int? PreSocksPort { get; set; }
public string Fingerprint { get; set; }
public bool DisplayLog { get; set; } = true;
public string PublicKey { get; set; }
public string ShortId { get; set; }
public string SpiderX { get; set; }

23
v2rayN/ServiceLib/Models/ProfileItemModel.cs
View file

@ -1,16 +1,24 @@
namespace ServiceLib.Models;
[Serializable]
public class ProfileItemModel : ProfileItem
public class ProfileItemModel : ReactiveObject
{
public bool IsActive { get; set; }
public string IndexId { get; set; }
public EConfigType ConfigType { get; set; }
public string Remarks { get; set; }
public string Address { get; set; }
public int Port { get; set; }
public string Network { get; set; }
public string StreamSecurity { get; set; }
public string Subid { get; set; }
public string SubRemarks { get; set; }
public int Sort { get; set; }
[Reactive]
public int Delay { get; set; }
public decimal Speed { get; set; }
public int Sort { get; set; }
[Reactive]
public string DelayVal { get; set; }
@ -29,4 +37,15 @@ public class ProfileItemModel : ProfileItem
[Reactive]
public string TotalDown { get; set; }
public string GetSummary()
{
var summary = $"[{ConfigType}] {Remarks}";
if (!ConfigType.IsComplexType())
{
summary += $"({Address}:{Port})";
}
return summary;
}
}

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

@ -49,12 +49,15 @@ public class AddServerViewModel : MyReactiveObject
[Reactive]
public string WgPublicKey { get; set; }
//[Reactive]
//public string WgPresharedKey { get; set; }
[Reactive]
public string WgInterfaceAddress { get; set; }
[Reactive]
public string WgReserved { get; set; }
[Reactive]
public int WgMtu { get; set; }

2
v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs
View file

@ -200,7 +200,7 @@ public class ProfilesSelectViewModel : MyReactiveObject
private async Task<List<ProfileItemModel>?> GetProfileItemsEx(string subid, string filter)
{
var lstModel = await AppManager.Instance.ProfileItems(_subIndexId, filter);
var lstModel = await AppManager.Instance.ProfileModels(_subIndexId, filter);
lstModel = (from t in lstModel
select new ProfileItemModel
{

4
v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
View file

@ -56,7 +56,7 @@ public class ProfilesViewModel : MyReactiveObject
public ReactiveCommand<Unit, Unit> MoveUpCmd { get; }
public ReactiveCommand<Unit, Unit> MoveDownCmd { get; }
public ReactiveCommand<Unit, Unit> MoveBottomCmd { get; }
public ReactiveCommand<Unit, Unit> MoveBottomCmd { get; }
public ReactiveCommand<SubItem, Unit> MoveToGroupCmd { get; }
//servers ping
@ -428,7 +428,7 @@ public class ProfilesViewModel : MyReactiveObject
private async Task<List<ProfileItemModel>?> GetProfileItemsEx(string subid, string filter)
{
var lstModel = await AppManager.Instance.ProfileItems(_config.SubIndexId, filter);
var lstModel = await AppManager.Instance.ProfileModels(_config.SubIndexId, filter);
await ConfigHandler.SetDefaultServer(_config, lstModel);

4
v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
View file

@ -303,7 +303,7 @@ public class StatusBarViewModel : MyReactiveObject
private async Task RefreshServersMenu()
{
var lstModel = await AppManager.Instance.ProfileItems(_config.SubIndexId, "");
var lstModel = await AppManager.Instance.ProfileModels(_config.SubIndexId, "");
Servers.Clear();
if (lstModel.Count > _config.GuiItem.TrayMenuServersLimit)
@ -315,7 +315,7 @@ public class StatusBarViewModel : MyReactiveObject
BlServers = true;
for (var k = 0; k < lstModel.Count; k++)
{
ProfileItem it = lstModel[k];
var it = lstModel[k];
var name = it.GetSummary();
var item = new ComboItem() { ID = it.IndexId, Text = name };