add error handling to package retrieval

pull/702/head
Luke Pulverenti 9 years ago
parent d661472844
commit dbc9beab22

@ -194,37 +194,36 @@ namespace MediaBrowser.Common.Implementations.Updates
/// <returns>Task{List{PackageInfo}}.</returns> /// <returns>Task{List{PackageInfo}}.</returns>
public async Task<IEnumerable<PackageInfo>> GetAvailablePackagesWithoutRegistrationInfo(CancellationToken cancellationToken) public async Task<IEnumerable<PackageInfo>> GetAvailablePackagesWithoutRegistrationInfo(CancellationToken cancellationToken)
{ {
using (var stream = await GetCachedPackages(cancellationToken).ConfigureAwait(false)) try
{ {
var packages = _jsonSerializer.DeserializeFromStream<List<PackageInfo>>(stream).ToList(); using (var stream = _fileSystem.OpenRead(PackageCachePath))
if ((DateTime.UtcNow - _lastPackageUpdateTime) > GetCacheLength())
{ {
UpdateCachedPackages(CancellationToken.None, false); var packages = _jsonSerializer.DeserializeFromStream<List<PackageInfo>>(stream).ToList();
}
return packages;
}
}
private string PackageCachePath if ((DateTime.UtcNow - _lastPackageUpdateTime) > GetCacheLength())
{ {
get { return Path.Combine(_appPaths.CachePath, "serverpackages.json"); } UpdateCachedPackages(CancellationToken.None, false);
} }
private async Task<Stream> GetCachedPackages(CancellationToken cancellationToken) return packages;
{ }
try
{
return _fileSystem.OpenRead(PackageCachePath);
} }
catch (Exception) catch (Exception)
{ {
} }
_lastPackageUpdateTime = DateTime.MinValue;
await UpdateCachedPackages(cancellationToken, true).ConfigureAwait(false); await UpdateCachedPackages(cancellationToken, true).ConfigureAwait(false);
return _fileSystem.OpenRead(PackageCachePath); using (var stream = _fileSystem.OpenRead(PackageCachePath))
{
return _jsonSerializer.DeserializeFromStream<List<PackageInfo>>(stream).ToList();
}
}
private string PackageCachePath
{
get { return Path.Combine(_appPaths.CachePath, "serverpackages.json"); }
} }
private readonly SemaphoreSlim _updateSemaphore = new SemaphoreSlim(1, 1); private readonly SemaphoreSlim _updateSemaphore = new SemaphoreSlim(1, 1);

Loading…
Cancel
Save