zishuo/Archive
1
0
Fork 0
mirror of https://github.com/bolucat/Archive.git synced 2026-04-23 00:17:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update On Mon Oct 21 20:36:26 CEST 2024

Browse Source
This commit is contained in:
github-action[bot]
2024-10-21 20:36:27 +02:00
parent a2e7d7f51b
commit db0940aedb
355 changed files with 12956 additions and 6642 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayn/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
+73 -56
View File
@@ -99,20 +99,6 @@ namespace ServiceLib.ViewModels
_config = AppHandler.Instance.Config;
_updateView = updateView;
if (_updateView != null)
{
MessageBus.Current.Listen<string>(EMsgCommand.RefreshProfiles.ToString())
.Subscribe(async x => await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null));
}
SelectedProfile = new();
SelectedSub = new();
SelectedMoveToGroup = new();
SelectedServer = new();
RefreshSubscriptions();
RefreshServers();
#region WhenAnyValue && ReactiveCommand
var canEditRemove = this.WhenAnyValue(
@@ -122,16 +108,16 @@ namespace ServiceLib.ViewModels
this.WhenAnyValue(
x => x.SelectedSub,
y => y != null && !y.remarks.IsNullOrEmpty() && _config.subIndexId != y.id)
.Subscribe(c => SubSelectedChangedAsync(c));
.Subscribe(async c => await SubSelectedChangedAsync(c));
this.WhenAnyValue(
x => x.SelectedMoveToGroup,
y => y != null && !y.remarks.IsNullOrEmpty())
.Subscribe(c => MoveToGroup(c));
.Subscribe(async c => await MoveToGroup(c));
this.WhenAnyValue(
x => x.SelectedServer,
y => y != null && !y.Text.IsNullOrEmpty())
.Subscribe(c => ServerSelectedChanged(c));
.Subscribe(async c => await ServerSelectedChanged(c));
this.WhenAnyValue(
x => x.ServerFilter,
@@ -240,12 +226,35 @@ namespace ServiceLib.ViewModels
});
#endregion WhenAnyValue && ReactiveCommand
if (_updateView != null)
{
MessageBus.Current.Listen<string>(EMsgCommand.RefreshProfiles.ToString()).Subscribe(OnNext);
}
Init();
}
private async Task Init()
{
SelectedProfile = new();
SelectedSub = new();
SelectedMoveToGroup = new();
SelectedServer = new();
await RefreshSubscriptions();
RefreshServers();
}
#endregion Init
#region Actions
private async void OnNext(string x)
{
await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null);
}
private void Reload()
{
Locator.Current.GetService<MainWindowViewModel>()?.Reload();
@@ -350,9 +359,9 @@ namespace ServiceLib.ViewModels
MessageBus.Current.SendMessage("", EMsgCommand.RefreshProfiles.ToString());
}
public void RefreshServersBiz()
public async Task RefreshServersBiz()
{
var lstModel = AppHandler.Instance.ProfileItemsEx(_config.subIndexId, _serverFilter);
var lstModel = await AppHandler.Instance.ProfileItemsEx(_config.subIndexId, _serverFilter);
_lstProfile = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(lstModel)) ?? [];
_profileItems.Clear();
@@ -371,12 +380,13 @@ namespace ServiceLib.ViewModels
}
}
public void RefreshSubscriptions()
public async Task RefreshSubscriptions()
{
_subItems.Clear();
_subItems.Add(new SubItem { remarks = ResUI.AllGroupServers });
foreach (var item in AppHandler.Instance.SubItems().OrderBy(t => t.sort))
foreach (var item in await AppHandler.Instance.SubItems())
{
_subItems.Add(item);
}
@@ -394,12 +404,12 @@ namespace ServiceLib.ViewModels
#region Add Servers
private int GetProfileItems(out List<ProfileItem> lstSelecteds, bool latest)
private async Task<List<ProfileItem>?> GetProfileItems(bool latest)
{
lstSelecteds = new List<ProfileItem>();
var lstSelecteds = new List<ProfileItem>();
if (SelectedProfiles == null || SelectedProfiles.Count <= 0)
{
return -1;
return null;
}
var orderProfiles = SelectedProfiles?.OrderBy(t => t.sort);
@@ -407,7 +417,7 @@ namespace ServiceLib.ViewModels
{
foreach (var profile in orderProfiles)
{
var item = AppHandler.Instance.GetProfileItem(profile.indexId);
var item = await AppHandler.Instance.GetProfileItem(profile.indexId);
if (item is not null)
{
lstSelecteds.Add(item);
@@ -419,7 +429,7 @@ namespace ServiceLib.ViewModels
lstSelecteds = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(orderProfiles));
}
return 0;
return lstSelecteds;
}
public async Task EditServerAsync(EConfigType eConfigType)
@@ -428,7 +438,7 @@ namespace ServiceLib.ViewModels
{
return;
}
var item = AppHandler.Instance.GetProfileItem(SelectedProfile.indexId);
var item = await AppHandler.Instance.GetProfileItem(SelectedProfile.indexId);
if (item is null)
{
NoticeHandler.Instance.Enqueue(ResUI.PleaseSelectServer);
@@ -457,7 +467,8 @@ namespace ServiceLib.ViewModels
public async Task RemoveServerAsync()
{
if (GetProfileItems(out List<ProfileItem> lstSelecteds, true) < 0)
var lstSelecteds = await GetProfileItems(true);
if (lstSelecteds == null)
{
return;
}
@@ -467,7 +478,7 @@ namespace ServiceLib.ViewModels
}
var exists = lstSelecteds.Exists(t => t.indexId == _config.indexId);
ConfigHandler.RemoveServer(_config, lstSelecteds);
await ConfigHandler.RemoveServer(_config, lstSelecteds);
NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
RefreshServers();
@@ -487,7 +498,8 @@ namespace ServiceLib.ViewModels
private async Task CopyServer()
{
if (GetProfileItems(out List<ProfileItem> lstSelecteds, false) < 0)
var lstSelecteds = await GetProfileItems(false);
if (lstSelecteds == null)
{
return;
}
@@ -504,7 +516,7 @@ namespace ServiceLib.ViewModels
{
return;
}
SetDefaultServer(SelectedProfile.indexId);
await SetDefaultServer(SelectedProfile.indexId);
}
public async Task SetDefaultServer(string indexId)
@@ -517,7 +529,7 @@ namespace ServiceLib.ViewModels
{
return;
}
var item = AppHandler.Instance.GetProfileItem(indexId);
var item = await AppHandler.Instance.GetProfileItem(indexId);
if (item is null)
{
NoticeHandler.Instance.Enqueue(ResUI.PleaseSelectServer);
@@ -531,7 +543,7 @@ namespace ServiceLib.ViewModels
}
}
private void ServerSelectedChanged(bool c)
private async Task ServerSelectedChanged(bool c)
{
if (!c)
{
@@ -545,12 +557,12 @@ namespace ServiceLib.ViewModels
{
return;
}
SetDefaultServer(SelectedServer.ID);
await SetDefaultServer(SelectedServer.ID);
}
public async Task ShareServerAsync()
{
var item = AppHandler.Instance.GetProfileItem(SelectedProfile.indexId);
var item = await AppHandler.Instance.GetProfileItem(SelectedProfile.indexId);
if (item is null)
{
NoticeHandler.Instance.Enqueue(ResUI.PleaseSelectServer);
@@ -567,25 +579,26 @@ namespace ServiceLib.ViewModels
private async Task SetDefaultMultipleServer(ECoreType coreType)
{
if (GetProfileItems(out List<ProfileItem> lstSelecteds, true) < 0)
var lstSelecteds = await GetProfileItems(true);
if (lstSelecteds == null)
{
return;
}
var ret = await ConfigHandler.AddCustomServer4Multiple(_config, lstSelecteds, coreType);
if (ret.Item1 != 0)
if (ret.Success != true)
{
NoticeHandler.Instance.Enqueue(ResUI.OperationFailed);
return;
}
if (ret.Item2 == _config.indexId)
if (ret?.Data?.ToString() == _config.indexId)
{
RefreshServers();
Reload();
}
else
{
await SetDefaultServer(ret.Item2);
await SetDefaultServer(ret?.Data?.ToString());
}
}
@@ -607,19 +620,20 @@ namespace ServiceLib.ViewModels
}
//move server
private void MoveToGroup(bool c)
private async Task MoveToGroup(bool c)
{
if (!c)
{
return;
}
if (GetProfileItems(out List<ProfileItem> lstSelecteds, true) < 0)
var lstSelecteds = await GetProfileItems(true);
if (lstSelecteds == null)
{
return;
}
ConfigHandler.MoveToGroup(_config, lstSelecteds, SelectedMoveToGroup.id);
await ConfigHandler.MoveToGroup(_config, lstSelecteds, SelectedMoveToGroup.id);
NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
RefreshServers();
@@ -665,7 +679,8 @@ namespace ServiceLib.ViewModels
{
SelectedProfiles = _profileItems;
}
if (GetProfileItems(out List<ProfileItem> lstSelecteds, false) < 0)
var lstSelecteds = await GetProfileItems(false);
if (lstSelecteds == null)
{
return;
}
@@ -681,7 +696,7 @@ namespace ServiceLib.ViewModels
private async Task Export2ClientConfigAsync(bool blClipboard)
{
var item = AppHandler.Instance.GetProfileItem(SelectedProfile.indexId);
var item = await AppHandler.Instance.GetProfileItem(SelectedProfile.indexId);
if (item is null)
{
NoticeHandler.Instance.Enqueue(ResUI.PleaseSelectServer);
@@ -689,13 +704,14 @@ namespace ServiceLib.ViewModels
}
if (blClipboard)
{
if (CoreConfigHandler.GenerateClientConfig(item, null, out string msg, out string content) != 0)
var result = await CoreConfigHandler.GenerateClientConfig(item, null);
if (result.Success != true)
{
NoticeHandler.Instance.Enqueue(msg);
NoticeHandler.Instance.Enqueue(result.Msg);
}
else
{
await _updateView?.Invoke(EViewAction.SetClipboardData, content);
await _updateView?.Invoke(EViewAction.SetClipboardData, result.Data);
NoticeHandler.Instance.SendMessage(ResUI.OperationSuccess);
}
}
@@ -705,26 +721,27 @@ namespace ServiceLib.ViewModels
}
}
public void Export2ClientConfigResult(string fileName, ProfileItem item)
public async Task Export2ClientConfigResult(string fileName, ProfileItem item)
{
if (Utils.IsNullOrEmpty(fileName))
{
return;
}
if (CoreConfigHandler.GenerateClientConfig(item, fileName, out string msg, out string content) != 0)
var result = await CoreConfigHandler.GenerateClientConfig(item, null);
if (result.Success != true)
{
NoticeHandler.Instance.Enqueue(msg);
NoticeHandler.Instance.Enqueue(result.Msg);
}
else
{
msg = string.Format(ResUI.SaveClientConfigurationIn, fileName);
NoticeHandler.Instance.SendMessageAndEnqueue(msg);
NoticeHandler.Instance.SendMessageAndEnqueue(string.Format(ResUI.SaveClientConfigurationIn, fileName));
}
}
public async Task Export2ShareUrlAsync(bool blEncode)
{
if (GetProfileItems(out List<ProfileItem> lstSelecteds, true) < 0)
var lstSelecteds = await GetProfileItems(true);
if (lstSelecteds == null)
{
return;
}
@@ -767,7 +784,7 @@ namespace ServiceLib.ViewModels
}
else
{
item = AppHandler.Instance.GetSubItem(_config.subIndexId);
item = await AppHandler.Instance.GetSubItem(_config.subIndexId);
if (item is null)
{
return;
@@ -775,8 +792,8 @@ namespace ServiceLib.ViewModels
}
if (await _updateView?.Invoke(EViewAction.SubEditWindow, item) == true)
{
RefreshSubscriptions();
SubSelectedChangedAsync(true);
await RefreshSubscriptions();
await SubSelectedChangedAsync(true);
}
}