Register and initialize IActivityRepository correctly

This commit is contained in:
Mark Monteiro 2020-04-04 12:46:35 -04:00
parent 3dbbe54f6c
commit 4ba07b114d

View File

@ -834,9 +834,8 @@ namespace Emby.Server.Implementations
LibraryManager); LibraryManager);
serviceCollection.AddSingleton(EncodingManager); serviceCollection.AddSingleton(EncodingManager);
var activityLogRepo = GetActivityLogRepository(); serviceCollection.AddSingleton<IActivityRepository, ActivityRepository>();
serviceCollection.AddSingleton(activityLogRepo); serviceCollection.AddSingleton<IActivityManager, ActivityManager>();
serviceCollection.AddSingleton<IActivityManager>(new ActivityManager(LoggerFactory, activityLogRepo, UserManager));
serviceCollection.AddSingleton<IAuthorizationContext, AuthorizationContext>(); serviceCollection.AddSingleton<IAuthorizationContext, AuthorizationContext>();
serviceCollection.AddSingleton<ISessionContext, SessionContext>(); serviceCollection.AddSingleton<ISessionContext, SessionContext>();
@ -860,6 +859,7 @@ namespace Emby.Server.Implementations
AuthService = Resolve<IAuthService>(); AuthService = Resolve<IAuthService>();
SubtitleEncoder = Resolve<ISubtitleEncoder>(); SubtitleEncoder = Resolve<ISubtitleEncoder>();
((ActivityRepository)Resolve<IActivityRepository>()).Initialize();
_displayPreferencesRepository.Initialize(); _displayPreferencesRepository.Initialize();
var userDataRepo = new SqliteUserDataRepository(LoggerFactory.CreateLogger<SqliteUserDataRepository>(), ApplicationPaths); var userDataRepo = new SqliteUserDataRepository(LoggerFactory.CreateLogger<SqliteUserDataRepository>(), ApplicationPaths);
@ -963,15 +963,6 @@ namespace Emby.Server.Implementations
return repo; return repo;
} }
private IActivityRepository GetActivityLogRepository()
{
var repo = new ActivityRepository(LoggerFactory, ServerConfigurationManager.ApplicationPaths, FileSystemManager);
repo.Initialize();
return repo;
}
/// <summary> /// <summary>
/// Dirty hacks. /// Dirty hacks.
/// </summary> /// </summary>