Update Music Tests, Added Cases for Should Refresh Artist, Cleanup Skyhook Resources

This commit is contained in:
Qstick
2017-09-28 22:02:08 -04:00
parent d10fb92a09
commit 6e4638f7b1
19 changed files with 352 additions and 690 deletions
@@ -1,19 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace NzbDrone.Core.MetadataSource.SkyHook.Resource
{
public class ArtistInfoResource
{
public ArtistInfoResource() { }
public List<string> Genres { get; set; }
public string AristUrl { get; set; }
public string Overview { get; set; }
public string Id { get; set; }
public List<ImageResource> Images { get; set; }
public string ArtistName { get; set; }
}
}
@@ -1,17 +0,0 @@
using System;
namespace NzbDrone.Core.MetadataSource.SkyHook.Resource
{
public class EpisodeResource
{
public int SeasonNumber { get; set; }
public int EpisodeNumber { get; set; }
public int? AbsoluteEpisodeNumber { get; set; }
public string Title { get; set; }
public string AirDate { get; set; }
public DateTime? AirDateUtc { get; set; }
public RatingResource Rating { get; set; }
public string Overview { get; set; }
public string Image { get; set; }
}
}
@@ -1,9 +1,9 @@
namespace NzbDrone.Core.MetadataSource.SkyHook.Resource
{
public class ActorResource
public class MemberResource
{
public string Name { get; set; }
public string Character { get; set; }
public string Instrument { get; set; }
public string Image { get; set; }
}
}
}
@@ -1,15 +0,0 @@
using System.Collections.Generic;
namespace NzbDrone.Core.MetadataSource.SkyHook.Resource
{
public class SeasonResource
{
public SeasonResource()
{
Images = new List<ImageResource>();
}
public int SeasonNumber { get; set; }
public List<ImageResource> Images { get; set; }
}
}
@@ -1,43 +0,0 @@
using System.Collections.Generic;
namespace NzbDrone.Core.MetadataSource.SkyHook.Resource
{
public class ShowResource
{
public ShowResource()
{
Actors = new List<ActorResource>();
Genres = new List<string>();
Images = new List<ImageResource>();
Seasons = new List<SeasonResource>();
Episodes = new List<EpisodeResource>();
}
public int TvdbId { get; set; }
public string Title { get; set; }
public string Overview { get; set; }
//public string Language { get; set; }
public string Slug { get; set; }
public string FirstAired { get; set; }
public int? TvRageId { get; set; }
public int? TvMazeId { get; set; }
public string Status { get; set; }
public int? Runtime { get; set; }
public TimeOfDayResource TimeOfDay { get; set; }
public string Network { get; set; }
public string ImdbId { get; set; }
public List<ActorResource> Actors { get; set; }
public List<string> Genres { get; set; }
public string ContentRating { get; set; }
public RatingResource Rating { get; set; }
public List<ImageResource> Images { get; set; }
public List<SeasonResource> Seasons { get; set; }
public List<EpisodeResource> Episodes { get; set; }
}
}
@@ -17,7 +17,7 @@ using NzbDrone.Core.Configuration;
namespace NzbDrone.Core.MetadataSource.SkyHook
{
public class SkyHookProxy : IProvideSeriesInfo, IProvideArtistInfo, ISearchForNewArtist
public class SkyHookProxy : IProvideArtistInfo, ISearchForNewArtist
{
private readonly IHttpClient _httpClient;
private readonly Logger _logger;
@@ -37,12 +37,6 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
_logger = logger;
}
[Obsolete("Used for Sonarr, not Lidarr")]
public Tuple<Series, List<Episode>> GetSeriesInfo(int tvdbSeriesId)
{
throw new NotImplementedException();
}
public Tuple<Artist, List<Album>> GetArtistInfo(string foreignArtistId)
{
@@ -191,23 +185,23 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
return artist;
}
private static Actor MapActors(ActorResource arg)
private static Member MapMembers(MemberResource arg)
{
var newActor = new Actor
var newMember = new Member
{
Name = arg.Name,
Character = arg.Character
Instrument = arg.Instrument
};
if (arg.Image != null)
{
newActor.Images = new List<MediaCover.MediaCover>
newMember.Images = new List<MediaCover.MediaCover>
{
new MediaCover.MediaCover(MediaCoverTypes.Headshot, arg.Image)
};
}
return newActor;
return newMember;
}
private static ArtistStatusType MapArtistStatus(string status)