diff options
| author | Patrick Barron <barronpm@gmail.com> | 2020-05-15 17:20:07 -0400 |
|---|---|---|
| committer | Patrick Barron <barronpm@gmail.com> | 2020-05-15 17:20:07 -0400 |
| commit | aca7e221d811040bdb14da6390bbd16c5f7db785 (patch) | |
| tree | 87c77521066511890e236a97afb27a475f32c0a3 /MediaBrowser.Api/Library/LibraryService.cs | |
| parent | b7621d762c58320b35096838ae8ab10d98ea9bb2 (diff) | |
| parent | 652e9702fc67784fd11e26ee159f31e6f0ba9dd7 (diff) | |
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
# Emby.Server.Implementations/ApplicationHost.cs
# Emby.Server.Implementations/Devices/DeviceManager.cs
# Jellyfin.Server/Jellyfin.Server.csproj
# Jellyfin.Server/Migrations/MigrationRunner.cs
# MediaBrowser.Controller/Devices/IDeviceManager.cs
Diffstat (limited to 'MediaBrowser.Api/Library/LibraryService.cs')
| -rw-r--r-- | MediaBrowser.Api/Library/LibraryService.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs index 783fc6073..50977c48f 100644 --- a/MediaBrowser.Api/Library/LibraryService.cs +++ b/MediaBrowser.Api/Library/LibraryService.cs @@ -319,11 +319,14 @@ namespace MediaBrowser.Api.Library private readonly ILocalizationManager _localization; private readonly ILibraryMonitor _libraryMonitor; + private readonly ILogger<MoviesService> _moviesServiceLogger; + /// <summary> /// Initializes a new instance of the <see cref="LibraryService" /> class. /// </summary> public LibraryService( ILogger<LibraryService> logger, + ILogger<MoviesService> moviesServiceLogger, IServerConfigurationManager serverConfigurationManager, IHttpResultFactory httpResultFactory, IProviderManager providerManager, @@ -344,6 +347,7 @@ namespace MediaBrowser.Api.Library _activityManager = activityManager; _localization = localization; _libraryMonitor = libraryMonitor; + _moviesServiceLogger = moviesServiceLogger; } private string[] GetRepresentativeItemTypes(string contentType) @@ -543,7 +547,7 @@ namespace MediaBrowser.Api.Library if (item is Movie || (program != null && program.IsMovie) || item is Trailer) { return new MoviesService( - Logger, + _moviesServiceLogger, ServerConfigurationManager, ResultFactory, _userManager, @@ -762,9 +766,7 @@ namespace MediaBrowser.Api.Library _activityManager.Create(new Jellyfin.Data.Entities.ActivityLog( string.Format(_localization.GetLocalizedString("UserDownloadingItemWithValues"), user.Username, item.Name), "UserDownloadingContent", - auth.UserId, - DateTime.UtcNow, - LogLevel.Trace) + auth.UserId) { ShortOverview = string.Format(_localization.GetLocalizedString("AppDeviceValues"), auth.Client, auth.Device), }); |