diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-03-08 02:24:52 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-03-08 02:24:52 -0500 |
| commit | d5c7845917bd15a945aacb92f50db6502123ad9a (patch) | |
| tree | b4f9ecfd2d716733ff04406d9360d084ec11cf18 /MediaBrowser.LocalMetadata | |
| parent | cf57e8193c5108804724dd55242a56e03b907ed7 (diff) | |
| parent | 23010f2980381a4b56e05620d4604cafc0e00043 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/Emby
Diffstat (limited to 'MediaBrowser.LocalMetadata')
| -rw-r--r-- | MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs | 32 | ||||
| -rw-r--r-- | MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs | 16 |
3 files changed, 1 insertions, 49 deletions
diff --git a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs index 2f7059fec..c986e2005 100644 --- a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs +++ b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs @@ -177,7 +177,7 @@ namespace MediaBrowser.LocalMetadata.Images "default" }; - if (item is MusicAlbum || item is MusicArtist || item is PhotoAlbum) + if (item is MusicAlbum || item is MusicArtist || item is PhotoAlbum || item is Person) { // these prefer folder names.Insert(0, "poster"); diff --git a/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs b/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs index 9e36f2f95..a1fd71ab2 100644 --- a/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs +++ b/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs @@ -207,38 +207,6 @@ namespace MediaBrowser.LocalMetadata.Parsers break; } - case "Budget": - { - var text = reader.ReadElementContentAsString(); - var hasBudget = item as IHasBudget; - if (hasBudget != null) - { - double value; - if (double.TryParse(text, NumberStyles.Any, _usCulture, out value)) - { - hasBudget.Budget = value; - } - } - - break; - } - - case "Revenue": - { - var text = reader.ReadElementContentAsString(); - var hasBudget = item as IHasBudget; - if (hasBudget != null) - { - double value; - if (double.TryParse(text, NumberStyles.Any, _usCulture, out value)) - { - hasBudget.Revenue = value; - } - } - - break; - } - case "Metascore": { var text = reader.ReadElementContentAsString(); diff --git a/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs index e1bf4613b..6a2e2263b 100644 --- a/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs +++ b/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs @@ -37,7 +37,6 @@ namespace MediaBrowser.LocalMetadata.Savers "AudioDbArtistId", "AwardSummary", "BirthDate", - "Budget", // Deprecated. No longer saving in this field. "certification", @@ -90,7 +89,6 @@ namespace MediaBrowser.LocalMetadata.Savers "PremiereDate", "ProductionYear", "Rating", - "Revenue", "RottenTomatoesId", "RunningTime", @@ -435,20 +433,6 @@ namespace MediaBrowser.LocalMetadata.Savers writer.WriteElementString("AwardSummary", hasAwards.AwardSummary); } - var hasBudget = item as IHasBudget; - if (hasBudget != null) - { - if (hasBudget.Budget.HasValue) - { - writer.WriteElementString("Budget", hasBudget.Budget.Value.ToString(UsCulture)); - } - - if (hasBudget.Revenue.HasValue) - { - writer.WriteElementString("Revenue", hasBudget.Revenue.Value.ToString(UsCulture)); - } - } - if (item.CommunityRating.HasValue) { writer.WriteElementString("Rating", item.CommunityRating.Value.ToString(UsCulture)); |