diff options
| author | TSRBerry <20988865+TSRBerry@users.noreply.github.com> | 2023-04-24 04:08:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-24 02:08:31 +0000 |
| commit | c26aeefe039ff819f79196623a7e94a1908b7add (patch) | |
| tree | d815f1789f7a6e182484c79107bc733962f9badc /Ryujinx.Ava/UI/ViewModels/AmiiboWindowViewModel.cs | |
| parent | 666e05f5cb9aa9dc86874823c108586e7a5b38bd (diff) | |
Fix amiibo timeout issues & log errors/exceptions (#4712)1.1.728
Diffstat (limited to 'Ryujinx.Ava/UI/ViewModels/AmiiboWindowViewModel.cs')
| -rw-r--r-- | Ryujinx.Ava/UI/ViewModels/AmiiboWindowViewModel.cs | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/Ryujinx.Ava/UI/ViewModels/AmiiboWindowViewModel.cs b/Ryujinx.Ava/UI/ViewModels/AmiiboWindowViewModel.cs index 090c13a9..bb92798f 100644 --- a/Ryujinx.Ava/UI/ViewModels/AmiiboWindowViewModel.cs +++ b/Ryujinx.Ava/UI/ViewModels/AmiiboWindowViewModel.cs @@ -7,6 +7,7 @@ using Ryujinx.Ava.UI.Helpers; using Ryujinx.Ava.UI.Windows; using Ryujinx.Common; using Ryujinx.Common.Configuration; +using Ryujinx.Common.Logging; using Ryujinx.Common.Utilities; using Ryujinx.Ui.Common.Models.Amiibo; using System; @@ -42,13 +43,18 @@ namespace Ryujinx.Ava.UI.ViewModels private bool _showAllAmiibo; private bool _useRandomUuid; private string _usage; - + private static readonly AmiiboJsonSerializerContext SerializerContext = new(JsonHelper.GetDefaultSerializerOptions()); public AmiiboWindowViewModel(StyleableWindow owner, string lastScannedAmiiboId, string titleId) { _owner = owner; - _httpClient = new HttpClient { Timeout = TimeSpan.FromMilliseconds(5000) }; + + _httpClient = new HttpClient + { + Timeout = TimeSpan.FromSeconds(30) + }; + LastScannedAmiiboId = lastScannedAmiiboId; TitleId = titleId; @@ -89,9 +95,7 @@ namespace Ryujinx.Ava.UI.ViewModels { _showAllAmiibo = value; -#pragma warning disable 4014 ParseAmiiboData(); -#pragma warning restore 4014 OnPropertyChanged(); } @@ -203,8 +207,10 @@ namespace Ryujinx.Ava.UI.ViewModels { amiiboJsonString = await DownloadAmiiboJson(); } - catch + catch (Exception ex) { + Logger.Error?.Print(LogClass.Application, $"Failed to download amiibo data: {ex}"); + ShowInfoDialog(); } } @@ -369,8 +375,10 @@ namespace Ryujinx.Ava.UI.ViewModels return false; } - catch + catch (Exception ex) { + Logger.Error?.Print(LogClass.Application, $"Failed to check for amiibo updates: {ex}"); + ShowInfoDialog(); return false; @@ -393,6 +401,8 @@ namespace Ryujinx.Ava.UI.ViewModels return amiiboJsonString; } + Logger.Error?.Print(LogClass.Application, $"Failed to download amiibo data. Response status code: {response.StatusCode}"); + await ContentDialogHelper.CreateInfoDialog(LocaleManager.Instance[LocaleKeys.DialogAmiiboApiTitle], LocaleManager.Instance[LocaleKeys.DialogAmiiboApiFailFetchMessage], LocaleManager.Instance[LocaleKeys.InputDialogOk], @@ -429,6 +439,10 @@ namespace Ryujinx.Ava.UI.ViewModels AmiiboImage = bitmap.CreateScaledBitmap(new PixelSize(resizeWidth, resizeHeight)); } } + else + { + Logger.Error?.Print(LogClass.Application, $"Failed to get amiibo preview. Response status code: {response.StatusCode}"); + } } private void ResetAmiiboPreview() |