diff options
Diffstat (limited to 'MediaBrowser.Controller')
4 files changed, 39 insertions, 10 deletions
diff --git a/MediaBrowser.Controller/Entities/IHasShortOverview.cs b/MediaBrowser.Controller/Entities/IHasShortOverview.cs new file mode 100644 index 000000000..437201faa --- /dev/null +++ b/MediaBrowser.Controller/Entities/IHasShortOverview.cs @@ -0,0 +1,12 @@ + +namespace MediaBrowser.Controller.Entities +{ + public interface IHasShortOverview + { + /// <summary> + /// Gets or sets the short overview. + /// </summary> + /// <value>The short overview.</value> + string ShortOverview { get; set; } + } +} diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs index 5510c795a..54cb3fcc9 100644 --- a/MediaBrowser.Controller/Entities/Movies/Movie.cs +++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs @@ -14,7 +14,7 @@ namespace MediaBrowser.Controller.Entities.Movies /// <summary> /// Class Movie /// </summary> - public class Movie : Video, IHasCriticRating, IHasSoundtracks, IHasProductionLocations, IHasBudget, IHasKeywords, IHasTrailers, IHasThemeMedia, IHasTaglines, IHasPreferredMetadataLanguage, IHasAwards, IHasMetascore, IHasLookupInfo<MovieInfo>, ISupportsBoxSetGrouping + public class Movie : Video, IHasCriticRating, IHasSoundtracks, IHasProductionLocations, IHasBudget, IHasKeywords, IHasTrailers, IHasThemeMedia, IHasTaglines, IHasPreferredMetadataLanguage, IHasAwards, IHasMetascore, IHasLookupInfo<MovieInfo>, ISupportsBoxSetGrouping, IHasShortOverview { public List<Guid> SpecialFeatureIds { get; set; } @@ -52,6 +52,7 @@ namespace MediaBrowser.Controller.Entities.Movies ProductionLocations = new List<string>(); } + public string ShortOverview { get; set; } public string AwardSummary { get; set; } public float? Metascore { get; set; } diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 5f3a06f79..1310e7797 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -133,6 +133,7 @@ <Compile Include="Entities\IHasProductionLocations.cs" /> <Compile Include="Entities\IHasScreenshots.cs" /> <Compile Include="Entities\IHasSeries.cs" /> + <Compile Include="Entities\IHasShortOverview.cs" /> <Compile Include="Entities\IHasSoundtracks.cs" /> <Compile Include="Entities\IHasTaglines.cs" /> <Compile Include="Entities\IHasTags.cs" /> diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs index 41f994303..3cb90d360 100644 --- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs +++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs @@ -1,5 +1,4 @@ using MediaBrowser.Controller.Entities; -using MediaBrowser.Controller.Persistence; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Logging; using System; @@ -9,7 +8,6 @@ using System.IO; using System.Linq; using System.Text; using System.Threading; -using System.Threading.Tasks; using System.Xml; namespace MediaBrowser.Controller.Providers @@ -249,6 +247,23 @@ namespace MediaBrowser.Controller.Providers break; } + case "ShortOverview": + { + var val = reader.ReadElementContentAsString(); + + if (!string.IsNullOrWhiteSpace(val)) + { + var hasShortOverview = item as IHasShortOverview; + + if (hasShortOverview != null) + { + hasShortOverview.ShortOverview = val; + } + } + + break; + } + case "CriticRatingSummary": { var val = reader.ReadElementContentAsString(); @@ -812,19 +827,19 @@ namespace MediaBrowser.Controller.Providers { var val = reader.ReadElementContentAsString(); - if (string.Equals("HSBS", val)) + if (string.Equals("HSBS", val, StringComparison.CurrentCulture)) { video.Video3DFormat = Video3DFormat.HalfSideBySide; } - else if (string.Equals("HTAB", val)) + else if (string.Equals("HTAB", val, StringComparison.CurrentCulture)) { video.Video3DFormat = Video3DFormat.HalfTopAndBottom; } - else if (string.Equals("FTAB", val)) + else if (string.Equals("FTAB", val, StringComparison.CurrentCulture)) { video.Video3DFormat = Video3DFormat.FullTopAndBottom; } - else if (string.Equals("FSBS", val)) + else if (string.Equals("FSBS", val, StringComparison.CurrentCulture)) { video.Video3DFormat = Video3DFormat.FullSideBySide; } @@ -1195,10 +1210,10 @@ namespace MediaBrowser.Controller.Providers /// </summary> /// <param name="reader">The reader.</param> /// <returns>IEnumerable{PersonInfo}.</returns> - private IEnumerable<Entities.PersonInfo> GetPersonsFromXmlNode(XmlReader reader) + private IEnumerable<PersonInfo> GetPersonsFromXmlNode(XmlReader reader) { var name = string.Empty; - var type = "Actor"; // If type is not specified assume actor + var type = PersonType.Actor; // If type is not specified assume actor var role = string.Empty; int? sortOrder = null; @@ -1257,7 +1272,7 @@ namespace MediaBrowser.Controller.Providers } } - var personInfo = new Entities.PersonInfo + var personInfo = new PersonInfo { Name = name.Trim(), Role = role, |