Show what hub server was fetched from

space-wizards · Aug 18, 2023 · 7601746 · 7601746
1 parent 7a475fd
commit 7601746
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 8 deletions.
diff --git a/SS14.Launcher/Utility/HubUtility.cs b/SS14.Launcher/Utility/HubUtility.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace SS14.Launcher.Utility;
+
+public static class HubUtility
+{
+    public static string GetHubShortName(string hubAddress)
+    {
+        return Uri.TryCreate(hubAddress, UriKind.Absolute, out var uri)
+            ? uri.Host
+            : hubAddress;
+    }
+}
diff --git a/SS14.Launcher/ViewModels/HubSettingsViewModel.cs b/SS14.Launcher/ViewModels/HubSettingsViewModel.cs
@@ -13,7 +13,7 @@ public class HubSettingsViewModel : ViewModelBase
 {
     public ObservableCollection<HubViewModel> HubList { get; set; } = new();
 
-    private readonly DataManager _dataManager =  Locator.Current.GetRequiredService<DataManager>();
+    private readonly DataManager _dataManager = Locator.Current.GetRequiredService<DataManager>();
 
     public void Save()
     {

diff --git a/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs b/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs
@@ -4,6 +4,7 @@
 using Microsoft.Toolkit.Mvvm.Messaging;
 using SS14.Launcher.Models.Data;
 using SS14.Launcher.Models.ServerStatus;
+using static SS14.Launcher.Utility.HubUtility;
 
 namespace SS14.Launcher.ViewModels.MainWindowTabs;
 
@@ -132,6 +133,20 @@ public string FallbackName
 
     public ServerStatusData CacheData => _cacheData;
 
+    public string? FetchedFrom
+    {
+        get
+        {
+            if (_cfg.Hubs.Count > 1)
+            {
+                return _cacheData.HubAddress == null ? null : $"Fetched from {GetHubShortName(_cacheData.HubAddress)}";
+            }
+
+            return null;
+        }
+    }
+    public bool ShowFetchedFrom => _cfg.Hubs.Count > 1 && !ViewedInFavoritesPane;
+
     public void FavoriteButtonPressed()
     {
         if (IsFavorite)

diff --git a/SS14.Launcher/ViewModels/MainWindowTabs/ServerListFiltersViewModel.cs b/SS14.Launcher/ViewModels/MainWindowTabs/ServerListFiltersViewModel.cs
@@ -9,6 +9,7 @@
 using SS14.Launcher.Models.ServerStatus;
 using SS14.Launcher.Utility;
 using static SS14.Launcher.Api.ServerApi;
+using static SS14.Launcher.Utility.HubUtility;
 
 namespace SS14.Launcher.ViewModels.MainWindowTabs;
 
@@ -159,11 +160,7 @@ public void UpdatePresentFilters(IEnumerable<ServerStatusData> servers)
                 if (!alreadyAdded.Add(filter))
                     continue;
 
-                var shortName = Uri.TryCreate(hub, UriKind.Absolute, out var uri)
-                    ? uri.Host
-                    : hub;
-
-                var vm = new ServerFilterViewModel(hub, shortName, filter, this);
+                var vm = new ServerFilterViewModel(hub, GetHubShortName(hub), filter, this);
                 filtersHub.Add(vm);
             }
         }

diff --git a/SS14.Launcher/Views/MainWindowTabs/ServerEntryView.xaml b/SS14.Launcher/Views/MainWindowTabs/ServerEntryView.xaml
@@ -27,8 +27,19 @@
         </DockPanel>
       </Expander.Header>
       <DockPanel Margin="4">
-        <TextBlock DockPanel.Dock="Top" Name="Description" Margin="4,0,4,16"
-                   Text="{Binding Description}" TextWrapping="Wrap" />
+        <TextBlock DockPanel.Dock="Top"
+                   Name="Description" Margin="4,0,4,4"
+                   Text="{Binding Description}"
+                   TextWrapping="Wrap" />
+
+        <TextBlock DockPanel.Dock="Top"
+                   Margin="4,0,4,4"
+                   TextWrapping="Wrap"
+                   Foreground="{DynamicResource ThemeSubTextBrush}"
+                   Text="{Binding FetchedFrom}"
+                   IsVisible="{Binding ShowFetchedFrom}" />
+
+        <Control DockPanel.Dock="Top" Height="8" />
 
         <Grid DockPanel.Dock="Right" VerticalAlignment="Bottom" RowDefinitions="Auto,Auto">
           <!-- Favorite add/remove button -->