pjandro/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-08-25 16:42:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use Rx event subscription to replace MessageBus refresh configuration file function

Browse Source
This commit is contained in:
2dust
2025-08-29 14:46:08 +08:00
parent a108eaf34b
commit ea1d438e40
9 changed files with 59 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
View File

@@ -260,7 +260,7 @@ public class MainWindowViewModel : MyReactiveObject
if (success)
{
var indexIdOld = _config.IndexId;
RefreshServers();
await RefreshServers();
if (indexIdOld != _config.IndexId)
{
await Reload();
@@ -350,9 +350,11 @@ public class MainWindowViewModel : MyReactiveObject
#region Servers && Groups
private void RefreshServers()
private async Task RefreshServers()
{
MessageBus.Current.SendMessage("", EMsgCommand.RefreshProfiles.ToString());
AppEvents.ProfilesRefreshRequested.OnNext(Unit.Default);
await Task.Delay(200);
}
private void RefreshSubscriptions()
@@ -384,7 +386,7 @@ public class MainWindowViewModel : MyReactiveObject
}
if (ret == true)
{
RefreshServers();
await RefreshServers();
if (item.IndexId == _config.IndexId)
{
await Reload();
@@ -399,11 +401,11 @@ public class MainWindowViewModel : MyReactiveObject
await _updateView?.Invoke(EViewAction.AddServerViaClipboard, null);
return;
}
int ret = await ConfigHandler.AddBatchServers(_config, clipboardData, _config.SubIndexId, false);
var ret = await ConfigHandler.AddBatchServers(_config, clipboardData, _config.SubIndexId, false);
if (ret > 0)
{
RefreshSubscriptions();
RefreshServers();
await RefreshServers();
NoticeManager.Instance.Enqueue(string.Format(ResUI.SuccessfullyImportedServerViaClipboard, ret));
}
else
@@ -449,11 +451,11 @@ public class MainWindowViewModel : MyReactiveObject
}
else
{
int ret = await ConfigHandler.AddBatchServers(_config, result, _config.SubIndexId, false);
var ret = await ConfigHandler.AddBatchServers(_config, result, _config.SubIndexId, false);
if (ret > 0)
{
RefreshSubscriptions();
RefreshServers();
await RefreshServers();
NoticeManager.Instance.Enqueue(ResUI.SuccessfullyImportedServerViaScan);
}
else
@@ -532,7 +534,7 @@ public class MainWindowViewModel : MyReactiveObject
private async Task ClearServerStatistics()
{
await StatisticsManager.Instance.ClearAllServerStatistics();
RefreshServers();
await RefreshServers();
}
private async Task OpenTheFileLocation()