Merge pull request #1109 from MediaBrowser/dev

3.0.5621.3

1 files changed, 21 insertions, 14 deletions

diff --git a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
index 11cb25ab8..868c667f6 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
@@ -122,13 +122,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                 {
                     var endingXml = xml.Substring(index);
 
-                    var imdbId = endingXml.Split('/')
-                        .FirstOrDefault(i => i.StartsWith("tt", StringComparison.OrdinalIgnoreCase));
-
-                    if (!string.IsNullOrWhiteSpace(imdbId))
-                    {
-                        item.SetProviderId(MetadataProviders.Imdb, imdbId);
-                    }
+                    ParseProviderLinks(item, endingXml);
 
                     // If the file is just an imdb url, don't go any further
                     if (index == 0)
@@ -142,13 +136,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                 {
                     // If the file is just an Imdb url, handle that
 
-                    var imdbId = xml.Split('/')
-                        .FirstOrDefault(i => i.StartsWith("tt", StringComparison.OrdinalIgnoreCase));
-
-                    if (!string.IsNullOrWhiteSpace(imdbId))
-                    {
-                        item.SetProviderId(MetadataProviders.Imdb, imdbId);
-                    }
+                    ParseProviderLinks(item, xml);
 
                     return;
                 }
@@ -181,6 +169,20 @@ namespace MediaBrowser.XbmcMetadata.Parsers
             }
         }
 
+        private void ParseProviderLinks(T item, string xml)
+        {
+            var imdbId = xml.Split('/')
+                .FirstOrDefault(i => i.StartsWith("tt", StringComparison.OrdinalIgnoreCase));
+
+            if (!string.IsNullOrWhiteSpace(imdbId))
+            {
+                item.SetProviderId(MetadataProviders.Imdb, imdbId);
+            }
+
+            // TODO: Support Tmdb
+            // http://www.themoviedb.org/movie/36557
+        }
+
         protected virtual void FetchDataFromXmlNode(XmlReader reader, T item, List<UserItemData> userDataList)
         {
             var userDataUserId = _config.GetNfoConfiguration().UserId;
@@ -952,6 +954,11 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                                     var userData = GetOrAdd(userDataList, userDataUserId);
 
                                     userData.PlayCount = parsedValue;
+
+                                    if (parsedValue > 0)
+                                    {
+                                        userData.Played = true;
+                                    }
                                 }
                             }
                         }