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

Merge pull request #2322 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-12-02 03:07:36 -05:00 committed by GitHub
commit 2050eb7bb2
5 changed files with 82 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Emby.Server.Implementations/Connect/ConnectManager.cs
View File

@ -817,7 +817,6 @@ namespace Emby.Server.Implementations.Connect
}
}
private readonly SemaphoreSlim _connectImageSemaphore = new SemaphoreSlim(5, 5);
private async Task RefreshAuthorizations(List<ServerUserAuthorizationResponse> list, bool refreshImages)
{
var users = _userManager.Users.ToList();
@ -992,7 +991,7 @@ namespace Emby.Server.Implementations.Connect
if (changed)
{
await _providerManager.SaveImage(user, imageUrl, _connectImageSemaphore, ImageType.Primary, null, CancellationToken.None).ConfigureAwait(false);
await _providerManager.SaveImage(user, imageUrl, null, ImageType.Primary, null, CancellationToken.None).ConfigureAwait(false);
await user.RefreshMetadata(new MetadataRefreshOptions(_fileSystem)
{

2
Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
View File

@ -1650,7 +1650,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
{
var image = program.GetImageInfo(ImageType.Primary, 0);
if (image != null)
if (image != null && program.IsMovie)
{
try
{

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

@ -39,7 +39,7 @@ namespace Emby.Server.Implementations.Security
}
}
private readonly ConcurrentDictionary<Guid, DateTime> _updateRecords = new ConcurrentDictionary<Guid, DateTime>();
private readonly ConcurrentDictionary<Guid, FeatureRegInfo> _updateRecords = new ConcurrentDictionary<Guid, FeatureRegInfo>();
private readonly object _fileLock = new object();
private string _regKey;
@ -52,7 +52,7 @@ namespace Emby.Server.Implementations.Security
Load();
}
private void SetUpdateRecord(Guid key, DateTime value)
private void SetUpdateRecord(Guid key, FeatureRegInfo value)
{
_updateRecords.AddOrUpdate(key, value, (k, v) => value);
}
@ -62,10 +62,14 @@ namespace Emby.Server.Implementations.Security
return new Guid(_cryptographyProvider.ComputeMD5(Encoding.Unicode.GetBytes(featureId)));
}
public void AddRegCheck(string featureId)
public void AddRegCheck(string featureId, DateTime expirationDate)
{
var key = GetKey(featureId);
var value = DateTime.UtcNow;
var value = new FeatureRegInfo
{
ExpirationDate = expirationDate,
LastChecked = DateTime.UtcNow
};
SetUpdateRecord(key, value);
Save();
@ -74,21 +78,26 @@ namespace Emby.Server.Implementations.Security
public void RemoveRegCheck(string featureId)
{
var key = GetKey(featureId);
DateTime val;
FeatureRegInfo val;
_updateRecords.TryRemove(key, out val);
Save();
}
public DateTime LastChecked(string featureId)
public FeatureRegInfo GetRegInfo(string featureId)
{
var key = GetKey(featureId);
DateTime last;
_updateRecords.TryGetValue(key, out last);
FeatureRegInfo info = null;
_updateRecords.TryGetValue(key, out info);
if (info == null)
{
return null;
}
// guard agains people just putting a large number in the file
return last < DateTime.UtcNow ? last : DateTime.MinValue;
return info.LastChecked < DateTime.UtcNow ? info : null;
}
private void Load()
@ -105,7 +114,7 @@ namespace Emby.Server.Implementations.Security
{
lock (_fileLock)
{
_fileSystem.WriteAllBytes(licenseFile, new byte[] {});
_fileSystem.WriteAllBytes(licenseFile, new byte[] { });
}
}
catch (IOException)
@ -139,7 +148,23 @@ namespace Emby.Server.Implementations.Security
Guid feat;
if (Guid.TryParse(line, out feat))
{
SetUpdateRecord(feat, new DateTime(Convert.ToInt64(contents[i + 1])));
var lineParts = contents[i + 1].Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
long ticks;
if (long.TryParse(lineParts[0], out ticks))
{
var info = new FeatureRegInfo
{
LastChecked = new DateTime(ticks)
};
if (lineParts.Length > 1 && long.TryParse(lineParts[1], out ticks))
{
info.ExpirationDate = new DateTime(ticks);
}
SetUpdateRecord(feat, info);
}
}
}
}
@ -160,7 +185,11 @@ namespace Emby.Server.Implementations.Security
.ToList())
{
lines.Add(pair.Key.ToString());
lines.Add(pair.Value.Ticks.ToString(CultureInfo.InvariantCulture));
var dateLine = pair.Value.LastChecked.Ticks.ToString(CultureInfo.InvariantCulture) + "|" +
pair.Value.ExpirationDate.Ticks.ToString(CultureInfo.InvariantCulture);
lines.Add(dateLine);
}
var licenseFile = Filename;
@ -171,4 +200,15 @@ namespace Emby.Server.Implementations.Security
}
}
}
internal class FeatureRegInfo
{
public DateTime ExpirationDate { get; set; }
public DateTime LastChecked { get; set; }
public FeatureRegInfo()
{
ExpirationDate = DateTime.MinValue;
}
}
}

19
Emby.Server.Implementations/Security/PluginSecurityManager.cs
View File

@ -245,18 +245,29 @@ namespace Emby.Server.Implementations.Security
string mb2Equivalent = null,
string version = null)
{
var lastChecked = LicenseFile.LastChecked(feature);
var regInfo = LicenseFile.GetRegInfo(feature);
var lastChecked = regInfo == null ? DateTime.MinValue : regInfo.LastChecked;
var expDate = regInfo == null ? DateTime.MinValue : regInfo.ExpirationDate;
var maxCacheDays = 14;
var nextCheckDate = new [] { expDate, lastChecked.AddDays(maxCacheDays) }.Min();
if (nextCheckDate > DateTime.UtcNow.AddDays(maxCacheDays))
{
nextCheckDate = DateTime.MinValue;
}
//check the reg file first to alleviate strain on the MB admin server - must actually check in every 30 days tho
var reg = new RegRecord
{
// Cache the result for up to a week
registered = lastChecked > DateTime.UtcNow.AddDays(-7)
registered = regInfo != null && nextCheckDate >= DateTime.UtcNow && expDate >= DateTime.UtcNow,
expDate = expDate
};
var success = reg.registered;
if (!(lastChecked > DateTime.UtcNow.AddDays(-1)))
if (!(lastChecked > DateTime.UtcNow.AddDays(-1)) || !reg.registered)
{
var data = new Dictionary<string, string>
{
@ -291,7 +302,7 @@ namespace Emby.Server.Implementations.Security
if (reg.registered)
{
LicenseFile.AddRegCheck(feature);
LicenseFile.AddRegCheck(feature, reg.expDate);
}
else
{

15
Emby.Server.Implementations/Session/SessionManager.cs
View File

@ -820,6 +820,17 @@ namespace Emby.Server.Implementations.Session
}
}
if (info.Item != null)
{
var msString = info.PositionTicks.HasValue ? (info.PositionTicks.Value / 10000).ToString(CultureInfo.InvariantCulture) : "unknown";
_logger.Info("Playback stopped reported by app {0} {1} playing {2}. Stopped at {3} ms",
session.Client,
session.ApplicationVersion,
info.Item.Name,
msString);
}
RemoveNowPlayingItem(session);
var users = GetUsers(session);
@ -874,7 +885,7 @@ namespace Emby.Server.Implementations.Session
{
playedToCompletion = _userDataManager.UpdatePlayState(item, data, positionTicks.Value);
}
else
else
{
// If the client isn't able to report this, then we'll just have to make an assumption
data.PlayCount++;
@ -973,7 +984,7 @@ namespace Emby.Server.Implementations.Session
var subItems = await TranslateItemForPlayback(itemId, user).ConfigureAwait(false);
list.AddRange(subItems);
}
items = list
.Where(i => i.LocationType != LocationType.Virtual)
.ToList();