Update to work with Deluge v2 (#3577)

Fixes #3514

.github/FUNDING.yml

@@ -0,0 +1,8 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: radarr
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+custom: # Replace with a single custom sponsorship URL

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

@@ -48,9 +48,25 @@ namespace NzbDrone.Core.Download.Clients.Deluge
 
         public string GetVersion(DelugeSettings settings)
         {
-            var response = ProcessRequest<string>(settings, "daemon.info");
+            try
+            {
+                var response = ProcessRequest<string>(settings, "daemon.info");
 
-            return response;
+                return response;
+            }
+            catch (DownloadClientException ex)
+            {
+                if (ex.Message.Contains("Unknown method"))
+                {
+                    // Deluge v2 beta replaced 'daemon.info' with 'daemon.get_version'.
+                    // It may return or become official, for now we just retry with the get_version api.
+                    var response = ProcessRequest<string>(settings, "daemon.get_version");
+
+                    return response;
+                }
+
+                throw;
+            }
         }
 
         public Dictionary<string, object> GetConfig(DelugeSettings settings)

src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadata.cs

@@ -102,156 +102,158 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
 
         public override MetadataFileResult MovieMetadata(Movie movie, MovieFile movieFile)
         {
-            var xmlResult = string.Empty;
-            if (Settings.MovieMetadata)
+            if (!Settings.MovieMetadata)
             {
-                _logger.Debug("Generating Movie Metadata for: {0}", Path.Combine(movie.Path, movieFile.RelativePath));
-                var watched = GetExistingWatchedStatus(movie, movieFile.RelativePath);
-
-                var sb = new StringBuilder();
-                var xws = new XmlWriterSettings();
-                xws.OmitXmlDeclaration = true;
-                xws.Indent = false;
-
-                using (var xw = XmlWriter.Create(sb, xws))
-                {
-                    var doc = new XDocument();
-                    var thumbnail = movie.Images.SingleOrDefault(i => i.CoverType == MediaCoverTypes.Screenshot);
-                    var posters = movie.Images.Where(i => i.CoverType == MediaCoverTypes.Poster);
-                    var fanarts = movie.Images.Where(i => i.CoverType == MediaCoverTypes.Fanart);
-
-                    var details = new XElement("movie");
-
-                    details.Add(new XElement("title", movie.Title));
-
-                    if (movie.Ratings != null && movie.Ratings.Votes > 0)
-                    {
-                        details.Add(new XElement("rating", movie.Ratings.Value));
-                    }
-
-                    details.Add(new XElement("plot", movie.Overview));
-                    details.Add(new XElement("id", movie.ImdbId));
-
-                    if (movie.ImdbId.IsNotNullOrWhiteSpace())
-                    {
-                        var imdbId = new XElement("uniqueid", movie.ImdbId);
-                        imdbId.SetAttributeValue("type", "imdb");
-                        imdbId.SetAttributeValue("default", true);
-                        details.Add(imdbId);
-                    }
-
-                    var uniqueId = new XElement("uniqueid", movie.TmdbId);
-                    uniqueId.SetAttributeValue("type", "tmdb");
-                    details.Add(uniqueId);
-
-                    details.Add(new XElement("year", movie.Year));
-
-                    if (movie.InCinemas.HasValue)
-                    {
-                        details.Add(new XElement("premiered", movie.InCinemas.Value.ToString("yyyy-MM-dd")));
-                    }
-
-                    foreach (var genre in movie.Genres)
-                    {
-                        details.Add(new XElement("genre", genre));
-                    }
-
-                    details.Add(new XElement("studio", movie.Studio));
-
-                    if (thumbnail == null)
-                    {
-                        details.Add(new XElement("thumb"));
-                    }
-
-                    else
-                    {
-                        details.Add(new XElement("thumb", thumbnail.Url));
-                    }
-
-                    foreach (var poster in posters)
-                    {                    
-                        if (poster != null && poster.Url != null)
-                        {
-                            details.Add(new XElement("thumb", new XAttribute("aspect", "poster"), poster.Url));
-                        }
-                    }
-
-                    if (fanarts.Count() > 0)
-                    {
-                        var fanartElement = new XElement("fanart");
-                        foreach (var fanart in fanarts)
-                        {
-                            if (fanart != null && fanart.Url != null)
-                            {
-                                fanartElement.Add(new XElement("thumb", fanart.Url));
-                            }
-                        }
-                        details.Add(fanartElement);
-                    }
-
-                    details.Add(new XElement("watched", watched));
-
-                    if (movieFile.MediaInfo != null)
-                    {
-                        var sceneName = movieFile.GetSceneOrFileName();
-
-                        var fileInfo = new XElement("fileinfo");
-                        var streamDetails = new XElement("streamdetails");
-
-                        var video = new XElement("video");
-                        video.Add(new XElement("aspect", (float)movieFile.MediaInfo.Width / (float)movieFile.MediaInfo.Height));
-                        video.Add(new XElement("bitrate", movieFile.MediaInfo.VideoBitrate));
-                        video.Add(new XElement("codec", MediaInfoFormatter.FormatVideoCodec(movieFile.MediaInfo, sceneName)));
-                        video.Add(new XElement("framerate", movieFile.MediaInfo.VideoFps));
-                        video.Add(new XElement("height", movieFile.MediaInfo.Height));
-                        video.Add(new XElement("scantype", movieFile.MediaInfo.ScanType));
-                        video.Add(new XElement("width", movieFile.MediaInfo.Width));
-
-                        if (movieFile.MediaInfo.RunTime != null)
-                        {
-                            video.Add(new XElement("duration", movieFile.MediaInfo.RunTime.TotalMinutes));
-                            video.Add(new XElement("durationinseconds", movieFile.MediaInfo.RunTime.TotalSeconds));
-                        }
-
-                        streamDetails.Add(video);
-
-                        var audio = new XElement("audio");
-                        audio.Add(new XElement("bitrate", movieFile.MediaInfo.AudioBitrate));
-                        audio.Add(new XElement("channels", movieFile.MediaInfo.AudioChannels));
-                        audio.Add(new XElement("codec", MediaInfoFormatter.FormatAudioCodec(movieFile.MediaInfo, sceneName)));
-                        audio.Add(new XElement("language", movieFile.MediaInfo.AudioLanguages));
-                        streamDetails.Add(audio);
-
-                        if (movieFile.MediaInfo.Subtitles != null && movieFile.MediaInfo.Subtitles.Length > 0)
-                        {
-                            var subtitle = new XElement("subtitle");
-                            subtitle.Add(new XElement("language", movieFile.MediaInfo.Subtitles));
-                            streamDetails.Add(subtitle);
-                        }
-
-                        fileInfo.Add(streamDetails);
-                        details.Add(fileInfo);
-                    }
-
-                    doc.Add(details);
-                    doc.Save(xw);
-
-                    xmlResult += doc.ToString();
-                    xmlResult += Environment.NewLine;
-                }
+                return null;
             }
-            if (Settings.MovieMetadataURL)
+
+            _logger.Debug("Generating Movie Metadata for: {0}", Path.Combine(movie.Path, movieFile.RelativePath));
+
+            var watched = GetExistingWatchedStatus(movie, movieFile.RelativePath);
+
+            var xmlResult = string.Empty;
+
+            var sb = new StringBuilder();
+            var xws = new XmlWriterSettings();
+            xws.OmitXmlDeclaration = true;
+            xws.Indent = false;
+
+            using (var xw = XmlWriter.Create(sb, xws))
             {
-                xmlResult += "https://www.themoviedb.org/movie/" + movie.TmdbId;
+                var doc = new XDocument();
+                var thumbnail = movie.Images.SingleOrDefault(i => i.CoverType == MediaCoverTypes.Screenshot);
+                var posters = movie.Images.Where(i => i.CoverType == MediaCoverTypes.Poster);
+                var fanarts = movie.Images.Where(i => i.CoverType == MediaCoverTypes.Fanart);
+
+                var details = new XElement("movie");
+
+                details.Add(new XElement("title", movie.Title));
+
+                if (movie.Ratings != null && movie.Ratings.Votes > 0)
+                {
+                    details.Add(new XElement("rating", movie.Ratings.Value));
+                }
+
+                details.Add(new XElement("plot", movie.Overview));
+                details.Add(new XElement("id", movie.ImdbId));
+
+                if (movie.ImdbId.IsNotNullOrWhiteSpace())
+                {
+                    var imdbId = new XElement("uniqueid", movie.ImdbId);
+                    imdbId.SetAttributeValue("type", "imdb");
+                    imdbId.SetAttributeValue("default", true);
+                    details.Add(imdbId);
+                }
+
+                var uniqueId = new XElement("uniqueid", movie.TmdbId);
+                uniqueId.SetAttributeValue("type", "tmdb");
+                details.Add(uniqueId);
+
+                details.Add(new XElement("year", movie.Year));
+
+                if (movie.InCinemas.HasValue)
+                {
+                    details.Add(new XElement("premiered", movie.InCinemas.Value.ToString("yyyy-MM-dd")));
+                }
+
+                foreach (var genre in movie.Genres)
+                {
+                    details.Add(new XElement("genre", genre));
+                }
+
+                details.Add(new XElement("studio", movie.Studio));
+
+                if (thumbnail == null)
+                {
+                    details.Add(new XElement("thumb"));
+                }
+
+                else
+                {
+                    details.Add(new XElement("thumb", thumbnail.Url));
+                }
+
+                foreach (var poster in posters)
+                {                    
+                    if (poster != null && poster.Url != null)
+                    {
+                        details.Add(new XElement("thumb", new XAttribute("aspect", "poster"), poster.Url));
+                    }
+                }
+
+                if (fanarts.Count() > 0)
+                {
+                    var fanartElement = new XElement("fanart");
+                    foreach (var fanart in fanarts)
+                    {
+                        if (fanart != null && fanart.Url != null)
+                        {
+                            fanartElement.Add(new XElement("thumb", fanart.Url));
+                        }
+                    }
+                    details.Add(fanartElement);
+                }
+
+                details.Add(new XElement("watched", watched));
+
+                if (movieFile.MediaInfo != null)
+                {
+                    var sceneName = movieFile.GetSceneOrFileName();
+
+                    var fileInfo = new XElement("fileinfo");
+                    var streamDetails = new XElement("streamdetails");
+
+                    var video = new XElement("video");
+                    video.Add(new XElement("aspect", (float)movieFile.MediaInfo.Width / (float)movieFile.MediaInfo.Height));
+                    video.Add(new XElement("bitrate", movieFile.MediaInfo.VideoBitrate));
+                    video.Add(new XElement("codec", MediaInfoFormatter.FormatVideoCodec(movieFile.MediaInfo, sceneName)));
+                    video.Add(new XElement("framerate", movieFile.MediaInfo.VideoFps));
+                    video.Add(new XElement("height", movieFile.MediaInfo.Height));
+                    video.Add(new XElement("scantype", movieFile.MediaInfo.ScanType));
+                    video.Add(new XElement("width", movieFile.MediaInfo.Width));
+
+                    if (movieFile.MediaInfo.RunTime != null)
+                    {
+                        video.Add(new XElement("duration", movieFile.MediaInfo.RunTime.TotalMinutes));
+                        video.Add(new XElement("durationinseconds", movieFile.MediaInfo.RunTime.TotalSeconds));
+                    }
+
+                    streamDetails.Add(video);
+
+                    var audio = new XElement("audio");
+                    audio.Add(new XElement("bitrate", movieFile.MediaInfo.AudioBitrate));
+                    audio.Add(new XElement("channels", movieFile.MediaInfo.AudioChannels));
+                    audio.Add(new XElement("codec", MediaInfoFormatter.FormatAudioCodec(movieFile.MediaInfo, sceneName)));
+                    audio.Add(new XElement("language", movieFile.MediaInfo.AudioLanguages));
+                    streamDetails.Add(audio);
+
+                    if (movieFile.MediaInfo.Subtitles != null && movieFile.MediaInfo.Subtitles.Length > 0)
+                    {
+                        var subtitle = new XElement("subtitle");
+                        subtitle.Add(new XElement("language", movieFile.MediaInfo.Subtitles));
+                        streamDetails.Add(subtitle);
+                    }
+
+                    fileInfo.Add(streamDetails);
+                    details.Add(fileInfo);
+                }
+
+                doc.Add(details);
+                doc.Save(xw);
+
+                xmlResult += doc.ToString();
                 xmlResult += Environment.NewLine;
 
-                xmlResult += "https://www.imdb.com/title/" + movie.ImdbId;
-                xmlResult += Environment.NewLine;
             }
 
             var metadataFileName = GetMovieMetadataFilename(movieFile.RelativePath);
 
-            return xmlResult == string.Empty ? null : new MetadataFileResult(metadataFileName, xmlResult.Trim(Environment.NewLine.ToCharArray()));
+            if (Settings.UseMovieNfo)
+            {
+                metadataFileName = "movie.nfo";
+            }
+
+            return new MetadataFileResult(metadataFileName, xmlResult.Trim(Environment.NewLine.ToCharArray()));
         }
 
         public override List<ImageFileResult> MovieImages(Movie movie)
@@ -277,14 +279,7 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
 
         private string GetMovieMetadataFilename(string movieFilePath)
         {
-            if (Settings.UseMovieNfo)
-            {
-                return Path.Combine(Path.GetDirectoryName(movieFilePath), "movie.nfo");
-            }
-            else
-            {
-                return Path.ChangeExtension(movieFilePath, "nfo");
-            }
+            return Path.ChangeExtension(movieFilePath, "nfo");
         }
 
         private bool GetExistingWatchedStatus(Movie movie, string movieFilePath)

src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadataSettings.cs

@@ -19,7 +19,6 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
         public XbmcMetadataSettings()
         {
             MovieMetadata = true;
-            MovieMetadataURL = true;
             MovieImages = true;
             UseMovieNfo = false;
         }
@@ -27,13 +26,10 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
         [FieldDefinition(0, Label = "Movie Metadata", Type = FieldType.Checkbox)]
         public bool MovieMetadata { get; set; }
 
-        [FieldDefinition(1, Label = "Movie Metadata URL", Type = FieldType.Checkbox, HelpText = "Radarr will write the tmdb/imdb url in the .nfo file")]
-        public bool MovieMetadataURL { get; set; }
-
-        [FieldDefinition(2, Label = "Movie Images", Type = FieldType.Checkbox)]
+        [FieldDefinition(1, Label = "Movie Images", Type = FieldType.Checkbox)]
         public bool MovieImages { get; set; }
 
-        [FieldDefinition(3, Label = "Use Movie.nfo", Type = FieldType.Checkbox, HelpText = "Radarr will write metadata to movie.nfo instead of the default <movie-filename>.nfo")]
+        [FieldDefinition(2, Label = "Use Movie.nfo", Type = FieldType.Checkbox, HelpText = "Radarr will write metadata to movie.nfo instead of the default <movie-filename>.nfo")]
         public bool UseMovieNfo { get; set; }
 
         public bool IsValid => true;

src/UI/Movies/Index/MoviesIndexLayout.js

@@ -370,7 +370,7 @@ module.exports = Marionette.Layout.extend({
     },
 
     _renderView : function() {
-        if (MoviesCollection.length === 0) {
+        if (MoviesCollection.length === 0 && !this.moviesCollection.isFiltered()) {
             this.moviesRegion.show(new EmptyView());
 
             this.toolbar.close();

src/UI/Movies/MoviesCollection.js

@@ -261,6 +261,10 @@ var Collection = PageableCollection.extend({
       this.fetch();
     },
 
+    isFiltered : function() {
+        return this.state.filterKey && this.state.filterKey !== 'all';
+    },
+
     comparator: function (model) {
 		return model.get('sortTitle');
     }