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

Fix styling

Browse Source
This commit is contained in:
crobibero 2020-09-01 07:58:05 -06:00
parent 39041019e7
commit b111b9e2c9
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
View File

@ -788,7 +788,13 @@ namespace Emby.Server.Implementations.LiveTv.Listings
station = new ScheduleDirect.Station { stationID = map.stationID }; station = new ScheduleDirect.Station { stationID = map.stationID };
} }
var channelInfo = new ChannelInfo {Id = station.stationID, CallSign = station.callsign, Number = channelNumber, Name = string.IsNullOrWhiteSpace(station.name) ? channelNumber : station.name}; var channelInfo = new ChannelInfo
{
Id = station.stationID,
CallSign = station.callsign,
Number = channelNumber,
Name = string.IsNullOrWhiteSpace(station.name) ? channelNumber : station.name
};
if (station.logo != null) if (station.logo != null)
{ {

8
Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
View File

@ -128,10 +128,9 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
try try
{ {
Logger.LogInformation("Beginning {0} stream to {1}", GetType().Name, TempFilePath); Logger.LogInformation("Beginning {0} stream to {1}", GetType().Name, TempFilePath);
using (response) using var message = response;
await using (var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false)) await using var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
await using (var fileStream = new FileStream(TempFilePath, FileMode.Create, FileAccess.Write, FileShare.Read)) await using var fileStream = new FileStream(TempFilePath, FileMode.Create, FileAccess.Write, FileShare.Read);
{
await StreamHelper.CopyToAsync( await StreamHelper.CopyToAsync(
stream, stream,
fileStream, fileStream,
@ -139,7 +138,6 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
() => Resolve(openTaskCompletionSource), () => Resolve(openTaskCompletionSource),
cancellationToken).ConfigureAwait(false); cancellationToken).ConfigureAwait(false);
} }
}
catch (OperationCanceledException ex) catch (OperationCanceledException ex)
{ {
Logger.LogInformation("Copying of {0} to {1} was canceled", GetType().Name, TempFilePath); Logger.LogInformation("Copying of {0} to {1} was canceled", GetType().Name, TempFilePath);