michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert changes

Browse Source
This commit is contained in:
crobibero 2020-09-09 12:26:18 -06:00
parent 612e135c8c
commit 25ac778a79
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Jellyfin.Api/Controllers/SystemController.cs
View File

@ -198,7 +198,10 @@ namespace Jellyfin.Api.Controllers
var file = _fileSystem.GetFiles(_appPaths.LogDirectoryPath)
.First(i => string.Equals(i.Name, name, StringComparison.OrdinalIgnoreCase));
return File(file.FullName, MediaTypeNames.Text.Plain);
// For older files, assume fully static
var fileShare = file.LastWriteTimeUtc < DateTime.UtcNow.AddHours(-1) ? FileShare.Read : FileShare.ReadWrite;
FileStream stream = new FileStream(file.FullName, FileMode.Open, FileAccess.Read, fileShare);
return File(stream, "text/plain");
}
/// <summary>

1
Jellyfin.Api/Controllers/VideoAttachmentsController.cs
View File

@ -1,6 +1,5 @@
using System;
using System.ComponentModel.DataAnnotations;
using System.IO;
using System.Net.Mime;
using System.Threading;
using System.Threading.Tasks;