alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-24 02:56:31 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

update character escaping

Browse Source
This commit is contained in:
Luke Pulverenti
2016-11-13 22:44:54 -05:00
parent 0e9cd51f9c
commit 635c8d50a3
5 changed files with 52 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1108,7 +1108,11 @@ namespace Emby.Server.Implementations.Channels
{
if (_fileSystem.GetLastWriteTimeUtc(cachePath).Add(cacheLength) > DateTime.UtcNow)
{
return _jsonSerializer.DeserializeFromFile<ChannelItemResult>(cachePath);
var cachedResult = _jsonSerializer.DeserializeFromFile<ChannelItemResult>(cachePath);
if (cachedResult != null)
{
return cachedResult;
}
}
}
}
@@ -1131,7 +1135,11 @@ namespace Emby.Server.Implementations.Channels
{
if (_fileSystem.GetLastWriteTimeUtc(cachePath).Add(cacheLength) > DateTime.UtcNow)
{
return _jsonSerializer.DeserializeFromFile<ChannelItemResult>(cachePath);
var cachedResult = _jsonSerializer.DeserializeFromFile<ChannelItemResult>(cachePath);
if (cachedResult != null)
{
return cachedResult;
}
}
}
}
@@ -1162,6 +1170,11 @@ namespace Emby.Server.Implementations.Channels
var result = await channel.GetChannelItems(query, cancellationToken).ConfigureAwait(false);
if (result == null)
{
throw new InvalidOperationException("Channel returned a null result from GetChannelItems");
}
if (!startIndex.HasValue && !limit.HasValue)
{
CacheResponse(result, cachePath);

12
Emby.Server.Implementations/Security/MBLicenseFile.cs
View File

@@ -57,9 +57,14 @@ namespace Emby.Server.Implementations.Security
_updateRecords.AddOrUpdate(key, value, (k, v) => value);
}
private Guid GetKey(string featureId)
{
return new Guid(_cryptographyProvider.ComputeMD5(Encoding.Unicode.GetBytes(featureId)));
}
public void AddRegCheck(string featureId)
{
var key = new Guid(_cryptographyProvider.ComputeMD5(Encoding.Unicode.GetBytes(featureId)));
var key = GetKey(featureId);
var value = DateTime.UtcNow;
SetUpdateRecord(key, value);
@@ -68,7 +73,7 @@ namespace Emby.Server.Implementations.Security
public void RemoveRegCheck(string featureId)
{
var key = new Guid(_cryptographyProvider.ComputeMD5(Encoding.Unicode.GetBytes(featureId)));
var key = GetKey(featureId);
DateTime val;
_updateRecords.TryRemove(key, out val);
@@ -78,8 +83,9 @@ namespace Emby.Server.Implementations.Security
public DateTime LastChecked(string featureId)
{
var key = GetKey(featureId);
DateTime last;
_updateRecords.TryGetValue(new Guid(_cryptographyProvider.ComputeMD5(Encoding.Unicode.GetBytes(featureId))), out last);
_updateRecords.TryGetValue(key, out last);
// guard agains people just putting a large number in the file
return last < DateTime.UtcNow ? last : DateTime.MinValue;