unkin/jellyfin-ha-src
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into ef-cleanup

Browse Source 
# Conflicts:
#	Jellyfin.Data/Entities/Libraries/MediaFileStream.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
This commit is contained in:
Patrick Barron
2021-03-14 10:19:35 -04:00
parent 7c413a323b 109f24514f
commit e5380c653b
211 changed files with 2503 additions and 1144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jellyfin.Server.Implementations/Events/Consumers/Security/AuthenticationSucceededLogger.cs
+4 -4
View File
@@ -29,20 +29,20 @@ namespace Jellyfin.Server.Implementations.Events.Consumers.Security
}
/// <inheritdoc />
public async Task OnEvent(GenericEventArgs<AuthenticationResult> e)
public async Task OnEvent(GenericEventArgs<AuthenticationResult> eventArgs)
{
await _activityManager.CreateAsync(new ActivityLog(
string.Format(
CultureInfo.InvariantCulture,
_localizationManager.GetLocalizedString("AuthenticationSucceededWithUserName"),
e.Argument.User.Name),
eventArgs.Argument.User.Name),
"AuthenticationSucceeded",
e.Argument.User.Id)
eventArgs.Argument.User.Id)
{
ShortOverview = string.Format(
CultureInfo.InvariantCulture,
_localizationManager.GetLocalizedString("LabelIpAddressValue"),
e.Argument.SessionInfo.RemoteEndPoint),
eventArgs.Argument.SessionInfo.RemoteEndPoint),
}).ConfigureAwait(false);
}
}
Jellyfin.Server.Implementations/Events/Consumers/System/TaskCompletedLogger.cs
+7 -7
View File
@@ -33,10 +33,10 @@ namespace Jellyfin.Server.Implementations.Events.Consumers.System
}
/// <inheritdoc />
public async Task OnEvent(TaskCompletionEventArgs e)
public async Task OnEvent(TaskCompletionEventArgs eventArgs)
{
var result = e.Result;
var task = e.Task;
var result = eventArgs.Result;
var task = eventArgs.Task;
if (task.ScheduledTask is IConfigurableScheduledTask activityTask
&& !activityTask.IsLogged)
@@ -54,14 +54,14 @@ namespace Jellyfin.Server.Implementations.Events.Consumers.System
{
var vals = new List<string>();
if (!string.IsNullOrEmpty(e.Result.ErrorMessage))
if (!string.IsNullOrEmpty(eventArgs.Result.ErrorMessage))
{
vals.Add(e.Result.ErrorMessage);
vals.Add(eventArgs.Result.ErrorMessage);
}
if (!string.IsNullOrEmpty(e.Result.LongErrorMessage))
if (!string.IsNullOrEmpty(eventArgs.Result.LongErrorMessage))
{
vals.Add(e.Result.LongErrorMessage);
vals.Add(eventArgs.Result.LongErrorMessage);
}
await _activityManager.CreateAsync(new ActivityLog(
Jellyfin.Server.Implementations/Events/Consumers/Updates/PluginUninstalledLogger.cs
+2 -2
View File
@@ -30,13 +30,13 @@ namespace Jellyfin.Server.Implementations.Events.Consumers.Updates
}
/// <inheritdoc />
public async Task OnEvent(PluginUninstalledEventArgs e)
public async Task OnEvent(PluginUninstalledEventArgs eventArgs)
{
await _activityManager.CreateAsync(new ActivityLog(
string.Format(
CultureInfo.InvariantCulture,
_localizationManager.GetLocalizedString("PluginUninstalledWithName"),
e.Argument.Name),
eventArgs.Argument.Name),
NotificationType.PluginUninstalled.ToString(),
Guid.Empty))
.ConfigureAwait(false);
Jellyfin.Server.Implementations/Events/Consumers/Users/UserUpdatedNotifier.cs
+3 -3
View File
@@ -30,12 +30,12 @@ namespace Jellyfin.Server.Implementations.Events.Consumers.Users
}
/// <inheritdoc />
public async Task OnEvent(UserUpdatedEventArgs e)
public async Task OnEvent(UserUpdatedEventArgs eventArgs)
{
await _sessionManager.SendMessageToUserSessions(
new List<Guid> { e.Argument.Id },
new List<Guid> { eventArgs.Argument.Id },
SessionMessageType.UserUpdated,
_userManager.GetUserDto(e.Argument),
_userManager.GetUserDto(eventArgs.Argument),
CancellationToken.None).ConfigureAwait(false);
}
}