New: Support for seed configuration in DownloadService

src/NzbDrone.Core/Download/Clients/Aria2/Aria2.cs

@@ -31,7 +31,7 @@ public Aria2(IAria2Proxy proxy,
             _proxy = proxy;
         }
 
-        protected override string AddFromMagnetLink(ReleaseInfo release, string hash, string magnetLink)
+        protected override string AddFromMagnetLink(TorrentInfo release, string hash, string magnetLink)
         {
             var gid = _proxy.AddUri(Settings, magnetLink);
 
@@ -50,7 +50,7 @@ protected override string AddFromMagnetLink(ReleaseInfo release, string hash, st
             return hash;
         }
 
-        protected override string AddFromTorrentFile(ReleaseInfo release, string hash, string filename, byte[] fileContent)
+        protected override string AddFromTorrentFile(TorrentInfo release, string hash, string filename, byte[] fileContent)
         {
             var gid = _proxy.AddTorrent(Settings, fileContent);
 
@@ -120,7 +120,7 @@ private ValidationFailure TestConnection()
             return null;
         }
 
-        protected override string AddFromTorrentLink(ReleaseInfo release, string hash, string torrentLink)
+        protected override string AddFromTorrentLink(TorrentInfo release, string hash, string torrentLink)
         {
             var gid = _proxy.AddUri(Settings, torrentLink);
 

src/NzbDrone.Core/Download/Clients/Blackhole/TorrentBlackhole.cs

@@ -25,12 +25,12 @@ public TorrentBlackhole(ITorrentFileInfoReader torrentFileInfoReader,
         {
         }
 
-        protected override string AddFromTorrentLink(ReleaseInfo release, string hash, string torrentLink)
+        protected override string AddFromTorrentLink(TorrentInfo release, string hash, string torrentLink)
         {
             throw new NotImplementedException("Blackhole does not support redirected indexers.");
         }
 
-        protected override string AddFromMagnetLink(ReleaseInfo release, string hash, string magnetLink)
+        protected override string AddFromMagnetLink(TorrentInfo release, string hash, string magnetLink)
         {
             if (!Settings.SaveMagnetFiles)
             {
@@ -54,7 +54,7 @@ protected override string AddFromMagnetLink(ReleaseInfo release, string hash, st
             return null;
         }
 
-        protected override string AddFromTorrentFile(ReleaseInfo release, string hash, string filename, byte[] fileContent)
+        protected override string AddFromTorrentFile(TorrentInfo release, string hash, string filename, byte[] fileContent)
         {
             var title = release.Title;
 

src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs

@@ -29,7 +29,7 @@ public Deluge(IDelugeProxy proxy,
             _proxy = proxy;
         }
 
-        protected override string AddFromMagnetLink(ReleaseInfo release, string hash, string magnetLink)
+        protected override string AddFromMagnetLink(TorrentInfo release, string hash, string magnetLink)
         {
             var actualHash = _proxy.AddTorrentFromMagnet(magnetLink, Settings);
 
@@ -53,7 +53,7 @@ protected override string AddFromMagnetLink(ReleaseInfo release, string hash, st
             return actualHash.ToUpper();
         }
 
-        protected override string AddFromTorrentFile(ReleaseInfo release, string hash, string filename, byte[] fileContent)
+        protected override string AddFromTorrentFile(TorrentInfo release, string hash, string filename, byte[] fileContent)
         {
             var actualHash = _proxy.AddTorrentFromFile(filename, fileContent, Settings);
 
@@ -211,7 +211,7 @@ private ValidationFailure TestGetTorrents()
             return null;
         }
 
-        protected override string AddFromTorrentLink(ReleaseInfo release, string hash, string torrentLink)
+        protected override string AddFromTorrentLink(TorrentInfo release, string hash, string torrentLink)
         {
             throw new NotImplementedException();
         }

src/NzbDrone.Core/Download/Clients/DownloadStation/TorrentDownloadStation.cs

@@ -53,7 +53,7 @@ protected IEnumerable<DownloadStationTask> GetTasks()
             return _dsTaskProxy.GetTasks(Settings).Where(v => v.Type.ToLower() == DownloadStationTaskType.BT.ToString().ToLower());
         }
 
-        protected override string AddFromMagnetLink(ReleaseInfo release, string hash, string magnetLink)
+        protected override string AddFromMagnetLink(TorrentInfo release, string hash, string magnetLink)
         {
             var hashedSerialNumber = _serialNumberProvider.GetSerialNumber(Settings);
 
@@ -72,7 +72,7 @@ protected override string AddFromMagnetLink(ReleaseInfo release, string hash, st
             throw new DownloadClientException("Failed to add magnet task to Download Station");
         }
 
-        protected override string AddFromTorrentFile(ReleaseInfo release, string hash, string filename, byte[] fileContent)
+        protected override string AddFromTorrentFile(TorrentInfo release, string hash, string filename, byte[] fileContent)
         {
             var hashedSerialNumber = _serialNumberProvider.GetSerialNumber(Settings);
 
@@ -315,7 +315,7 @@ protected string GetDownloadDirectory()
             return null;
         }
 
-        protected override string AddFromTorrentLink(ReleaseInfo release, string hash, string torrentLink)
+        protected override string AddFromTorrentLink(TorrentInfo release, string hash, string torrentLink)
         {
             throw new NotImplementedException();
         }

src/NzbDrone.Core/Download/Clients/Flood/Flood.cs

@@ -63,14 +63,14 @@ private static IEnumerable<string> HandleTags(ReleaseInfo release, FloodSettings
         public override bool SupportsCategories => true;
         public override ProviderMessage Message => new ProviderMessage("Prowlarr is unable to remove torrents that have finished seeding when using Flood", ProviderMessageType.Warning);
 
-        protected override string AddFromTorrentFile(ReleaseInfo release, string hash, string filename, byte[] fileContent)
+        protected override string AddFromTorrentFile(TorrentInfo release, string hash, string filename, byte[] fileContent)
         {
             _proxy.AddTorrentByFile(Convert.ToBase64String(fileContent), HandleTags(release, Settings, GetCategoryForRelease(release)), Settings);
 
             return hash;
         }
 
-        protected override string AddFromMagnetLink(ReleaseInfo release, string hash, string magnetLink)
+        protected override string AddFromMagnetLink(TorrentInfo release, string hash, string magnetLink)
         {
             _proxy.AddTorrentByUrl(magnetLink, HandleTags(release, Settings, GetCategoryForRelease(release)), Settings);
 
@@ -93,7 +93,7 @@ protected override void Test(List<ValidationFailure> failures)
             }
         }
 
-        protected override string AddFromTorrentLink(ReleaseInfo release, string hash, string torrentLink)
+        protected override string AddFromTorrentLink(TorrentInfo release, string hash, string torrentLink)
         {
             throw new NotImplementedException();
         }

src/NzbDrone.Core/Download/Clients/FreeboxDownload/TorrentFreeboxDownload.cs

@@ -36,7 +36,7 @@ protected IEnumerable<FreeboxDownloadTask> GetTorrents()
             return _proxy.GetTasks(Settings).Where(v => v.Type.ToLower() == FreeboxDownloadTaskType.Bt.ToString().ToLower());
         }
 
-        protected override string AddFromMagnetLink(ReleaseInfo release, string hash, string magnetLink)
+        protected override string AddFromMagnetLink(TorrentInfo release, string hash, string magnetLink)
         {
             return _proxy.AddTaskFromUrl(magnetLink,
                                          GetDownloadDirectory(release).EncodeBase64(),
@@ -45,7 +45,7 @@ protected override string AddFromMagnetLink(ReleaseInfo release, string hash, st
                                          Settings);
         }
 
-        protected override string AddFromTorrentFile(ReleaseInfo release, string hash, string filename, byte[] fileContent)
+        protected override string AddFromTorrentFile(TorrentInfo release, string hash, string filename, byte[] fileContent)
         {
             return _proxy.AddTaskFromFile(filename,
                                           fileContent,
@@ -55,7 +55,7 @@ protected override string AddFromTorrentFile(ReleaseInfo release, string hash, s
                                           Settings);
         }
 
-        protected override string AddFromTorrentLink(ReleaseInfo release, string hash, string torrentLink)
+        protected override string AddFromTorrentLink(TorrentInfo release, string hash, string torrentLink)
         {
             return _proxy.AddTaskFromUrl(torrentLink,
                                          GetDownloadDirectory(release).EncodeBase64(),

src/NzbDrone.Core/Download/Clients/Hadouken/Hadouken.cs

@@ -40,14 +40,14 @@ protected override void Test(List<ValidationFailure> failures)
             failures.AddIfNotNull(TestGetTorrents());
         }
 
-        protected override string AddFromMagnetLink(ReleaseInfo release, string hash, string magnetLink)
+        protected override string AddFromMagnetLink(TorrentInfo release, string hash, string magnetLink)
         {
             _proxy.AddTorrentUri(Settings, magnetLink, GetCategoryForRelease(release) ?? Settings.Category);
 
             return hash.ToUpper();
         }
 
-        protected override string AddFromTorrentFile(ReleaseInfo release, string hash, string filename, byte[] fileContent)
+        protected override string AddFromTorrentFile(TorrentInfo release, string hash, string filename, byte[] fileContent)
         {
             return _proxy.AddTorrentFile(Settings, fileContent, GetCategoryForRelease(release) ?? Settings.Category).ToUpper();
         }
@@ -97,7 +97,7 @@ private ValidationFailure TestGetTorrents()
             return null;
         }
 
-        protected override string AddFromTorrentLink(ReleaseInfo release, string hash, string torrentLink)
+        protected override string AddFromTorrentLink(TorrentInfo release, string hash, string torrentLink)
         {
             throw new NotImplementedException();
         }

src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs

@@ -41,7 +41,7 @@ public QBittorrent(IQBittorrentProxySelector proxySelector,
         private IQBittorrentProxy Proxy => _proxySelector.GetProxy(Settings);
         private Version ProxyApiVersion => _proxySelector.GetApiVersion(Settings);
 
-        protected override string AddFromMagnetLink(ReleaseInfo release, string hash, string magnetLink)
+        protected override string AddFromMagnetLink(TorrentInfo release, string hash, string magnetLink)
         {
             if (!Proxy.GetConfig(Settings).DhtEnabled && !magnetLink.Contains("&tr="))
             {
@@ -95,7 +95,7 @@ protected override string AddFromMagnetLink(ReleaseInfo release, string hash, st
             return hash;
         }
 
-        protected override string AddFromTorrentFile(ReleaseInfo release, string hash, string filename, byte[] fileContent)
+        protected override string AddFromTorrentFile(TorrentInfo release, string hash, string filename, byte[] fileContent)
         {
             //var setShareLimits = release.SeedConfiguration != null && (release.SeedConfiguration.Ratio.HasValue || release.SeedConfiguration.SeedTime.HasValue);
             //var addHasSetShareLimits = setShareLimits && ProxyApiVersion >= new Version(2, 8, 1);
@@ -450,7 +450,7 @@ protected void FetchTorrentDetails(QBittorrentTorrent torrent)
             torrent.SeedingTime = torrentProperties.SeedingTime;
         }
 
-        protected override string AddFromTorrentLink(ReleaseInfo release, string hash, string torrentLink)
+        protected override string AddFromTorrentLink(TorrentInfo release, string hash, string torrentLink)
         {
             throw new NotImplementedException();
         }

src/NzbDrone.Core/Download/Clients/Transmission/TransmissionBase.cs

@@ -66,7 +66,7 @@ protected bool HasReachedSeedLimit(TransmissionTorrent torrent, double? ratio, L
             return false;
         }
 
-        protected override string AddFromMagnetLink(ReleaseInfo release, string hash, string magnetLink)
+        protected override string AddFromMagnetLink(TorrentInfo release, string hash, string magnetLink)
         {
             _proxy.AddTorrentFromUrl(magnetLink, GetDownloadDirectory(), Settings);
 
@@ -79,7 +79,7 @@ protected override string AddFromMagnetLink(ReleaseInfo release, string hash, st
             return hash;
         }
 
-        protected override string AddFromTorrentFile(ReleaseInfo release, string hash, string filename, byte[] fileContent)
+        protected override string AddFromTorrentFile(TorrentInfo release, string hash, string filename, byte[] fileContent)
         {
             _proxy.AddTorrentFromData(fileContent, GetDownloadDirectory(), Settings);
 
@@ -92,7 +92,7 @@ protected override string AddFromTorrentFile(ReleaseInfo release, string hash, s
             return hash;
         }
 
-        protected override string AddFromTorrentLink(ReleaseInfo release, string hash, string torrentLink)
+        protected override string AddFromTorrentLink(TorrentInfo release, string hash, string torrentLink)
         {
             throw new NotImplementedException();
         }

src/NzbDrone.Core/Download/Clients/rTorrent/RTorrent.cs

@@ -34,7 +34,7 @@ public RTorrent(IRTorrentProxy proxy,
             _rTorrentDirectoryValidator = rTorrentDirectoryValidator;
         }
 
-        protected override string AddFromMagnetLink(ReleaseInfo release, string hash, string magnetLink)
+        protected override string AddFromMagnetLink(TorrentInfo release, string hash, string magnetLink)
         {
             var priority = (RTorrentPriority)Settings.Priority;
 
@@ -54,7 +54,7 @@ protected override string AddFromMagnetLink(ReleaseInfo release, string hash, st
             return hash;
         }
 
-        protected override string AddFromTorrentFile(ReleaseInfo release, string hash, string filename, byte[] fileContent)
+        protected override string AddFromTorrentFile(TorrentInfo release, string hash, string filename, byte[] fileContent)
         {
             var priority = (RTorrentPriority)Settings.Priority;
 
@@ -157,7 +157,7 @@ private bool WaitForTorrent(string hash, int tries, int retryDelay)
             return false;
         }
 
-        protected override string AddFromTorrentLink(ReleaseInfo release, string hash, string torrentLink)
+        protected override string AddFromTorrentLink(TorrentInfo release, string hash, string torrentLink)
         {
             throw new NotImplementedException();
         }

src/NzbDrone.Core/Download/Clients/uTorrent/UTorrent.cs

@@ -32,7 +32,7 @@ public UTorrent(IUTorrentProxy proxy,
             _torrentCache = cacheManager.GetCache<UTorrentTorrentCache>(GetType(), "differentialTorrents");
         }
 
-        protected override string AddFromMagnetLink(ReleaseInfo release, string hash, string magnetLink)
+        protected override string AddFromMagnetLink(TorrentInfo release, string hash, string magnetLink)
         {
             _proxy.AddTorrentFromUrl(magnetLink, Settings);
 
@@ -53,7 +53,7 @@ protected override string AddFromMagnetLink(ReleaseInfo release, string hash, st
             return hash;
         }
 
-        protected override string AddFromTorrentFile(ReleaseInfo release, string hash, string filename, byte[] fileContent)
+        protected override string AddFromTorrentFile(TorrentInfo release, string hash, string filename, byte[] fileContent)
         {
             _proxy.AddTorrentFromFile(filename, fileContent, Settings);
 
@@ -148,7 +148,7 @@ private ValidationFailure TestGetTorrents()
             return null;
         }
 
-        protected override string AddFromTorrentLink(ReleaseInfo release, string hash, string torrentLink)
+        protected override string AddFromTorrentLink(TorrentInfo release, string hash, string torrentLink)
         {
             throw new NotImplementedException();
         }

src/NzbDrone.Core/Download/DownloadService.cs

@@ -29,6 +29,7 @@ public class DownloadService : IDownloadService
         private readonly IIndexerStatusService _indexerStatusService;
         private readonly IRateLimitService _rateLimitService;
         private readonly IEventAggregator _eventAggregator;
+        private readonly ISeedConfigProvider _seedConfigProvider;
         private readonly Logger _logger;
 
         public DownloadService(IProvideDownloadClient downloadClientProvider,
@@ -37,6 +38,7 @@ public DownloadService(IProvideDownloadClient downloadClientProvider,
                                IIndexerStatusService indexerStatusService,
                                IRateLimitService rateLimitService,
                                IEventAggregator eventAggregator,
+                               ISeedConfigProvider seedConfigProvider,
                                Logger logger)
         {
             _downloadClientProvider = downloadClientProvider;
@@ -45,6 +47,7 @@ public DownloadService(IProvideDownloadClient downloadClientProvider,
             _indexerStatusService = indexerStatusService;
             _rateLimitService = rateLimitService;
             _eventAggregator = eventAggregator;
+            _seedConfigProvider = seedConfigProvider;
             _logger = logger;
         }
 
@@ -59,7 +62,8 @@ public async Task SendReportToClient(ReleaseInfo release, string source, string
             }
 
             // Get the seed configuration for this release.
-            // remoteMovie.SeedConfiguration = _seedConfigProvider.GetSeedConfiguration(remoteMovie);
+            ((TorrentInfo)release).SeedConfiguration = _seedConfigProvider.GetSeedConfiguration(release);
+
             var indexer = _indexerFactory.GetInstance(_indexerFactory.Get(release.IndexerId));
 
             var grabEvent = new IndexerDownloadEvent(release, true, source, host, release.Title, release.DownloadUrl)

src/NzbDrone.Core/Download/TorrentClientBase.cs

@@ -36,9 +36,9 @@ protected TorrentClientBase(ITorrentFileInfoReader torrentFileInfoReader,
 
         public virtual bool PreferTorrentFile => false;
 
-        protected abstract string AddFromMagnetLink(ReleaseInfo release, string hash, string magnetLink);
-        protected abstract string AddFromTorrentFile(ReleaseInfo release, string hash, string filename, byte[] fileContent);
-        protected abstract string AddFromTorrentLink(ReleaseInfo release, string hash, string torrentLink);
+        protected abstract string AddFromMagnetLink(TorrentInfo release, string hash, string magnetLink);
+        protected abstract string AddFromTorrentFile(TorrentInfo release, string hash, string filename, byte[] fileContent);
+        protected abstract string AddFromTorrentLink(TorrentInfo release, string hash, string torrentLink);
 
         public override async Task<string> Download(ReleaseInfo release, bool redirect, IIndexer indexer)
         {
@@ -142,7 +142,7 @@ private async Task<string> DownloadFromWebUrl(ReleaseInfo release, IIndexer inde
 
             var filename = string.Format("{0}.torrent", StringUtil.CleanFileName(release.Title));
             var hash = _torrentFileInfoReader.GetHashFromTorrentFile(torrentFile);
-            var actualHash = AddFromTorrentFile(release, hash, filename, torrentFile);
+            var actualHash = AddFromTorrentFile((TorrentInfo)release, hash, filename, torrentFile);
 
             if (actualHash.IsNotNullOrWhiteSpace() && hash != actualHash)
             {
@@ -173,7 +173,7 @@ private string DownloadFromMagnetUrl(ReleaseInfo release, string magnetUrl)
 
             if (hash != null)
             {
-                actualHash = AddFromMagnetLink(release, hash, magnetUrl);
+                actualHash = AddFromMagnetLink((TorrentInfo)release, hash, magnetUrl);
             }
 
             if (actualHash.IsNotNullOrWhiteSpace() && hash != actualHash)

src/NzbDrone.Core/Indexers/SeedConfigProvider.cs

@@ -0,0 +1,91 @@
+using System;
+using NzbDrone.Common.Cache;
+using NzbDrone.Core.Datastore;
+using NzbDrone.Core.Download.Clients;
+using NzbDrone.Core.Messaging.Events;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.ThingiProvider.Events;
+
+namespace NzbDrone.Core.Indexers
+{
+    public interface ISeedConfigProvider
+    {
+        TorrentSeedConfiguration GetSeedConfiguration(ReleaseInfo release);
+        TorrentSeedConfiguration GetSeedConfiguration(int indexerId);
+    }
+
+    public class SeedConfigProvider : ISeedConfigProvider, IHandle<ProviderUpdatedEvent<IIndexer>>
+    {
+        private readonly IIndexerFactory _indexerFactory;
+        private readonly ICached<IndexerTorrentBaseSettings> _cache;
+
+        public SeedConfigProvider(IIndexerFactory indexerFactory, ICacheManager cacheManager)
+        {
+            _indexerFactory = indexerFactory;
+            _cache = cacheManager.GetRollingCache<IndexerTorrentBaseSettings>(GetType(), "criteriaByIndexer", TimeSpan.FromHours(1));
+        }
+
+        public TorrentSeedConfiguration GetSeedConfiguration(ReleaseInfo release)
+        {
+            if (release.DownloadProtocol != DownloadProtocol.Torrent)
+            {
+                return null;
+            }
+
+            if (release.IndexerId == 0)
+            {
+                return null;
+            }
+
+            return GetSeedConfiguration(release.IndexerId);
+        }
+
+        public TorrentSeedConfiguration GetSeedConfiguration(int indexerId)
+        {
+            if (indexerId == 0)
+            {
+                return null;
+            }
+
+            var seedCriteria = _cache.Get(indexerId.ToString(), () => FetchSeedCriteria(indexerId));
+
+            if (seedCriteria == null)
+            {
+                return null;
+            }
+
+            var seedConfig = new TorrentSeedConfiguration
+            {
+                Ratio = seedCriteria.SeedRatio
+            };
+
+            var seedTime = seedCriteria.SeedTime;
+            if (seedTime.HasValue)
+            {
+                seedConfig.SeedTime = TimeSpan.FromMinutes(seedTime.Value);
+            }
+
+            return seedConfig;
+        }
+
+        private IndexerTorrentBaseSettings FetchSeedCriteria(int indexerId)
+        {
+            try
+            {
+                var indexer = _indexerFactory.Get(indexerId);
+                var torrentIndexerSettings = indexer.Settings as ITorrentIndexerSettings;
+
+                return torrentIndexerSettings?.TorrentBaseSettings;
+            }
+            catch (ModelNotFoundException)
+            {
+                return null;
+            }
+        }
+
+        public void Handle(ProviderUpdatedEvent<IIndexer> message)
+        {
+            _cache.Clear();
+        }
+    }
+}

src/NzbDrone.Core/Parser/Model/TorrentInfo.cs

@@ -1,4 +1,5 @@
 using System.Text;
+using NzbDrone.Core.Download.Clients;
 
 namespace NzbDrone.Core.Parser.Model
 {
@@ -13,6 +14,8 @@ public class TorrentInfo : ReleaseInfo
         public double? DownloadVolumeFactor { get; set; }
         public double? UploadVolumeFactor { get; set; }
 
+        public TorrentSeedConfiguration SeedConfiguration { get; set; }
+
         public static int? GetSeeders(ReleaseInfo release)
         {
             var torrentInfo = release as TorrentInfo;