diff --git a/frontend/src/Episode/Search/InteractiveEpisodeSearchConnector.js b/frontend/src/Episode/Search/InteractiveEpisodeSearchConnector.js index f84bea723..a52755a79 100644 --- a/frontend/src/Episode/Search/InteractiveEpisodeSearchConnector.js +++ b/frontend/src/Episode/Search/InteractiveEpisodeSearchConnector.js @@ -55,8 +55,8 @@ class InteractiveEpisodeSearchConnector extends Component { this.props.setReleasesSort({ sortKey, sortDirection }); } - onGrabPress = (guid) => { - this.props.grabRelease({ guid }); + onGrabPress = (guid, indexerId) => { + this.props.grabRelease({ guid, indexerId }); } // diff --git a/frontend/src/Episode/Search/InteractiveEpisodeSearchRow.js b/frontend/src/Episode/Search/InteractiveEpisodeSearchRow.js index 4d32606cc..1486f3433 100644 --- a/frontend/src/Episode/Search/InteractiveEpisodeSearchRow.js +++ b/frontend/src/Episode/Search/InteractiveEpisodeSearchRow.js @@ -45,7 +45,7 @@ class InteractiveEpisodeSearchRow extends Component { // Listeners onGrabPress = () => { - this.props.onGrabPress(this.props.guid); + this.props.onGrabPress(this.props.guid, this.props.indexerId); } // @@ -175,6 +175,7 @@ InteractiveEpisodeSearchRow.propTypes = { title: PropTypes.string.isRequired, infoUrl: PropTypes.string.isRequired, indexer: PropTypes.string.isRequired, + indexerId: PropTypes.number.isRequired, size: PropTypes.number.isRequired, seeders: PropTypes.number, leechers: PropTypes.number, diff --git a/src/Lidarr.Api.V3/Indexers/ReleaseResource.cs b/src/Lidarr.Api.V3/Indexers/ReleaseResource.cs index 777c5ebf6..d98e601cf 100644 --- a/src/Lidarr.Api.V3/Indexers/ReleaseResource.cs +++ b/src/Lidarr.Api.V3/Indexers/ReleaseResource.cs @@ -27,12 +27,10 @@ public class ReleaseResource : RestResource public string Title { get; set; } public bool FullSeason { get; set; } public bool SceneSource { get; set; } - public int SeasonNumber { get; set; } public Language Language { get; set; } public string AirDate { get; set; } public string ArtistName { get; set; } - public int[] EpisodeNumbers { get; set; } - public int[] AbsoluteEpisodeNumbers { get; set; } + public string AlbumTitle { get; set; } public bool Approved { get; set; } public bool TemporarilyRejected { get; set; } public bool Rejected { get; set; } @@ -65,7 +63,7 @@ public static ReleaseResource ToResource(this DownloadDecision model) { var releaseInfo = model.RemoteAlbum.Release; var parsedAlbumInfo = model.RemoteAlbum.ParsedAlbumInfo; - var remoteEpisode = model.RemoteAlbum; + var remoteAlbum = model.RemoteAlbum; var torrentInfo = (model.RemoteAlbum.Release as TorrentInfo) ?? new TorrentInfo(); // TODO: Clean this mess up. don't mix data from multiple classes, use sub-resources instead? (Got a huge Deja Vu, didn't we talk about this already once?) @@ -83,14 +81,10 @@ public static ReleaseResource ToResource(this DownloadDecision model) ReleaseGroup = parsedAlbumInfo.ReleaseGroup, ReleaseHash = parsedAlbumInfo.ReleaseHash, Title = releaseInfo.Title, - //FullSeason = parsedEpisodeInfo.FullSeason, - //SeasonNumber = parsedEpisodeInfo.SeasonNumber, Language = parsedAlbumInfo.Language, - //AirDate = parsedEpisodeInfo.AirDate, ArtistName = parsedAlbumInfo.ArtistName, + AlbumTitle = parsedAlbumInfo.AlbumTitle, - //EpisodeNumbers = parsedEpisodeInfo.EpisodeNumbers, - //AbsoluteEpisodeNumbers = parsedEpisodeInfo.AbsoluteEpisodeNumbers, Approved = model.Approved, TemporarilyRejected = model.TemporarilyRejected, Rejected = model.Rejected, @@ -99,7 +93,7 @@ public static ReleaseResource ToResource(this DownloadDecision model) CommentUrl = releaseInfo.CommentUrl, DownloadUrl = releaseInfo.DownloadUrl, InfoUrl = releaseInfo.InfoUrl, - DownloadAllowed = remoteEpisode.DownloadAllowed, + DownloadAllowed = remoteAlbum.DownloadAllowed, //ReleaseWeight