Merge pull request #797 from Bond-009/warnings

Fix all warnings

Emby.Drawing/ImageProcessor.cs

@@ -261,15 +261,6 @@ namespace Emby.Drawing
 
                 return (cacheFilePath, GetMimeType(outputFormat, cacheFilePath), _fileSystem.GetLastWriteTimeUtc(cacheFilePath));
             }
-            catch (ArgumentOutOfRangeException ex)
-            {
-                // Decoder failed to decode it
-#if DEBUG
-                _logger.LogError(ex, "Error encoding image");
-#endif
-                // Just spit out the original file if all the options are default
-                return (originalImagePath, MimeTypes.GetMimeType(originalImagePath), dateModified);
-            }
             catch (Exception ex)
             {
                 // If it fails for whatever reason, return the original image

Emby.Server.Implementations/Library/UserManager.cs

@@ -448,30 +448,30 @@ namespace Emby.Server.Implementations.Library
 
         private void UpdateInvalidLoginAttemptCount(User user, int newValue)
         {
-            if (user.Policy.InvalidLoginAttemptCount != newValue || newValue > 0)
+            if (user.Policy.InvalidLoginAttemptCount == newValue || newValue <= 0)
             {
-                user.Policy.InvalidLoginAttemptCount = newValue;
+                return;
+            }
 
-                var maxCount = user.Policy.IsAdministrator ? 3 : 5;
+            user.Policy.InvalidLoginAttemptCount = newValue;
 
-                // TODO: Fix
+            var maxCount = user.Policy.IsAdministrator ? 3 : 5;
-                /*
-                var fireLockout = false;
 
-                if (newValue >= maxCount)
+            var fireLockout = false;
-                {
-                    _logger.LogDebug("Disabling user {0} due to {1} unsuccessful login attempts.", user.Name, newValue.ToString(CultureInfo.InvariantCulture));
-                    user.Policy.IsDisabled = true;
 
-                    fireLockout = true;
+            if (newValue >= maxCount)
-                }*/
+            {
+                _logger.LogDebug("Disabling user {0} due to {1} unsuccessful login attempts.", user.Name, newValue);
+                user.Policy.IsDisabled = true;
 
-                UpdateUserPolicy(user, user.Policy, false);
+                fireLockout = true;
+            }
 
-                /* if (fireLockout)
+            UpdateUserPolicy(user, user.Policy, false);
-                {
+
-                    UserLockedOut?.Invoke(this, new GenericEventArgs<User>(user));
+            if (fireLockout)
-                }*/
+            {
+                UserLockedOut?.Invoke(this, new GenericEventArgs<User>(user));
             }
         }
 

Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs

@@ -64,7 +64,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
         public static EmbyTV Current;
 
-        public event EventHandler DataSourceChanged;
         public event EventHandler<GenericEventArgs<TimerInfo>> TimerCreated;
         public event EventHandler<GenericEventArgs<string>> TimerCancelled;
 

Emby.Server.Implementations/LiveTv/LiveTvManager.cs

@@ -53,7 +53,7 @@ namespace Emby.Server.Implementations.LiveTv
 
         private readonly LiveTvDtoService _tvDtoService;
 
-        private ILiveTvService[] _services = new ILiveTvService[] { };
+        private ILiveTvService[] _services = Array.Empty<ILiveTvService>();
 
         private ITunerHost[] _tunerHosts = Array.Empty<ITunerHost>();
         private IListingsProvider[] _listingProviders = Array.Empty<IListingsProvider>();
@@ -127,8 +127,6 @@ namespace Emby.Server.Implementations.LiveTv
 
             foreach (var service in _services)
             {
-                service.DataSourceChanged += service_DataSourceChanged;
-
                 if (service is EmbyTV.EmbyTV embyTv)
                 {
                     embyTv.TimerCreated += EmbyTv_TimerCreated;
@@ -184,14 +182,6 @@ namespace Emby.Server.Implementations.LiveTv
             return EmbyTV.EmbyTV.Current.DiscoverTuners(newDevicesOnly, cancellationToken);
         }
 
-        void service_DataSourceChanged(object sender, EventArgs e)
-        {
-            if (!_isDisposed)
-            {
-                _taskManager.CancelIfRunningAndQueue<RefreshChannelsScheduledTask>();
-            }
-        }
-
         public QueryResult<BaseItem> GetInternalChannels(LiveTvChannelQuery query, DtoOptions dtoOptions, CancellationToken cancellationToken)
         {
             var user = query.UserId.Equals(Guid.Empty) ? null : _userManager.GetUserById(query.UserId);
@@ -2153,17 +2143,28 @@ namespace Emby.Server.Implementations.LiveTv
             Dispose(true);
         }
 
-        private bool _isDisposed = false;
+        private bool _disposed = false;
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources.
         /// </summary>
         /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected virtual void Dispose(bool dispose)
         {
+            if (_disposed)
+            {
+                return;
+            }
+
             if (dispose)
             {
-                _isDisposed = true;
+                // TODO: Dispose stuff
             }
+
+            _services = null;
+            _listingProviders = null;
+            _tunerHosts = null;
+
+            _disposed = true;
         }
 
         private LiveTvServiceInfo[] GetServiceInfos()

MediaBrowser.Controller/LiveTv/ILiveTvService.cs

@@ -12,11 +12,6 @@ namespace MediaBrowser.Controller.LiveTv
     /// </summary>
     public interface ILiveTvService
     {
-        /// <summary>
-        /// Occurs when [data source changed].
-        /// </summary>
-        event EventHandler DataSourceChanged;
-
         /// <summary>
         /// Gets the name.
         /// </summary>