From 556cc8062debd5370ef907b0c78e8636356a8068 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Wed, 23 Nov 2022 15:58:11 +0100
Subject: Investigate some TODO comments

---
 .../ScheduledTasks/Tasks/ChapterImagesTask.cs              | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs')

diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
index 0bf0838fa..6106ae6c4 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
@@ -16,6 +16,7 @@ using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Tasks;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.ScheduledTasks.Tasks
 {
@@ -24,15 +25,10 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
     /// </summary>
     public class ChapterImagesTask : IScheduledTask
     {
-        /// <summary>
-        /// The _library manager.
-        /// </summary>
+        private readonly ILogger _logger;
         private readonly ILibraryManager _libraryManager;
-
         private readonly IItemRepository _itemRepo;
-
         private readonly IApplicationPaths _appPaths;
-
         private readonly IEncodingManager _encodingManager;
         private readonly IFileSystem _fileSystem;
         private readonly ILocalizationManager _localization;
@@ -40,6 +36,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
         /// <summary>
         /// Initializes a new instance of the <see cref="ChapterImagesTask" /> class.
         /// </summary>
+        /// <param name="logger">The logger.</param>.
         /// <param name="libraryManager">The library manager.</param>.
         /// <param name="itemRepo">The item repository.</param>
         /// <param name="appPaths">The application paths.</param>
@@ -47,6 +44,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
         /// <param name="fileSystem">The filesystem.</param>
         /// <param name="localization">The localization manager.</param>
         public ChapterImagesTask(
+            ILogger<ChapterImagesTask> logger,
             ILibraryManager libraryManager,
             IItemRepository itemRepo,
             IApplicationPaths appPaths,
@@ -54,6 +52,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
             IFileSystem fileSystem,
             ILocalizationManager localization)
         {
+            _logger = logger;
             _libraryManager = libraryManager;
             _itemRepo = itemRepo;
             _appPaths = appPaths;
@@ -167,9 +166,10 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
 
                     progress.Report(100 * percent);
                 }
-                catch (ObjectDisposedException)
+                catch (ObjectDisposedException ex)
                 {
                     // TODO Investigate and properly fix.
+                    _logger.LogError(ex, "Object Disposed");
                     break;
                 }
             }
-- 
cgit v1.2.3


From fb3e97d7acf74adc1dda7dceb5c70271d3552770 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Sun, 27 Nov 2022 14:35:07 +0100
Subject: Use typed logger

---
 Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs | 2 +-
 MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs                  | 4 ++--
 MediaBrowser.Providers/MediaInfo/ProbeProvider.cs                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs')

diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
index 6106ae6c4..da7c8732a 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
@@ -25,7 +25,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
     /// </summary>
     public class ChapterImagesTask : IScheduledTask
     {
-        private readonly ILogger _logger;
+        private readonly ILogger<ChapterImagesTask> _logger;
         private readonly ILibraryManager _libraryManager;
         private readonly IItemRepository _itemRepo;
         private readonly IApplicationPaths _appPaths;
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
index 8c08ab30e..f00023947 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
@@ -34,7 +34,7 @@ namespace MediaBrowser.Providers.MediaInfo
 {
     public class FFProbeVideoInfo
     {
-        private readonly ILogger _logger;
+        private readonly ILogger<FFProbeVideoInfo> _logger;
         private readonly IMediaEncoder _mediaEncoder;
         private readonly IItemRepository _itemRepo;
         private readonly IBlurayExaminer _blurayExaminer;
@@ -51,7 +51,7 @@ namespace MediaBrowser.Providers.MediaInfo
         private readonly long _dummyChapterDuration = TimeSpan.FromMinutes(5).Ticks;
 
         public FFProbeVideoInfo(
-            ILogger logger,
+            ILogger<FFProbeVideoInfo> logger,
             IMediaSourceManager mediaSourceManager,
             IMediaEncoder mediaEncoder,
             IItemRepository itemRepo,
diff --git a/MediaBrowser.Providers/MediaInfo/ProbeProvider.cs b/MediaBrowser.Providers/MediaInfo/ProbeProvider.cs
index 659136607..75f997a28 100644
--- a/MediaBrowser.Providers/MediaInfo/ProbeProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/ProbeProvider.cs
@@ -83,7 +83,7 @@ namespace MediaBrowser.Providers.MediaInfo
             _audioResolver = new AudioResolver(loggerFactory.CreateLogger<AudioResolver>(), localization, mediaEncoder, fileSystem, namingOptions);
             _subtitleResolver = new SubtitleResolver(loggerFactory.CreateLogger<SubtitleResolver>(), localization, mediaEncoder, fileSystem, namingOptions);
             _videoProber = new FFProbeVideoInfo(
-                _logger,
+                loggerFactory.CreateLogger<FFProbeVideoInfo>(),
                 mediaSourceManager,
                 mediaEncoder,
                 itemRepo,
-- 
cgit v1.2.3