@ -114,7 +114,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
var requestString = _jsonSerializer . SerializeToString ( requestList ) ;
_logger . Debug ( "Request string for schedules is: " + requestString ) ;
httpOptions . RequestContent = requestString ;
using ( var response = await _httpClient. Post( httpOptions ) )
using ( var response = await Post( httpOptions ) . ConfigureAwait ( false ) )
{
StreamReader reader = new StreamReader ( response . Content ) ;
string responseString = reader . ReadToEnd ( ) ;
@ -136,7 +136,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
var requestBody = "[\"" + string . Join ( "\", \"" , programsID ) + "\"]" ;
httpOptions . RequestContent = requestBody ;
using ( var innerResponse = await _httpClient. Post( httpOptions ) )
using ( var innerResponse = await Post( httpOptions ) . ConfigureAwait ( false ) )
{
StreamReader innerReader = new StreamReader ( innerResponse . Content ) ;
responseString = innerReader . ReadToEnd ( ) ;
@ -225,7 +225,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
httpOptions . RequestHeaders [ "token" ] = token ;
using ( var response = await _httpClient. Get( httpOptions ) )
using ( var response = await Get( httpOptions ) . ConfigureAwait ( false ) )
{
var root = _jsonSerializer . DeserializeFromStream < ScheduleDirect . Channel > ( response ) ;
_logger . Info ( "Found " + root . map . Count ( ) + " channels on the lineup on ScheduleDirect" ) ;
@ -466,7 +466,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
LogErrorResponseBody = true
} ;
List < ScheduleDirect . ShowImages > images ;
using ( var innerResponse2 = await _httpClient. Post( httpOptions ) )
using ( var innerResponse2 = await Post( httpOptions ) . ConfigureAwait ( false ) )
{
images = _jsonSerializer . DeserializeFromStream < List < ScheduleDirect . ShowImages > > (
innerResponse2 . Content ) ;
@ -498,7 +498,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
try
{
using ( Stream responce = await _httpClient. Get( options ) . ConfigureAwait ( false ) )
using ( Stream responce = await Get( options ) . ConfigureAwait ( false ) )
{
var root = _jsonSerializer . DeserializeFromStream < List < ScheduleDirect . Headends > > ( responce ) ;
@ -567,7 +567,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
if ( long . TryParse ( savedToken . Value , NumberStyles . Any , CultureInfo . InvariantCulture , out ticks ) )
{
// If it's under 24 hours old we can still use it
if ( ( DateTime . UtcNow . Ticks - ticks ) < TimeSpan . FromHours ( 2 4 ) . Ticks )
if ( ( DateTime . UtcNow . Ticks - ticks ) < TimeSpan . FromHours ( 2 0 ) . Ticks )
{
return savedToken . Name ;
}
@ -600,6 +600,32 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
}
}
private async Task < HttpResponseInfo > Post ( HttpRequestOptions options )
{
try
{
return await _httpClient . Post ( options ) . ConfigureAwait ( false ) ;
}
catch
{
_tokens . Clear ( ) ;
throw ;
}
}
private async Task < Stream > Get ( HttpRequestOptions options )
{
try
{
return await _httpClient . Get ( options ) . ConfigureAwait ( false ) ;
}
catch
{
_tokens . Clear ( ) ;
throw ;
}
}
private async Task < string > GetTokenInternal ( string username , string password ,
CancellationToken cancellationToken )
{
@ -614,7 +640,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
//_logger.Info("Obtaining token from Schedules Direct from addres: " + httpOptions.Url + " with body " +
// httpOptions.RequestContent);
using ( var responce = await _httpClient. Post( httpOptions ) )
using ( var responce = await Post( httpOptions ) . ConfigureAwait ( false ) )
{
var root = _jsonSerializer . DeserializeFromStream < ScheduleDirect . Token > ( responce . Content ) ;
if ( root . message = = "OK" )
@ -696,7 +722,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
try
{
using ( var response = await _httpClient. Get( options ) . ConfigureAwait ( false ) )
using ( var response = await Get( options ) . ConfigureAwait ( false ) )
{
var root = _jsonSerializer . DeserializeFromStream < ScheduleDirect . Lineups > ( response ) ;