2
0
Эх сурвалжийг харах

Remove websocketmanager from ApplicationHost

cvium 4 жил өмнө
parent
commit
137baab0ac

+ 5 - 8
Emby.Server.Implementations/ApplicationHost.cs

@@ -128,7 +128,6 @@ namespace Emby.Server.Implementations
         private IMediaEncoder _mediaEncoder;
         private IMediaEncoder _mediaEncoder;
         private ISessionManager _sessionManager;
         private ISessionManager _sessionManager;
         private IHttpClientFactory _httpClientFactory;
         private IHttpClientFactory _httpClientFactory;
-        private IWebSocketManager _webSocketManager;
 
 
         private string[] _urlPrefixes;
         private string[] _urlPrefixes;
 
 
@@ -259,8 +258,8 @@ namespace Emby.Server.Implementations
             IServiceCollection serviceCollection)
             IServiceCollection serviceCollection)
         {
         {
             _xmlSerializer = new MyXmlSerializer();
             _xmlSerializer = new MyXmlSerializer();
-            _jsonSerializer = new JsonSerializer();            
-            
+            _jsonSerializer = new JsonSerializer();
+
             ServiceCollection = serviceCollection;
             ServiceCollection = serviceCollection;
 
 
             _networkManager = networkManager;
             _networkManager = networkManager;
@@ -667,7 +666,6 @@ namespace Emby.Server.Implementations
             _mediaEncoder = Resolve<IMediaEncoder>();
             _mediaEncoder = Resolve<IMediaEncoder>();
             _sessionManager = Resolve<ISessionManager>();
             _sessionManager = Resolve<ISessionManager>();
             _httpClientFactory = Resolve<IHttpClientFactory>();
             _httpClientFactory = Resolve<IHttpClientFactory>();
-            _webSocketManager = Resolve<IWebSocketManager>();
 
 
             ((AuthenticationRepository)Resolve<IAuthenticationRepository>()).Initialize();
             ((AuthenticationRepository)Resolve<IAuthenticationRepository>()).Initialize();
 
 
@@ -788,7 +786,6 @@ namespace Emby.Server.Implementations
                         .ToArray();
                         .ToArray();
 
 
             _urlPrefixes = GetUrlPrefixes().ToArray();
             _urlPrefixes = GetUrlPrefixes().ToArray();
-            _webSocketManager.Init(GetExports<IWebSocketListener>());
 
 
             Resolve<ILibraryManager>().AddParts(
             Resolve<ILibraryManager>().AddParts(
                 GetExports<IResolverIgnoreRule>(),
                 GetExports<IResolverIgnoreRule>(),
@@ -1090,7 +1087,7 @@ namespace Emby.Server.Implementations
                     {
                     {
                         // No metafile, so lets see if the folder is versioned.
                         // No metafile, so lets see if the folder is versioned.
                         metafile = dir.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries)[^1];
                         metafile = dir.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries)[^1];
-                        
+
                         int versionIndex = dir.LastIndexOf('_');
                         int versionIndex = dir.LastIndexOf('_');
                         if (versionIndex != -1 && Version.TryParse(dir.Substring(versionIndex + 1), out Version ver))
                         if (versionIndex != -1 && Version.TryParse(dir.Substring(versionIndex + 1), out Version ver))
                         {
                         {
@@ -1099,9 +1096,9 @@ namespace Emby.Server.Implementations
                         }
                         }
                         else
                         else
                         {
                         {
-                            // Un-versioned folder - Add it under the path name and version 0.0.0.1.                        
+                            // Un-versioned folder - Add it under the path name and version 0.0.0.1.
                             versions.Add((new Version(0, 0, 0, 1), metafile, dir));
                             versions.Add((new Version(0, 0, 0, 1), metafile, dir));
-                        }   
+                        }
                     }
                     }
                 }
                 }
                 catch
                 catch