pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix More Live TV Warnings (#10818) 

* Fix CA1819 in LiveTvManager

* Call ConfigureAwait in ChannelManager
This commit is contained in:
Patrick Barron 2024-01-06 15:33:58 -05:00 committed by GitHub
parent 55916a09eb
commit 82f93afa22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -812,11 +812,16 @@ namespace Emby.Server.Implementations.Channels
{ {
if (_fileSystem.GetLastWriteTimeUtc(cachePath).Add(cacheLength) > DateTime.UtcNow) if (_fileSystem.GetLastWriteTimeUtc(cachePath).Add(cacheLength) > DateTime.UtcNow)
{ {
await using FileStream jsonStream = AsyncFile.OpenRead(cachePath); var jsonStream = AsyncFile.OpenRead(cachePath);
var cachedResult = await JsonSerializer.DeserializeAsync<ChannelItemResult>(jsonStream, _jsonOptions, cancellationToken).ConfigureAwait(false); await using (jsonStream.ConfigureAwait(false))
if (cachedResult is not null)
{ {
return null; var cachedResult = await JsonSerializer
.DeserializeAsync<ChannelItemResult>(jsonStream, _jsonOptions, cancellationToken)
.ConfigureAwait(false);
if (cachedResult is not null)
{
return null;
}
} }
} }
} }
@ -835,11 +840,16 @@ namespace Emby.Server.Implementations.Channels
{ {
if (_fileSystem.GetLastWriteTimeUtc(cachePath).Add(cacheLength) > DateTime.UtcNow) if (_fileSystem.GetLastWriteTimeUtc(cachePath).Add(cacheLength) > DateTime.UtcNow)
{ {
await using FileStream jsonStream = AsyncFile.OpenRead(cachePath); var jsonStream = AsyncFile.OpenRead(cachePath);
var cachedResult = await JsonSerializer.DeserializeAsync<ChannelItemResult>(jsonStream, _jsonOptions, cancellationToken).ConfigureAwait(false); await using (jsonStream.ConfigureAwait(false))
if (cachedResult is not null)
{ {
return null; var cachedResult = await JsonSerializer
.DeserializeAsync<ChannelItemResult>(jsonStream, _jsonOptions, cancellationToken)
.ConfigureAwait(false);
if (cachedResult is not null)
{
return null;
}
} }
} }
} }
@ -867,7 +877,7 @@ namespace Emby.Server.Implementations.Channels
throw new InvalidOperationException("Channel returned a null result from GetChannelItems"); throw new InvalidOperationException("Channel returned a null result from GetChannelItems");
} }
await CacheResponse(result, cachePath); await CacheResponse(result, cachePath).ConfigureAwait(false);
return result; return result;
} }
@ -883,8 +893,11 @@ namespace Emby.Server.Implementations.Channels
{ {
Directory.CreateDirectory(Path.GetDirectoryName(path)); Directory.CreateDirectory(Path.GetDirectoryName(path));
await using FileStream createStream = File.Create(path); var createStream = File.Create(path);
await JsonSerializer.SerializeAsync(createStream, result, _jsonOptions).ConfigureAwait(false); await using (createStream.ConfigureAwait(false))
{
await JsonSerializer.SerializeAsync(createStream, result, _jsonOptions).ConfigureAwait(false);
}
} }
catch (Exception ex) catch (Exception ex)
{ {

4
Emby.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@ -105,9 +105,9 @@ namespace Emby.Server.Implementations.LiveTv
/// <value>The services.</value> /// <value>The services.</value>
public IReadOnlyList<ILiveTvService> Services => _services; public IReadOnlyList<ILiveTvService> Services => _services;
public ITunerHost[] TunerHosts => _tunerHosts; public IReadOnlyList<ITunerHost> TunerHosts => _tunerHosts;
public IListingsProvider[] ListingProviders => _listingProviders; public IReadOnlyList<IListingsProvider> ListingProviders => _listingProviders;
private LiveTvOptions GetConfiguration() private LiveTvOptions GetConfiguration()
{ {

2
MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
View File

@ -36,7 +36,7 @@ namespace MediaBrowser.Controller.LiveTv
/// <value>The services.</value> /// <value>The services.</value>
IReadOnlyList<ILiveTvService> Services { get; } IReadOnlyList<ILiveTvService> Services { get; }
IListingsProvider[] ListingProviders { get; } IReadOnlyList<IListingsProvider> ListingProviders { get; }
/// <summary> /// <summary>
/// Gets the new timer defaults asynchronous. /// Gets the new timer defaults asynchronous.