Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-07 18:24:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7567 from cvium/fix_xmltv_caching

Browse Source 
(cherry picked from commit 385a0b94373606983051ff7662dfbe1e5514d4bc)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
This commit is contained in:
Cody Robibero 2022-04-12 13:40:05 -06:00 committed by Joshua Boniface
parent 7424f0ca8c
commit 435fc7ade9
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
View File

@ -8,6 +8,7 @@ using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net.Http; using System.Net.Http;
using System.Security.Cryptography;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Jellyfin.Extensions; using Jellyfin.Extensions;
@ -124,7 +125,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
{ {
using (var stream = File.OpenRead(file)) using (var stream = File.OpenRead(file))
{ {
string tempFolder = Path.Combine(_config.ApplicationPaths.TempDirectory, Guid.NewGuid().ToString()); string tempFolder = GetTempFolderPath(stream);
Directory.CreateDirectory(tempFolder); Directory.CreateDirectory(tempFolder);
_zipClient.ExtractFirstFileFromGz(stream, tempFolder, "data.xml"); _zipClient.ExtractFirstFileFromGz(stream, tempFolder, "data.xml");
@ -137,7 +138,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
{ {
using (var stream = File.OpenRead(file)) using (var stream = File.OpenRead(file))
{ {
string tempFolder = Path.Combine(_config.ApplicationPaths.TempDirectory, Guid.NewGuid().ToString()); string tempFolder = GetTempFolderPath(stream);
Directory.CreateDirectory(tempFolder); Directory.CreateDirectory(tempFolder);
_zipClient.ExtractAllFromGz(stream, tempFolder, true); _zipClient.ExtractAllFromGz(stream, tempFolder, true);
@ -146,6 +147,16 @@ namespace Emby.Server.Implementations.LiveTv.Listings
} }
} }
private string GetTempFolderPath(Stream stream)
{
#pragma warning disable CA5351
using var md5 = MD5.Create();
#pragma warning restore CA5351
var checksum = Convert.ToHexString(md5.ComputeHash(stream));
stream.Position = 0;
return Path.Combine(_config.ApplicationPaths.TempDirectory, checksum);
}
private string FindXmlFile(string directory) private string FindXmlFile(string directory)
{ {
return _fileSystem.GetFiles(directory, true) return _fileSystem.GetFiles(directory, true)