Packages: support multiple unofficial catalog URLs

Author: dooly123

src/BasisPM.App/Localization/Languages/en.json

@@ -490,6 +490,10 @@
       "key": "packages.badge.github",
       "value": "github"
     },
+    {
+      "key": "packages.badge.unofficial",
+      "value": "UNOFFICIAL"
+    },
     {
       "key": "packages.bundle.basisLine",
       "value": "Basis: {0}  ·  Unity {1}"
@@ -1210,6 +1214,26 @@
       "key": "settings.catalog.title",
       "value": "Package Catalog URL"
     },
+    {
+      "key": "settings.extraCatalogs.add",
+      "value": "Add"
+    },
+    {
+      "key": "settings.extraCatalogs.description",
+      "value": "Add package catalogs from other sources. These are UNOFFICIAL — not reviewed or vetted by BasisVR — so install from them at your own risk. Official Basis packages always take priority over an unofficial one with the same id."
+    },
+    {
+      "key": "settings.extraCatalogs.remove",
+      "value": "Remove this catalog"
+    },
+    {
+      "key": "settings.extraCatalogs.title",
+      "value": "Additional Catalogs (Unofficial)"
+    },
+    {
+      "key": "settings.extraCatalogs.watermark",
+      "value": "https://example.com/catalog.json"
+    },
     {
       "key": "settings.clone.description",
       "value": "Where new Basis clones are created by default."

src/BasisPM.App/Styles/BasisTheme.axaml

@@ -33,6 +33,7 @@
 
             <Color x:Key="BasisDanger">#EF1237</Color>
             <Color x:Key="BasisSuccess">#22C55E</Color>
+            <Color x:Key="BasisWarning">#F59E0B</Color>
 
             <SolidColorBrush x:Key="BasisBackgroundBrush" Color="{StaticResource BasisBackground}"/>
             <SolidColorBrush x:Key="BasisPanelBrush" Color="{StaticResource BasisPanel}"/>
@@ -58,6 +59,7 @@
             <SolidColorBrush x:Key="BasisPinkBrush" Color="{StaticResource BasisPink}"/>
             <SolidColorBrush x:Key="BasisDangerBrush" Color="{StaticResource BasisDanger}"/>
             <SolidColorBrush x:Key="BasisSuccessBrush" Color="{StaticResource BasisSuccess}"/>
+            <SolidColorBrush x:Key="BasisWarningBrush" Color="{StaticResource BasisWarning}"/>
 
             <SolidColorBrush x:Key="BasisAccentBrush" Color="{StaticResource BasisBrand}"/>
 
@@ -378,6 +380,15 @@
         <Setter Property="Padding" Value="10,3"/>
     </Style>
 
+    <!-- Caution pill for packages from an unofficial (user-added) catalog. -->
+    <Style Selector="Border.unofficialBadge">
+        <Setter Property="Background" Value="#26F59E0B"/>
+        <Setter Property="BorderBrush" Value="#80F59E0B"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="CornerRadius" Value="999"/>
+        <Setter Property="Padding" Value="8,2"/>
+    </Style>
+
     <Style Selector="Border.versionPill">
         <Setter Property="Background" Value="{StaticResource BasisSurfaceMutedBrush}"/>
         <Setter Property="BorderBrush" Value="{StaticResource BasisBorderBrush}"/>

src/BasisPM.App/ViewModels/MainWindowViewModel.cs

@@ -292,7 +292,7 @@ public async Task InitializeAsync()
         ShowDevelopTab = settings.DeveloperMode;
         PackagesVM.SetInitialGridView(settings.PackagesGridView);
         await InstallsVM.LoadAsync(settings);
-        await PackagesVM.LoadCatalogAsync(settings.CatalogUrl);
+        await PackagesVM.LoadCatalogAsync(settings.CatalogUrl, settings.ExtraCatalogUrls);
 
         // Handle a launch-time deep link now (active install + packages are ready) — don't wait on the slower Unity refresh.
         if (DeepLinkDispatcher.Pending is { } pending)

src/BasisPM.App/ViewModels/PackagesViewModel.cs

@@ -29,6 +29,11 @@ public sealed class PackagesViewModel : ObservableObject
     private readonly List<InstalledPackageRow> _allInstalled = new();
     private BasisInstall? _selectedInstall;
     private bool _syncingSelection;
+    // Configured catalog sources, remembered so Refresh reloads exactly what's configured.
+    private string? _officialCatalogUrl;
+    private IReadOnlyList<string> _extraCatalogUrls = Array.Empty<string>();
+    // Package ids that came only from an unofficial (extra) catalog — drives the "Unofficial" badge.
+    private readonly HashSet<string> _unofficialIds = new(StringComparer.OrdinalIgnoreCase);
 
     private static string AllOwnersLabel => L.Tr("packages.filter.allOwners");
 
@@ -162,20 +167,43 @@ public void SetInstallOptions(IReadOnlyList<BasisInstall> installs)
         _syncingSelection = false;
     }
 
-    public async Task LoadCatalogAsync(string? url)
+    public Task LoadCatalogAsync(string? officialUrl, IReadOnlyList<string>? extraUrls = null)
+    {
+        _officialCatalogUrl = officialUrl;
+        _extraCatalogUrls = extraUrls ?? Array.Empty<string>();
+        return ReloadCatalogAsync();
+    }
+
+    /// <summary>Reloads the official Basis catalog plus any configured unofficial extras, merged into
+    /// one list. The official catalog always wins a package-id conflict; extras contribute only ids it
+    /// doesn't already define, tracked in <see cref="_unofficialIds"/> so they can be badged.</summary>
+    private async Task ReloadCatalogAsync()
     {
         IsBusy = true;
         try
         {
-            _catalog = await _catalogService.LoadAsync(url);
+            var merged = await _catalogService.LoadAsync(_officialCatalogUrl);
+            _unofficialIds.Clear();
+            foreach (var extraUrl in _extraCatalogUrls)
+            {
+                var extra = await _catalogService.TryLoadAsync(extraUrl?.Trim() ?? "");
+                if (extra is null) continue;
+                foreach (var kv in extra.Packages)
+                {
+                    if (merged.Packages.ContainsKey(kv.Key)) continue; // official / earlier extra wins
+                    merged.Packages[kv.Key] = kv.Value;
+                    _unofficialIds.Add(kv.Key);
+                }
+            }
+            _catalog = merged;
             Refilter();
         }
         finally { IsBusy = false; }
     }
 
     private async Task RefreshAsync()
     {
-        await LoadCatalogAsync(null);
+        await ReloadCatalogAsync();
         if (_install is not null && _install.HasUnityProject)
         {
             try
@@ -200,7 +228,7 @@ private void Refilter()
                 continue;
 
             var installedVersion = _install?.Manifest.Dependencies.GetValueOrDefault(v.Name);
-            Available.Add(new PackageRow(v, installedVersion));
+            Available.Add(new PackageRow(v, installedVersion, _unofficialIds.Contains(v.Name)));
         }
 
         // Keep an open detail panel pointed at the refreshed row so its installed-state stays current.
@@ -643,7 +671,7 @@ private static string Slugify(string s)
     private static void OpenUrl(string url) => ExternalLink.Open(url);
 }
 
-public sealed record PackageRow(CatalogPackageVersion Entry, string? InstalledVersion)
+public sealed record PackageRow(CatalogPackageVersion Entry, string? InstalledVersion, bool IsUnofficial = false)
 {
     public string DisplayName => Entry.DisplayName;
     public string Name => Entry.Name;

src/BasisPM.App/ViewModels/SettingsViewModel.cs

@@ -1,3 +1,4 @@
+using System.Collections.ObjectModel;
 using BasisPM.App.Localization;
 using BasisPM.Core.Models;
 using BasisPM.Core.Services;
@@ -13,6 +14,7 @@ public sealed class SettingsViewModel : ObservableObject
 
     private string _clonePath = "";
     private string _catalogUrl = "";
+    private string _newCatalogUrl = "";
     private string _unityHubPath = "";
     private bool _showLocalChanges;
     private bool _developerMode;
@@ -23,6 +25,10 @@ public sealed class SettingsViewModel : ObservableObject
 
     public string ClonePath { get => _clonePath; set => SetField(ref _clonePath, value); }
     public string CatalogUrl { get => _catalogUrl; set => SetField(ref _catalogUrl, value); }
+    // Extra, user-added catalog URLs — all UNOFFICIAL (not vetted by BasisVR).
+    public ObservableCollection<CatalogUrlItem> ExtraCatalogs { get; } = new();
+    // URL typed into the "add" field before it's committed to the list.
+    public string NewCatalogUrl { get => _newCatalogUrl; set => SetField(ref _newCatalogUrl, value); }
     public string UnityHubPath { get => _unityHubPath; set => SetField(ref _unityHubPath, value); }
     public bool ShowLocalChanges { get => _showLocalChanges; set => SetField(ref _showLocalChanges, value); }
     public bool DeveloperMode { get => _developerMode; set => SetField(ref _developerMode, value); }
@@ -47,6 +53,8 @@ public LanguageInfo? SelectedLanguage
     public LogsViewModel Logs { get; }
 
     public RelayCommand SaveCommand { get; }
+    public RelayCommand AddCatalogCommand { get; }
+    public RelayCommand<CatalogUrlItem> RemoveCatalogCommand { get; }
     public RelayCommand CheckForUpdatesCommand => _shell.CheckForUpdatesCommand;
 
     public SettingsViewModel(UserSettingsService settingsService, GitService gitService, UnityHubService hubService, MainWindowViewModel shell, LogsViewModel logs)
@@ -58,6 +66,8 @@ public SettingsViewModel(UserSettingsService settingsService, GitService gitServ
         Logs = logs;
         SettingsPath = settingsService.SettingsPath;
         SaveCommand = new RelayCommand(SaveAsync);
+        AddCatalogCommand = new RelayCommand(AddCatalog);
+        RemoveCatalogCommand = new RelayCommand<CatalogUrlItem>(item => { if (item is not null) ExtraCatalogs.Remove(item); });
         _selectedLanguage = FindLanguage(Localizer.Instance.CurrentCode);
         // Re-pull the localized "detected tooling" fallbacks when the language changes.
         Localizer.Instance.LanguageChanged += _ => RefreshDetected();
@@ -68,6 +78,9 @@ public void Apply(UserSettings settings)
     {
         ClonePath = settings.ClonePath ?? "";
         CatalogUrl = settings.CatalogUrl;
+        ExtraCatalogs.Clear();
+        foreach (var u in settings.ExtraCatalogUrls)
+            if (!string.IsNullOrWhiteSpace(u)) ExtraCatalogs.Add(new CatalogUrlItem(u));
         UnityHubPath = settings.UnityHubPath ?? "";
         ShowLocalChanges = settings.ShowLocalChanges;
         DeveloperMode = settings.DeveloperMode;
@@ -102,17 +115,39 @@ private async Task SaveAsync()
         var settings = await _settingsService.LoadAsync();
         settings.ClonePath = string.IsNullOrWhiteSpace(ClonePath) ? null : ClonePath.Trim();
         settings.CatalogUrl = CatalogUrl?.Trim() ?? "";
+        settings.ExtraCatalogUrls = ExtraCatalogs
+            .Select(c => c.Url?.Trim() ?? "")
+            .Where(u => u.Length > 0)
+            .Distinct(StringComparer.OrdinalIgnoreCase)
+            .ToList();
         settings.UnityHubPath = string.IsNullOrWhiteSpace(UnityHubPath) ? null : UnityHubPath.Trim();
         settings.ShowLocalChanges = ShowLocalChanges;
         settings.DeveloperMode = DeveloperMode;
         settings.PrereleaseUpdates = PrereleaseUpdates;
         await _settingsService.SaveAsync(settings);
 
-        await _shell.PackagesVM.LoadCatalogAsync(settings.CatalogUrl);
+        await _shell.PackagesVM.LoadCatalogAsync(settings.CatalogUrl, settings.ExtraCatalogUrls);
         _shell.ShowChangesTab = settings.ShowLocalChanges;
         _shell.ShowDevelopTab = settings.DeveloperMode;
         _shell.ApplyPrerelease(settings.PrereleaseUpdates);
         RefreshDetected();
         _shell.SetStatus(L.Tr("settings.status.saved"), StatusKind.Success);
     }
+
+    private void AddCatalog()
+    {
+        var url = NewCatalogUrl?.Trim();
+        if (string.IsNullOrWhiteSpace(url)) return;
+        if (!ExtraCatalogs.Any(c => string.Equals(c.Url?.Trim(), url, StringComparison.OrdinalIgnoreCase)))
+            ExtraCatalogs.Add(new CatalogUrlItem(url));
+        NewCatalogUrl = "";
+    }
+}
+
+/// <summary>One user-added (unofficial) catalog URL row in Settings; editable in place.</summary>
+public sealed class CatalogUrlItem : ObservableObject
+{
+    private string _url;
+    public CatalogUrlItem(string url) => _url = url;
+    public string Url { get => _url; set => SetField(ref _url, value); }
 }

src/BasisPM.App/Views/PackagesView.axaml

@@ -103,6 +103,10 @@
                                                         <Border Background="{StaticResource BasisSurfaceHoverBrush}" CornerRadius="999" Padding="8,2" VerticalAlignment="Center">
                                                             <TextBlock Text="{Binding Owner}" FontSize="10" FontWeight="Bold" Classes="muted"/>
                                                         </Border>
+                                                        <Border Classes="unofficialBadge" VerticalAlignment="Center" IsVisible="{Binding IsUnofficial}">
+                                                            <TextBlock Text="{loc:Tr packages.badge.unofficial}" FontSize="9" FontWeight="Bold"
+                                                                       Foreground="{StaticResource BasisWarningBrush}"/>
+                                                        </Border>
                                                     </StackPanel>
                                                     <TextBlock Text="{Binding Name}" Classes="dim" FontSize="11"/>
                                                     <TextBlock Text="{Binding Description}" Classes="muted" FontSize="12" TextWrapping="Wrap" MaxLines="2" TextTrimming="CharacterEllipsis" Margin="0,3,0,0"/>
@@ -116,7 +120,7 @@
                                                         </Border>
                                                         <TextBlock Text="{Binding Author, StringFormat='by {0}'}" Classes="dim" FontSize="11" VerticalAlignment="Center" IsVisible="{Binding HasAuthor}"/>
                                                         <TextBlock Text="{Binding Unity, StringFormat='Unity {0}'}" Classes="dim" FontSize="11" VerticalAlignment="Center" IsVisible="{Binding HasUnity}"/>
-                                                        <Button Content="Website ↗" Classes="link" VerticalAlignment="Center" IsVisible="{Binding HasLink}"
+                                                        <Button Content="🔗" FontSize="14" Classes="link" VerticalAlignment="Center" IsVisible="{Binding HasLink}"
                                                                 ToolTip.Tip="{Binding Link}"
                                                                 Command="{Binding #Root.((vm:PackagesViewModel)DataContext).OpenLinkCommand}"
                                                                 CommandParameter="{Binding Link}"/>
@@ -153,6 +157,10 @@
                                                         <TextBlock Text="{Binding DisplayName}" FontWeight="SemiBold" FontSize="13"
                                                                    TextTrimming="CharacterEllipsis" MaxWidth="150"/>
                                                         <TextBlock Text="{Binding Owner}" Classes="dim" FontSize="10"/>
+                                                        <Border Classes="unofficialBadge" HorizontalAlignment="Left" Margin="0,2,0,0" IsVisible="{Binding IsUnofficial}">
+                                                            <TextBlock Text="{loc:Tr packages.badge.unofficial}" FontSize="9" FontWeight="Bold"
+                                                                       Foreground="{StaticResource BasisWarningBrush}"/>
+                                                        </Border>
                                                     </StackPanel>
                                                 </StackPanel>
                                                 <TextBlock Text="{Binding Description}" Classes="muted" FontSize="11" TextWrapping="Wrap"
@@ -165,7 +173,7 @@
                                                             ToolTip.Tip="{loc:Tr packages.label.license}">
                                                         <TextBlock Text="{Binding License, StringFormat='⚖ {0}'}" FontSize="10" Classes="muted"/>
                                                     </Border>
-                                                    <Button Content="Website ↗" Classes="link" VerticalAlignment="Center" IsVisible="{Binding HasLink}"
+                                                    <Button Content="🔗" FontSize="14" Classes="link" VerticalAlignment="Center" IsVisible="{Binding HasLink}"
                                                             ToolTip.Tip="{Binding Link}"
                                                             Command="{Binding #Root.((vm:PackagesViewModel)DataContext).OpenLinkCommand}"
                                                             CommandParameter="{Binding Link}"/>
@@ -256,6 +264,10 @@
                             <StackPanel Orientation="Horizontal" Spacing="10" Margin="0,3,0,0">
                                 <TextBlock Text="{Binding Author, StringFormat='by {0}'}" Classes="muted" FontSize="12" IsVisible="{Binding HasAuthor}"/>
                                 <TextBlock Text="{Binding Owner}" Classes="dim" FontSize="12"/>
+                                <Border Classes="unofficialBadge" VerticalAlignment="Center" IsVisible="{Binding IsUnofficial}">
+                                    <TextBlock Text="{loc:Tr packages.badge.unofficial}" FontSize="9" FontWeight="Bold"
+                                               Foreground="{StaticResource BasisWarningBrush}"/>
+                                </Border>
                             </StackPanel>
                         </StackPanel>
                         <Button Grid.Column="2" Content="✕" FontSize="15" Padding="11,6" VerticalAlignment="Top"

src/BasisPM.App/Views/SettingsView.axaml

@@ -49,6 +49,31 @@
                         <TextBox Text="{Binding CatalogUrl}" Watermark="https://basisvr.org/packages/catalog.json"/>
                     </StackPanel>
 
+                    <StackPanel Spacing="6">
+                        <TextBlock Text="{loc:Tr settings.extraCatalogs.title}" Classes="h3"/>
+                        <TextBlock Text="{loc:Tr settings.extraCatalogs.description}"
+                                   Classes="muted" FontSize="12" TextWrapping="Wrap"/>
+                        <ItemsControl ItemsSource="{Binding ExtraCatalogs}">
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate DataType="vm:CatalogUrlItem">
+                                    <Grid ColumnDefinitions="*,Auto" Margin="0,0,0,6">
+                                        <TextBox Grid.Column="0" Text="{Binding Url}"/>
+                                        <Button Grid.Column="1" Content="✕" Margin="8,0,0,0" Classes="danger"
+                                                Command="{Binding $parent[ItemsControl].((vm:SettingsViewModel)DataContext).RemoveCatalogCommand}"
+                                                CommandParameter="{Binding}"
+                                                ToolTip.Tip="{loc:Tr settings.extraCatalogs.remove}"/>
+                                    </Grid>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+                        <Grid ColumnDefinitions="*,Auto">
+                            <TextBox Grid.Column="0" Text="{Binding NewCatalogUrl}"
+                                     Watermark="{loc:Tr settings.extraCatalogs.watermark}"/>
+                            <Button Grid.Column="1" Content="{loc:Tr settings.extraCatalogs.add}" Margin="8,0,0,0"
+                                    Classes="primary" Command="{Binding AddCatalogCommand}"/>
+                        </Grid>
+                    </StackPanel>
+
                     <StackPanel Spacing="6">
                         <TextBlock Text="{loc:Tr settings.unityHub.title}" Classes="h3"/>
                         <TextBlock Text="{loc:Tr settings.unityHub.description}"

src/BasisPM.Core/Models/UserSettings.cs

@@ -17,6 +17,12 @@ public sealed class UserSettings
     [JsonPropertyName("catalogUrl")]
     public string CatalogUrl { get; set; } = "";
 
+    // Additional, user-added catalog URLs. These are UNOFFICIAL (not vetted by BasisVR): their
+    // packages are merged into the list and badged as such, and can never override an official
+    // package id (the Basis catalog above always wins a conflict).
+    [JsonPropertyName("extraCatalogUrls")]
+    public List<string> ExtraCatalogUrls { get; set; } = new();
+
     [JsonPropertyName("unityHubPath")]
     public string? UnityHubPath { get; set; }