@ -4,11 +4,10 @@ using System.Globalization;
using System.Linq ;
using System.Text ;
using System.Threading.Tasks ;
using Jellyfin.Data.Entities ;
using MediaBrowser.Common.Plugins ;
using MediaBrowser.Common.Updates ;
using MediaBrowser.Controller.Authentication ;
using MediaBrowser.Controller.Devices ;
using MediaBrowser.Controller.Entities ;
using MediaBrowser.Controller.Library ;
using MediaBrowser.Controller.Plugins ;
using MediaBrowser.Controller.Session ;
@ -30,7 +29,7 @@ namespace Emby.Server.Implementations.Activity
/// </summary>
public sealed class ActivityLogEntryPoint : IServerEntryPoint
{
private readonly ILogger _logger ;
private readonly ILogger < ActivityLogEntryPoint > _logger ;
private readonly IInstallationManager _installationManager ;
private readonly ISessionManager _sessionManager ;
private readonly ITaskManager _taskManager ;
@ -38,14 +37,12 @@ namespace Emby.Server.Implementations.Activity
private readonly ILocalizationManager _localization ;
private readonly ISubtitleManager _subManager ;
private readonly IUserManager _userManager ;
private readonly IDeviceManager _deviceManager ;
/// <summary>
/// Initializes a new instance of the <see cref="ActivityLogEntryPoint"/> class.
/// </summary>
/// <param name="logger">The logger.</param>
/// <param name="sessionManager">The session manager.</param>
/// <param name="deviceManager">The device manager.</param>
/// <param name="taskManager">The task manager.</param>
/// <param name="activityManager">The activity manager.</param>
/// <param name="localization">The localization manager.</param>
@ -55,7 +52,6 @@ namespace Emby.Server.Implementations.Activity
public ActivityLogEntryPoint (
ILogger < ActivityLogEntryPoint > logger ,
ISessionManager sessionManager ,
IDeviceManager deviceManager ,
ITaskManager taskManager ,
IActivityManager activityManager ,
ILocalizationManager localization ,
@ -65,7 +61,6 @@ namespace Emby.Server.Implementations.Activity
{
_logger = logger ;
_sessionManager = sessionManager ;
_deviceManager = deviceManager ;
_taskManager = taskManager ;
_activityManager = activityManager ;
_localization = localization ;
@ -93,58 +88,45 @@ namespace Emby.Server.Implementations.Activity
_subManager . SubtitleDownloadFailure + = OnSubtitleDownloadFailure ;
_userManager . UserCreated + = OnUserCreated ;
_userManager . UserPasswordChanged + = OnUserPasswordChanged ;
_userManager . UserDeleted + = OnUserDeleted ;
_userManager . UserPolicyUpdated + = OnUserPolicyUpdated ;
_userManager . UserLockedOut + = OnUserLockedOut ;
_deviceManager . CameraImageUploaded + = OnCameraImageUploaded ;
_userManager . OnUserCreated + = OnUserCreated ;
_userManager . OnUserPasswordChanged + = OnUserPasswordChanged ;
_userManager . OnUserDeleted + = OnUserDeleted ;
_userManager . OnUserLockedOut + = OnUserLockedOut ;
return Task . CompletedTask ;
}
private void OnCameraImageUploaded ( object sender , GenericEventArgs < CameraImageUploadInfo > e )
private async void OnUserLockedOut ( object sender , GenericEventArgs < User > e )
{
CreateLogEntry ( new ActivityLogEntry
await CreateLogEntry ( new ActivityLog (
string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "UserLockedOutWithName" ) ,
e . Argument . Username ) ,
NotificationType . UserLockedOut . ToString ( ) ,
e . Argument . Id )
{
Name = string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "CameraImageUploadedFrom" ) ,
e . Argument . Device . Name ) ,
Type = NotificationType . CameraImageUploaded . ToString ( )
} ) ;
LogSeverity = LogLevel . Error
} ) . ConfigureAwait ( false ) ;
}
private void OnUserLockedOut ( object sender , GenericEventArgs < User > e )
private async void OnSubtitleDownloadFailure ( object sender , SubtitleDownloadFailureEventArgs e )
{
CreateLogEntry ( new ActivityLogEntry
{
Name = string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "UserLockedOutWithName" ) ,
e . Argument . Name ) ,
Type = NotificationType . UserLockedOut . ToString ( ) ,
UserId = e . Argument . Id
} ) ;
}
private void OnSubtitleDownloadFailure ( object sender , SubtitleDownloadFailureEventArgs e )
{
CreateLogEntry ( new ActivityLogEntry
{
Name = string . Format (
await CreateLogEntry ( new ActivityLog (
string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "SubtitleDownloadFailureFromForItem" ) ,
e . Provider ,
Emby . Notifications . NotificationEntryPoint . GetItemName ( e . Item ) ) ,
Type = "SubtitleDownloadFailure" ,
Notifications . NotificationEntryPoint . GetItemName ( e . Item ) ) ,
"SubtitleDownloadFailure" ,
Guid . Empty )
{
ItemId = e . Item . Id . ToString ( "N" , CultureInfo . InvariantCulture ) ,
ShortOverview = e . Exception . Message
} )
} ) . ConfigureAwait ( false ) ;
}
private OnPlaybackStopped ( object sender , PlaybackStopEventArgs e )
private async void OnPlaybackStopped ( object sender , PlaybackStopEventArgs e )
{
var item = e . MediaInfo ;
@ -167,20 +149,19 @@ namespace Emby.Server.Implementations.Activity
var user = e . Users [ 0 ] ;
CreateLogEntry ( new ActivityLogEntry
{
Name = string . Format (
await CreateLogEntry ( new ActivityLog (
string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "UserStoppedPlayingItemWithValues" ) ,
user . N ame,
user . Usern ame,
GetItemName ( item ) ,
e . DeviceName ) ,
Type = GetPlaybackStoppedNotificationType( item . MediaType ) ,
UserId = user. Id
} ) ;
( item . MediaType ) ,
. Id ) )
. ConfigureAwait ( false ) ;
}
private OnPlaybackStart ( object sender , PlaybackProgressEventArgs e )
private async void OnPlaybackStart ( object sender , PlaybackProgressEventArgs e )
{
var item = e . MediaInfo ;
@ -203,17 +184,16 @@ namespace Emby.Server.Implementations.Activity
var user = e . Users . First ( ) ;
CreateLogEntry ( new ActivityLogEntry
{
Name = string . Format (
await CreateLogEntry ( new ActivityLog (
string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "UserStartedPlayingItemWithValues" ) ,
user . N ame,
user . Usern ame,
GetItemName ( item ) ,
e . DeviceName ) ,
Type = GetPlaybackNotificationType( item . MediaType ) ,
UserId = user. Id
} ) ;
( item . MediaType ) ,
. Id ) )
. ConfigureAwait ( false ) ;
}
private static string GetItemName ( BaseItemDto item )
@ -263,230 +243,197 @@ namespace Emby.Server.Implementations.Activity
return null ;
}
private OnSessionEnded ( object sender , SessionEventArgs e )
private async void OnSessionEnded ( object sender , SessionEventArgs e )
{
string name ;
var session = e . SessionInfo ;
if ( string . IsNullOrEmpty ( session . UserName ) )
{
name = string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "DeviceOfflineWithName" ) ,
session . DeviceName ) ;
// Causing too much spam for now
return ;
}
else
{
name = string . Format (
await CreateLogEntry ( new ActivityLog (
string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "UserOfflineFromDevice" ) ,
session . UserName ,
session . DeviceName ) ;
}
CreateLogEntry ( new ActivityLogEntry
session . DeviceName ) ,
"SessionEnded" ,
session . UserId )
{
Name = name ,
Type = "SessionEnded" ,
ShortOverview = string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "LabelIpAddressValue" ) ,
session . RemoteEndPoint ) ,
UserId = session . UserId
} ) ;
} ) . ConfigureAwait ( false ) ;
}
private OnAuthenticationSucceeded ( object sender , GenericEventArgs < AuthenticationResult > e )
private async void OnAuthenticationSucceeded ( object sender , GenericEventArgs < AuthenticationResult > e )
{
var user = e . Argument . User ;
CreateLogEntry ( new ActivityLogEntry
{
Name = string . Format (
await CreateLogEntry ( new ActivityLog (
string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "AuthenticationSucceededWithUserName" ) ,
user . Name ) ,
Type = "AuthenticationSucceeded" ,
"AuthenticationSucceeded" ,
user . Id )
{
ShortOverview = string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "LabelIpAddressValue" ) ,
e . Argument . SessionInfo . RemoteEndPoint ) ,
UserId = user . Id
} ) ;
} ) . ConfigureAwait ( false ) ;
}
private OnAuthenticationFailed ( object sender , GenericEventArgs < AuthenticationRequest > e )
private async void OnAuthenticationFailed ( object sender , GenericEventArgs < AuthenticationRequest > e )
{
CreateLogEntry ( new ActivityLogEntry
{
Name = string . Format (
await CreateLogEntry ( new ActivityLog (
string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "FailedLoginAttemptWithUserName" ) ,
e . Argument . Username ) ,
Type = "AuthenticationFailed" ,
"AuthenticationFailed" ,
Guid . Empty )
{
LogSeverity = LogLevel . Error ,
ShortOverview = string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "LabelIpAddressValue" ) ,
e . Argument . RemoteEndPoint ) ,
Severity = LogLevel . Error
} ) ;
} ) . ConfigureAwait ( false ) ;
}
private void OnUserPolicyUpda ted( object sender , GenericEventArgs < User > e )
private async void OnUserDele ted( object sender , GenericEventArgs < User > e )
{
CreateLogEntry ( new ActivityLogEntry
{
Name = string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "UserPolicyUpdatedWithName" ) ,
e . Argument . Name ) ,
Type = "UserPolicyUpdated" ,
UserId = e . Argument . Id
} ) ;
}
private void OnUserDeleted ( object sender , GenericEventArgs < User > e )
{
CreateLogEntry ( new ActivityLogEntry
{
Name = string . Format (
await CreateLogEntry ( new ActivityLog (
string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "UserDeletedWithName" ) ,
e . Argument . Name ) ,
Type = "UserDeleted"
} ) ;
e . Argument . Username ) ,
"UserDeleted" ,
Guid . Empty ) )
. ConfigureAwait ( false ) ;
}
private OnUserPasswordChanged ( object sender , GenericEventArgs < User > e )
private async void OnUserPasswordChanged ( object sender , GenericEventArgs < User > e )
{
CreateLogEntry ( new ActivityLogEntry
{
Name = string . Format (
await CreateLogEntry ( new ActivityLog (
string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "UserPasswordChangedWithName" ) ,
e . Argument . N ame) ,
Type = "UserPasswordChanged" ,
UserId = e. Argument . Id
} ) ;
e . Argument . Usern ame) ,
"UserPasswordChanged" ,
. Argument . Id ) )
. ConfigureAwait ( false ) ;
}
private OnUserCreated ( object sender , GenericEventArgs < User > e )
private async void OnUserCreated ( object sender , GenericEventArgs < User > e )
{
CreateLogEntry ( new ActivityLogEntry
{
Name = string . Format (
await CreateLogEntry ( new ActivityLog (
string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "UserCreatedWithName" ) ,
e . Argument . N ame) ,
Type = "UserCreated" ,
UserId = e. Argument . Id
} ) ;
e . Argument . Usern ame) ,
"UserCreated" ,
. Argument . Id ) )
. ConfigureAwait ( false ) ;
}
private OnSessionStarted ( object sender , SessionEventArgs e )
private async void OnSessionStarted ( object sender , SessionEventArgs e )
{
string name ;
var session = e . SessionInfo ;
if ( string . IsNullOrEmpty ( session . UserName ) )
{
name = string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "DeviceOnlineWithName" ) ,
session . DeviceName ) ;
// Causing too much spam for now
return ;
}
else
{
name = string . Format (
await CreateLogEntry ( new ActivityLog (
string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "UserOnlineFromDevice" ) ,
session . UserName ,
session . DeviceName ) ;
}
CreateLogEntry ( new ActivityLogEntry
session . DeviceName ) ,
"SessionStarted" ,
session . UserId )
{
Name = name ,
Type = "SessionStarted" ,
ShortOverview = string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "LabelIpAddressValue" ) ,
session . RemoteEndPoint ) ,
UserId = session . UserId
} ) ;
session . RemoteEndPoint )
} ) . ConfigureAwait ( false ) ;
}
private OnPluginUpdated ( object sender , GenericEventArgs< ( IPlugi n, Ver ) > e )
private async void OnPluginUpdated ( object sender , tallat ionInfo e )
{
CreateLogEntry ( new ActivityLogEntry
{
Name = string . Format (
await CreateLogEntry ( new ActivityLog (
string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "PluginUpdatedWithName" ) ,
e . Argument . Item1 . Name ) ,
Type = NotificationType . PluginUpdateInstalled . ToString ( ) ,
e . Name ) ,
NotificationType . PluginUpdateInstalled . ToString ( ) ,
Guid . Empty )
{
ShortOverview = string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "VersionNumber" ) ,
e . Argument. Item2 . v ersion) ,
Overview = e . Argument. Item2 . c hangelog
} )
e . V ersion) ,
Overview = e . C hangelog
} ) .ConfigureAwait ( false ) ;
}
private OnPluginUninstalled ( object sender , GenericEventArgs< IPlugin> e )
private async void OnPluginUninstalled ( object sender , e )
{
CreateLogEntry ( new ActivityLogEntry
{
Name = string . Format (
await CreateLogEntry ( new ActivityLog (
string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "PluginUninstalledWithName" ) ,
e . Argument . Name ) ,
Type = NotificationType . PluginUninstalled . ToString ( )
} ) ;
e . Name ) ,
NotificationType . PluginUninstalled . ToString ( ) ,
Guid . Empty ) )
. ConfigureAwait ( false ) ;
}
private OnPluginInstalled ( object sender , GenericEventArgs< VersionInfo > e )
private async void OnPluginInstalled ( object sender , InstallationInfo e )
{
CreateLogEntry ( new ActivityLogEntry
{
Name = string . Format (
await CreateLogEntry ( new ActivityLog (
string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "PluginInstalledWithName" ) ,
e . Argument . name ) ,
Type = NotificationType . PluginInstalled . ToString ( ) ,
e . Name ) ,
NotificationType . PluginInstalled . ToString ( ) ,
Guid . Empty )
{
ShortOverview = string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "VersionNumber" ) ,
e . Argument. v ersion)
} )
e . V ersion)
} ) .ConfigureAwait ( false ) ;
}
private OnPackageInstallationFailed ( object sender , InstallationFailedEventArgs e )
private async void OnPackageInstallationFailed ( object sender , InstallationFailedEventArgs e )
{
var installationInfo = e . InstallationInfo ;
CreateLogEntry ( new ActivityLogEntry
{
Name = string . Format (
await CreateLogEntry ( new ActivityLog (
string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "NameInstallFailed" ) ,
installationInfo . Name ) ,
Type = NotificationType . InstallationFailed . ToString ( ) ,
NotificationType . InstallationFailed . ToString ( ) ,
Guid . Empty )
{
ShortOverview = string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "VersionNumber" ) ,
installationInfo . Version ) ,
Overview = e . Exception . Message
} )
} ) .ConfigureAwait ( false ) ;
}
private OnTaskCompleted ( object sender , TaskCompletionEventArgs e )
private async void OnTaskCompleted ( object sender , TaskCompletionEventArgs e )
{
var result = e . Result ;
var task = e . Task ;
@ -517,22 +464,20 @@ namespace Emby.Server.Implementations.Activity
vals . Add ( e . Result . LongErrorMessage ) ;
}
CreateLogEntry ( new ActivityLogEntry
await CreateLogEntry ( new ActivityLog (
string . Format ( CultureInfo . InvariantCulture , _localization . GetLocalizedString ( "ScheduledTaskFailedWithName" ) , task . Name ) ,
NotificationType . TaskFailed . ToString ( ) ,
Guid . Empty )
{
Name = string . Format (
CultureInfo . InvariantCulture ,
_localization . GetLocalizedString ( "ScheduledTaskFailedWithName" ) ,
task . Name ) ,
Type = NotificationType . TaskFailed . ToString ( ) ,
LogSeverity = LogLevel . Error ,
Overview = string . Join ( Environment . NewLine , vals ) ,
ShortOverview = runningTime ,
Severity = LogLevel . Error
} ) ;
ShortOverview = runningTime
} ) . ConfigureAwait ( false ) ;
}
}
private void CreateLogEntry ( ActivityLog Entry entry )
= > _activityManager . Create ( entry ) ;
private async Task CreateLogEntry ( ActivityLog entry )
= > await _activityManager . Create Async ( entry ) . ConfigureAwait ( false ) ;
/// <inheritdoc />
public void Dispose ( )
@ -554,13 +499,10 @@ namespace Emby.Server.Implementations.Activity
_subManager . SubtitleDownloadFailure - = OnSubtitleDownloadFailure ;
_userManager . UserCreated - = OnUserCreated ;
_userManager . UserPasswordChanged - = OnUserPasswordChanged ;
_userManager . UserDeleted - = OnUserDeleted ;
_userManager . UserPolicyUpdated - = OnUserPolicyUpdated ;
_userManager . UserLockedOut - = OnUserLockedOut ;
_deviceManager . CameraImageUploaded - = OnCameraImageUploaded ;
_userManager . OnUserCreated - = OnUserCreated ;
_userManager . OnUserPasswordChanged - = OnUserPasswordChanged ;
_userManager . OnUserDeleted - = OnUserDeleted ;
_userManager . OnUserLockedOut - = OnUserLockedOut ;
}
/// <summary>
@ -580,7 +522,7 @@ namespace Emby.Server.Implementations.Activity
{
int years = days / DaysInYear ;
values . Add ( CreateValueString ( years , "year" ) ) ;
days = days % DaysInYear ;
days %= DaysInYear ;
}
// Number of months
crobibero
4 years ago