|
|
@ -433,7 +433,7 @@ namespace Emby.Server.Implementations
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (_deviceId == null)
|
|
|
|
if (_deviceId == null)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
_deviceId = new DeviceId(ApplicationPaths, LoggerFactory, FileSystemManager);
|
|
|
|
_deviceId = new DeviceId(ApplicationPaths, LoggerFactory);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return _deviceId.Value;
|
|
|
|
return _deviceId.Value;
|
|
|
@ -668,7 +668,7 @@ namespace Emby.Server.Implementations
|
|
|
|
InstallationManager = new InstallationManager(LoggerFactory, this, ApplicationPaths, HttpClient, JsonSerializer, ServerConfigurationManager, FileSystemManager, CryptographyProvider, ZipClient, PackageRuntime);
|
|
|
|
InstallationManager = new InstallationManager(LoggerFactory, this, ApplicationPaths, HttpClient, JsonSerializer, ServerConfigurationManager, FileSystemManager, CryptographyProvider, ZipClient, PackageRuntime);
|
|
|
|
serviceCollection.AddSingleton(InstallationManager);
|
|
|
|
serviceCollection.AddSingleton(InstallationManager);
|
|
|
|
|
|
|
|
|
|
|
|
ZipClient = new ZipClient(FileSystemManager);
|
|
|
|
ZipClient = new ZipClient();
|
|
|
|
serviceCollection.AddSingleton(ZipClient);
|
|
|
|
serviceCollection.AddSingleton(ZipClient);
|
|
|
|
|
|
|
|
|
|
|
|
HttpResultFactory = new HttpResultFactory(LoggerFactory, FileSystemManager, JsonSerializer, CreateBrotliCompressor());
|
|
|
|
HttpResultFactory = new HttpResultFactory(LoggerFactory, FileSystemManager, JsonSerializer, CreateBrotliCompressor());
|
|
|
@ -706,7 +706,7 @@ namespace Emby.Server.Implementations
|
|
|
|
AuthenticationRepository = GetAuthenticationRepository();
|
|
|
|
AuthenticationRepository = GetAuthenticationRepository();
|
|
|
|
serviceCollection.AddSingleton(AuthenticationRepository);
|
|
|
|
serviceCollection.AddSingleton(AuthenticationRepository);
|
|
|
|
|
|
|
|
|
|
|
|
UserManager = new UserManager(LoggerFactory, ServerConfigurationManager, UserRepository, XmlSerializer, NetworkManager, () => ImageProcessor, () => DtoService, this, JsonSerializer, FileSystemManager, CryptographyProvider);
|
|
|
|
UserManager = new UserManager(LoggerFactory, ServerConfigurationManager, UserRepository, XmlSerializer, NetworkManager, () => ImageProcessor, () => DtoService, this, JsonSerializer, FileSystemManager);
|
|
|
|
serviceCollection.AddSingleton(UserManager);
|
|
|
|
serviceCollection.AddSingleton(UserManager);
|
|
|
|
|
|
|
|
|
|
|
|
LibraryManager = new LibraryManager(this, LoggerFactory, TaskManager, UserManager, ServerConfigurationManager, UserDataManager, () => LibraryMonitor, FileSystemManager, () => ProviderManager, () => UserViewManager);
|
|
|
|
LibraryManager = new LibraryManager(this, LoggerFactory, TaskManager, UserManager, ServerConfigurationManager, UserDataManager, () => LibraryMonitor, FileSystemManager, () => ProviderManager, () => UserViewManager);
|
|
|
@ -716,7 +716,7 @@ namespace Emby.Server.Implementations
|
|
|
|
var musicManager = new MusicManager(LibraryManager);
|
|
|
|
var musicManager = new MusicManager(LibraryManager);
|
|
|
|
serviceCollection.AddSingleton<IMusicManager>(new MusicManager(LibraryManager));
|
|
|
|
serviceCollection.AddSingleton<IMusicManager>(new MusicManager(LibraryManager));
|
|
|
|
|
|
|
|
|
|
|
|
LibraryMonitor = new LibraryMonitor(LoggerFactory, TaskManager, LibraryManager, ServerConfigurationManager, FileSystemManager, EnvironmentInfo);
|
|
|
|
LibraryMonitor = new LibraryMonitor(LoggerFactory, LibraryManager, ServerConfigurationManager, FileSystemManager, EnvironmentInfo);
|
|
|
|
serviceCollection.AddSingleton(LibraryMonitor);
|
|
|
|
serviceCollection.AddSingleton(LibraryMonitor);
|
|
|
|
|
|
|
|
|
|
|
|
serviceCollection.AddSingleton<ISearchEngine>(new SearchEngine(LoggerFactory, LibraryManager, UserManager));
|
|
|
|
serviceCollection.AddSingleton<ISearchEngine>(new SearchEngine(LoggerFactory, LibraryManager, UserManager));
|
|
|
@ -745,7 +745,7 @@ namespace Emby.Server.Implementations
|
|
|
|
var encryptionManager = new EncryptionManager();
|
|
|
|
var encryptionManager = new EncryptionManager();
|
|
|
|
serviceCollection.AddSingleton<IEncryptionManager>(encryptionManager);
|
|
|
|
serviceCollection.AddSingleton<IEncryptionManager>(encryptionManager);
|
|
|
|
|
|
|
|
|
|
|
|
DeviceManager = new DeviceManager(AuthenticationRepository, JsonSerializer, LibraryManager, LocalizationManager, UserManager, FileSystemManager, LibraryMonitor, ServerConfigurationManager, LoggerFactory, NetworkManager);
|
|
|
|
DeviceManager = new DeviceManager(AuthenticationRepository, JsonSerializer, LibraryManager, LocalizationManager, UserManager, FileSystemManager, LibraryMonitor, ServerConfigurationManager);
|
|
|
|
serviceCollection.AddSingleton(DeviceManager);
|
|
|
|
serviceCollection.AddSingleton(DeviceManager);
|
|
|
|
|
|
|
|
|
|
|
|
MediaSourceManager = new MediaSourceManager(ItemRepository, ApplicationPaths, LocalizationManager, UserManager, LibraryManager, LoggerFactory, JsonSerializer, FileSystemManager, UserDataManager, () => MediaEncoder);
|
|
|
|
MediaSourceManager = new MediaSourceManager(ItemRepository, ApplicationPaths, LocalizationManager, UserManager, LibraryManager, LoggerFactory, JsonSerializer, FileSystemManager, UserDataManager, () => MediaEncoder);
|
|
|
@ -757,7 +757,7 @@ namespace Emby.Server.Implementations
|
|
|
|
ProviderManager = new ProviderManager(HttpClient, SubtitleManager, ServerConfigurationManager, LibraryMonitor, LoggerFactory, FileSystemManager, ApplicationPaths, () => LibraryManager, JsonSerializer);
|
|
|
|
ProviderManager = new ProviderManager(HttpClient, SubtitleManager, ServerConfigurationManager, LibraryMonitor, LoggerFactory, FileSystemManager, ApplicationPaths, () => LibraryManager, JsonSerializer);
|
|
|
|
serviceCollection.AddSingleton(ProviderManager);
|
|
|
|
serviceCollection.AddSingleton(ProviderManager);
|
|
|
|
|
|
|
|
|
|
|
|
DtoService = new DtoService(LoggerFactory, LibraryManager, UserDataManager, ItemRepository, ImageProcessor, ServerConfigurationManager, FileSystemManager, ProviderManager, () => ChannelManager, this, () => DeviceManager, () => MediaSourceManager, () => LiveTvManager);
|
|
|
|
DtoService = new DtoService(LoggerFactory, LibraryManager, UserDataManager, ItemRepository, ImageProcessor, ProviderManager, this, () => MediaSourceManager, () => LiveTvManager);
|
|
|
|
serviceCollection.AddSingleton(DtoService);
|
|
|
|
serviceCollection.AddSingleton(DtoService);
|
|
|
|
|
|
|
|
|
|
|
|
ChannelManager = new ChannelManager(UserManager, DtoService, LibraryManager, LoggerFactory, ServerConfigurationManager, FileSystemManager, UserDataManager, JsonSerializer, LocalizationManager, HttpClient, ProviderManager);
|
|
|
|
ChannelManager = new ChannelManager(UserManager, DtoService, LibraryManager, LoggerFactory, ServerConfigurationManager, FileSystemManager, UserDataManager, JsonSerializer, LocalizationManager, HttpClient, ProviderManager);
|
|
|
@ -947,7 +947,7 @@ namespace Emby.Server.Implementations
|
|
|
|
|
|
|
|
|
|
|
|
protected virtual FFMpegInfo GetFFMpegInfo()
|
|
|
|
protected virtual FFMpegInfo GetFFMpegInfo()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return new FFMpegLoader(Logger, ApplicationPaths, HttpClient, ZipClient, FileSystemManager, GetFfmpegInstallInfo())
|
|
|
|
return new FFMpegLoader(ApplicationPaths, FileSystemManager, GetFfmpegInstallInfo())
|
|
|
|
.GetFFMpegInfo(StartupOptions);
|
|
|
|
.GetFFMpegInfo(StartupOptions);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|