New: Add qBittorrent API V2 support, Indexer seed limit Support (#653)
* Fixed: qBittorrent api v2 support (qbit v4.1+) Co-Authored-By: taloth <taloth@users.noreply.github.com> Co-Authored-By: Mark Bebbington <mark@thebebs.uk> * Fixed: Magnet Link progress visualisation and adding magnet links if dht is disabled in qBittorrent * New: Indexer Seed Limit settings applied to new downloads for qBit Co-Authored-By: taloth <taloth@users.noreply.github.com> * Handle Deluge v2 beta breaking change in their api. closes #2412 * Fixed: Codacy Format Issuespull/6/head
Qstick
6 years ago
committed by
GitHub
parent
61b0b2681a
commit
1e48ea58b0
@ -0,0 +1,89 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
using NLog;
|
||||||
|
using NzbDrone.Common.Cache;
|
||||||
|
|
||||||
|
using NzbDrone.Common.Http;
|
||||||
|
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Download.Clients.QBittorrent
|
||||||
|
{
|
||||||
|
public interface IQBittorrentProxy
|
||||||
|
{
|
||||||
|
bool IsApiSupported(QBittorrentSettings settings);
|
||||||
|
Version GetApiVersion(QBittorrentSettings settings);
|
||||||
|
string GetVersion(QBittorrentSettings settings);
|
||||||
|
QBittorrentPreferences GetConfig(QBittorrentSettings settings);
|
||||||
|
List<QBittorrentTorrent> GetTorrents(QBittorrentSettings settings);
|
||||||
|
|
||||||
|
void AddTorrentFromUrl(string torrentUrl, QBittorrentSettings settings);
|
||||||
|
void AddTorrentFromFile(string fileName, byte[] fileContent, QBittorrentSettings settings);
|
||||||
|
|
||||||
|
void RemoveTorrent(string hash, bool removeData, QBittorrentSettings settings);
|
||||||
|
void SetTorrentLabel(string hash, string label, QBittorrentSettings settings);
|
||||||
|
void SetTorrentSeedingConfiguration(string hash, TorrentSeedConfiguration seedConfiguration, QBittorrentSettings settings);
|
||||||
|
void MoveTorrentToTopInQueue(string hash, QBittorrentSettings settings);
|
||||||
|
void PauseTorrent(string hash, QBittorrentSettings settings);
|
||||||
|
void ResumeTorrent(string hash, QBittorrentSettings settings);
|
||||||
|
void SetForceStart(string hash, bool enabled, QBittorrentSettings settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
public interface IQBittorrentProxySelector
|
||||||
|
{
|
||||||
|
IQBittorrentProxy GetProxy(QBittorrentSettings settings, bool force = false);
|
||||||
|
}
|
||||||
|
|
||||||
|
public class QBittorrentProxySelector : IQBittorrentProxySelector
|
||||||
|
{
|
||||||
|
private readonly IHttpClient _httpClient;
|
||||||
|
private readonly ICached<IQBittorrentProxy> _proxyCache;
|
||||||
|
private readonly Logger _logger;
|
||||||
|
|
||||||
|
private readonly IQBittorrentProxy _proxyV1;
|
||||||
|
private readonly IQBittorrentProxy _proxyV2;
|
||||||
|
|
||||||
|
public QBittorrentProxySelector(QBittorrentProxyV1 proxyV1,
|
||||||
|
QBittorrentProxyV2 proxyV2,
|
||||||
|
IHttpClient httpClient,
|
||||||
|
ICacheManager cacheManager,
|
||||||
|
Logger logger)
|
||||||
|
{
|
||||||
|
_httpClient = httpClient;
|
||||||
|
_proxyCache = cacheManager.GetCache<IQBittorrentProxy>(GetType());
|
||||||
|
_logger = logger;
|
||||||
|
|
||||||
|
_proxyV1 = proxyV1;
|
||||||
|
_proxyV2 = proxyV2;
|
||||||
|
}
|
||||||
|
|
||||||
|
public IQBittorrentProxy GetProxy(QBittorrentSettings settings, bool force)
|
||||||
|
{
|
||||||
|
var proxyKey = $"{settings.Host}_{settings.Port}";
|
||||||
|
|
||||||
|
if (force)
|
||||||
|
{
|
||||||
|
_proxyCache.Remove(proxyKey);
|
||||||
|
}
|
||||||
|
|
||||||
|
return _proxyCache.Get(proxyKey, () => FetchProxy(settings), TimeSpan.FromMinutes(10.0));
|
||||||
|
}
|
||||||
|
|
||||||
|
private IQBittorrentProxy FetchProxy(QBittorrentSettings settings)
|
||||||
|
{
|
||||||
|
if (_proxyV2.IsApiSupported(settings))
|
||||||
|
{
|
||||||
|
_logger.Trace("Using qbitTorrent API v2");
|
||||||
|
return _proxyV2;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_proxyV1.IsApiSupported(settings))
|
||||||
|
{
|
||||||
|
_logger.Trace("Using qbitTorrent API v1");
|
||||||
|
return _proxyV1;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new DownloadClientException("Unable to determine qBittorrent API version");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,359 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Net;
|
||||||
|
using NLog;
|
||||||
|
using NzbDrone.Common.Cache;
|
||||||
|
using NzbDrone.Common.Extensions;
|
||||||
|
using NzbDrone.Common.Http;
|
||||||
|
using NzbDrone.Common.Serializer;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Download.Clients.QBittorrent
|
||||||
|
{
|
||||||
|
// API https://github.com/qbittorrent/qBittorrent/wiki/Web-API-Documentation
|
||||||
|
|
||||||
|
public class QBittorrentProxyV2 : IQBittorrentProxy
|
||||||
|
{
|
||||||
|
private readonly IHttpClient _httpClient;
|
||||||
|
private readonly Logger _logger;
|
||||||
|
private readonly ICached<Dictionary<string, string>> _authCookieCache;
|
||||||
|
|
||||||
|
public QBittorrentProxyV2(IHttpClient httpClient, ICacheManager cacheManager, Logger logger)
|
||||||
|
{
|
||||||
|
_httpClient = httpClient;
|
||||||
|
_logger = logger;
|
||||||
|
|
||||||
|
_authCookieCache = cacheManager.GetCache<Dictionary<string, string>>(GetType(), "authCookies");
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool IsApiSupported(QBittorrentSettings settings)
|
||||||
|
{
|
||||||
|
// We can do the api test without having to authenticate since v3.2.0-v4.0.4 will return 404 on the request.
|
||||||
|
var request = BuildRequest(settings).Resource("/api/v2/app/webapiVersion");
|
||||||
|
request.SuppressHttpError = true;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var response = _httpClient.Execute(request.Build());
|
||||||
|
|
||||||
|
// Version request will return 404 if it doesn't exist.
|
||||||
|
if (response.StatusCode == HttpStatusCode.NotFound)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (response.StatusCode == HttpStatusCode.Forbidden)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (response.HasHttpError)
|
||||||
|
{
|
||||||
|
throw new DownloadClientException("Failed to connect to qBittorrent, check your settings.", new HttpException(response));
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (WebException ex)
|
||||||
|
{
|
||||||
|
throw new DownloadClientException("Failed to connect to qBittorrent, check your settings.", ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public Version GetApiVersion(QBittorrentSettings settings)
|
||||||
|
{
|
||||||
|
var request = BuildRequest(settings).Resource("/api/v2/app/webapiVersion");
|
||||||
|
var response = Version.Parse(ProcessRequest(request, settings));
|
||||||
|
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
public string GetVersion(QBittorrentSettings settings)
|
||||||
|
{
|
||||||
|
var request = BuildRequest(settings).Resource("/api/v2/app/version");
|
||||||
|
var response = ProcessRequest(request, settings).TrimStart('v');
|
||||||
|
|
||||||
|
// eg "4.2alpha"
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
public QBittorrentPreferences GetConfig(QBittorrentSettings settings)
|
||||||
|
{
|
||||||
|
var request = BuildRequest(settings).Resource("/api/v2/app/preferences");
|
||||||
|
var response = ProcessRequest<QBittorrentPreferences>(request, settings);
|
||||||
|
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<QBittorrentTorrent> GetTorrents(QBittorrentSettings settings)
|
||||||
|
{
|
||||||
|
var request = BuildRequest(settings).Resource("/api/v2/torrents/info")
|
||||||
|
.AddQueryParam("category", settings.MusicCategory);
|
||||||
|
var response = ProcessRequest<List<QBittorrentTorrent>>(request, settings);
|
||||||
|
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void AddTorrentFromUrl(string torrentUrl, QBittorrentSettings settings)
|
||||||
|
{
|
||||||
|
var request = BuildRequest(settings).Resource("/api/v2/torrents/add")
|
||||||
|
.Post()
|
||||||
|
.AddFormParameter("urls", torrentUrl);
|
||||||
|
if (settings.MusicCategory.IsNotNullOrWhiteSpace())
|
||||||
|
{
|
||||||
|
request.AddFormParameter("category", settings.MusicCategory);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((QBittorrentState)settings.InitialState == QBittorrentState.Pause)
|
||||||
|
{
|
||||||
|
request.AddFormParameter("paused", true);
|
||||||
|
}
|
||||||
|
|
||||||
|
var result = ProcessRequest(request, settings);
|
||||||
|
|
||||||
|
// Note: Older qbit versions returned nothing, so we can't do != "Ok." here.
|
||||||
|
if (result == "Fails.")
|
||||||
|
{
|
||||||
|
throw new DownloadClientException("Download client failed to add torrent by url");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void AddTorrentFromFile(string fileName, byte[] fileContent, QBittorrentSettings settings)
|
||||||
|
{
|
||||||
|
var request = BuildRequest(settings).Resource("/api/v2/torrents/add")
|
||||||
|
.Post()
|
||||||
|
.AddFormUpload("torrents", fileName, fileContent);
|
||||||
|
|
||||||
|
if (settings.MusicCategory.IsNotNullOrWhiteSpace())
|
||||||
|
{
|
||||||
|
request.AddFormParameter("category", settings.MusicCategory);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((QBittorrentState)settings.InitialState == QBittorrentState.Pause)
|
||||||
|
{
|
||||||
|
request.AddFormParameter("paused", "true");
|
||||||
|
}
|
||||||
|
|
||||||
|
var result = ProcessRequest(request, settings);
|
||||||
|
|
||||||
|
// Note: Current qbit versions return nothing, so we can't do != "Ok." here.
|
||||||
|
if (result == "Fails.")
|
||||||
|
{
|
||||||
|
throw new DownloadClientException("Download client failed to add torrent");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void RemoveTorrent(string hash, bool removeData, QBittorrentSettings settings)
|
||||||
|
{
|
||||||
|
var request = BuildRequest(settings).Resource("/api/v2/torrents/delete")
|
||||||
|
.Post()
|
||||||
|
.AddFormParameter("hashes", hash);
|
||||||
|
|
||||||
|
if (removeData)
|
||||||
|
{
|
||||||
|
request.AddFormParameter("deleteFiles", "true");
|
||||||
|
}
|
||||||
|
|
||||||
|
ProcessRequest(request, settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetTorrentLabel(string hash, string label, QBittorrentSettings settings)
|
||||||
|
{
|
||||||
|
var request = BuildRequest(settings).Resource("/api/v2/torrents/setCategory")
|
||||||
|
.Post()
|
||||||
|
.AddFormParameter("hashes", hash)
|
||||||
|
.AddFormParameter("category", label);
|
||||||
|
ProcessRequest(request, settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetTorrentSeedingConfiguration(string hash, TorrentSeedConfiguration seedConfiguration, QBittorrentSettings settings)
|
||||||
|
{
|
||||||
|
var ratioLimit = seedConfiguration.Ratio.HasValue ? seedConfiguration.Ratio : -2;
|
||||||
|
var seedingTimeLimit = seedConfiguration.SeedTime.HasValue ? (long)seedConfiguration.SeedTime.Value.TotalMinutes : -2;
|
||||||
|
|
||||||
|
var request = BuildRequest(settings).Resource("/api/v2/torrents/setShareLimits")
|
||||||
|
.Post()
|
||||||
|
.AddFormParameter("hashes", hash)
|
||||||
|
.AddFormParameter("ratioLimit", ratioLimit)
|
||||||
|
.AddFormParameter("seedingTimeLimit", seedingTimeLimit);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
ProcessRequest(request, settings);
|
||||||
|
}
|
||||||
|
catch (DownloadClientException ex)
|
||||||
|
{
|
||||||
|
// setShareLimits was added in api v2.0.1 so catch it case of the unlikely event that someone has api v2.0
|
||||||
|
if (ex.InnerException is HttpException && (ex.InnerException as HttpException).Response.StatusCode == HttpStatusCode.NotFound)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void MoveTorrentToTopInQueue(string hash, QBittorrentSettings settings)
|
||||||
|
{
|
||||||
|
var request = BuildRequest(settings).Resource("/api/v2/torrents/topPrio")
|
||||||
|
.Post()
|
||||||
|
.AddFormParameter("hashes", hash);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
ProcessRequest(request, settings);
|
||||||
|
}
|
||||||
|
catch (DownloadClientException ex)
|
||||||
|
{
|
||||||
|
// qBittorrent rejects all Prio commands with 409: Conflict if Options -> BitTorrent -> Torrent Queueing is not enabled
|
||||||
|
if (ex.InnerException is HttpException && (ex.InnerException as HttpException).Response.StatusCode == HttpStatusCode.Conflict)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public void PauseTorrent(string hash, QBittorrentSettings settings)
|
||||||
|
{
|
||||||
|
var request = BuildRequest(settings).Resource("/api/v2/torrents/pause")
|
||||||
|
.Post()
|
||||||
|
.AddFormParameter("hashes", hash);
|
||||||
|
ProcessRequest(request, settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ResumeTorrent(string hash, QBittorrentSettings settings)
|
||||||
|
{
|
||||||
|
var request = BuildRequest(settings).Resource("/api/v2/torrents/resume")
|
||||||
|
.Post()
|
||||||
|
.AddFormParameter("hashes", hash);
|
||||||
|
ProcessRequest(request, settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetForceStart(string hash, bool enabled, QBittorrentSettings settings)
|
||||||
|
{
|
||||||
|
var request = BuildRequest(settings).Resource("/api/v2/torrents/setForceStart")
|
||||||
|
.Post()
|
||||||
|
.AddFormParameter("hashes", hash)
|
||||||
|
.AddFormParameter("value", enabled ? "true" : "false");
|
||||||
|
ProcessRequest(request, settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
private HttpRequestBuilder BuildRequest(QBittorrentSettings settings)
|
||||||
|
{
|
||||||
|
var requestBuilder = new HttpRequestBuilder(settings.UseSsl, settings.Host, settings.Port)
|
||||||
|
{
|
||||||
|
LogResponseContent = true,
|
||||||
|
NetworkCredential = new NetworkCredential(settings.Username, settings.Password)
|
||||||
|
};
|
||||||
|
return requestBuilder;
|
||||||
|
}
|
||||||
|
|
||||||
|
private TResult ProcessRequest<TResult>(HttpRequestBuilder requestBuilder, QBittorrentSettings settings)
|
||||||
|
where TResult : new()
|
||||||
|
{
|
||||||
|
var responseContent = ProcessRequest(requestBuilder, settings);
|
||||||
|
|
||||||
|
return Json.Deserialize<TResult>(responseContent);
|
||||||
|
}
|
||||||
|
|
||||||
|
private string ProcessRequest(HttpRequestBuilder requestBuilder, QBittorrentSettings settings)
|
||||||
|
{
|
||||||
|
AuthenticateClient(requestBuilder, settings);
|
||||||
|
|
||||||
|
var request = requestBuilder.Build();
|
||||||
|
request.LogResponseContent = true;
|
||||||
|
|
||||||
|
HttpResponse response;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
response = _httpClient.Execute(request);
|
||||||
|
}
|
||||||
|
catch (HttpException ex)
|
||||||
|
{
|
||||||
|
if (ex.Response.StatusCode == HttpStatusCode.Forbidden)
|
||||||
|
{
|
||||||
|
_logger.Debug("Authentication required, logging in.");
|
||||||
|
|
||||||
|
AuthenticateClient(requestBuilder, settings, true);
|
||||||
|
|
||||||
|
request = requestBuilder.Build();
|
||||||
|
|
||||||
|
response = _httpClient.Execute(request);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
throw new DownloadClientException("Failed to connect to qBittorrent, check your settings.", ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (WebException ex)
|
||||||
|
{
|
||||||
|
throw new DownloadClientException("Failed to connect to qBittorrent, please check your settings.", ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
return response.Content;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void AuthenticateClient(HttpRequestBuilder requestBuilder, QBittorrentSettings settings, bool reauthenticate = false)
|
||||||
|
{
|
||||||
|
if (settings.Username.IsNullOrWhiteSpace() || settings.Password.IsNullOrWhiteSpace())
|
||||||
|
{
|
||||||
|
if (reauthenticate)
|
||||||
|
{
|
||||||
|
throw new DownloadClientAuthenticationException("Failed to authenticate with qBittorrent.");
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var authKey = string.Format("{0}:{1}", requestBuilder.BaseUrl, settings.Password);
|
||||||
|
|
||||||
|
var cookies = _authCookieCache.Find(authKey);
|
||||||
|
|
||||||
|
if (cookies == null || reauthenticate)
|
||||||
|
{
|
||||||
|
_authCookieCache.Remove(authKey);
|
||||||
|
|
||||||
|
var authLoginRequest = BuildRequest(settings).Resource("/api/v2/auth/login")
|
||||||
|
.Post()
|
||||||
|
.AddFormParameter("username", settings.Username ?? string.Empty)
|
||||||
|
.AddFormParameter("password", settings.Password ?? string.Empty)
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
HttpResponse response;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
response = _httpClient.Execute(authLoginRequest);
|
||||||
|
}
|
||||||
|
catch (HttpException ex)
|
||||||
|
{
|
||||||
|
_logger.Debug("qbitTorrent authentication failed.");
|
||||||
|
if (ex.Response.StatusCode == HttpStatusCode.Forbidden)
|
||||||
|
{
|
||||||
|
throw new DownloadClientAuthenticationException("Failed to authenticate with qBittorrent.", ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new DownloadClientException("Failed to connect to qBittorrent, please check your settings.", ex);
|
||||||
|
}
|
||||||
|
catch (WebException ex)
|
||||||
|
{
|
||||||
|
throw new DownloadClientUnavailableException("Failed to connect to qBittorrent, please check your settings.", ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (response.Content != "Ok.") // returns "Fails." on bad login
|
||||||
|
{
|
||||||
|
_logger.Debug("qbitTorrent authentication failed.");
|
||||||
|
throw new DownloadClientAuthenticationException("Failed to authenticate with qBittorrent.");
|
||||||
|
}
|
||||||
|
|
||||||
|
_logger.Debug("qBittorrent authentication succeeded.");
|
||||||
|
|
||||||
|
cookies = response.GetCookies();
|
||||||
|
|
||||||
|
_authCookieCache.Set(authKey, cookies);
|
||||||
|
}
|
||||||
|
|
||||||
|
requestBuilder.SetCookies(cookies);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in new issue