mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Code cleanup per commit comments. More Work?! 

EpisodeParseResult will use Season ## when it is a full season instead of writing out each episode number.
This commit is contained in:
Mark McDowall 2012-01-30 22:55:57 -08:00
parent 1f983094ac
commit 26adbf2602
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
NzbDrone.Core/Helpers/SabnzbdQueueTimeConverter.cs
View File

@ -10,34 +10,28 @@ namespace NzbDrone.Core.Helpers
{ {
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{ {
if (value is TimeSpan) var ts = (TimeSpan)value;
writer.WriteValue(value.ToString()); writer.WriteValue(ts.ToString());
else
throw new Exception("Expected TimeSpan object value.");
} }
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{ {
var split = reader.Value.ToString().Split(':'); var split = reader.Value.ToString().Split(':');
if (split.Count() == 3) if (split.Count() != 3)
{ {
return new TimeSpan(int.Parse(split[0]), // hours throw new ArgumentException("TimeSpan is invalid");
}
return new TimeSpan(int.Parse(split[0]), // hours
int.Parse(split[1]), // minutes int.Parse(split[1]), // minutes
int.Parse(split[2]) // seconds int.Parse(split[2]) // seconds
); );
}
throw new ArgumentException("TimeSpan is invalid");
} }
public override bool CanConvert(Type objectType) public override bool CanConvert(Type objectType)
{ {
if (objectType == typeof(TimeSpan)) return objectType == typeof(TimeSpan);
return true;
return false;
} }
} }
} }

3
NzbDrone.Core/Model/EpisodeParseResult.cs
View File

@ -44,6 +44,9 @@ namespace NzbDrone.Core.Model
if (AirDate != null && EpisodeNumbers == null) if (AirDate != null && EpisodeNumbers == null)
return string.Format("{0} - {1} {2}", SeriesTitle, AirDate.Value.ToShortDateString(), Quality); return string.Format("{0} - {1} {2}", SeriesTitle, AirDate.Value.ToShortDateString(), Quality);
if (FullSeason)
return string.Format("{0} - Season {1:00}", SeriesTitle, SeasonNumber);
if (EpisodeNumbers != null) if (EpisodeNumbers != null)
return string.Format("{0} - S{1:00}E{2} {3}", SeriesTitle, SeasonNumber, return string.Format("{0} - S{1:00}E{2} {3}", SeriesTitle, SeasonNumber,
String.Join("-", EpisodeNumbers), Quality); String.Join("-", EpisodeNumbers), Quality);