Merge branch 'master' into TVFix

1 files changed, 12 insertions, 2 deletions

diff --git a/Jellyfin.Server.Implementations/JellyfinDbProvider.cs b/Jellyfin.Server.Implementations/JellyfinDbProvider.cs
index 486be6053..c2c5198d1 100644
--- a/Jellyfin.Server.Implementations/JellyfinDbProvider.cs
+++ b/Jellyfin.Server.Implementations/JellyfinDbProvider.cs
@@ -1,8 +1,10 @@
 using System;
 using System.IO;
+using System.Linq;
 using MediaBrowser.Common.Configuration;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 
 namespace Jellyfin.Server.Implementations
 {
@@ -13,19 +15,27 @@ namespace Jellyfin.Server.Implementations
     {
         private readonly IServiceProvider _serviceProvider;
         private readonly IApplicationPaths _appPaths;
+        private readonly ILogger<JellyfinDbProvider> _logger;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="JellyfinDbProvider"/> class.
         /// </summary>
         /// <param name="serviceProvider">The application's service provider.</param>
         /// <param name="appPaths">The application paths.</param>
-        public JellyfinDbProvider(IServiceProvider serviceProvider, IApplicationPaths appPaths)
+        /// <param name="logger">The logger.</param>
+        public JellyfinDbProvider(IServiceProvider serviceProvider, IApplicationPaths appPaths, ILogger<JellyfinDbProvider> logger)
         {
             _serviceProvider = serviceProvider;
             _appPaths = appPaths;
+            _logger = logger;
 
             using var jellyfinDb = CreateContext();
-            jellyfinDb.Database.Migrate();
+            if (jellyfinDb.Database.GetPendingMigrations().Any())
+            {
+                _logger.LogInformation("There are pending EFCore migrations in the database. Applying... (This may take a while, do not stop Jellyfin)");
+                jellyfinDb.Database.Migrate();
+                _logger.LogInformation("EFCore migrations applied successfully");
+            }
         }
 
         /// <summary>