From e91dd14b3167e3fcf12e24b4664d4d18cdad7d26 Mon Sep 17 00:00:00 2001
From: Bond-009 <bond.009@outlook.com>
Date: Thu, 7 Mar 2019 18:10:55 +0100
Subject: Remove redundent class AssemblyInfo

---
 Emby.Server.Implementations/Data/SqliteItemRepository.cs | 6 ++----
 Emby.Server.Implementations/Data/TypeMapper.cs           | 9 ++-------
 2 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'Emby.Server.Implementations/Data')

diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 06f6563a3..3ae63279b 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -24,7 +24,6 @@ using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.LiveTv;
 using MediaBrowser.Model.Querying;
-using MediaBrowser.Model.Reflection;
 using MediaBrowser.Model.Serialization;
 using Microsoft.Extensions.Logging;
 using SQLitePCL.pretty;
@@ -65,8 +64,7 @@ namespace Emby.Server.Implementations.Data
             IServerConfigurationManager config,
             IServerApplicationHost appHost,
             IJsonSerializer jsonSerializer,
-            ILoggerFactory loggerFactory,
-            IAssemblyInfo assemblyInfo)
+            ILoggerFactory loggerFactory)
             : base(loggerFactory.CreateLogger(nameof(SqliteItemRepository)))
         {
             if (config == null)
@@ -82,7 +80,7 @@ namespace Emby.Server.Implementations.Data
             _appHost = appHost;
             _config = config;
             _jsonSerializer = jsonSerializer;
-            _typeMapper = new TypeMapper(assemblyInfo);
+            _typeMapper = new TypeMapper();
 
             DbFilePath = Path.Combine(_config.ApplicationPaths.DataPath, "library.db");
         }
diff --git a/Emby.Server.Implementations/Data/TypeMapper.cs b/Emby.Server.Implementations/Data/TypeMapper.cs
index 37c952e88..0e67affbf 100644
--- a/Emby.Server.Implementations/Data/TypeMapper.cs
+++ b/Emby.Server.Implementations/Data/TypeMapper.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Concurrent;
 using System.Linq;
-using MediaBrowser.Model.Reflection;
 
 namespace Emby.Server.Implementations.Data
 {
@@ -10,16 +9,13 @@ namespace Emby.Server.Implementations.Data
     /// </summary>
     public class TypeMapper
     {
-        private readonly IAssemblyInfo _assemblyInfo;
-
         /// <summary>
         /// This holds all the types in the running assemblies so that we can de-serialize properly when we don't have strong types
         /// </summary>
         private readonly ConcurrentDictionary<string, Type> _typeMap = new ConcurrentDictionary<string, Type>();
 
-        public TypeMapper(IAssemblyInfo assemblyInfo)
+        public TypeMapper()
         {
-            _assemblyInfo = assemblyInfo;
         }
 
         /// <summary>
@@ -45,8 +41,7 @@ namespace Emby.Server.Implementations.Data
         /// <returns>Type.</returns>
         private Type LookupType(string typeName)
         {
-            return _assemblyInfo
-                .GetCurrentAssemblies()
+            return AppDomain.CurrentDomain.GetAssemblies()
                 .Select(a => a.GetType(typeName))
                 .FirstOrDefault(t => t != null);
         }
-- 
cgit v1.2.3