Merge pull request #7286 from daullmer/sonarr-thumb

1 files changed, 9 insertions, 4 deletions

diff --git a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
index 007101868..09ff84044 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
@@ -778,7 +778,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                 case "thumb":
                     {
-                        FetchThumbNode(reader, itemResult);
+                        FetchThumbNode(reader, itemResult, "thumb");
                         break;
                     }
 
@@ -796,7 +796,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                             break;
                         }
 
-                        FetchThumbNode(subtree, itemResult);
+                        FetchThumbNode(subtree, itemResult, "fanart");
                         break;
                     }
 
@@ -819,17 +819,22 @@ namespace MediaBrowser.XbmcMetadata.Parsers
             }
         }
 
-        private void FetchThumbNode(XmlReader reader, MetadataResult<T> itemResult)
+        private void FetchThumbNode(XmlReader reader, MetadataResult<T> itemResult, string parentNode)
         {
             var artType = reader.GetAttribute("aspect");
             var val = reader.ReadElementContentAsString();
 
             // artType is null if the thumb node is a child of the fanart tag
             // -> set image type to fanart
-            if (string.IsNullOrWhiteSpace(artType))
+            if (string.IsNullOrWhiteSpace(artType) && parentNode.Equals("fanart", StringComparison.Ordinal))
             {
                 artType = "fanart";
             }
+            else if (string.IsNullOrWhiteSpace(artType))
+            {
+                // Sonarr writes thumb tags for posters without aspect property
+                artType = "poster";
+            }
 
             // skip:
             // - empty uri