pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass cancellation token

This commit is contained in:
Stepan Goremykin 2023-10-07 23:50:45 +02:00
parent 8925390ad4
commit 73309f2649
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/Channels/ChannelManager.cs
View File

@ -1156,7 +1156,7 @@ namespace Emby.Server.Implementations.Channels
if (info.People is not null && info.People.Count > 0) if (info.People is not null && info.People.Count > 0)
{ {
_libraryManager.UpdatePeople(item, info.People); await _libraryManager.UpdatePeopleAsync(item, info.People, cancellationToken).ConfigureAwait(false);
} }
} }
else if (forceUpdate) else if (forceUpdate)

5
Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
View File

@ -115,7 +115,8 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
{ {
try try
{ {
previouslyFailedImages = File.ReadAllText(failHistoryPath) var failHistoryText = await File.ReadAllTextAsync(failHistoryPath, cancellationToken).ConfigureAwait(false);
previouslyFailedImages = failHistoryText
.Split('|', StringSplitOptions.RemoveEmptyEntries) .Split('|', StringSplitOptions.RemoveEmptyEntries)
.ToList(); .ToList();
} }
@ -156,7 +157,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
} }
string text = string.Join('|', previouslyFailedImages); string text = string.Join('|', previouslyFailedImages);
File.WriteAllText(failHistoryPath, text); await File.WriteAllTextAsync(failHistoryPath, text, cancellationToken).ConfigureAwait(false);
} }
numComplete++; numComplete++;

7
Emby.Server.Implementations/Updates/InstallationManager.cs
View File

@ -524,14 +524,15 @@ namespace Emby.Server.Implementations.Updates
using var md5 = MD5.Create(); using var md5 = MD5.Create();
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
var hash = Convert.ToHexString(md5.ComputeHash(stream)); var hash = await md5.ComputeHashAsync(stream, cancellationToken).ConfigureAwait(false);
if (!string.Equals(package.Checksum, hash, StringComparison.OrdinalIgnoreCase)) var hashHex = Convert.ToHexString(hash);
if (!string.Equals(package.Checksum, hashHex, StringComparison.OrdinalIgnoreCase))
{ {
_logger.LogError( _logger.LogError(
"The checksums didn't match while installing {Package}, expected: {Expected}, got: {Received}", "The checksums didn't match while installing {Package}, expected: {Expected}, got: {Received}",
package.Name, package.Name,
package.Checksum, package.Checksum,
hash); hashHex);
throw new InvalidDataException("The checksum of the received data doesn't match."); throw new InvalidDataException("The checksum of the received data doesn't match.");
} }