diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-04-23 15:17:29 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-04-23 15:17:29 -0400 |
| commit | d314c8e5f8cc52a6fb8c2c057f65707f8fb50ed7 (patch) | |
| tree | 6ba2c4fc3fcc794c97a07aea057dec005d93dd22 | |
| parent | 4390e2f7108f24f89a1bf7ef9f6f7c9c57b4f221 (diff) | |
| parent | 599e54caf1baa5af14131e1a7f21ea7293a16ed4 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Controller/Providers/TV/FanArtTVProvider.cs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/Providers/TV/FanArtTVProvider.cs b/MediaBrowser.Controller/Providers/TV/FanArtTVProvider.cs index cdbfb0883..c974d5857 100644 --- a/MediaBrowser.Controller/Providers/TV/FanArtTVProvider.cs +++ b/MediaBrowser.Controller/Providers/TV/FanArtTVProvider.cs @@ -90,10 +90,13 @@ namespace MediaBrowser.Controller.Providers.TV if (doc.HasChildNodes) { string path; + var hd = ConfigurationManager.Configuration.DownloadHDFanArt ? "hdtv" : "clear"; if (ConfigurationManager.Configuration.DownloadSeriesImages.Logo && !series.ResolveArgs.ContainsMetaFileByName(LOGO_FILE)) { - var node = doc.SelectSingleNode("//fanart/series/clearlogos/clearlogo[@lang = \"" + language + "\"]/@url") ?? - doc.SelectSingleNode("//fanart/series/clearlogos/clearlogo/@url"); + var node = doc.SelectSingleNode("//fanart/series/"+hd+"logos/"+hd+"logo[@lang = \"" + language + "\"]/@url") ?? + doc.SelectSingleNode("//fanart/series/clearlogos/clearlogo[@lang = \"" + language + "\"]/@url") ?? + doc.SelectSingleNode("//fanart/series/"+hd+"logos/"+hd+"logo/@url") ?? + doc.SelectSingleNode("//fanart/series/clearlogos/clearlogo/@url"); path = node != null ? node.Value : null; if (!string.IsNullOrEmpty(path)) { @@ -114,9 +117,12 @@ namespace MediaBrowser.Controller.Providers.TV cancellationToken.ThrowIfCancellationRequested(); + hd = ConfigurationManager.Configuration.DownloadHDFanArt ? "hd" : ""; if (ConfigurationManager.Configuration.DownloadSeriesImages.Art && !series.ResolveArgs.ContainsMetaFileByName(ART_FILE)) { - var node = doc.SelectSingleNode("//fanart/series/cleararts/clearart[@lang = \"" + language + "\"]/@url") ?? + var node = doc.SelectSingleNode("//fanart/series/"+hd+"cleararts/"+hd+"clearart[@lang = \"" + language + "\"]/@url") ?? + doc.SelectSingleNode("//fanart/series/cleararts/clearart[@lang = \"" + language + "\"]/@url") ?? + doc.SelectSingleNode("//fanart/series/"+hd+"cleararts/"+hd+"clearart/@url") ?? doc.SelectSingleNode("//fanart/series/cleararts/clearart/@url"); path = node != null ? node.Value : null; if (!string.IsNullOrEmpty(path)) |