Compare commits

...

2 commits

Author SHA1 Message Date
2dust
ef30d389dc up 7.14.11
Some checks are pending
release Linux / build (Release) (push) Waiting to run
release macOS / build (Release) (push) Waiting to run
release Windows desktop (Avalonia UI) / build (Release) (push) Waiting to run
release Windows / build (Release) (push) Waiting to run
2025-09-20 14:06:55 +08:00
2dust
bf8783fed7 Update CheckUpdateViewModel.cs 2025-09-20 14:06:41 +08:00
2 changed files with 9 additions and 18 deletions

View file

@ -1,7 +1,7 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<Version>7.14.10</Version> <Version>7.14.11</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>

View file

@ -38,7 +38,7 @@ public class CheckUpdateViewModel : MyReactiveObject
this.WhenAnyValue( this.WhenAnyValue(
x => x.EnableCheckPreReleaseUpdate, x => x.EnableCheckPreReleaseUpdate,
y => y == true) y => y == true)
.Subscribe(c => { _config.CheckUpdateItem.CheckPreReleaseUpdate = EnableCheckPreReleaseUpdate; }); .Subscribe(c => _config.CheckUpdateItem.CheckPreReleaseUpdate = EnableCheckPreReleaseUpdate);
RefreshCheckUpdateItems(); RefreshCheckUpdateItems();
} }
@ -158,11 +158,8 @@ public class CheckUpdateViewModel : MyReactiveObject
UpdatedPlusPlus(_geo, ""); UpdatedPlusPlus(_geo, "");
} }
} }
await (new UpdateService()).UpdateGeoFileAll(_config, _updateUI) await new UpdateService().UpdateGeoFileAll(_config, _updateUI)
.ContinueWith(t => .ContinueWith(t => UpdatedPlusPlus(_geo, ""));
{
UpdatedPlusPlus(_geo, "");
});
} }
private async Task CheckUpdateN(bool preRelease) private async Task CheckUpdateN(bool preRelease)
@ -176,11 +173,8 @@ public class CheckUpdateViewModel : MyReactiveObject
UpdatedPlusPlus(_v2rayN, msg); UpdatedPlusPlus(_v2rayN, msg);
} }
} }
await (new UpdateService()).CheckUpdateGuiN(_config, _updateUI, preRelease) await new UpdateService().CheckUpdateGuiN(_config, _updateUI, preRelease)
.ContinueWith(t => .ContinueWith(t => UpdatedPlusPlus(_v2rayN, ""));
{
UpdatedPlusPlus(_v2rayN, "");
});
} }
private async Task CheckUpdateCore(CheckUpdateModel model, bool preRelease) private async Task CheckUpdateCore(CheckUpdateModel model, bool preRelease)
@ -196,11 +190,8 @@ public class CheckUpdateViewModel : MyReactiveObject
} }
} }
var type = (ECoreType)Enum.Parse(typeof(ECoreType), model.CoreType); var type = (ECoreType)Enum.Parse(typeof(ECoreType), model.CoreType);
await (new UpdateService()).CheckUpdateCore(type, _config, _updateUI, preRelease) await new UpdateService().CheckUpdateCore(type, _config, _updateUI, preRelease)
.ContinueWith(t => .ContinueWith(t => UpdatedPlusPlus(model.CoreType, ""));
{
UpdatedPlusPlus(model.CoreType, "");
});
} }
private async Task UpdateFinished() private async Task UpdateFinished()
@ -311,7 +302,7 @@ public class CheckUpdateViewModel : MyReactiveObject
if (Utils.IsNonWindows()) if (Utils.IsNonWindows())
{ {
var filesList = (new DirectoryInfo(toPath)).GetFiles().Select(u => u.FullName).ToList(); var filesList = new DirectoryInfo(toPath).GetFiles().Select(u => u.FullName).ToList();
foreach (var file in filesList) foreach (var file in filesList)
{ {
await Utils.SetLinuxChmod(Path.Combine(toPath, item.CoreType.ToLower())); await Utils.SetLinuxChmod(Path.Combine(toPath, item.CoreType.ToLower()));