shpaq/Prowlarr-Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2025-09-27 12:33:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: Connecting to XBMC when user name and password are configured

Browse Source
This commit is contained in:
Mark McDowall
2014-07-31 23:30:30 -07:00
parent 6ee4b6d428
commit fc46018c9a
13 changed files with 284 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs
View File

@@ -4,8 +4,6 @@ using System.Linq;
using FluentValidation.Results;
using Newtonsoft.Json.Linq;
using NLog;
using NzbDrone.Common.Http;
using NzbDrone.Common.Instrumentation;
using NzbDrone.Common.Serializer;
using NzbDrone.Core.Notifications.Xbmc.Model;
using NzbDrone.Core.Tv;
@@ -23,13 +21,13 @@ namespace NzbDrone.Core.Notifications.Xbmc
public class XbmcService : IXbmcService
{
private readonly IHttpProvider _httpProvider;
private readonly IXbmcJsonApiProxy _proxy;
private readonly IEnumerable<IApiProvider> _apiProviders;
private readonly Logger _logger;
public XbmcService(IHttpProvider httpProvider, IEnumerable<IApiProvider> apiProviders, Logger logger)
public XbmcService(IXbmcJsonApiProxy proxy, IEnumerable<IApiProvider> apiProviders, Logger logger)
{
_httpProvider = httpProvider;
_proxy = proxy;
_apiProviders = apiProviders;
_logger = logger;
}
@@ -56,12 +54,7 @@ namespace NzbDrone.Core.Notifications.Xbmc
{
try
{
var postJson = new JObject();
postJson.Add(new JProperty("jsonrpc", "2.0"));
postJson.Add(new JProperty("method", "JSONRPC.Version"));
postJson.Add(new JProperty("id", 1));
var response = _httpProvider.PostCommand(settings.Address, settings.Username, settings.Password, postJson.ToString());
var response = _proxy.GetJsonVersion(settings);
_logger.Debug("Getting version from response: " + response);
var result = Json.Deserialize<XbmcJsonResult<JObject>>(response);