diff --git a/Igniter/ViewModels/MainViewModel.cs b/Igniter/ViewModels/MainViewModel.cs index 60e512f..bde7c55 100644 --- a/Igniter/ViewModels/MainViewModel.cs +++ b/Igniter/ViewModels/MainViewModel.cs @@ -69,7 +69,7 @@ Text = fileName; } }; - await Task.Run(() => zipFile.ExtractAll(Path.GetDirectoryName(IgniterComponent.QwilightFilePath), ExtractExistingFileAction.OverwriteSilently)); + await Task.Run(() => zipFile.ExtractAll(Path.GetDirectoryName(IgniterComponent.QwilightFilePath), ExtractExistingFileAction.OverwriteSilently)).ConfigureAwait(false); } OnIgnited(); diff --git a/Qwilight/AvatarWww.cs b/Qwilight/AvatarWww.cs index 07dc5d7..149b66b 100644 --- a/Qwilight/AvatarWww.cs +++ b/Qwilight/AvatarWww.cs @@ -26,7 +26,7 @@ { _wantAvatarDrawing = false; - _ = Awaitable().ConfigureAwait(false); + _ = Awaitable(); async Task Awaitable() => SetProperty(ref _avatarDrawing, (await AvatarDrawingSystem.Instance.GetAvatarDrawing(AvatarID).ConfigureAwait(false)).DefaultDrawing, nameof(AvatarDrawing)); } return _avatarDrawing; @@ -41,7 +41,7 @@ { _wantAvatarTitle = false; - _ = Awaitable().ConfigureAwait(false); + _ = Awaitable(); async Task Awaitable() => SetProperty(ref _avatarTitle, await AvatarTitleSystem.Instance.GetAvatarTitle(AvatarID, _allowNotAvatarTitle).ConfigureAwait(false), nameof(AvatarTitleValue)); } return _avatarTitle; @@ -56,7 +56,7 @@ { _wantAvatarEdge = false; - _ = Awaitable().ConfigureAwait(false); + _ = Awaitable(); async Task Awaitable() => SetProperty(ref _avatarEdge, (await AvatarEdgeSystem.Instance.GetAvatarEdge(AvatarID).ConfigureAwait(false)).DefaultDrawing, nameof(AvatarEdge)); } return _avatarEdge; diff --git a/Qwilight/Compute/DefaultCompute.cs b/Qwilight/Compute/DefaultCompute.cs index 5e170c9..7af5f5b 100644 --- a/Qwilight/Compute/DefaultCompute.cs +++ b/Qwilight/Compute/DefaultCompute.cs @@ -3999,16 +3999,16 @@ } } } - _ = DB.Instance.SetHandled(NoteFile).ConfigureAwait(false); + _ = DB.Instance.SetHandled(NoteFile); - _ = DB.Instance.NewDate(NoteFile, default, date).ConfigureAwait(false); + _ = DB.Instance.NewDate(NoteFile, default, date); NoteFile.LatestDate = date; ++NoteFile.HandledCount; } else { - _ = DB.Instance.NewDate(default, eventNoteID, date).ConfigureAwait(false); + _ = DB.Instance.NewDate(default, eventNoteID, date); EventNoteEntryItem.LatestDate = date; ++EventNoteEntryItem.HandledCount; } @@ -4513,7 +4513,7 @@ } } - _ = Awaitable().ConfigureAwait(false); + _ = Awaitable(); async Task Awaitable() { var eventNoteID = EventNoteEntryItem?.EventNoteID; @@ -4577,11 +4577,7 @@ var commentID = commentItem.CommentID; if (commentItem.IsTwilightComment) { - using var s = await TwilightSystem.Instance.GetWwwParallel($"{QwilightComponent.QwilightAPI}/comment?noteID={NoteFile.GetNoteID512()}&commentID={commentID}").ConfigureAwait(false); - if (s.Length > 0) - { - netItem.Comment = Comment.Parser.ParseFrom(s); - } + netItem.Comment = Comment.Parser.ParseFrom(await TwilightSystem.Instance.GetWwwParallel($"{QwilightComponent.QwilightAPI}/comment?noteID={NoteFile.GetNoteID512()}&commentID={commentID}").ConfigureAwait(false)); } else { diff --git a/Qwilight/System/MediaInputSystem.cs b/Qwilight/System/MediaInputSystem.cs index c6df1e2..9c3fef2 100644 --- a/Qwilight/System/MediaInputSystem.cs +++ b/Qwilight/System/MediaInputSystem.cs @@ -47,7 +47,7 @@ { if (SetProperty(ref _mediaInputQuality, value, nameof(MediaInputQualityValue)) && value.HasValue) { - _ = Awaitable().ConfigureAwait(false); + _ = Awaitable(); async Task Awaitable() => await _mediaInputSystem.VideoDeviceController.SetMediaStreamPropertiesAsync(MediaStreamType.VideoRecord, value.Value.Data); } } diff --git a/Qwilight/View/MainWindow/MainWindow.xaml.cs b/Qwilight/View/MainWindow/MainWindow.xaml.cs index 555e89a..fc04f95 100644 --- a/Qwilight/View/MainWindow/MainWindow.xaml.cs +++ b/Qwilight/View/MainWindow/MainWindow.xaml.cs @@ -146,11 +146,11 @@ void OnFileAs(object sender, DragEventArgs e) => ViewModels.Instance.MainValue.OnFileAs(e); - async void OnLoaded(object sender, EventArgs e) + void OnLoaded(object sender, EventArgs e) { var mainViewModel = ViewModels.Instance.MainValue; mainViewModel.OnWindowDPIModified(PInvoke.GetDpiForWindow(_handle) / 96.0); - await mainViewModel.OnLoaded(_handle); + _ = mainViewModel.OnLoaded(_handle); } public async void Receive(ICC message) diff --git a/Qwilight/View/QwilightClass.xaml.cs b/Qwilight/View/QwilightClass.xaml.cs index 8b6407a..c2e494c 100644 --- a/Qwilight/View/QwilightClass.xaml.cs +++ b/Qwilight/View/QwilightClass.xaml.cs @@ -102,7 +102,7 @@ var (logFilePath, faultText) = Utility.SetFault(QwilightComponent.FaultEntryPath, e); PInvoke.MessageBox(HWND.Null, e.Message, "Qwilight", MESSAGEBOX_STYLE.MB_OK | MESSAGEBOX_STYLE.MB_ICONERROR); Utility.OpenAs(logFilePath); - _ = TwilightSystem.Instance.PostWwwParallel($"{QwilightComponent.QwilightAPI}/fault", faultText).ConfigureAwait(false); + _ = TwilightSystem.Instance.PostWwwParallel($"{QwilightComponent.QwilightAPI}/fault", faultText); } } diff --git a/Qwilight/ViewModel/AvatarViewModel.cs b/Qwilight/ViewModel/AvatarViewModel.cs index 97124c7..2512957 100644 --- a/Qwilight/ViewModel/AvatarViewModel.cs +++ b/Qwilight/ViewModel/AvatarViewModel.cs @@ -406,7 +406,7 @@ base.OnCollasped(); if (IsMe) { - _ = TwilightSystem.Instance.PutAvatarParallel($"{QwilightComponent.TaehuiNetAPI}/avatar/avatarIntro", AvatarIntro).ConfigureAwait(false); + _ = TwilightSystem.Instance.PutAvatarParallel($"{QwilightComponent.TaehuiNetAPI}/avatar/avatarIntro", AvatarIntro); } } } diff --git a/Qwilight/ViewModel/ConfigureViewModel.cs b/Qwilight/ViewModel/ConfigureViewModel.cs index 8006b0f..3cfa562 100644 --- a/Qwilight/ViewModel/ConfigureViewModel.cs +++ b/Qwilight/ViewModel/ConfigureViewModel.cs @@ -486,7 +486,7 @@ static void OnStopLastEqualAudio() => Configure.Instance.StopLastEqualAudio = !Configure.Instance.StopLastEqualAudio; [RelayCommand] - static async Task OnGetMIDI() => await MIDISystem.Instance.GetMIDIs(); + static async Task OnGetMIDI() => await MIDISystem.Instance.GetMIDIs().ConfigureAwait(false); [RelayCommand] static void OnFontFamily(int? e) @@ -617,7 +617,7 @@ var handlingComputer = ViewModels.Instance.MainValue.GetHandlingComputer(); if (handlingComputer != null) { - _ = handlingComputer.SetWait(); + handlingComputer.SetWait(); MediaSystem.Instance.HandleDefaultIfAvailable(handlingComputer); MediaSystem.Instance.HandleIfAvailable(handlingComputer); } @@ -883,10 +883,10 @@ }); [RelayCommand] - static async Task OnDefaultNote() => await TwilightSystem.Instance.GetDefaultNoteDate(0, false); + static async Task OnDefaultNote() => await TwilightSystem.Instance.GetDefaultNoteDate(0, false).ConfigureAwait(false); [RelayCommand] - static async Task OnDefaultUI() => await TwilightSystem.Instance.GetDefaultUIDate(0, false); + static async Task OnDefaultUI() => await TwilightSystem.Instance.GetDefaultUIDate(0, false).ConfigureAwait(false); [RelayCommand] static void OnLoadBanalFailedMedia() => WeakReferenceMessenger.Default.Send(new() @@ -909,7 +909,7 @@ { if (Configure.Instance.MediaInput) { - await MediaInputSystem.Instance.GetMediaInputItems(); + await MediaInputSystem.Instance.GetMediaInputItems().ConfigureAwait(false); } else { @@ -918,10 +918,10 @@ } [RelayCommand] - static async Task OnGetMedia() => await MediaInputSystem.Instance.GetMediaInputItems(); + static async Task OnGetMedia() => await MediaInputSystem.Instance.GetMediaInputItems().ConfigureAwait(false); [RelayCommand] - static async Task OnGetQwilight() => await ViewModels.Instance.MainValue.GetQwilight(false); + static async Task OnGetQwilight() => await ViewModels.Instance.MainValue.GetQwilight(false).ConfigureAwait(false); [RelayCommand] static void OnAutoHighlight() => Configure.Instance.AutoHighlight = !Configure.Instance.AutoHighlight; @@ -1511,7 +1511,7 @@ UI.Instance.LoadUI(null, Configure.Instance.UIItemValue, false); }); } - _ = mainViewModel.AutoComputer?.SetWait(); + mainViewModel.AutoComputer?.SetWait(); mainViewModel.HandleAutoComputer(); } } diff --git a/Qwilight/ViewModel/MainViewModel.cs b/Qwilight/ViewModel/MainViewModel.cs index 5d74a48..4bef658 100644 --- a/Qwilight/ViewModel/MainViewModel.cs +++ b/Qwilight/ViewModel/MainViewModel.cs @@ -74,7 +74,6 @@ { EnableRaisingEvents = true }; - DispatcherTimer _fadeHandler; DispatcherTimer _fadeInHandler; bool _isAvailable = true; string _twilightCommentText0 = string.Empty; @@ -541,7 +540,7 @@ } } - public async ValueTask OnLoaded(nint handle) + public async Task OnLoaded(nint handle) { WeakReferenceMessenger.Default.Send(new() { @@ -836,7 +835,7 @@ { LanguageSystem.Instance.WipeCommentNotify, MESSAGEBOX_STYLE.MB_YESNO | MESSAGEBOX_STYLE.MB_ICONQUESTION | MESSAGEBOX_STYLE.MB_DEFBUTTON1, - new Action(async r => + new Action(r => { if (r == MESSAGEBOX_RESULT.IDYES) { @@ -850,7 +849,7 @@ { Utility.WipeFile(defaultCommentFilePath); } - _ = DB.Instance.WipeComment(defaultCommentFilePath).ConfigureAwait(false); + _ = DB.Instance.WipeComment(defaultCommentFilePath); } }) } @@ -965,7 +964,7 @@ } foreach (var noteFile in EntryItemValue.NoteFiles.Where(noteFile => !noteFile.IsLogical)) { - _ = TwilightSystem.Instance.PostWwwParallel($"{QwilightComponent.QwilightAPI}/note", noteFile.GetContents()).ConfigureAwait(false); + _ = TwilightSystem.Instance.PostWwwParallel($"{QwilightComponent.QwilightAPI}/note", noteFile.GetContents()); } break; case DB.EventNoteVariety.Qwilight: @@ -973,7 +972,7 @@ Clipboard.SetContent(dataBundle); foreach (var noteFile in EntryItemValue.NoteFiles.Where(noteFile => !noteFile.IsLogical)) { - _ = TwilightSystem.Instance.PostWwwParallel($"{QwilightComponent.QwilightAPI}/note", noteFile.GetContents()).ConfigureAwait(false); + _ = TwilightSystem.Instance.PostWwwParallel($"{QwilightComponent.QwilightAPI}/note", noteFile.GetContents()); } break; } @@ -2370,7 +2369,7 @@ var millis = BaseUI.Instance.FadingPropertyValues[(int)ModeValue]?[FadingValue.Layer]?.Millis; var fadingCounter = Stopwatch.StartNew(); - _fadeHandler = new(QwilightComponent.StandardFrametime, DispatcherPriority.Render, (sender, e) => + new DispatcherTimer(QwilightComponent.StandardFrametime, DispatcherPriority.Render, (sender, e) => { if (millis > 0) { @@ -2552,7 +2551,7 @@ var handlingComputer = GetHandlingComputer(); if (handlingComputer != null) { - _ = handlingComputer.SetWait(); + handlingComputer.SetWait(); MediaSystem.Instance.HandleDefaultIfAvailable(handlingComputer); MediaSystem.Instance.HandleIfAvailable(handlingComputer); } diff --git a/Qwilight/ViewModel/NoteFileViewModel.cs b/Qwilight/ViewModel/NoteFileViewModel.cs index 5e98042..bb6157b 100644 --- a/Qwilight/ViewModel/NoteFileViewModel.cs +++ b/Qwilight/ViewModel/NoteFileViewModel.cs @@ -278,13 +278,13 @@ switch (mode) { case 0: - await DB.Instance.WipeHandled(NoteFile); + await DB.Instance.WipeHandled(NoteFile).ConfigureAwait(false); NoteFile.HandledValue = BaseNoteFile.Handled.Not; break; case 1: foreach (var noteFile in EntryItemValue.NoteFiles) { - await DB.Instance.WipeHandled(noteFile); + await DB.Instance.WipeHandled(noteFile).ConfigureAwait(false); noteFile.HandledValue = BaseNoteFile.Handled.Not; } break; @@ -359,7 +359,7 @@ var noteFile = EntryItemValue?.NoteFile; if (noteFile != null) { - await DB.Instance.SetNoteFormat(noteFile, noteFormatID); + await DB.Instance.SetNoteFormat(noteFile, noteFormatID).ConfigureAwait(false); FastDB.Instance.WipeNoteFile(noteFile); } var mainViewModel = ViewModels.Instance.MainValue; @@ -380,7 +380,7 @@ { if (!noteFile.IsLogical) { - await DB.Instance.SetNoteFormat(noteFile, e.Value); + await DB.Instance.SetNoteFormat(noteFile, e.Value).ConfigureAwait(false); FastDB.Instance.WipeNoteFile(noteFile); } } diff --git a/Qwilight/ViewModel/SiteViewModel.cs b/Qwilight/ViewModel/SiteViewModel.cs index 1018965..9d834e3 100644 --- a/Qwilight/ViewModel/SiteViewModel.cs +++ b/Qwilight/ViewModel/SiteViewModel.cs @@ -247,7 +247,7 @@ Contents = new object[] { Array.Empty(), - new Action(async fileName => TwilightSystem.Instance.SendParallel(Event.Types.EventID.PostFile, Path.GetFileName(fileName), UnsafeByteOperations.UnsafeWrap(await File.ReadAllBytesAsync(fileName)))) + new Action(async fileName => TwilightSystem.Instance.SendParallel(Event.Types.EventID.PostFile, Path.GetFileName(fileName), UnsafeByteOperations.UnsafeWrap(await File.ReadAllBytesAsync(fileName).ConfigureAwait(false)))) } }); diff --git a/Qwilight/ViewModel/SiteWindowViewModel.cs b/Qwilight/ViewModel/SiteWindowViewModel.cs index 902a312..c974717 100644 --- a/Qwilight/ViewModel/SiteWindowViewModel.cs +++ b/Qwilight/ViewModel/SiteWindowViewModel.cs @@ -151,7 +151,7 @@ { if (IsOpened) { - var twilightWwwSites = await TwilightSystem.Instance.GetWwwParallel($"{QwilightComponent.QwilightAPI}/sites"); + var twilightWwwSites = await TwilightSystem.Instance.GetWwwParallel($"{QwilightComponent.QwilightAPI}/sites").ConfigureAwait(false); if (twilightWwwSites != null) { Utility.SetUICollection(SiteItemCollection, twilightWwwSites.Select(data => new SiteItem diff --git a/Qwilight/ViewModel/WwwLevelViewModel.cs b/Qwilight/ViewModel/WwwLevelViewModel.cs index 19e115d..7eb449b 100644 --- a/Qwilight/ViewModel/WwwLevelViewModel.cs +++ b/Qwilight/ViewModel/WwwLevelViewModel.cs @@ -51,7 +51,7 @@ IsLevelGroupsLoading = true; var avatarID = value?.AvatarWwwValue?.AvatarID ?? string.Empty; - var levelNames = await TwilightSystem.Instance.GetWwwParallel($"{QwilightComponent.QwilightAPI}/level?avatarID={WebUtility.UrlEncode(avatarID)}"); + var levelNames = await TwilightSystem.Instance.GetWwwParallel($"{QwilightComponent.QwilightAPI}/level?avatarID={WebUtility.UrlEncode(avatarID)}").ConfigureAwait(false); if (levelNames != null && (WwwLevelAvatarValue?.AvatarWwwValue?.AvatarID ?? string.Empty) == avatarID) { Utility.SetUICollection(WwwLevelGroupCollection, levelNames.Select(levelName => new WwwLevelGroup @@ -99,7 +99,7 @@ IsLevelGroupLoading = true; var levelName = value.LevelName; - var twilightWwwLevels = await TwilightSystem.Instance.GetWwwParallel($"{QwilightComponent.QwilightAPI}/level?levelName={WebUtility.UrlEncode(levelName)}"); + var twilightWwwLevels = await TwilightSystem.Instance.GetWwwParallel($"{QwilightComponent.QwilightAPI}/level?levelName={WebUtility.UrlEncode(levelName)}").ConfigureAwait(false); if (twilightWwwLevels != null && WwwLevelGroupValue?.LevelName == levelName) { var wwwLevelItemCollection = value.WwwLevelItemCollection; @@ -132,7 +132,7 @@ { base.OnOpened(); IsAvatarIDsLoading = true; - var twilightWwwLevelAvatars = await TwilightSystem.Instance.GetWwwParallel($"{QwilightComponent.QwilightAPI}/level?avatarIDMe={WebUtility.UrlEncode(TwilightSystem.Instance.AvatarID)}"); + var twilightWwwLevelAvatars = await TwilightSystem.Instance.GetWwwParallel($"{QwilightComponent.QwilightAPI}/level?avatarIDMe={WebUtility.UrlEncode(TwilightSystem.Instance.AvatarID)}").ConfigureAwait(false); if (twilightWwwLevelAvatars.HasValue) { var twilightWwwLevelAvatarsValue = twilightWwwLevelAvatars.Value;