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

Fixed: Remove extraneous rate limiting for grabs

Browse Source 
Co-authored-by: Michael Goodnow <mmgoodnow@gmail.com>

Closes #2140
This commit is contained in:
Bogdan
2024-06-01 10:37:30 +03:00
parent 76c288a6e4
commit 468436b9f7
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/NzbDrone.Core/Download/DownloadService.cs
View File

@@ -1,10 +1,8 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using NLog; using NLog;
using NzbDrone.Common.Extensions;
using NzbDrone.Common.Http; using NzbDrone.Common.Http;
using NzbDrone.Common.Instrumentation.Extensions; using NzbDrone.Common.Instrumentation.Extensions;
using NzbDrone.Common.TPL;
using NzbDrone.Core.Download.Clients; using NzbDrone.Core.Download.Clients;
using NzbDrone.Core.Exceptions; using NzbDrone.Core.Exceptions;
using NzbDrone.Core.Indexers; using NzbDrone.Core.Indexers;
@@ -27,7 +25,6 @@ namespace NzbDrone.Core.Download
private readonly IDownloadClientStatusService _downloadClientStatusService; private readonly IDownloadClientStatusService _downloadClientStatusService;
private readonly IIndexerFactory _indexerFactory; private readonly IIndexerFactory _indexerFactory;
private readonly IIndexerStatusService _indexerStatusService; private readonly IIndexerStatusService _indexerStatusService;
private readonly IRateLimitService _rateLimitService;
private readonly IEventAggregator _eventAggregator; private readonly IEventAggregator _eventAggregator;
private readonly Logger _logger; private readonly Logger _logger;
@@ -35,7 +32,6 @@ namespace NzbDrone.Core.Download
IDownloadClientStatusService downloadClientStatusService, IDownloadClientStatusService downloadClientStatusService,
IIndexerFactory indexerFactory, IIndexerFactory indexerFactory,
IIndexerStatusService indexerStatusService, IIndexerStatusService indexerStatusService,
IRateLimitService rateLimitService,
IEventAggregator eventAggregator, IEventAggregator eventAggregator,
Logger logger) Logger logger)
{ {
@@ -43,7 +39,6 @@ namespace NzbDrone.Core.Download
_downloadClientStatusService = downloadClientStatusService; _downloadClientStatusService = downloadClientStatusService;
_indexerFactory = indexerFactory; _indexerFactory = indexerFactory;
_indexerStatusService = indexerStatusService; _indexerStatusService = indexerStatusService;
_rateLimitService = rateLimitService;
_eventAggregator = eventAggregator; _eventAggregator = eventAggregator;
_logger = logger; _logger = logger;
} }
@@ -132,15 +127,7 @@ namespace NzbDrone.Core.Download
_logger.Trace("Attempting download of {0}", link); _logger.Trace("Attempting download of {0}", link);
var url = new Uri(link); var url = new Uri(link);
// Limit grabs to 2 per second.
if (link.IsNotNullOrWhiteSpace() && !link.StartsWith("magnet:"))
{
await _rateLimitService.WaitAndPulseAsync(url.Host, TimeSpan.FromSeconds(2));
}
var indexer = _indexerFactory.GetInstance(_indexerFactory.Get(indexerId)); var indexer = _indexerFactory.GetInstance(_indexerFactory.Get(indexerId));
var success = false;
var downloadedBytes = Array.Empty<byte>();
var release = new ReleaseInfo var release = new ReleaseInfo
{ {
@@ -151,12 +138,14 @@ namespace NzbDrone.Core.Download
DownloadProtocol = indexer.Protocol DownloadProtocol = indexer.Protocol
}; };
var grabEvent = new IndexerDownloadEvent(release, success, source, host, release.Title, release.DownloadUrl) var grabEvent = new IndexerDownloadEvent(release, false, source, host, release.Title, release.DownloadUrl)
{ {
Indexer = indexer, Indexer = indexer,
GrabTrigger = source == "Prowlarr" ? GrabTrigger.Manual : GrabTrigger.Api GrabTrigger = source == "Prowlarr" ? GrabTrigger.Manual : GrabTrigger.Api
}; };
byte[] downloadedBytes;
try try
{ {
downloadedBytes = await indexer.Download(url); downloadedBytes = await indexer.Download(url);