michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
Eric Reed 2013-04-14 10:44:47 -04:00
commit 2da8146955
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@ -32,7 +32,7 @@ namespace MediaBrowser.Controller.Entities
/// Gets or sets the name. /// Gets or sets the name.
/// </summary> /// </summary>
/// <value>The name.</value> /// <value>The name.</value>
public string Name { get; set; } public virtual string Name { get; set; }
/// <summary> /// <summary>
/// Gets or sets the id. /// Gets or sets the id.

4
MediaBrowser.Server.Implementations/Library/UserManager.cs
View File

@ -106,10 +106,12 @@ namespace MediaBrowser.Server.Implementations.Library
/// </summary> /// </summary>
/// <param name="logger">The logger.</param> /// <param name="logger">The logger.</param>
/// <param name="configurationManager">The configuration manager.</param> /// <param name="configurationManager">The configuration manager.</param>
public UserManager(ILogger logger, IServerConfigurationManager configurationManager) /// <param name="userDataRepository">The user data repository.</param>
public UserManager(ILogger logger, IServerConfigurationManager configurationManager, IUserDataRepository userDataRepository)
{ {
_logger = logger; _logger = logger;
ConfigurationManager = configurationManager; ConfigurationManager = configurationManager;
_userDataRepository = userDataRepository;
} }
#region Events #region Events

6
MediaBrowser.ServerApplication/ApplicationHost.cs
View File

@ -220,12 +220,12 @@ namespace MediaBrowser.ServerApplication
ZipClient = new DotNetZipClient(); ZipClient = new DotNetZipClient();
RegisterSingleInstance(ZipClient); RegisterSingleInstance(ZipClient);
UserManager = new UserManager(Logger, ServerConfigurationManager);
RegisterSingleInstance(UserManager);
UserDataRepository = new SQLiteUserDataRepository(ApplicationPaths, JsonSerializer, LogManager); UserDataRepository = new SQLiteUserDataRepository(ApplicationPaths, JsonSerializer, LogManager);
RegisterSingleInstance(UserDataRepository); RegisterSingleInstance(UserDataRepository);
UserManager = new UserManager(Logger, ServerConfigurationManager, UserDataRepository);
RegisterSingleInstance(UserManager);
LibraryManager = new LibraryManager(Logger, TaskManager, UserManager, ServerConfigurationManager, UserDataRepository); LibraryManager = new LibraryManager(Logger, TaskManager, UserManager, ServerConfigurationManager, UserDataRepository);
RegisterSingleInstance(LibraryManager); RegisterSingleInstance(LibraryManager);