Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-21 05:00:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6664 from cvium/subtitle_refresh

Browse source
This commit is contained in:
Bond-009 2021-10-06 10:48:32 +02:00 committed by GitHub
parent a1246ba3a0 7abdf71c49
commit c5285cee1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Jellyfin.Api/Controllers/SubtitleController.cs
View file

@ -417,6 +417,8 @@ namespace Jellyfin.Api.Controllers
IsForced = body.IsForced, IsForced = body.IsForced,
Stream = memoryStream Stream = memoryStream
}).ConfigureAwait(false); }).ConfigureAwait(false);
_providerManager.QueueRefresh(video.Id, new MetadataRefreshOptions(new DirectoryService(_fileSystem)), RefreshPriority.High);
return NoContent(); return NoContent();
} }

14
MediaBrowser.Providers/Subtitles/SubtitleManager.cs
View file

@ -187,8 +187,8 @@ namespace MediaBrowser.Providers.Subtitles
{ {
var saveInMediaFolder = libraryOptions.SaveSubtitlesWithMedia; var saveInMediaFolder = libraryOptions.SaveSubtitlesWithMedia;
using var stream = response.Stream; await using var stream = response.Stream;
using var memoryStream = new MemoryStream(); await using var memoryStream = new MemoryStream();
await stream.CopyToAsync(memoryStream).ConfigureAwait(false); await stream.CopyToAsync(memoryStream).ConfigureAwait(false);
memoryStream.Position = 0; memoryStream.Position = 0;
@ -236,7 +236,7 @@ namespace MediaBrowser.Providers.Subtitles
foreach (var savePath in savePaths) foreach (var savePath in savePaths)
{ {
_logger.LogInformation("Saving subtitles to {0}", savePath); _logger.LogInformation("Saving subtitles to {SavePath}", savePath);
_monitor.ReportFileSystemChangeBeginning(savePath); _monitor.ReportFileSystemChangeBeginning(savePath);
@ -254,13 +254,9 @@ namespace MediaBrowser.Providers.Subtitles
{ {
// Bug in analyzer -- https://github.com/dotnet/roslyn-analyzers/issues/5160 // Bug in analyzer -- https://github.com/dotnet/roslyn-analyzers/issues/5160
#pragma warning disable CA1508 #pragma warning disable CA1508
exs ??= new List<Exception>() (exs ??= new List<Exception>()).Add(ex);
{
ex
};
#pragma warning restore CA1508 #pragma warning restore CA1508
}
}
finally finally
{ {
_monitor.ReportFileSystemChangeComplete(savePath, false); _monitor.ReportFileSystemChangeComplete(savePath, false);