diff --git a/Qwilight/System/LevelSystem.cs b/Qwilight/System/LevelSystem.cs index cb79099..00b7922 100644 --- a/Qwilight/System/LevelSystem.cs +++ b/Qwilight/System/LevelSystem.cs @@ -108,7 +108,7 @@ { return await GetLevelNotifyItem(async (levelNotifyItem, setCancelGet) => { - using var s = await TwilightSystem.Instance.GetWwwParallel(www, setCancelGet); + using var s = await TwilightSystem.Instance.GetWwwParallel(www, setCancelGet.Token); using var sr = new StreamReader(s); return await (www.IsTailCaselsss(".json") ? GetJSON(levelNotifyItem, setCancelGet, s, www) : GetHTML(levelNotifyItem, setCancelGet, await sr.ReadToEndAsync(setCancelGet.Token), www)); }); @@ -155,7 +155,7 @@ levelCompiler.LoadHtml(text); using var s = await TwilightSystem.Instance.GetWwwParallel(WebUtility.HtmlDecode(ModifyDataValue(levelCompiler.CreateNavigator().SelectSingleNode("/html/head/meta[@name='bmstable']/@content")?.ToString() ?? levelCompiler.CreateNavigator().SelectSingleNode("/html/body/meta[@name='bmstable']/@content")?.ToString() - ?? levelCompiler.CreateNavigator().SelectSingleNode("/html/head/body/meta[@name='bmstable']/@content")?.ToString(), www))); + ?? levelCompiler.CreateNavigator().SelectSingleNode("/html/head/body/meta[@name='bmstable']/@content")?.ToString(), www)), setCancelGet.Token); return await GetJSON(levelNotifyItem, setCancelGet, s, www); } diff --git a/Qwilight/System/TwilightSystem.cs b/Qwilight/System/TwilightSystem.cs index f7d9c25..de03492 100644 --- a/Qwilight/System/TwilightSystem.cs +++ b/Qwilight/System/TwilightSystem.cs @@ -1429,16 +1429,16 @@ Stop(); } - public async ValueTask GetWwwParallel(string target, CancellationTokenSource setCancelWww = null) + public async ValueTask GetWwwParallel(string target, CancellationToken setCancelWww = default) { if (!target.IsFrontCaselsss(QwilightComponent.QwilightAPI) || IsEstablished) { try { var dataGet = new HttpRequestMessage(HttpMethod.Get, target); - var www = await _wwwClient.SendAsync(dataGet, setCancelWww.Token); + var www = await _wwwClient.SendAsync(dataGet, setCancelWww); www.EnsureSuccessStatusCode(); - return await www.Content.ReadAsStreamAsync(setCancelWww.Token); + return await www.Content.ReadAsStreamAsync(setCancelWww); } catch { @@ -1448,16 +1448,16 @@ return Stream.Null; } - public async Task GetWwwParallel(string target, CancellationTokenSource setCancelWww = null) + public async Task GetWwwParallel(string target, CancellationToken setCancelWww = default) { if (target.EqualsCaseless($"{QwilightComponent.TaehuiNetFE}/qwilight/qwilight.json") || !target.IsFrontCaselsss(QwilightComponent.TaehuiNetFE) || IsEstablished) { try { var dataGet = new HttpRequestMessage(HttpMethod.Get, target); - using var www = await _wwwClient.SendAsync(dataGet, setCancelWww.Token); + using var www = await _wwwClient.SendAsync(dataGet, setCancelWww); www.EnsureSuccessStatusCode(); - var text = await www.Content.ReadAsStringAsync(setCancelWww.Token); + var text = await www.Content.ReadAsStringAsync(setCancelWww); if (!string.IsNullOrEmpty(text)) { return Utility.GetJSON(text); diff --git a/Qwilight/ViewModel/MainViewModel.cs b/Qwilight/ViewModel/MainViewModel.cs index 20c2f0a..90f3561 100644 --- a/Qwilight/ViewModel/MainViewModel.cs +++ b/Qwilight/ViewModel/MainViewModel.cs @@ -3256,7 +3256,7 @@ NotifySystem.Instance.Notify(NotifySystem.NotifyVariety.Info, NotifySystem.NotifyConfigure.NotSave, qwilightNotifyItem.Text, false, null, null, NotifySystem.SaveQwilightID); } - var taehuiQwilightDate = await TwilightSystem.Instance.GetWwwParallel($"{QwilightComponent.TaehuiNetFE}/qwilight/qwilight.json", setCancelGet); + var taehuiQwilightDate = await TwilightSystem.Instance.GetWwwParallel($"{QwilightComponent.TaehuiNetFE}/qwilight/qwilight.json", setCancelGet.Token); if (taehuiQwilightDate.HasValue) { var taehuiQwilightDateValue = taehuiQwilightDate.Value;