Mirrors/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2024-09-17 15:02:34 +02:00
Code Issues Releases Wiki Activity

New: Show ended on add series if applicable

Browse Source
This commit is contained in:
Mark McDowall 2013-11-07 17:02:35 -08:00
parent 6b04faedbc
commit 2183526a34
4 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/NzbDrone.Core/MetadataSource/Trakt/FullShow.cs
View File

@ -25,6 +25,7 @@ public class Show
public int tvrage_id { get; set; }
public int last_updated { get; set; }
public string poster { get; set; }
public bool? ended { get; set; }
public Images images { get; set; }
public List<string> genres { get; set; }
public List<Season> seasons { get; set; }

14
src/NzbDrone.Core/MetadataSource/TraktProxy.cs
View File

@ -78,7 +78,7 @@ private static Series MapSeries(Show show)
series.Network = show.network;
series.AirTime = show.air_time_utc;
series.TitleSlug = show.url.ToLower().Replace("http://trakt.tv/show/", "");
series.Status = GetSeriesStatus(show.status);
series.Status = GetSeriesStatus(show.status, show.ended);
series.Seasons = show.seasons.Select(s => new Tv.Season
{
@ -114,9 +114,17 @@ private static string GetPosterThumbnailUrl(string posterUrl)
return withoutExtension + "-300" + extension;
}
private static SeriesStatusType GetSeriesStatus(string status)
private static SeriesStatusType GetSeriesStatus(string status, bool? ended)
{
if (string.IsNullOrWhiteSpace(status)) return SeriesStatusType.Continuing;
if (string.IsNullOrWhiteSpace(status))
{
if (ended.HasValue && ended.Value)
{
return SeriesStatusType.Ended;
}
return SeriesStatusType.Continuing;
}
if (status.Equals("Ended", StringComparison.InvariantCultureIgnoreCase)) return SeriesStatusType.Ended;
return SeriesStatusType.Continuing;
}

9
src/UI/AddSeries/SearchResultViewTemplate.html
View File

@ -1,4 +1,4 @@
<div class="search-item {{#unless isExisting}}search-item-new{{/unless}}">
<div class="search-item {{#unless isExisting}}search-item-new{{/unless}}">
<div class="row">
<div class="span2">
<a href="{{traktUrl}}" target="_blank">
@ -9,7 +9,12 @@
<div class="span9">
<div class="row">
<h2>{{titleWithYear}}</h2>
<h2 class="series-title">
{{titleWithYear}}
{{#unless_eq status compare="continuing"}}
<span class="label label-important">Ended</span>
{{/unless_eq}}
</h2>
</div>
<div class="row new-series-overview x-overview">
{{overview}}

7
src/UI/AddSeries/addSeries.less
View File

@ -57,6 +57,13 @@
.search-item {
.series-title {
.label {
margin-left: 15px;
vertical-align: middle;
}
}
.new-series-overview {
overflow : hidden;
height : 120px;