mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-07 03:48:06 +02:00
add error handling to package retrieval
This commit is contained in:
parent
d661472844
commit
dbc9beab22
1 changed files with 21 additions and 22 deletions
|
@ -193,38 +193,37 @@ namespace MediaBrowser.Common.Implementations.Updates
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
/// <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))
|
|
||||||
{
|
|
||||||
var packages = _jsonSerializer.DeserializeFromStream<List<PackageInfo>>(stream).ToList();
|
|
||||||
|
|
||||||
if ((DateTime.UtcNow - _lastPackageUpdateTime) > GetCacheLength())
|
|
||||||
{
|
|
||||||
UpdateCachedPackages(CancellationToken.None, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
return packages;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private string PackageCachePath
|
|
||||||
{
|
|
||||||
get { return Path.Combine(_appPaths.CachePath, "serverpackages.json"); }
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task<Stream> GetCachedPackages(CancellationToken cancellationToken)
|
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
return _fileSystem.OpenRead(PackageCachePath);
|
using (var stream = _fileSystem.OpenRead(PackageCachePath))
|
||||||
|
{
|
||||||
|
var packages = _jsonSerializer.DeserializeFromStream<List<PackageInfo>>(stream).ToList();
|
||||||
|
|
||||||
|
if ((DateTime.UtcNow - _lastPackageUpdateTime) > GetCacheLength())
|
||||||
|
{
|
||||||
|
UpdateCachedPackages(CancellationToken.None, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
return packages;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
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…
Reference in a new issue