removed a bunch of validation, security, registration, premiere, whatever bs

2 files changed, 66 insertions, 98 deletions

diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 75ac625ef1..2c671f5105 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -1183,14 +1183,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     return;
                 }
 
-                var registration = await _liveTvManager.GetRegistrationInfo("dvr").ConfigureAwait(false);
-                if (!registration.IsValid)
-                {
-                    _logger.LogWarning("Emby Premiere required to use Emby DVR.");
-                    OnTimerOutOfDate(timer);
-                    return;
-                }
-
                 var activeRecordingInfo = new ActiveRecordingInfo
                 {
                     CancellationTokenSource = new CancellationTokenSource(),
@@ -2379,79 +2371,74 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             var allTimers = GetTimersForSeries(seriesTimer)
                 .ToList();
 
-            var registration = await _liveTvManager.GetRegistrationInfo("seriesrecordings").ConfigureAwait(false);
 
             var enabledTimersForSeries = new List<TimerInfo>();
-
-            if (registration.IsValid)
+            foreach (var timer in allTimers)
             {
-                foreach (var timer in allTimers)
+                var existingTimer = _timerProvider.GetTimer(timer.Id);
+
+                if (existingTimer == null)
                 {
-                    var existingTimer = _timerProvider.GetTimer(timer.Id);
+                    existingTimer = string.IsNullOrWhiteSpace(timer.ProgramId)
+                        ? null
+                        : _timerProvider.GetTimerByProgramId(timer.ProgramId);
+                }
 
-                    if (existingTimer == null)
+                if (existingTimer == null)
+                {
+                    if (ShouldCancelTimerForSeriesTimer(seriesTimer, timer))
+                    {
+                        timer.Status = RecordingStatus.Cancelled;
+                    }
+                    else
                     {
-                        existingTimer = string.IsNullOrWhiteSpace(timer.ProgramId)
-                            ? null
-                            : _timerProvider.GetTimerByProgramId(timer.ProgramId);
+                        enabledTimersForSeries.Add(timer);
                     }
+                    _timerProvider.Add(timer);
 
-                    if (existingTimer == null)
+                    if (TimerCreated != null)
                     {
+                        TimerCreated(this, new GenericEventArgs<TimerInfo>(timer));
+                    }
+                }
+                else
+                {
+                    // Only update if not currently active - test both new timer and existing in case Id's are different
+                    // Id's could be different if the timer was created manually prior to series timer creation
+                    ActiveRecordingInfo activeRecordingInfo;
+                    if (!_activeRecordings.TryGetValue(timer.Id, out activeRecordingInfo) && !_activeRecordings.TryGetValue(existingTimer.Id, out activeRecordingInfo))
+                    {
+                        UpdateExistingTimerWithNewMetadata(existingTimer, timer);
+
+                        // Needed by ShouldCancelTimerForSeriesTimer
+                        timer.IsManual = existingTimer.IsManual;
+
                         if (ShouldCancelTimerForSeriesTimer(seriesTimer, timer))
                         {
-                            timer.Status = RecordingStatus.Cancelled;
+                            existingTimer.Status = RecordingStatus.Cancelled;
                         }
-                        else
+                        else if (!existingTimer.IsManual)
                         {
-                            enabledTimersForSeries.Add(timer);
+                            existingTimer.Status = RecordingStatus.New;
                         }
-                        _timerProvider.Add(timer);
 
-                        if (TimerCreated != null)
+                        if (existingTimer.Status != RecordingStatus.Cancelled)
                         {
-                            TimerCreated(this, new GenericEventArgs<TimerInfo>(timer));
+                            enabledTimersForSeries.Add(existingTimer);
                         }
-                    }
-                    else
-                    {
-                        // Only update if not currently active - test both new timer and existing in case Id's are different
-                        // Id's could be different if the timer was created manually prior to series timer creation
-                        ActiveRecordingInfo activeRecordingInfo;
-                        if (!_activeRecordings.TryGetValue(timer.Id, out activeRecordingInfo) && !_activeRecordings.TryGetValue(existingTimer.Id, out activeRecordingInfo))
+
+                        if (updateTimerSettings)
                         {
-                            UpdateExistingTimerWithNewMetadata(existingTimer, timer);
-
-                            // Needed by ShouldCancelTimerForSeriesTimer
-                            timer.IsManual = existingTimer.IsManual;
-
-                            if (ShouldCancelTimerForSeriesTimer(seriesTimer, timer))
-                            {
-                                existingTimer.Status = RecordingStatus.Cancelled;
-                            }
-                            else if (!existingTimer.IsManual)
-                            {
-                                existingTimer.Status = RecordingStatus.New;
-                            }
-
-                            if (existingTimer.Status != RecordingStatus.Cancelled)
-                            {
-                                enabledTimersForSeries.Add(existingTimer);
-                            }
-
-                            if (updateTimerSettings)
-                            {
-                                existingTimer.KeepUntil = seriesTimer.KeepUntil;
-                                existingTimer.IsPostPaddingRequired = seriesTimer.IsPostPaddingRequired;
-                                existingTimer.IsPrePaddingRequired = seriesTimer.IsPrePaddingRequired;
-                                existingTimer.PostPaddingSeconds = seriesTimer.PostPaddingSeconds;
-                                existingTimer.PrePaddingSeconds = seriesTimer.PrePaddingSeconds;
-                                existingTimer.Priority = seriesTimer.Priority;
-                            }
-
-                            existingTimer.SeriesTimerId = seriesTimer.Id;
-                            _timerProvider.Update(existingTimer);
+                            existingTimer.KeepUntil = seriesTimer.KeepUntil;
+                            existingTimer.IsPostPaddingRequired = seriesTimer.IsPostPaddingRequired;
+                            existingTimer.IsPrePaddingRequired = seriesTimer.IsPrePaddingRequired;
+                            existingTimer.PostPaddingSeconds = seriesTimer.PostPaddingSeconds;
+                            existingTimer.PrePaddingSeconds = seriesTimer.PrePaddingSeconds;
+                            existingTimer.Priority = seriesTimer.Priority;
                         }
+
+                        existingTimer.SeriesTimerId = seriesTimer.Id;
+                        _timerProvider.Update(existingTimer);
                     }
                 }
             }
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index 4e38ad7be0..c360a6a82d 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -22,7 +22,6 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Common.Security;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Model.Events;
@@ -51,7 +50,6 @@ namespace Emby.Server.Implementations.LiveTv
         private readonly ITaskManager _taskManager;
         private readonly IJsonSerializer _jsonSerializer;
         private readonly IProviderManager _providerManager;
-        private readonly ISecurityManager _security;
         private readonly Func<IChannelManager> _channelManager;
 
         private readonly IDtoService _dtoService;
@@ -78,7 +76,23 @@ namespace Emby.Server.Implementations.LiveTv
         private IServerApplicationHost _appHost;
         private IHttpClient _httpClient;
 
-        public LiveTvManager(IServerApplicationHost appHost, IHttpClient httpClient, IServerConfigurationManager config, ILogger logger, IItemRepository itemRepo, IImageProcessor imageProcessor, IUserDataManager userDataManager, IDtoService dtoService, IUserManager userManager, ILibraryManager libraryManager, ITaskManager taskManager, ILocalizationManager localization, IJsonSerializer jsonSerializer, IProviderManager providerManager, IFileSystem fileSystem, ISecurityManager security, Func<IChannelManager> channelManager)
+        public LiveTvManager(
+            IServerApplicationHost appHost,
+            IHttpClient httpClient,
+            IServerConfigurationManager config,
+            ILogger logger,
+            IItemRepository itemRepo,
+            IImageProcessor imageProcessor,
+            IUserDataManager userDataManager,
+            IDtoService dtoService,
+            IUserManager userManager,
+            ILibraryManager libraryManager,
+            ITaskManager taskManager,
+            ILocalizationManager localization,
+            IJsonSerializer jsonSerializer,
+            IProviderManager providerManager,
+            IFileSystem fileSystem,
+            Func<IChannelManager> channelManager)
         {
             _appHost = appHost;
             _config = config;
@@ -91,7 +105,6 @@ namespace Emby.Server.Implementations.LiveTv
             _jsonSerializer = jsonSerializer;
             _providerManager = providerManager;
             _fileSystem = fileSystem;
-            _security = security;
             _dtoService = dtoService;
             _userDataManager = userDataManager;
             _channelManager = channelManager;
@@ -2087,14 +2100,6 @@ namespace Emby.Server.Implementations.LiveTv
 
         public async Task CreateSeriesTimer(SeriesTimerInfoDto timer, CancellationToken cancellationToken)
         {
-            var registration = await GetRegistrationInfo("seriesrecordings").ConfigureAwait(false);
-
-            if (!registration.IsValid)
-            {
-                _logger.LogInformation("Creating series recordings requires an active Emby Premiere subscription.");
-                return;
-            }
-
             var service = GetService(timer.ServiceName);
 
             var info = await _tvDtoService.GetSeriesTimerInfo(timer, true, this, cancellationToken).ConfigureAwait(false);
@@ -2436,30 +2441,6 @@ namespace Emby.Server.Implementations.LiveTv
             }
         }
 
-        public Task<MBRegistrationRecord> GetRegistrationInfo(string feature)
-        {
-            if (string.Equals(feature, "seriesrecordings", StringComparison.OrdinalIgnoreCase))
-            {
-                feature = "embytvseriesrecordings";
-            }
-
-            if (string.Equals(feature, "dvr-l", StringComparison.OrdinalIgnoreCase))
-            {
-                var config = GetConfiguration();
-                if (config.TunerHosts.Length > 0 &&
-                    config.ListingProviders.Count(i => (i.EnableAllTuners || i.EnabledTuners.Length > 0) && string.Equals(i.Type, SchedulesDirect.TypeName, StringComparison.OrdinalIgnoreCase)) > 0)
-                {
-                    return Task.FromResult(new MBRegistrationRecord
-                    {
-                        IsRegistered = true,
-                        IsValid = true
-                    });
-                }
-            }
-
-            return _security.GetRegistrationStatus(feature);
-        }
-
         public Task<List<ChannelInfo>> GetChannelsForListingsProvider(string id, CancellationToken cancellationToken)
         {
             var info = GetConfiguration().ListingProviders.First(i => string.Equals(i.Id, id, StringComparison.OrdinalIgnoreCase));