Improved error messages + finished all control renamings due to the l…

…ast ui change
Phalcode · Jan 5, 2024 · 3262252 · 3262252
1 parent 2009124
commit 3262252
Show file tree

Hide file tree

Showing 16 changed files with 87 additions and 123 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,11 @@
 # GameVault App Changelog
 
 ## 1.8.2
-Recommended Gamevault Server Version: `v10.0.2`
+Recommended Gamevault Server Version: `v10.1.0`
 ### Changes
 - Write permissions of the root folder are now checked on selection
 - The scrollbar in the download tab now covers the entire tab
+- Improved error messages
 
 ## 1.8.1
 Recommended Gamevault Server Version: `v10.0.2`

diff --git a/gamevault/Helper/LoginManager.cs b/gamevault/Helper/LoginManager.cs
@@ -41,6 +41,7 @@ public static LoginManager Instance
         #endregion
         private User? m_User { get; set; }
         private LoginState m_LoginState { get; set; }
+        private string m_LoginMessage { get; set; }
         public User? GetCurrentUser()
         {
             return m_User;
@@ -53,6 +54,10 @@ public LoginState GetState()
         {
             return m_LoginState;
         }
+        public string GetLoginMessage()
+        {
+            return m_LoginMessage;
+        }
         public void SwitchToOfflineMode()
         {
             MainWindowViewModel.Instance.OnlineState = System.Windows.Visibility.Visible;
@@ -70,17 +75,15 @@ public async Task StartupLogin()
                     string result = WebHelper.GetRequest(@$"{SettingsViewModel.Instance.ServerUrl}/api/users/me");
                     return JsonSerializer.Deserialize<User>(result);
                 }
-                catch (WebException ex)
+                catch (Exception ex)
                 {
                     string code = WebExceptionHelper.GetServerStatusCode(ex);
                     state = DetermineLoginState(code);
+                    if (state == LoginState.Error)
+                        m_LoginMessage = WebExceptionHelper.TryGetServerMessage(ex);
+
                     return null;
-                }
-                catch
-                {
-                    state = LoginState.Error;
-                    return null;
-                }
+                }               
             });
             m_User = user;
             m_LoginState = state;
@@ -96,17 +99,15 @@ public async Task<LoginState> ManualLogin(string username, string password)
                     string result = WebHelper.GetRequest(@$"{SettingsViewModel.Instance.ServerUrl}/api/users/me");
                     return JsonSerializer.Deserialize<User>(result);
                 }
-                catch (WebException ex)
+                catch (Exception ex)
                 {
                     string code = WebExceptionHelper.GetServerStatusCode(ex);
                     state = DetermineLoginState(code);
+                    if (state == LoginState.Error)
+                        m_LoginMessage = WebExceptionHelper.TryGetServerMessage(ex);
+
                     return null;
-                }
-                catch
-                {
-                    state = LoginState.Error;
-                    return null;
-                }
+                }               
             });
             m_User = user;
             m_LoginState = state;

diff --git a/gamevault/Helper/WebExceptionHelper.cs b/gamevault/Helper/WebExceptionHelper.cs
@@ -11,7 +11,7 @@ namespace gamevault.Helper
 {
     internal class WebExceptionHelper
     {
-        internal static string GetServerMessage(WebException ex)
+        private static string GetServerMessage(WebException ex)
         {
             string errMessage = string.Empty;
             try
@@ -23,15 +23,30 @@ internal static string GetServerMessage(WebException ex)
             catch { }
             return errMessage;
         }
-        internal static string GetServerStatusCode(WebException ex)
+        /// <summary>
+        /// Tries to get the response message of the server. Else returns exception message
+        /// </summary>
+        internal static string TryGetServerMessage(Exception ex)
         {
+            if (ex is WebException webEx)
+            {
+                string msg = GetServerMessage(webEx);
+                return string.IsNullOrEmpty(msg) ? ex.Message : $"Server responded:{webEx}";
+            }
+            return ex.Message;
+        }
+        internal static string GetServerStatusCode(Exception ex)
+        {
+            if (ex is not WebException webex)
+                return "";
+
             string errMessage = string.Empty;
             try
             {
-                if (ex.Response == null)
+                if (webex.Response == null)
                     return string.Empty;
 
-                var resp = new StreamReader(ex.Response.GetResponseStream()).ReadToEnd();
+                var resp = new StreamReader(webex.Response.GetResponseStream()).ReadToEnd();
                 JsonObject obj = JsonNode.Parse(resp).AsObject();
                 errMessage = obj["statusCode"].ToString().Replace("\n", " ").Replace("\r", "");
             }

diff --git a/gamevault/UserControls/AdminConsoleUserControl.xaml.cs b/gamevault/UserControls/AdminConsoleUserControl.xaml.cs
@@ -56,9 +56,9 @@ public async Task InitUserList()
                     return JsonSerializer.Deserialize<User[]>(userList);
                 });
             }
-            catch (WebException ex)
+            catch (Exception ex)
             {
-                string msg = WebExceptionHelper.GetServerMessage(ex);
+                string msg = WebExceptionHelper.TryGetServerMessage(ex);
                 MainWindowViewModel.Instance.AppBarText = msg;
             }
         }
@@ -75,9 +75,9 @@ private void PermissionRole_SelectionChanged(object sender, SelectionChangedEven
                 WebHelper.Put(@$"{SettingsViewModel.Instance.ServerUrl}/api/users/{selectedUser.ID}", JsonSerializer.Serialize(new User() { Role = selectedUser.Role }));
                 MainWindowViewModel.Instance.AppBarText = $"Successfully updated permission role of user '{selectedUser.Username}' to '{selectedUser.Role}'";
             }
-            catch (WebException ex)
+            catch (Exception ex)
             {
-                string msg = WebExceptionHelper.GetServerMessage(ex);
+                string msg = WebExceptionHelper.TryGetServerMessage(ex);
                 MainWindowViewModel.Instance.AppBarText = msg;
             }
         }
@@ -91,9 +91,9 @@ private void Activated_Toggled(object sender, RoutedEventArgs e)
                 string state = selectedUser.Activated == true ? "activated" : "deactivated";
                 MainWindowViewModel.Instance.AppBarText = $"Successfully {state} user '{selectedUser.Username}'";
             }
-            catch (WebException ex)
+            catch (Exception ex)
             {
-                string msg = WebExceptionHelper.GetServerMessage(ex);
+                string msg = WebExceptionHelper.TryGetServerMessage(ex);
                 MainWindowViewModel.Instance.AppBarText = msg;
             }
         }
@@ -120,9 +120,9 @@ await Task.Run(async () =>
                         await InitUserList();
                     }
                 }
-                catch (WebException ex)
+                catch (Exception ex)
                 {
-                    string msg = WebExceptionHelper.GetServerMessage(ex);
+                    string msg = WebExceptionHelper.TryGetServerMessage(ex);
                     MainWindowViewModel.Instance.AppBarText = msg;
                 }
             });
@@ -158,10 +158,10 @@ await Task.Run(() =>
                     WebHelper.Put(@$"{SettingsViewModel.Instance.ServerUrl}/api/users/{selectedUser.ID}", JsonSerializer.Serialize(selectedUser));
                     MainWindowViewModel.Instance.AppBarText = "Sucessfully saved user changes";
                 }
-                catch (WebException ex)
+                catch (Exception ex)
                 {
                     error = true;
-                    string msg = WebExceptionHelper.GetServerMessage(ex);
+                    string msg = WebExceptionHelper.TryGetServerMessage(ex);
                     MainWindowViewModel.Instance.AppBarText = msg;
                 }
             });
@@ -198,9 +198,9 @@ await Task.Run(() =>
                     WebHelper.Put(@$"{SettingsViewModel.Instance.ServerUrl}/api/files/reindex", string.Empty);
                     MainWindowViewModel.Instance.AppBarText = "Sucessfully reindexed games";
                 }
-                catch (WebException ex)
+                catch (Exception ex)
                 {
-                    string msg = WebExceptionHelper.GetServerMessage(ex);
+                    string msg = WebExceptionHelper.TryGetServerMessage(ex);
                     MainWindowViewModel.Instance.AppBarText = msg;
                 }
             });

diff --git a/gamevault/UserControls/CommunityUserControl.xaml.cs b/gamevault/UserControls/CommunityUserControl.xaml.cs
@@ -131,7 +131,7 @@ private async void Users_SelectionChanged(object sender, SelectionChangedEventAr
                     uiSortBy.SelectedIndex = 2;
                 }
             }
-            catch (Exception ex) { MainWindowViewModel.Instance.AppBarText = "Could not connect to server"; }
+            catch (Exception ex) { MainWindowViewModel.Instance.AppBarText = WebExceptionHelper.TryGetServerMessage(ex); }
         }
         private User[] BringCurrentUserToTop(User[] users)
         {
@@ -230,13 +230,9 @@ private async void DeleteProgress_Click(object sender, System.Windows.Input.Mous
                     MainWindowViewModel.Instance.AppBarText = $"Successfully deleted progress";
                 }
             }
-            catch (WebException webex)
-            {
-                MainWindowViewModel.Instance.AppBarText = $"Could not delete the Progress. {WebExceptionHelper.GetServerMessage(webex)}";
-            }
             catch (Exception ex)
             {
-                MainWindowViewModel.Instance.AppBarText = $"Could not delete the Progress. {ex.Message}";
+                MainWindowViewModel.Instance.AppBarText = $"Could not delete. {WebExceptionHelper.TryGetServerMessage(ex)}";
             }
         }
     }

diff --git a/gamevault/UserControls/DownloadsUserControl.xaml b/gamevault/UserControls/DownloadsUserControl.xaml
@@ -27,7 +27,7 @@
             </TextBlock.Style>
         </TextBlock>
         <Grid Grid.Row="1">
-            <ScrollViewer Grid.Column="1" Margin="10,10,0,10" VerticalScrollBarVisibility="Auto">
+            <ScrollViewer Grid.Column="1" VerticalAlignment="Top" Margin="10,10,0,10" VerticalScrollBarVisibility="Auto">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition/>

diff --git a/gamevault/UserControls/DownloadsUserControl.xaml.cs b/gamevault/UserControls/DownloadsUserControl.xaml.cs
@@ -69,20 +69,15 @@ public async Task RestoreDownloadedGames()
                      }
                      return offlineCacheGames.ToArray();
                  }
-                 catch (WebException exWeb)
-                 {
-                     string webMsg = WebExceptionHelper.GetServerMessage(exWeb);
-                     if (webMsg == string.Empty) webMsg = "Could not connect to server";
-                     MainWindowViewModel.Instance.AppBarText = webMsg;
-                 }
-                 catch (JsonException exJson)
-                 {
-                     MainWindowViewModel.Instance.AppBarText = exJson.Message;
-                 }
                  catch (FormatException exFormat)
                  {
                      MainWindowViewModel.Instance.AppBarText = "The offline cache is corrupted";
                  }
+                 catch (Exception ex)
+                 {
+                     string webMsg = WebExceptionHelper.TryGetServerMessage(ex);
+                     MainWindowViewModel.Instance.AppBarText = webMsg;
+                 }
                  return null;
              });
             if (games == null)
@@ -105,7 +100,7 @@ public async Task TryStartDownload(Game game)
         {
             if (LoginManager.Instance.IsLoggedIn() == false)
             {
-                MainWindowViewModel.Instance.AppBarText = "Could not connect to server";
+                MainWindowViewModel.Instance.AppBarText = "You are not logged in or offline";
                 return;
             }
             if (SettingsViewModel.Instance.RootPath == string.Empty)

diff --git a/gamevault/UserControls/GameSettingsUserControl.xaml.cs b/gamevault/UserControls/GameSettingsUserControl.xaml.cs
@@ -611,14 +611,9 @@ await Task.Run(() =>
                         success = true;
                         MainWindowViewModel.Instance.AppBarText = "Successfully updated image";
                     }
-                    catch (WebException ex)
-                    {
-                        string msg = WebExceptionHelper.GetServerMessage(ex);
-                        MainWindowViewModel.Instance.AppBarText = msg;
-                    }
                     catch (Exception ex)
                     {
-                        MainWindowViewModel.Instance.AppBarText = ex.Message;
+                        MainWindowViewModel.Instance.AppBarText = WebExceptionHelper.TryGetServerMessage(ex);
                     }
                 });
                 //Update Data Context for Library. So that the images are also refreshed there directly
@@ -632,14 +627,9 @@ await Task.Run(() =>
                     }
                 }
             }
-            catch (WebException ex)
-            {
-                string msg = WebExceptionHelper.GetServerMessage(ex);
-                MainWindowViewModel.Instance.AppBarText = msg;
-            }
             catch (Exception ex)
             {
-                MainWindowViewModel.Instance.AppBarText = ex.Message;
+                MainWindowViewModel.Instance.AppBarText = WebExceptionHelper.TryGetServerMessage(ex);
             }
         }
         private void Image_Paste(object sender, KeyEventArgs e)
@@ -721,9 +711,9 @@ await Task.Run(() =>
                     WebHelper.Put(@$"{SettingsViewModel.Instance.ServerUrl}/api/rawg/{ViewModel.Game.ID}/recache", string.Empty);
                     MainWindowViewModel.Instance.AppBarText = $"Sucessfully re-cached {ViewModel.Game.Title}";
                 }
-                catch (WebException ex)
+                catch (Exception ex)
                 {
-                    string msg = WebExceptionHelper.GetServerMessage(ex);
+                    string msg = WebExceptionHelper.TryGetServerMessage(ex);
                     MainWindowViewModel.Instance.AppBarText = msg;
                 }
             });
@@ -743,10 +733,9 @@ await Task.Run(() =>
 
                     MainWindowViewModel.Instance.AppBarText = $"Successfully re-mapped {ViewModel.Game.Title}";
                 }
-                catch (WebException ex)
+                catch (Exception ex)
                 {
-                    string errMessage = WebExceptionHelper.GetServerMessage(ex);
-                    if (errMessage == string.Empty) { errMessage = "Failed to re-map game"; }
+                    string errMessage = WebExceptionHelper.TryGetServerMessage(ex);
                     MainWindowViewModel.Instance.AppBarText = errMessage;
                 }
             });

diff --git a/gamevault/UserControls/GameViewUserControl.xaml.cs b/gamevault/UserControls/GameViewUserControl.xaml.cs
@@ -180,16 +180,11 @@ await Task.Run(() =>
                     {
                         WebHelper.Put(@$"{SettingsViewModel.Instance.ServerUrl}/api/progresses/user/{LoginManager.Instance.GetCurrentUser().ID}/game/{gameID}", System.Text.Json.JsonSerializer.Serialize(new Progress() { State = ViewModel.Progress.State }));
                     }
-                    catch (WebException webEx)
+                    catch (Exception ex)
                     {
-                        string msg = WebExceptionHelper.GetServerMessage(webEx);
-                        if (msg == string.Empty)
-                        {
-                            msg = "Could not connect to server";
-                        }
+                        string msg = WebExceptionHelper.TryGetServerMessage(ex);
                         MainWindowViewModel.Instance.AppBarText = msg;
                     }
-                    catch { }
                 });
             }
         }

diff --git a/gamevault/UserControls/GeneralControls/TagSelector.xaml.cs b/gamevault/UserControls/GeneralControls/TagSelector.xaml.cs
@@ -100,9 +100,9 @@ await Task.Run(() =>
                             Selection.Genres => JsonSerializer.Deserialize<Genre_Tag[]>(result).Where(x => x.Name.Contains(debounceTimer.Data, StringComparison.OrdinalIgnoreCase)).ToArray()
                         };
                     }
-                    catch
+                    catch (Exception ex)
                     {
-                        MainWindowViewModel.Instance.AppBarText = "Could not connect to server";
+                        MainWindowViewModel.Instance.AppBarText = WebExceptionHelper.TryGetServerMessage(ex);
                     }
                 });
             }

diff --git a/gamevault/UserControls/InstallUserControl.xaml.cs b/gamevault/UserControls/InstallUserControl.xaml.cs
@@ -113,19 +113,9 @@ public async Task RestoreInstalledGames()
                             }
                         }
                     }
-                    catch (WebException exWeb)
-                    {
-                        MainWindowViewModel.Instance.AppBarText = "Could not connect to server";
-                        return null;
-                    }
-                    catch (JsonException exJson)
-                    {
-                        MainWindowViewModel.Instance.AppBarText = exJson.Message;
-                        return null;
-                    }
                     catch (Exception ex)
                     {
-                        MainWindowViewModel.Instance.AppBarText = ex.Message;
+                        MainWindowViewModel.Instance.AppBarText = WebExceptionHelper.TryGetServerMessage(ex);
                         return null;
                     }
                 }