Jellyfin.Plugin.SRFPlay/Api/Models/RecordingEntry.cs

@@ -20,13 +20,6 @@ public class RecordingEntry
     [JsonPropertyName("urn")]
     public string Urn { get; set; } = string.Empty;
 
-    /// <summary>
-    /// Gets or sets the business unit this recording belongs to (e.g. "srf", "rts").
-    /// Used to show recordings under the matching unit's channel.
-    /// </summary>
-    [JsonPropertyName("businessUnit")]
-    public string BusinessUnit { get; set; } = string.Empty;
-
     /// <summary>
     /// Gets or sets the title.
     /// </summary>

Jellyfin.Plugin.SRFPlay/Channels/RsiChannel.cs

@@ -1,43 +0,0 @@
-using Jellyfin.Plugin.SRFPlay.Api;
-using Jellyfin.Plugin.SRFPlay.Configuration;
-using Jellyfin.Plugin.SRFPlay.Services.Interfaces;
-using Microsoft.Extensions.Logging;
-
-namespace Jellyfin.Plugin.SRFPlay.Channels;
-
-/// <summary>
-/// Radiotelevisione svizzera — Swiss Italian channel.
-/// </summary>
-public sealed class RsiChannel : SrgChannelBase
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="RsiChannel"/> class.
-    /// </summary>
-    /// <param name="loggerFactory">The logger factory.</param>
-    /// <param name="contentRefreshService">The content refresh service.</param>
-    /// <param name="streamResolver">The stream resolver.</param>
-    /// <param name="mediaSourceFactory">The media source factory.</param>
-    /// <param name="categoryService">The category service.</param>
-    /// <param name="apiClientFactory">The API client factory.</param>
-    /// <param name="recordingService">The recording service.</param>
-    public RsiChannel(
-        ILoggerFactory loggerFactory,
-        IContentRefreshService contentRefreshService,
-        IStreamUrlResolver streamResolver,
-        IMediaSourceFactory mediaSourceFactory,
-        ICategoryService? categoryService,
-        ISRFApiClientFactory apiClientFactory,
-        IRecordingService recordingService)
-        : base(loggerFactory, contentRefreshService, streamResolver, mediaSourceFactory, categoryService, apiClientFactory, recordingService)
-    {
-    }
-
-    /// <inheritdoc />
-    protected override BusinessUnit Unit => BusinessUnit.RSI;
-
-    /// <inheritdoc />
-    protected override string LogoResourceName => "Jellyfin.Plugin.SRFPlay.Images.rsi-logo.png";
-
-    /// <inheritdoc />
-    public override string Description => "Radiotelevisione svizzera — Swiss Italian video-on-demand content";
-}

Jellyfin.Plugin.SRFPlay/Channels/RtrChannel.cs

@@ -1,43 +0,0 @@
-using Jellyfin.Plugin.SRFPlay.Api;
-using Jellyfin.Plugin.SRFPlay.Configuration;
-using Jellyfin.Plugin.SRFPlay.Services.Interfaces;
-using Microsoft.Extensions.Logging;
-
-namespace Jellyfin.Plugin.SRFPlay.Channels;
-
-/// <summary>
-/// Radiotelevisiun Svizra Rumantscha — Swiss Romansh channel.
-/// </summary>
-public sealed class RtrChannel : SrgChannelBase
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="RtrChannel"/> class.
-    /// </summary>
-    /// <param name="loggerFactory">The logger factory.</param>
-    /// <param name="contentRefreshService">The content refresh service.</param>
-    /// <param name="streamResolver">The stream resolver.</param>
-    /// <param name="mediaSourceFactory">The media source factory.</param>
-    /// <param name="categoryService">The category service.</param>
-    /// <param name="apiClientFactory">The API client factory.</param>
-    /// <param name="recordingService">The recording service.</param>
-    public RtrChannel(
-        ILoggerFactory loggerFactory,
-        IContentRefreshService contentRefreshService,
-        IStreamUrlResolver streamResolver,
-        IMediaSourceFactory mediaSourceFactory,
-        ICategoryService? categoryService,
-        ISRFApiClientFactory apiClientFactory,
-        IRecordingService recordingService)
-        : base(loggerFactory, contentRefreshService, streamResolver, mediaSourceFactory, categoryService, apiClientFactory, recordingService)
-    {
-    }
-
-    /// <inheritdoc />
-    protected override BusinessUnit Unit => BusinessUnit.RTR;
-
-    /// <inheritdoc />
-    protected override string LogoResourceName => "Jellyfin.Plugin.SRFPlay.Images.rtr-logo.png";
-
-    /// <inheritdoc />
-    public override string Description => "Radiotelevisiun Svizra Rumantscha — Swiss Romansh video-on-demand content";
-}

Jellyfin.Plugin.SRFPlay/Channels/RtsChannel.cs

@@ -1,43 +0,0 @@
-using Jellyfin.Plugin.SRFPlay.Api;
-using Jellyfin.Plugin.SRFPlay.Configuration;
-using Jellyfin.Plugin.SRFPlay.Services.Interfaces;
-using Microsoft.Extensions.Logging;
-
-namespace Jellyfin.Plugin.SRFPlay.Channels;
-
-/// <summary>
-/// Radio Télévision Suisse — Swiss French channel.
-/// </summary>
-public sealed class RtsChannel : SrgChannelBase
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="RtsChannel"/> class.
-    /// </summary>
-    /// <param name="loggerFactory">The logger factory.</param>
-    /// <param name="contentRefreshService">The content refresh service.</param>
-    /// <param name="streamResolver">The stream resolver.</param>
-    /// <param name="mediaSourceFactory">The media source factory.</param>
-    /// <param name="categoryService">The category service.</param>
-    /// <param name="apiClientFactory">The API client factory.</param>
-    /// <param name="recordingService">The recording service.</param>
-    public RtsChannel(
-        ILoggerFactory loggerFactory,
-        IContentRefreshService contentRefreshService,
-        IStreamUrlResolver streamResolver,
-        IMediaSourceFactory mediaSourceFactory,
-        ICategoryService? categoryService,
-        ISRFApiClientFactory apiClientFactory,
-        IRecordingService recordingService)
-        : base(loggerFactory, contentRefreshService, streamResolver, mediaSourceFactory, categoryService, apiClientFactory, recordingService)
-    {
-    }
-
-    /// <inheritdoc />
-    protected override BusinessUnit Unit => BusinessUnit.RTS;
-
-    /// <inheritdoc />
-    protected override string LogoResourceName => "Jellyfin.Plugin.SRFPlay.Images.rts-logo.png";
-
-    /// <inheritdoc />
-    public override string Description => "Radio Télévision Suisse — Swiss French video-on-demand content";
-}

Jellyfin.Plugin.SRFPlay/Channels/SRFPlayChannel.cs

@@ -7,7 +7,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Plugin.SRFPlay.Api;
 using Jellyfin.Plugin.SRFPlay.Api.Models;
-using Jellyfin.Plugin.SRFPlay.Configuration;
 using Jellyfin.Plugin.SRFPlay.Constants;
 using Jellyfin.Plugin.SRFPlay.Services.Interfaces;
 using Jellyfin.Plugin.SRFPlay.Utilities;
@@ -23,12 +22,11 @@ using Microsoft.Extensions.Logging;
 namespace Jellyfin.Plugin.SRFPlay.Channels;
 
 /// <summary>
-/// Base channel for browsing and playing content from a single SRG SSR business unit.
-/// One concrete subclass exists per unit (SRF, RTS, RSI, RTR, SWI), each shown as its own tile.
+/// SRF Play channel for browsing and playing content.
 /// </summary>
-public abstract class SrgChannelBase : IChannel, IHasCacheKey
+public class SRFPlayChannel : IChannel, IHasCacheKey
 {
-    private readonly ILogger<SrgChannelBase> _logger;
+    private readonly ILogger<SRFPlayChannel> _logger;
     private readonly IContentRefreshService _contentRefreshService;
     private readonly IStreamUrlResolver _streamResolver;
     private readonly IMediaSourceFactory _mediaSourceFactory;
@@ -37,7 +35,7 @@ public abstract class SrgChannelBase : IChannel, IHasCacheKey
     private readonly IRecordingService _recordingService;
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="SrgChannelBase"/> class.
+    /// Initializes a new instance of the <see cref="SRFPlayChannel"/> class.
     /// </summary>
     /// <param name="loggerFactory">The logger factory.</param>
     /// <param name="contentRefreshService">The content refresh service.</param>
@@ -46,7 +44,7 @@ public abstract class SrgChannelBase : IChannel, IHasCacheKey
     /// <param name="categoryService">The category service (optional).</param>
     /// <param name="apiClientFactory">The API client factory.</param>
     /// <param name="recordingService">The recording service.</param>
-    protected SrgChannelBase(
+    public SRFPlayChannel(
         ILoggerFactory loggerFactory,
         IContentRefreshService contentRefreshService,
         IStreamUrlResolver streamResolver,
@@ -55,7 +53,7 @@ public abstract class SrgChannelBase : IChannel, IHasCacheKey
         ISRFApiClientFactory apiClientFactory,
         IRecordingService recordingService)
     {
-        _logger = loggerFactory.CreateLogger<SrgChannelBase>();
+        _logger = loggerFactory.CreateLogger<SRFPlayChannel>();
         _contentRefreshService = contentRefreshService;
         _streamResolver = streamResolver;
         _mediaSourceFactory = mediaSourceFactory;
@@ -68,24 +66,14 @@ public abstract class SrgChannelBase : IChannel, IHasCacheKey
             _logger.LogWarning("CategoryService not available - category folders will be disabled");
         }
 
-        _logger.LogDebug("SrgChannelBase initialized");
+        _logger.LogDebug("SRFPlayChannel initialized");
     }
 
-    /// <summary>
-    /// Gets the business unit this channel serves.
-    /// </summary>
-    protected abstract BusinessUnit Unit { get; }
-
-    /// <summary>
-    /// Gets the embedded resource name of this unit's logo PNG.
-    /// </summary>
-    protected abstract string LogoResourceName { get; }
+    /// <inheritdoc />
+    public string Name => "SRF Play";
 
     /// <inheritdoc />
-    public string Name => $"{Unit} Play";
-
-    /// <inheritdoc />
-    public abstract string Description { get; }
+    public string Description => "Swiss Radio and Television video-on-demand content";
 
     /// <inheritdoc />
     public string DataVersion => "2.0"; // Back to authenticating at channel refresh with auto-refresh for fresh tokens
@@ -126,8 +114,7 @@ public abstract class SrgChannelBase : IChannel, IHasCacheKey
     public Task<DynamicImageResponse> GetChannelImage(ImageType type, CancellationToken cancellationToken)
     {
         var assembly = GetType().Assembly;
-        var resourceStream = assembly.GetManifestResourceStream(LogoResourceName)
-            ?? assembly.GetManifestResourceStream("Jellyfin.Plugin.SRFPlay.Images.logo.png");
+        var resourceStream = assembly.GetManifestResourceStream("Jellyfin.Plugin.SRFPlay.Images.logo.png");
 
         if (resourceStream == null)
         {
@@ -175,21 +162,8 @@ public abstract class SrgChannelBase : IChannel, IHasCacheKey
         }
     }
 
-    private bool IsUnitEnabled()
-    {
-        var config = Plugin.Instance?.Configuration;
-        return config == null || config.ResolveEnabledUnits().Contains(Unit);
-    }
-
     private async Task<List<ChannelItemInfo>> GetFolderItemsAsync(string? folderId, CancellationToken cancellationToken)
     {
-        // If this unit is not enabled in configuration, show nothing (empty tile).
-        if (!IsUnitEnabled())
-        {
-            _logger.LogDebug("Business unit {Unit} is not enabled - returning no items", Unit);
-            return new List<ChannelItemInfo>();
-        }
-
         // Root level - show folder list
         if (string.IsNullOrEmpty(folderId))
         {
@@ -224,7 +198,7 @@ public abstract class SrgChannelBase : IChannel, IHasCacheKey
         {
             try
             {
-                var businessUnit = Unit.ToLowerString();
+                var businessUnit = config.BusinessUnit.ToLowerString();
                 var topics = await _categoryService.GetTopicsAsync(businessUnit, cancellationToken).ConfigureAwait(false);
 
                 foreach (var topic in topics.Where(t => !string.IsNullOrEmpty(t.Id)))
@@ -265,23 +239,24 @@ public abstract class SrgChannelBase : IChannel, IHasCacheKey
 
     private async Task<List<ChannelItemInfo>> GetLatestVideosAsync(CancellationToken cancellationToken)
     {
-        var urns = await _contentRefreshService.RefreshLatestContentAsync(Unit.ToLowerString(), cancellationToken).ConfigureAwait(false);
+        var urns = await _contentRefreshService.RefreshLatestContentAsync(cancellationToken).ConfigureAwait(false);
         return await ConvertUrnsToChannelItems(urns, cancellationToken).ConfigureAwait(false);
     }
 
     private async Task<List<ChannelItemInfo>> GetTrendingVideosAsync(CancellationToken cancellationToken)
     {
-        var urns = await _contentRefreshService.RefreshTrendingContentAsync(Unit.ToLowerString(), cancellationToken).ConfigureAwait(false);
+        var urns = await _contentRefreshService.RefreshTrendingContentAsync(cancellationToken).ConfigureAwait(false);
         return await ConvertUrnsToChannelItems(urns, cancellationToken).ConfigureAwait(false);
     }
 
     private async Task<List<ChannelItemInfo>> GetLiveSportsAsync(CancellationToken cancellationToken)
     {
         var items = new List<ChannelItemInfo>();
+        var config = Plugin.Instance?.Configuration;
 
         try
         {
-            var businessUnit = Unit.ToLowerString();
+            var businessUnit = config?.BusinessUnit.ToLowerString() ?? "srf";
 
             using var apiClient = _apiClientFactory.CreateClient();
             var scheduledLivestreams = await apiClient.GetScheduledLivestreamsAsync(businessUnit, "SPORT", cancellationToken).ConfigureAwait(false);
@@ -332,7 +307,6 @@ public abstract class SrgChannelBase : IChannel, IHasCacheKey
     private List<ChannelItemInfo> GetRecordingItems()
     {
         var items = new List<ChannelItemInfo>();
-        var unit = Unit.ToLowerString();
         var recordings = _recordingService.GetRecordings(RecordingState.Completed);
 
         foreach (var recording in recordings)
@@ -342,15 +316,6 @@ public abstract class SrgChannelBase : IChannel, IHasCacheKey
                 continue;
             }
 
-            // Only show recordings belonging to this unit. Recordings created before the
-            // BusinessUnit tag existed have an empty value and are shown everywhere so they
-            // are not lost.
-            if (!string.IsNullOrEmpty(recording.BusinessUnit) &&
-                !string.Equals(recording.BusinessUnit, unit, StringComparison.OrdinalIgnoreCase))
-            {
-                continue;
-            }
-
             var fileInfo = new System.IO.FileInfo(recording.OutputPath);
             var itemId = $"recording_{recording.Id}";
 
@@ -403,8 +368,9 @@ public abstract class SrgChannelBase : IChannel, IHasCacheKey
 
         try
         {
+            var config = Plugin.Instance?.Configuration;
             var topicId = folderId.Substring("category_".Length);
-            var businessUnit = Unit.ToLowerString();
+            var businessUnit = config?.BusinessUnit.ToLowerString() ?? "srf";
 
             var shows = await _categoryService.GetShowsByTopicAsync(topicId, businessUnit, 20, cancellationToken).ConfigureAwait(false);
             var urns = new List<string>();
@@ -506,7 +472,7 @@ public abstract class SrgChannelBase : IChannel, IHasCacheKey
         var timeKey = timeBucket.ToString("yyyy-MM-dd-HH-mm", CultureInfo.InvariantCulture);
 
         var recordingCount = _recordingService.GetRecordings(RecordingState.Completed).Count;
-        return $"{Unit}_{config?.EnableLatestContent}_{config?.EnableTrendingContent}_{config?.EnableCategoryFolders}_{enabledTopics}_{timeKey}_rec{recordingCount}";
+        return $"{config?.BusinessUnit}_{config?.EnableLatestContent}_{config?.EnableTrendingContent}_{config?.EnableCategoryFolders}_{enabledTopics}_{timeKey}_rec{recordingCount}";
     }
 
     private async Task<List<ChannelItemInfo>> ConvertUrnsToChannelItems(List<string> urns, CancellationToken cancellationToken)

Jellyfin.Plugin.SRFPlay/Channels/SrfChannel.cs

@@ -1,43 +0,0 @@
-using Jellyfin.Plugin.SRFPlay.Api;
-using Jellyfin.Plugin.SRFPlay.Configuration;
-using Jellyfin.Plugin.SRFPlay.Services.Interfaces;
-using Microsoft.Extensions.Logging;
-
-namespace Jellyfin.Plugin.SRFPlay.Channels;
-
-/// <summary>
-/// Schweizer Radio und Fernsehen — Swiss German channel.
-/// </summary>
-public sealed class SrfChannel : SrgChannelBase
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="SrfChannel"/> class.
-    /// </summary>
-    /// <param name="loggerFactory">The logger factory.</param>
-    /// <param name="contentRefreshService">The content refresh service.</param>
-    /// <param name="streamResolver">The stream resolver.</param>
-    /// <param name="mediaSourceFactory">The media source factory.</param>
-    /// <param name="categoryService">The category service.</param>
-    /// <param name="apiClientFactory">The API client factory.</param>
-    /// <param name="recordingService">The recording service.</param>
-    public SrfChannel(
-        ILoggerFactory loggerFactory,
-        IContentRefreshService contentRefreshService,
-        IStreamUrlResolver streamResolver,
-        IMediaSourceFactory mediaSourceFactory,
-        ICategoryService? categoryService,
-        ISRFApiClientFactory apiClientFactory,
-        IRecordingService recordingService)
-        : base(loggerFactory, contentRefreshService, streamResolver, mediaSourceFactory, categoryService, apiClientFactory, recordingService)
-    {
-    }
-
-    /// <inheritdoc />
-    protected override BusinessUnit Unit => BusinessUnit.SRF;
-
-    /// <inheritdoc />
-    protected override string LogoResourceName => "Jellyfin.Plugin.SRFPlay.Images.srf-logo.png";
-
-    /// <inheritdoc />
-    public override string Description => "Schweizer Radio und Fernsehen — Swiss German video-on-demand content";
-}

Jellyfin.Plugin.SRFPlay/Channels/SwiChannel.cs

@@ -1,43 +0,0 @@
-using Jellyfin.Plugin.SRFPlay.Api;
-using Jellyfin.Plugin.SRFPlay.Configuration;
-using Jellyfin.Plugin.SRFPlay.Services.Interfaces;
-using Microsoft.Extensions.Logging;
-
-namespace Jellyfin.Plugin.SRFPlay.Channels;
-
-/// <summary>
-/// SWI swissinfo.ch — Swiss international channel.
-/// </summary>
-public sealed class SwiChannel : SrgChannelBase
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="SwiChannel"/> class.
-    /// </summary>
-    /// <param name="loggerFactory">The logger factory.</param>
-    /// <param name="contentRefreshService">The content refresh service.</param>
-    /// <param name="streamResolver">The stream resolver.</param>
-    /// <param name="mediaSourceFactory">The media source factory.</param>
-    /// <param name="categoryService">The category service.</param>
-    /// <param name="apiClientFactory">The API client factory.</param>
-    /// <param name="recordingService">The recording service.</param>
-    public SwiChannel(
-        ILoggerFactory loggerFactory,
-        IContentRefreshService contentRefreshService,
-        IStreamUrlResolver streamResolver,
-        IMediaSourceFactory mediaSourceFactory,
-        ICategoryService? categoryService,
-        ISRFApiClientFactory apiClientFactory,
-        IRecordingService recordingService)
-        : base(loggerFactory, contentRefreshService, streamResolver, mediaSourceFactory, categoryService, apiClientFactory, recordingService)
-    {
-    }
-
-    /// <inheritdoc />
-    protected override BusinessUnit Unit => BusinessUnit.SWI;
-
-    /// <inheritdoc />
-    protected override string LogoResourceName => "Jellyfin.Plugin.SRFPlay.Images.swi-logo.png";
-
-    /// <inheritdoc />
-    public override string Description => "SWI swissinfo.ch — Swiss international video-on-demand content";
-}

Jellyfin.Plugin.SRFPlay/Configuration/PluginConfiguration.cs

@@ -66,7 +66,6 @@ public class PluginConfiguration : BasePluginConfiguration
     {
         // Set default options
         BusinessUnit = BusinessUnit.SRF;
-        EnabledBusinessUnits = new System.Collections.Generic.List<BusinessUnit> { BusinessUnit.SRF };
         QualityPreference = QualityPreference.Auto;
         ContentRefreshIntervalHours = 6;
         ExpirationCheckIntervalHours = 24;
@@ -79,20 +78,10 @@ public class PluginConfiguration : BasePluginConfiguration
     }
 
     /// <summary>
-    /// Gets or sets the legacy single business unit. Retained for backwards compatibility and
-    /// migration into <see cref="EnabledBusinessUnits"/>; new code should use the list instead.
+    /// Gets or sets the business unit to fetch content from.
     /// </summary>
     public BusinessUnit BusinessUnit { get; set; }
 
-    /// <summary>
-    /// Gets or sets the list of business units to expose as channels. One channel tile is shown
-    /// per enabled unit, so polylingual households can browse e.g. SRF (German) and RTS (French)
-    /// at the same time.
-    /// </summary>
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2227:Collection properties should be read only", Justification = "Required for configuration serialization")]
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1002:Do not expose generic lists", Justification = "Configuration DTO")]
-    public System.Collections.Generic.List<BusinessUnit> EnabledBusinessUnits { get; set; }
-
     /// <summary>
     /// Gets or sets the preferred video quality.
     /// </summary>
@@ -172,20 +161,4 @@ public class PluginConfiguration : BasePluginConfiguration
     /// Gets or sets the output directory for sport livestream recordings.
     /// </summary>
     public string RecordingOutputPath { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Resolves the effective set of enabled business units, migrating from the legacy single
-    /// <see cref="BusinessUnit"/> value when the list has not been populated yet.
-    /// </summary>
-    /// <returns>The business units that should have channels.</returns>
-    public System.Collections.Generic.IReadOnlyList<BusinessUnit> ResolveEnabledUnits()
-    {
-        if (EnabledBusinessUnits != null && EnabledBusinessUnits.Count > 0)
-        {
-            return EnabledBusinessUnits;
-        }
-
-        // Legacy installs only had a single BusinessUnit; honour it so they keep working.
-        return new System.Collections.Generic.List<BusinessUnit> { BusinessUnit };
-    }
 }

Jellyfin.Plugin.SRFPlay/Configuration/configPage.html

@@ -2,29 +2,16 @@
         <div data-role="content">
             <div class="content-primary">
                 <form id="SRFPlayConfigForm">
-                    <div class="checkboxContainer checkboxContainer-withDescription">
-                        <h3>Channels (Business Units)</h3>
-                        <div class="fieldDescription" style="margin-bottom: 0.5em;">Enable a channel tile for each Swiss broadcaster you want. A separate tile appears per enabled unit, so polylingual households can browse e.g. SRF (German) and RTS (French) at the same time.</div>
-                        <label class="emby-checkbox-label">
-                            <input id="buSRF" type="checkbox" is="emby-checkbox" data-bu="SRF" />
-                            <span>SRF — Schweizer Radio und Fernsehen (German)</span>
-                        </label>
-                        <label class="emby-checkbox-label">
-                            <input id="buRTS" type="checkbox" is="emby-checkbox" data-bu="RTS" />
-                            <span>RTS — Radio Télévision Suisse (French)</span>
-                        </label>
-                        <label class="emby-checkbox-label">
-                            <input id="buRSI" type="checkbox" is="emby-checkbox" data-bu="RSI" />
-                            <span>RSI — Radiotelevisione svizzera (Italian)</span>
-                        </label>
-                        <label class="emby-checkbox-label">
-                            <input id="buRTR" type="checkbox" is="emby-checkbox" data-bu="RTR" />
-                            <span>RTR — Radiotelevisiun Svizra Rumantscha (Romansh)</span>
-                        </label>
-                        <label class="emby-checkbox-label">
-                            <input id="buSWI" type="checkbox" is="emby-checkbox" data-bu="SWI" />
-                            <span>SWI — swissinfo.ch (International)</span>
-                        </label>
+                    <div class="selectContainer">
+                        <label class="selectLabel" for="BusinessUnit">Business Unit</label>
+                        <select is="emby-select" id="BusinessUnit" name="BusinessUnit" class="emby-select-withcolor emby-select">
+                            <option id="optSRF" value="SRF">SRF (German)</option>
+                            <option id="optRTS" value="RTS">RTS (French)</option>
+                            <option id="optRSI" value="RSI">RSI (Italian)</option>
+                            <option id="optRTR" value="RTR">RTR (Romansh)</option>
+                            <option id="optSWI" value="SWI">SWI (International)</option>
+                        </select>
+                        <div class="fieldDescription">Select the Swiss broadcasting unit to fetch content from</div>
                     </div>
                     <div class="selectContainer">
                         <label class="selectLabel" for="QualityPreference">Quality Preference</label>
@@ -155,12 +142,7 @@
                 .addEventListener('pageshow', function() {
                     Dashboard.showLoadingMsg();
                     ApiClient.getPluginConfiguration(SRFPlayConfig.pluginUniqueId).then(function (config) {
-                        var enabled = (config.EnabledBusinessUnits && config.EnabledBusinessUnits.length)
-                            ? config.EnabledBusinessUnits
-                            : [config.BusinessUnit]; // migrate legacy single value
-                        ['SRF','RTS','RSI','RTR','SWI'].forEach(function(bu) {
-                            document.querySelector('#bu' + bu).checked = enabled.indexOf(bu) !== -1;
-                        });
+                        document.querySelector('#BusinessUnit').value = config.BusinessUnit;
                         document.querySelector('#QualityPreference').value = config.QualityPreference;
                         document.querySelector('#ContentRefreshIntervalHours').value = config.ContentRefreshIntervalHours;
                         document.querySelector('#ExpirationCheckIntervalHours').value = config.ExpirationCheckIntervalHours;
@@ -186,11 +168,7 @@
                 .addEventListener('submit', function(e) {
                 Dashboard.showLoadingMsg();
                 ApiClient.getPluginConfiguration(SRFPlayConfig.pluginUniqueId).then(function (config) {
-                    config.EnabledBusinessUnits = ['SRF','RTS','RSI','RTR','SWI'].filter(function(bu) {
-                        return document.querySelector('#bu' + bu).checked;
-                    });
-                    // Keep legacy field in sync with the first enabled unit for backwards compat.
-                    config.BusinessUnit = config.EnabledBusinessUnits[0] || 'SRF';
+                    config.BusinessUnit = document.querySelector('#BusinessUnit').value;
                     config.QualityPreference = document.querySelector('#QualityPreference').value;
                     config.ContentRefreshIntervalHours = parseInt(document.querySelector('#ContentRefreshIntervalHours').value);
                     config.ExpirationCheckIntervalHours = parseInt(document.querySelector('#ExpirationCheckIntervalHours').value);

Jellyfin.Plugin.SRFPlay/Jellyfin.Plugin.SRFPlay.csproj

@@ -33,11 +33,6 @@
   <ItemGroup>
     <None Remove="..\assests\main logo.png" />
     <EmbeddedResource Include="..\assests\main logo.png" LogicalName="Jellyfin.Plugin.SRFPlay.Images.logo.png" />
-    <EmbeddedResource Include="..\assests\units\srf-logo.png" LogicalName="Jellyfin.Plugin.SRFPlay.Images.srf-logo.png" />
-    <EmbeddedResource Include="..\assests\units\rts-logo.png" LogicalName="Jellyfin.Plugin.SRFPlay.Images.rts-logo.png" />
-    <EmbeddedResource Include="..\assests\units\rsi-logo.png" LogicalName="Jellyfin.Plugin.SRFPlay.Images.rsi-logo.png" />
-    <EmbeddedResource Include="..\assests\units\rtr-logo.png" LogicalName="Jellyfin.Plugin.SRFPlay.Images.rtr-logo.png" />
-    <EmbeddedResource Include="..\assests\units\swi-logo.png" LogicalName="Jellyfin.Plugin.SRFPlay.Images.swi-logo.png" />
   </ItemGroup>
 
 </Project>

Jellyfin.Plugin.SRFPlay/ScheduledTasks/ContentRefreshTask.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Plugin.SRFPlay.Services.Interfaces;
-using Jellyfin.Plugin.SRFPlay.Utilities;
 using MediaBrowser.Model.Tasks;
 using Microsoft.Extensions.Logging;
 
@@ -64,25 +63,20 @@ public class ContentRefreshTask : IScheduledTask
                 return;
             }
 
-            // Refresh content for every enabled business unit (one channel per unit).
-            var units = config.ResolveEnabledUnits();
-            foreach (var unit in units)
+            // Refresh latest content
+            if (config.EnableLatestContent)
             {
-                var businessUnit = unit.ToLowerString();
+                _logger.LogInformation("Refreshing latest content");
+                progress?.Report(25);
+                await _contentRefreshService.RefreshLatestContentAsync(cancellationToken).ConfigureAwait(false);
+            }
 
-                if (config.EnableLatestContent)
-                {
-                    _logger.LogInformation("Refreshing latest content for {BusinessUnit}", businessUnit);
-                    progress?.Report(25);
-                    await _contentRefreshService.RefreshLatestContentAsync(businessUnit, cancellationToken).ConfigureAwait(false);
-                }
-
-                if (config.EnableTrendingContent)
-                {
-                    _logger.LogInformation("Refreshing trending content for {BusinessUnit}", businessUnit);
-                    progress?.Report(75);
-                    await _contentRefreshService.RefreshTrendingContentAsync(businessUnit, cancellationToken).ConfigureAwait(false);
-                }
+            // Refresh trending content
+            if (config.EnableTrendingContent)
+            {
+                _logger.LogInformation("Refreshing trending content");
+                progress?.Report(75);
+                await _contentRefreshService.RefreshTrendingContentAsync(cancellationToken).ConfigureAwait(false);
             }
 
             progress?.Report(100);

Jellyfin.Plugin.SRFPlay/ServiceRegistrator.cs

@@ -49,13 +49,7 @@ public class ServiceRegistrator : IPluginServiceRegistrator
         serviceCollection.AddSingleton<IScheduledTask, ExpirationCheckTask>();
         serviceCollection.AddSingleton<IScheduledTask, RecordingSchedulerTask>();
 
-        // Register one channel (tile) per SRG business unit. Each must be registered as IChannel
-        // for Jellyfin to discover it. A unit that is not in EnabledBusinessUnits returns no
-        // content (its tile appears empty) - see SrgChannelBase.
-        serviceCollection.AddSingleton<IChannel, SrfChannel>();
-        serviceCollection.AddSingleton<IChannel, RtsChannel>();
-        serviceCollection.AddSingleton<IChannel, RsiChannel>();
-        serviceCollection.AddSingleton<IChannel, RtrChannel>();
-        serviceCollection.AddSingleton<IChannel, SwiChannel>();
+        // Register channel - must register as IChannel interface for Jellyfin to discover it
+        serviceCollection.AddSingleton<IChannel, SRFPlayChannel>();
     }
 }

Jellyfin.Plugin.SRFPlay/Services/CategoryService.cs

@@ -18,10 +18,8 @@ public class CategoryService : ICategoryService
     private readonly ILogger<CategoryService> _logger;
     private readonly ISRFApiClientFactory _apiClientFactory;
     private readonly TimeSpan _topicsCacheDuration = TimeSpan.FromHours(24);
-
-    // Cache topics per business unit. A single shared cache would return one unit's
-    // topics (e.g. German SRF) even after the user switched to another (e.g. French RTS).
-    private readonly Dictionary<string, (Dictionary<string, PlayV3Topic> Topics, DateTime Expiry)> _topicsCacheByUnit = new(StringComparer.OrdinalIgnoreCase);
+    private Dictionary<string, PlayV3Topic>? _topicsCache;
+    private DateTime _topicsCacheExpiry = DateTime.MinValue;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="CategoryService"/> class.
@@ -37,11 +35,11 @@ public class CategoryService : ICategoryService
     /// <inheritdoc />
     public async Task<List<PlayV3Topic>> GetTopicsAsync(string businessUnit, CancellationToken cancellationToken = default)
     {
-        // Return cached topics for this business unit if still valid
-        if (_topicsCacheByUnit.TryGetValue(businessUnit, out var cached) && DateTime.UtcNow < cached.Expiry)
+        // Return cached topics if still valid
+        if (_topicsCache != null && DateTime.UtcNow < _topicsCacheExpiry)
         {
             _logger.LogDebug("Returning cached topics for business unit: {BusinessUnit}", businessUnit);
-            return cached.Topics.Values.ToList();
+            return _topicsCache.Values.ToList();
         }
 
         _logger.LogInformation("Fetching topics for business unit: {BusinessUnit}", businessUnit);
@@ -50,13 +48,13 @@ public class CategoryService : ICategoryService
 
         if (topics != null && topics.Count > 0)
         {
-            // Cache topics by ID for quick lookups, scoped to this business unit
-            var byId = topics
+            // Cache topics by ID for quick lookups
+            _topicsCache = topics
                 .Where(t => !string.IsNullOrEmpty(t.Id))
                 .ToDictionary(t => t.Id!, t => t);
-            _topicsCacheByUnit[businessUnit] = (byId, DateTime.UtcNow.Add(_topicsCacheDuration));
+            _topicsCacheExpiry = DateTime.UtcNow.Add(_topicsCacheDuration);
 
-            _logger.LogInformation("Cached {Count} topics for business unit: {BusinessUnit}", byId.Count, businessUnit);
+            _logger.LogInformation("Cached {Count} topics for business unit: {BusinessUnit}", _topicsCache.Count, businessUnit);
         }
 
         return topics ?? new List<PlayV3Topic>();
@@ -65,14 +63,13 @@ public class CategoryService : ICategoryService
     /// <inheritdoc />
     public async Task<PlayV3Topic?> GetTopicByIdAsync(string topicId, string businessUnit, CancellationToken cancellationToken = default)
     {
-        // Ensure topics are loaded for this business unit
-        if (!_topicsCacheByUnit.TryGetValue(businessUnit, out var cached) || DateTime.UtcNow >= cached.Expiry)
+        // Ensure topics are loaded
+        if (_topicsCache == null || DateTime.UtcNow >= _topicsCacheExpiry)
         {
             await GetTopicsAsync(businessUnit, cancellationToken).ConfigureAwait(false);
-            _topicsCacheByUnit.TryGetValue(businessUnit, out cached);
         }
 
-        return cached.Topics?.GetValueOrDefault(topicId);
+        return _topicsCache?.GetValueOrDefault(topicId);
     }
 
     /// <inheritdoc />
@@ -104,7 +101,8 @@ public class CategoryService : ICategoryService
     /// <inheritdoc />
     public void ClearCache()
     {
-        _topicsCacheByUnit.Clear();
+        _topicsCache = null;
+        _topicsCacheExpiry = DateTime.MinValue;
         _logger.LogInformation("Topics cache cleared");
     }
 

Jellyfin.Plugin.SRFPlay/Services/ContentRefreshService.cs

@@ -34,10 +34,9 @@ public class ContentRefreshService : IContentRefreshService
     /// <summary>
     /// Refreshes latest content from SRF API using Play v3.
     /// </summary>
-    /// <param name="businessUnit">The business unit to fetch content for (e.g. "srf", "rts").</param>
     /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns>List of URNs for new content.</returns>
-    public async Task<List<string>> RefreshLatestContentAsync(string businessUnit, CancellationToken cancellationToken)
+    public async Task<List<string>> RefreshLatestContentAsync(CancellationToken cancellationToken)
     {
         var config = Plugin.Instance?.Configuration;
         if (config == null || !config.EnableLatestContent)
@@ -47,7 +46,7 @@ public class ContentRefreshService : IContentRefreshService
         }
 
         return await FetchVideosFromShowsAsync(
-            businessUnit,
+            config.BusinessUnit.ToLowerString(),
             minEpisodeCount: 0,
             maxShows: 20,
             videosPerShow: 1,
@@ -59,10 +58,9 @@ public class ContentRefreshService : IContentRefreshService
     /// Refreshes trending content from SRF API using Play v3.
     /// Gets videos from shows with the most episodes.
     /// </summary>
-    /// <param name="businessUnit">The business unit to fetch content for (e.g. "srf", "rts").</param>
     /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns>List of URNs for trending content.</returns>
-    public async Task<List<string>> RefreshTrendingContentAsync(string businessUnit, CancellationToken cancellationToken)
+    public async Task<List<string>> RefreshTrendingContentAsync(CancellationToken cancellationToken)
     {
         var config = Plugin.Instance?.Configuration;
         if (config == null || !config.EnableTrendingContent)
@@ -72,7 +70,7 @@ public class ContentRefreshService : IContentRefreshService
         }
 
         return await FetchVideosFromShowsAsync(
-            businessUnit,
+            config.BusinessUnit.ToLowerString(),
             minEpisodeCount: 10,
             maxShows: 15,
             videosPerShow: 2,

Jellyfin.Plugin.SRFPlay/Services/Interfaces/IContentRefreshService.cs

@@ -12,16 +12,14 @@ public interface IContentRefreshService
     /// <summary>
     /// Refreshes latest content from SRF API using Play v3.
     /// </summary>
-    /// <param name="businessUnit">The business unit to fetch content for (e.g. "srf", "rts").</param>
     /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns>List of URNs for new content.</returns>
-    Task<List<string>> RefreshLatestContentAsync(string businessUnit, CancellationToken cancellationToken);
+    Task<List<string>> RefreshLatestContentAsync(CancellationToken cancellationToken);
 
     /// <summary>
     /// Refreshes trending content from SRF API using Play v3.
     /// </summary>
-    /// <param name="businessUnit">The business unit to fetch content for (e.g. "srf", "rts").</param>
     /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns>List of URNs for trending content.</returns>
-    Task<List<string>> RefreshTrendingContentAsync(string businessUnit, CancellationToken cancellationToken);
+    Task<List<string>> RefreshTrendingContentAsync(CancellationToken cancellationToken);
 }

Jellyfin.Plugin.SRFPlay/Services/RecordingService.cs

@@ -148,25 +148,18 @@ public class RecordingService : IRecordingService, IDisposable
     public async Task<IReadOnlyList<PlayV3TvProgram>> GetUpcomingScheduleAsync(CancellationToken cancellationToken)
     {
         var config = Plugin.Instance?.Configuration;
-        var units = config?.ResolveEnabledUnits() ?? new[] { Configuration.BusinessUnit.SRF };
+        var businessUnit = (config?.BusinessUnit ?? Configuration.BusinessUnit.SRF).ToString().ToLowerInvariant();
 
         using var apiClient = _apiClientFactory.CreateClient();
+        var livestreams = await apiClient.GetScheduledLivestreamsAsync(businessUnit, "SPORT", cancellationToken).ConfigureAwait(false);
 
-        // Aggregate sport livestreams across every enabled business unit so the recordings
-        // page shows events from all enabled languages.
-        var all = new List<PlayV3TvProgram>();
-        foreach (var unit in units)
+        if (livestreams == null)
         {
-            var businessUnit = unit.ToString().ToLowerInvariant();
-            var livestreams = await apiClient.GetScheduledLivestreamsAsync(businessUnit, "SPORT", cancellationToken).ConfigureAwait(false);
-            if (livestreams != null)
-            {
-                all.AddRange(livestreams);
-            }
+            return Array.Empty<PlayV3TvProgram>();
         }
 
         // Filter to only future/current livestreams that aren't blocked
-        return all
+        return livestreams
             .Where(ls => ls.Blocked != true && (ls.ValidTo == null || ls.ValidTo.Value.ToUniversalTime() > DateTime.UtcNow))
             .OrderBy(ls => ls.ValidFrom)
             .ToList();
@@ -185,11 +178,9 @@ public class RecordingService : IRecordingService, IDisposable
             return existing;
         }
 
-        // Fetch metadata for the URN. The unit is encoded in the URN itself, so use that to
-        // query the right schedule regardless of which units are enabled.
+        // Fetch metadata for the URN
         var config = Plugin.Instance?.Configuration;
-        var businessUnit = ParseBusinessUnitFromUrn(urn)
-            ?? (config?.BusinessUnit ?? Configuration.BusinessUnit.SRF).ToString().ToLowerInvariant();
+        var businessUnit = (config?.BusinessUnit ?? Configuration.BusinessUnit.SRF).ToString().ToLowerInvariant();
 
         using var apiClient = _apiClientFactory.CreateClient();
         var livestreams = await apiClient.GetScheduledLivestreamsAsync(businessUnit, "SPORT", cancellationToken).ConfigureAwait(false);
@@ -199,7 +190,6 @@ public class RecordingService : IRecordingService, IDisposable
         {
             Id = Guid.NewGuid().ToString("N"),
             Urn = urn,
-            BusinessUnit = ParseBusinessUnitFromUrn(urn) ?? businessUnit,
             Title = program?.Title ?? urn,
             Description = program?.Lead ?? program?.Description,
             ImageUrl = program?.ImageUrl,
@@ -216,24 +206,6 @@ public class RecordingService : IRecordingService, IDisposable
         return entry;
     }
 
-    /// <summary>
-    /// Extracts the business unit from an SRF URN of the form "urn:&lt;bu&gt;:&lt;type&gt;:...".
-    /// </summary>
-    /// <param name="urn">The URN.</param>
-    /// <returns>The lowercase business unit, or null if it cannot be determined.</returns>
-    private static string? ParseBusinessUnitFromUrn(string urn)
-    {
-        if (string.IsNullOrEmpty(urn))
-        {
-            return null;
-        }
-
-        var parts = urn.Split(':');
-        return parts.Length >= 2 && !string.IsNullOrEmpty(parts[1])
-            ? parts[1].ToLowerInvariant()
-            : null;
-    }
-
     /// <inheritdoc />
     public bool CancelRecording(string recordingId)
     {