@ -1,11 +1,9 @@
using System.Collections.Generic ; using System.Collections.Generic ;
using NLog ; using NLog ;
using NzbDrone.Common.Extensions ; using NzbDrone.Common.Extensions ;
using NzbDrone.Common.Http ;
using NzbDrone.Common.Serializer ; using NzbDrone.Common.Serializer ;
using NzbDrone.Core.Notifications.Xbmc.Model ; using NzbDrone.Core.Notifications.Xbmc.Model ;
using NzbDrone.Core.Rest ;
using RestSharp ;
using RestSharp.Authenticators ;
namespace NzbDrone.Core.Notifications.Xbmc namespace NzbDrone.Core.Notifications.Xbmc
{ {
@ -21,108 +19,74 @@ namespace NzbDrone.Core.Notifications.Xbmc
public class XbmcJsonApiProxy : IXbmcJsonApiProxy
public class XbmcJsonApiProxy : IXbmcJsonApiProxy
{
{
private readonly I RestClientFactory _restClientFactory ;
private readonly I HttpClient _httpClient ;
private readonly Logger _logger ;
private readonly Logger _logger ;
public XbmcJsonApiProxy ( I RestClientFactory restClientFactory , Logger logger )
public XbmcJsonApiProxy ( I HttpClient httpClient , Logger logger )
{
{
_ restClientFactory = restClientFactory ;
_ httpClient = httpClient ;
_logger = logger ;
_logger = logger ;
}
}
public string GetJsonVersion ( XbmcSettings settings )
public string GetJsonVersion ( XbmcSettings settings )
{
{
var request = new RestRequest ( ) ;
return ProcessRequest ( settings , "JSONRPC.Version" ) ;
return ProcessRequest ( request , settings , "JSONRPC.Version" ) ;
}
}
public void Notify ( XbmcSettings settings , string title , string message )
public void Notify ( XbmcSettings settings , string title , string message )
{
{
var request = new RestRequest ( ) ;
ProcessRequest ( settings , "GUI.ShowNotification" , title , message , "https://raw.github.com/Sonarr/Sonarr/phantom-develop/Logo/64.png" , settings . DisplayTime * 1000 ) ;
var parameters = new Dictionary < string , object > ( ) ;
parameters . Add ( "title" , title ) ;
parameters . Add ( "message" , message ) ;
parameters . Add ( "image" , "https://raw.github.com/Sonarr/Sonarr/develop/Logo/64.png" ) ;
parameters . Add ( "displaytime" , settings . DisplayTime * 1000 ) ;
ProcessRequest ( request , settings , "GUI.ShowNotification" , parameters ) ;
}
}
public string UpdateLibrary ( XbmcSettings settings , string path )
public string UpdateLibrary ( XbmcSettings settings , string path )
{
{
var request = new RestRequest ( ) ;
var response = ProcessRequest ( settings , "VideoLibrary.Scan" , path ) ;
var parameters = new Dictionary < string , object > ( ) ;
parameters . Add ( "directory" , path ) ;
if ( path . IsNullOrWhiteSpace ( ) )
{
parameters = null ;
}
var response = ProcessRequest ( request , settings , "VideoLibrary.Scan" , parameters ) ;
return Json . Deserialize < XbmcJsonResult < string > > ( response ) . Result ;
return Json . Deserialize < XbmcJsonResult < string > > ( response ) . Result ;
}
}
public void CleanLibrary ( XbmcSettings settings )
public void CleanLibrary ( XbmcSettings settings )
{
{
var request = new RestRequest ( ) ;
ProcessRequest ( settings , "VideoLibrary.Clean" ) ;
ProcessRequest ( request , settings , "VideoLibrary.Clean" ) ;
}
}
public List < ActivePlayer > GetActivePlayers ( XbmcSettings settings )
public List < ActivePlayer > GetActivePlayers ( XbmcSettings settings )
{
{
var request = new RestRequest ( ) ;
var response = ProcessRequest ( settings , "Player.GetActivePlayers" ) ;
var response = ProcessRequest ( request , settings , "Player.GetActivePlayers" ) ;
return Json . Deserialize < ActivePlayersEdenResult > ( response ) . Result ;
return Json . Deserialize < ActivePlayersEdenResult > ( response ) . Result ;
}
}
public List < TvShow > GetSeries ( XbmcSettings settings )
public List < TvShow > GetSeries ( XbmcSettings settings )
{
{
var request = new RestRequest ( ) ;
var response = ProcessRequest ( settings , "VideoLibrary.GetMovies" , new [ ] { "file" , "imdbnumber" } ) ;
var parameters = new Dictionary < string , object > ( ) ;
parameters . Add ( "properties" , new [ ] { "file" , "imdbnumber" } ) ;
var response = ProcessRequest ( request , settings , "VideoLibrary.GetTvShows" , parameters ) ;
return Json . Deserialize < TvShowResponse > ( response ) . Result . TvShows ;
return Json . Deserialize < TvShowResponse > ( response ) . Result . TvShows ;
}
}
private string ProcessRequest ( IRestRequest request , XbmcSettings settings , string method , Dictionary < string , object > parameters = null )
private string ProcessRequest ( settings , string method , params object [ ] parameters )
{
{
var client = BuildClient ( settings ) ;
var url = string . Format ( @"http://{0}/jsonrpc" , settings . Address ) ;
var requestBuilder = new JsonRpcRequestBuilder ( url , method , parameters ) ;
request . Method = Method . POST ;
request . RequestFormat = DataFormat . Json ;
request . JsonSerializer = new JsonNetSerializer ( ) ;
request . AddBody ( new { jsonrpc = "2.0" , method = method , id = 10 , @params = parameters } ) ;
var response = client . ExecuteAndValidate ( request ) ;
_logger . Trace ( "Response: {0}" , response . Content ) ;
CheckForError ( response ) ;
return response . Content ;
requestBuilder . LogResponseContent = true ;
}
private IRestClient BuildClient ( XbmcSettings settings )
var request = requestBuilder . Build ( ) ;
{
var url = string . Format ( @"http://{0}/jsonrpc" , settings . Address ) ;
var client = _restClientFactory . BuildClient ( url ) ;
if ( ! settings . Username . IsNullOrWhiteSpace ( ) )
if ( ! settings . Username . IsNullOrWhiteSpace ( ) )
{
{
client. Authenticator = new HttpBasicAuthenticator ( settings . Username , settings . Password ) ;
request . AddBasicAuthentication ( settings . Username , settings . Password ) ;
}
}
return client ;
var response = _httpClient . Execute ( request ) ;
_logger . Trace ( "Response: {0}" , response . Content ) ;
CheckForError ( response ) ;
return response . Content ;
}
}
private void CheckForError ( IRestResponse response )
private void CheckForError ( Http Response response )
{
{
if ( string . IsNullOrWhiteSpace ( response . Content ) )
if ( string . IsNullOrWhiteSpace ( response . Content ) )
Qstick
5 years ago
committed by
Mark McDowall