alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-26 20:14:45 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Register and construct IUserDataManager and IUserDataRepository correctly

Browse Source
This commit is contained in:
Mark Monteiro
2020-04-04 19:57:26 -04:00
parent 5827f0f5a9
commit 615717e562
2 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Emby.Server.Implementations/ApplicationHost.cs
View File

@@ -247,12 +247,6 @@ namespace Emby.Server.Implementations
public LocalizationManager LocalizationManager { get; set; }
/// <summary>
/// Gets or sets the user data repository.
/// </summary>
/// <value>The user data repository.</value>
private IUserDataManager UserDataManager { get; set; }
/// <summary>
/// Gets the installation manager.
/// </summary>
@@ -641,8 +635,8 @@ namespace Emby.Server.Implementations
serviceCollection.AddSingleton<IBlurayExaminer>(new BdInfoExaminer(FileSystemManager));
UserDataManager = new UserDataManager(LoggerFactory, ServerConfigurationManager, Resolve<IUserManager>);
serviceCollection.AddSingleton(UserDataManager);
serviceCollection.AddSingleton<IUserDataRepository, SqliteUserDataRepository>();
serviceCollection.AddSingleton<IUserDataManager, UserDataManager>();
serviceCollection.AddSingleton<IDisplayPreferencesRepository, SqliteDisplayPreferencesRepository>();
@@ -752,15 +746,12 @@ namespace Emby.Server.Implementations
((SqliteUserRepository)Resolve<IUserRepository>()).Initialize();
((ActivityRepository)Resolve<IActivityRepository>()).Initialize();
var userDataRepo = new SqliteUserDataRepository(LoggerFactory.CreateLogger<SqliteUserDataRepository>(), ApplicationPaths);
SetStaticProperties();
var userManager = (UserManager)Resolve<IUserManager>();
userManager.Initialize();
((UserDataManager)UserDataManager).Repository = userDataRepo;
var userDataRepo = (SqliteUserDataRepository)Resolve<IUserDataRepository>();
((SqliteItemRepository)Resolve<IItemRepository>()).Initialize(userDataRepo, userManager);
FindParts();
@@ -846,7 +837,7 @@ namespace Emby.Server.Implementations
BaseItem.ItemRepository = Resolve<IItemRepository>();
User.UserManager = Resolve<IUserManager>();
BaseItem.FileSystem = FileSystemManager;
BaseItem.UserDataManager = UserDataManager;
BaseItem.UserDataManager = Resolve<IUserDataManager>();
BaseItem.ChannelManager = Resolve<IChannelManager>();
Video.LiveTvManager = Resolve<ILiveTvManager>();
Folder.UserViewManager = Resolve<IUserViewManager>();