Fixed: Timing issue in rtorrent handling of magnet links.

ref #1745

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

@@ -46,38 +46,32 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
             SetPriority(remoteEpisode, hash);
             SetDownloadDirectory(hash);
 
-            // Once the magnet meta download finishes, rTorrent replaces it with the actual torrent download with default settings.
-            // Schedule an event to apply the appropriate settings when that happens.
-            var priority = (RTorrentPriority)(remoteEpisode.IsRecentEpisode() ? Settings.RecentTvPriority : Settings.OlderTvPriority);
-            _proxy.SetDeferredMagnetProperties(hash, Settings.TvCategory, Settings.TvDirectory, priority, Settings);
-
             _proxy.StartTorrent(hash, Settings);
 
-            // Wait for the magnet to be resolved.
             var tries = 10;
             var retryDelay = 500;
-            if (WaitForTorrent(hash, tries, retryDelay))
+
+            // Wait a bit for the magnet to be resolved.
+            if (!WaitForTorrent(hash, tries - 2, retryDelay))
             {
-                return hash;
-            }
-            else
+                // Once the magnet meta download finishes, rTorrent replaces it with the actual torrent download with default settings.
+                // Schedule an event to apply the appropriate settings when that happens.
+                var priority = (RTorrentPriority)(remoteEpisode.IsRecentEpisode() ? Settings.RecentTvPriority : Settings.OlderTvPriority);
+                _proxy.SetDeferredMagnetProperties(hash, Settings.TvCategory, Settings.TvDirectory, priority, Settings);
+
+                // Wait a bit longer for the magnet to be resolved.
+                if (!WaitForTorrent(hash, 2, retryDelay))
                 {
+                    // The SetDeferredMagnetProperties will try set the label, priority & directory when rtorrent finishes the magnet, unless rtorrent restarts before that happens.
+
                     _logger.Warn("rTorrent could not resolve magnet within {0} seconds, download may remain stuck: {1}.", tries * retryDelay / 1000, magnetLink);
 
                     return hash;
                 }
             }
 
-        protected override string AddFromTorrentFile(RemoteEpisode remoteEpisode, string hash, string filename, byte[] fileContent)
-        {
-            _proxy.AddTorrentFromFile(filename, fileContent, Settings);
-
-            var tries = 5;
-            var retryDelay = 200;
-            if (WaitForTorrent(hash, tries, retryDelay))
-            {
+            // Make sure the label is set and the torrent started, because we can't rely on SetDeferredMagnetProperties for magnets that get resolved quickly.
             _proxy.SetTorrentLabel(hash, Settings.TvCategory, Settings);
-
             SetPriority(remoteEpisode, hash);
             SetDownloadDirectory(hash);
 
@@ -85,13 +79,27 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
 
             return hash;
         }
-            else
+
+        protected override string AddFromTorrentFile(RemoteEpisode remoteEpisode, string hash, string filename, byte[] fileContent)
+        {
+            _proxy.AddTorrentFromFile(filename, fileContent, Settings);
+
+            var tries = 10;
+            var retryDelay = 500;
+            if (!WaitForTorrent(hash, tries, retryDelay))
             {
-                _logger.Debug("rTorrent could not add file");
+                _logger.Debug("rTorrent didn't add the torrent within {0} seconds: {1}.", tries * retryDelay / 1000, filename);
 
-                RemoveItem(hash, true);
                 throw new ReleaseDownloadException(remoteEpisode.Release, "Downloading torrent failed");
             }
+
+            _proxy.SetTorrentLabel(hash, Settings.TvCategory, Settings);
+            SetPriority(remoteEpisode, hash);
+            SetDownloadDirectory(hash);
+
+            _proxy.StartTorrent(hash, Settings);
+
+            return hash;
         }
 
         public override string Name => "rTorrent";