mirror/Lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/Lidarr synced 2024-12-27 01:57:21 +00:00
Code Issues Releases Wiki Activity

Fix Manual Album Grab, Clean ReleaseResource

Browse source
This commit is contained in:
Qstick 2017-10-15 13:10:45 -04:00
parent 566ac1a9d3
commit 7776862359
3 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/Episode/Search/InteractiveEpisodeSearchConnector.js
View file

@ -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 });
}
//

3
frontend/src/Episode/Search/InteractiveEpisodeSearchRow.js
View file

@ -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,

14
src/Lidarr.Api.V3/Indexers/ReleaseResource.cs
View file

@ -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