add movie resolver fix

4 files changed, 58 insertions, 15 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index cc9d9551c..c8f472536 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -2181,7 +2181,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 }
             }
 
-            return item.People ?? new List<PersonInfo>();
+            return new List<PersonInfo>();
         }
 
         public List<Person> GetPeopleItems(InternalPeopleQuery query)
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index 0d1e4202c..d9f23977c 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -309,20 +309,26 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
                 //we need to only look at the name of this actual item (not parents)
                 var justName = item.IsInMixedFolder ? Path.GetFileName(item.Path) : Path.GetFileName(item.ContainingFolderPath);
 
-                // check for tmdb id
-                var tmdbid = justName.GetAttributeValue("tmdbid");
-
-                if (!string.IsNullOrEmpty(tmdbid))
+                if (!string.IsNullOrWhiteSpace(justName))
                 {
-                    item.SetProviderId(MetadataProviders.Tmdb, tmdbid);
-                }
+                    // check for tmdb id
+                    var tmdbid = justName.GetAttributeValue("tmdbid");
 
-                // check for imdb id - we use full media path, as we can assume, that this will match in any use case (wither id in parent dir or in file name)
-                var imdbid = item.Path.GetAttributeValue("imdbid");
+                    if (!string.IsNullOrWhiteSpace(tmdbid))
+                    {
+                        item.SetProviderId(MetadataProviders.Tmdb, tmdbid);
+                    }
+                }
 
-                if (!string.IsNullOrEmpty(imdbid))
+                if (!string.IsNullOrWhiteSpace(item.Path))
                 {
-                    item.SetProviderId(MetadataProviders.Imdb, imdbid);
+                    // check for imdb id - we use full media path, as we can assume, that this will match in any use case (wither id in parent dir or in file name)
+                    var imdbid = item.Path.GetAttributeValue("imdbid");
+
+                    if (!string.IsNullOrWhiteSpace(imdbid))
+                    {
+                        item.SetProviderId(MetadataProviders.Imdb, imdbid);
+                    }
                 }
             }
         }
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
index 02b3080e4..bc6ed47ad 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
@@ -329,7 +329,10 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                 RequiresClosing = true,
                 BufferMs = 1000,
                 Container = "ts",
-                Id = profile
+                Id = profile,
+                SupportsDirectPlay = true,
+                SupportsDirectStream = false,
+                SupportsTranscoding = true
             };
 
             return mediaSource;
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 00ebf7ea6..86b4e7d1c 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -187,11 +187,16 @@ namespace MediaBrowser.Server.Implementations.Persistence
         /// </summary>
         private readonly SemaphoreSlim _writeLock = new SemaphoreSlim(1, 1);
 
-        private string[] _retriveItemColumns =
+        private readonly string[] _retriveItemColumns =
         {
             "type",
             "data",
-            "IsOffline"
+            "EndDate",
+            "IsOffline",
+            "ChannelId",
+            "IsMovie",
+            "IsSports",
+            "IsKids"
         };
 
         /// <summary>
@@ -511,7 +516,36 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             if (!reader.IsDBNull(2))
             {
-                item.IsOffline = reader.GetBoolean(2);
+                item.EndDate = reader.GetDateTime(2).ToUniversalTime();
+            }
+
+            if (!reader.IsDBNull(3))
+            {
+                item.IsOffline = reader.GetBoolean(3);
+            }
+
+            if (!reader.IsDBNull(4))
+            {
+                item.ChannelId = reader.GetString(4);
+            }
+
+            var hasProgramAttributes = item as IHasProgramAttributes;
+            if (hasProgramAttributes != null)
+            {
+                if (!reader.IsDBNull(5))
+                {
+                    hasProgramAttributes.IsMovie = reader.GetBoolean(5);
+                }
+
+                if (!reader.IsDBNull(6))
+                {
+                    hasProgramAttributes.IsSports = reader.GetBoolean(6);
+                }
+
+                if (!reader.IsDBNull(7))
+                {
+                    hasProgramAttributes.IsKids = reader.GetBoolean(7);
+                }
             }
 
             return item;