From bac4bf96a0e642f80f35bd6cdf3de17a9302b6c6 Mon Sep 17 00:00:00 2001
From: Patrick Barron <barronpm@gmail.com>
Date: Tue, 12 May 2020 12:50:17 -0400
Subject: [PATCH] Fix build errors

---
 Jellyfin.Server/Migrations/MigrationRunner.cs |  2 +-
 .../Routines/MigrateActivityLogDb.cs          | 23 ++++++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Jellyfin.Server/Migrations/MigrationRunner.cs b/Jellyfin.Server/Migrations/MigrationRunner.cs
index c4927f8770..c7fa2af0ca 100644
--- a/Jellyfin.Server/Migrations/MigrationRunner.cs
+++ b/Jellyfin.Server/Migrations/MigrationRunner.cs
@@ -18,7 +18,7 @@ namespace Jellyfin.Server.Migrations
         {
             typeof(Routines.DisableTranscodingThrottling),
             typeof(Routines.CreateUserLoggingConfigFile),
-            typeof(Routines.MigrateActivityLogDb()
+            typeof(Routines.MigrateActivityLogDb)
         };
 
         /// <summary>
diff --git a/Jellyfin.Server/Migrations/Routines/MigrateActivityLogDb.cs b/Jellyfin.Server/Migrations/Routines/MigrateActivityLogDb.cs
index 9f1f5b92eb..fe7ef01eef 100644
--- a/Jellyfin.Server/Migrations/Routines/MigrateActivityLogDb.cs
+++ b/Jellyfin.Server/Migrations/Routines/MigrateActivityLogDb.cs
@@ -5,8 +5,8 @@ using System.IO;
 using Emby.Server.Implementations.Data;
 using Jellyfin.Data.Entities;
 using Jellyfin.Server.Implementations;
+using MediaBrowser.Controller;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using SQLitePCL.pretty;
 
@@ -16,20 +16,31 @@ namespace Jellyfin.Server.Migrations.Routines
     {
         private const string DbFilename = "activitylog.db";
 
+        private readonly ILogger<MigrateActivityLogDb> _logger;
+        private readonly JellyfinDbProvider _provider;
+        private readonly IServerApplicationPaths _paths;
+
+        public MigrateActivityLogDb(ILogger<MigrateActivityLogDb> logger, IServerApplicationPaths paths, JellyfinDbProvider provider)
+        {
+            _logger = logger;
+            _provider = provider;
+            _paths = paths;
+        }
+
         public Guid Id => Guid.Parse("3793eb59-bc8c-456c-8b9f-bd5a62a42978");
 
         public string Name => "MigrateActivityLogDatabase";
 
-        public void Perform(CoreAppHost host, ILogger logger)
+        public void Perform()
         {
-            var dataPath = host.ServerConfigurationManager.ApplicationPaths.DataPath;
+            var dataPath = _paths.DataPath;
             using (var connection = SQLite3.Open(
                 Path.Combine(dataPath, DbFilename),
                 ConnectionFlags.ReadOnly,
                 null))
             {
-                logger.LogInformation("Migrating the database may take a while, do not stop Jellyfin.");
-                using var dbContext = host.ServiceProvider.GetService<JellyfinDb>();
+                _logger.LogInformation("Migrating the database may take a while, do not stop Jellyfin.");
+                using var dbContext = _provider.CreateContext();
 
                 var queryResult = connection.Query("SELECT * FROM ActivityLog ORDER BY Id ASC");
 
@@ -75,7 +86,7 @@ namespace Jellyfin.Server.Migrations.Routines
             }
             catch (IOException e)
             {
-                logger.LogError(e, "Error renaming legacy activity log database to 'activitylog.db.old'");
+                _logger.LogError(e, "Error renaming legacy activity log database to 'activitylog.db.old'");
             }
         }