From 1279c6d8b5179017efb3fb9503d6937dcd84bc97 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 17 Jul 2015 22:52:27 -0400
Subject: fix roku live tv stream closing

---
 MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
index b6441053d..9b46a8057 100644
--- a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
@@ -230,7 +230,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
         private void SetKeyProperties(IMediaSourceProvider provider, MediaSourceInfo mediaSource)
         {
-            var prefix = provider.GetType().FullName.GetMD5().ToString("N") + "|";
+            var prefix = provider.GetType().FullName.GetMD5().ToString("N") + LiveStreamIdDelimeter;
 
             if (!string.IsNullOrWhiteSpace(mediaSource.OpenToken) && !mediaSource.OpenToken.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
             {
@@ -463,10 +463,13 @@ namespace MediaBrowser.Server.Implementations.Library
                 _liveStreamSemaphore.Release();
             }
         }
+        
+        // Do not use a pipe here because Roku http requests to the server will fail, without any explicit error message.
+        private const char LiveStreamIdDelimeter = '_';
 
         private Tuple<IMediaSourceProvider, string> GetProvider(string key)
         {
-            var keys = key.Split(new[] { '|' }, 2);
+            var keys = key.Split(new[] { LiveStreamIdDelimeter }, 2);
 
             var provider = _providers.FirstOrDefault(i => string.Equals(i.GetType().FullName.GetMD5().ToString("N"), keys[0], StringComparison.OrdinalIgnoreCase));
 
-- 
cgit v1.2.3


From 42542e10bf3a780f7f03cd94415aab51b3aa05c0 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 18 Jul 2015 15:32:59 -0400
Subject: add live tv to search

---
 .../Entities/InternalItemsQuery.cs                 |  1 +
 .../Library/SearchEngine.cs                        | 36 +++++++----
 .../Persistence/SqliteItemRepository.cs            | 72 ++++++++++++++++++----
 3 files changed, 87 insertions(+), 22 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
index c5e60a73d..3702716f9 100644
--- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
+++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
@@ -40,6 +40,7 @@ namespace MediaBrowser.Controller.Entities
         public string NameStartsWithOrGreater { get; set; }
         public string NameStartsWith { get; set; }
         public string NameLessThan { get; set; }
+        public string NameContains { get; set; }
 
         public string Person { get; set; }
         public string[] PersonIds { get; set; }
diff --git a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
index 05dde5b3e..db8a2d4fd 100644
--- a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
+++ b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
@@ -37,26 +37,22 @@ namespace MediaBrowser.Server.Implementations.Library
 
             Func<BaseItem, bool> filter = i => !(i is ICollectionFolder);
 
+            User user = null;
+
             if (string.IsNullOrWhiteSpace(query.UserId))
             {
                 inputItems = _libraryManager.RootFolder.GetRecursiveChildren(filter);
             }
             else
             {
-                var user = _userManager.GetUserById(query.UserId);
+                user = _userManager.GetUserById(query.UserId);
 
                 inputItems = user.RootFolder.GetRecursiveChildren(user, filter);
             }
 
             inputItems = _libraryManager.ReplaceVideosWithPrimaryVersions(inputItems);
 
-            var results = await GetSearchHints(inputItems, query).ConfigureAwait(false);
-
-            // Include item types
-            if (query.IncludeItemTypes.Length > 0)
-            {
-                results = results.Where(f => query.IncludeItemTypes.Contains(f.Item.GetType().Name, StringComparer.OrdinalIgnoreCase));
-            }
+            var results = await GetSearchHints(inputItems, query, user).ConfigureAwait(false);
 
             var searchResultArray = results.ToArray();
             results = searchResultArray;
@@ -86,9 +82,10 @@ namespace MediaBrowser.Server.Implementations.Library
         /// </summary>
         /// <param name="inputItems">The input items.</param>
         /// <param name="query">The query.</param>
+        /// <param name="user">The user.</param>
         /// <returns>IEnumerable{SearchHintResult}.</returns>
         /// <exception cref="System.ArgumentNullException">searchTerm</exception>
-        private Task<IEnumerable<SearchHintInfo>> GetSearchHints(IEnumerable<BaseItem> inputItems, SearchQuery query)
+        private Task<IEnumerable<SearchHintInfo>> GetSearchHints(IEnumerable<BaseItem> inputItems, SearchQuery query, User user)
         {
             var searchTerm = query.SearchTerm;
 
@@ -98,7 +95,7 @@ namespace MediaBrowser.Server.Implementations.Library
             }
 
             searchTerm = searchTerm.RemoveDiacritics();
-            
+
             var terms = GetWords(searchTerm);
 
             var hints = new List<Tuple<BaseItem, string, int>>();
@@ -107,8 +104,25 @@ namespace MediaBrowser.Server.Implementations.Library
 
             if (query.IncludeMedia)
             {
+                var mediaItems = _libraryManager.GetItems(new InternalItemsQuery
+                {
+                    NameContains = searchTerm,
+                    ExcludeItemTypes = new[]
+                    {
+                        typeof (Person).Name,
+                        typeof (Genre).Name,
+                        typeof (MusicArtist).Name,
+                        typeof (GameGenre).Name,
+                        typeof (MusicGenre).Name,
+                        typeof (Year).Name,
+                        typeof (Studio).Name
+                    },
+                    IncludeItemTypes = query.IncludeItemTypes
+
+                }).Items;
+
                 // Add search hints based on item name
-                hints.AddRange(items.Where(i => !string.IsNullOrWhiteSpace(i.Name) && IncludeInSearch(i)).Select(item =>
+                hints.AddRange(mediaItems.Where(i => (user == null || i.IsVisibleStandalone(user)) && !(i is CollectionFolder)).Select(item =>
                 {
                     var index = GetIndex(item.Name, searchTerm, terms);
 
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 852fbd76c..788d12cbb 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -1,5 +1,7 @@
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Persistence;
@@ -867,7 +869,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 whereClauses.Add("type=@type");
                 cmd.Parameters.Add(cmd, "@type", DbType.String).Value = includeTypes[0];
             }
-            if (includeTypes.Length > 1)
+            else if (includeTypes.Length > 1)
             {
                 var inClause = string.Join(",", includeTypes.Select(i => "'" + i + "'").ToArray());
                 whereClauses.Add(string.Format("type in ({0})", inClause));
@@ -930,6 +932,12 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 cmd.Parameters.Add(cmd, "@PersonName", DbType.String).Value = query.Person;
             }
 
+            if (!string.IsNullOrWhiteSpace(query.NameContains))
+            {
+                whereClauses.Add("Name like @NameContains");
+                cmd.Parameters.Add(cmd, "@NameContains", DbType.String).Value = "%" + query.NameContains + "%";
+            }
+            
             if (addPaging)
             {
                 if (query.StartIndex.HasValue && query.StartIndex.Value > 0)
@@ -947,16 +955,58 @@ namespace MediaBrowser.Server.Implementations.Persistence
             return whereClauses;
         }
 
+        private static readonly Type[] KnownTypes =
+        {
+            typeof(LiveTvProgram),
+            typeof(LiveTvChannel),
+            typeof(LiveTvVideoRecording),
+            typeof(LiveTvAudioRecording),
+            typeof(Series),
+            typeof(LiveTvAudioRecording),
+            typeof(LiveTvVideoRecording),
+            typeof(Audio),
+            typeof(MusicAlbum),
+            typeof(MusicArtist),
+            typeof(MusicGenre),
+            typeof(MusicVideo),
+            typeof(Movie),
+            typeof(BoxSet),
+            typeof(Episode),
+            typeof(Season),
+            typeof(Series),
+            typeof(Book),
+            typeof(CollectionFolder),
+            typeof(Folder),
+            typeof(Game),
+            typeof(GameGenre),
+            typeof(GameSystem),
+            typeof(Genre),
+            typeof(Person),
+            typeof(Photo),
+            typeof(PhotoAlbum),
+            typeof(Studio),
+            typeof(UserRootFolder),
+            typeof(UserView),
+            typeof(Video),
+            typeof(Year)
+        };
+
+        private static Dictionary<string, string[]> GetTypeMapDictionary()
+        {
+            var dict = new Dictionary<string, string[]>();
+
+            foreach (var t in KnownTypes)
+            {
+                dict[t.Name] = new[] { t.FullName };
+            }
+
+            dict["Recording"] = new[] { typeof(LiveTvAudioRecording).FullName, typeof(LiveTvVideoRecording).FullName };
+
+            return dict;
+        }
+
         // Not crazy about having this all the way down here, but at least it's in one place
-        readonly Dictionary<string, string[]> _types = new Dictionary<string, string[]>(StringComparer.OrdinalIgnoreCase)
-            {
-                {typeof(LiveTvProgram).Name, new []{typeof(LiveTvProgram).FullName}},
-                {typeof(LiveTvChannel).Name, new []{typeof(LiveTvChannel).FullName}},
-                {typeof(LiveTvVideoRecording).Name, new []{typeof(LiveTvVideoRecording).FullName}},
-                {typeof(LiveTvAudioRecording).Name, new []{typeof(LiveTvAudioRecording).FullName}},
-                {typeof(Series).Name, new []{typeof(Series).FullName}},
-                {"Recording", new []{typeof(LiveTvAudioRecording).FullName, typeof(LiveTvVideoRecording).FullName}}
-            };
+        readonly Dictionary<string, string[]> _types = GetTypeMapDictionary();
 
         private IEnumerable<string> MapIncludeItemTypes(string value)
         {
@@ -1260,7 +1310,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
             if (!string.IsNullOrWhiteSpace(query.NameContains))
             {
                 whereClauses.Add("Name like @NameContains");
-                cmd.Parameters.Add(cmd, "@NameContains", DbType.String).Value = "%"+query.NameContains+"%";
+                cmd.Parameters.Add(cmd, "@NameContains", DbType.String).Value = "%" + query.NameContains + "%";
             }
 
             return whereClauses;
-- 
cgit v1.2.3


From 3178896004540c4a5884b9235a67ffbe3f58af0b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 19 Jul 2015 23:43:13 -0400
Subject: update subtitle methods

---
 MediaBrowser.Api/Playback/BaseStreamingService.cs  |  4 ++--
 MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs  |  4 ++--
 .../MediaBrowser.MediaEncoding.csproj              |  1 -
 MediaBrowser.MediaEncoding/Subtitles/AssParser.cs  |  1 +
 .../Subtitles/ISubtitleParser.cs                   |  1 +
 .../Subtitles/ISubtitleWriter.cs                   |  1 +
 MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs |  3 ++-
 MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs  |  1 +
 MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs  |  1 +
 MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs  |  1 +
 .../Subtitles/SubtitleTrackInfo.cs                 | 22 ----------------------
 MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs |  1 +
 MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs  |  1 +
 .../MediaBrowser.Model.Portable.csproj             |  6 ++++++
 .../MediaBrowser.Model.net35.csproj                |  6 ++++++
 MediaBrowser.Model/MediaBrowser.Model.csproj       |  2 ++
 MediaBrowser.Model/MediaInfo/SubtitleTrackEvent.cs | 11 +++++++++++
 MediaBrowser.Model/MediaInfo/SubtitleTrackInfo.cs  | 14 ++++++++++++++
 .../Library/SearchEngine.cs                        |  2 +-
 .../Persistence/SqliteItemRepository.cs            |  2 ++
 .../MediaEncoding/Subtitles/AssParserTests.cs      |  1 +
 .../MediaEncoding/Subtitles/SrtParserTests.cs      |  1 +
 .../MediaEncoding/Subtitles/VttWriterTest.cs       |  1 +
 MediaBrowser.WebDashboard/Api/PackageCreator.cs    | 12 ++++++------
 24 files changed, 65 insertions(+), 35 deletions(-)
 delete mode 100644 MediaBrowser.MediaEncoding/Subtitles/SubtitleTrackInfo.cs
 create mode 100644 MediaBrowser.Model/MediaInfo/SubtitleTrackEvent.cs
 create mode 100644 MediaBrowser.Model/MediaInfo/SubtitleTrackInfo.cs

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index dc5858e86..e7885a3f8 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -689,7 +689,7 @@ namespace MediaBrowser.Api.Playback
 
                 // TODO: Perhaps also use original_size=1920x800 ??
                 return string.Format("subtitles=filename='{0}'{1},setpts=PTS -{2}/TB",
-                    subtitlePath.Replace('\\', '/').Replace("'", "\\'").Replace(":/", "\\:/"),
+                    subtitlePath.Replace('\\', '/').Replace(":/", "\\:/"),
                     charsetParam,
                     seconds.ToString(UsCulture));
             }
@@ -697,7 +697,7 @@ namespace MediaBrowser.Api.Playback
             var mediaPath = state.MediaPath ?? string.Empty;
 
             return string.Format("subtitles='{0}:si={1}',setpts=PTS -{2}/TB",
-                mediaPath.Replace('\\', '/').Replace("'", "\\'").Replace(":/", "\\:/"),
+                mediaPath.Replace('\\', '/').Replace(":/", "\\:/"),
                 state.InternalSubtitleStreamOffset.ToString(UsCulture),
                 seconds.ToString(UsCulture));
         }
diff --git a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
index 97c5aecd0..fbfe79272 100644
--- a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
@@ -902,13 +902,13 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
                 // TODO: Perhaps also use original_size=1920x800 ??
                 return string.Format("subtitles=filename='{0}'{1},setpts=PTS -{2}/TB",
-                    subtitlePath.Replace('\\', '/').Replace("'", "\\'").Replace(":/", "\\:/"),
+                    subtitlePath.Replace('\\', '/').Replace(":/", "\\:/"),
                     charsetParam,
                     seconds.ToString(UsCulture));
             }
 
             return string.Format("subtitles='{0}:si={1}',setpts=PTS -{2}/TB",
-                state.MediaPath.Replace('\\', '/').Replace("'", "\\'").Replace(":/", "\\:/"),
+                state.MediaPath.Replace('\\', '/').Replace(":/", "\\:/"),
                 state.InternalSubtitleStreamOffset.ToString(UsCulture),
                 seconds.ToString(UsCulture));
         }
diff --git a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
index ad561c484..de05d9ffd 100644
--- a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
+++ b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
@@ -81,7 +81,6 @@
     <Compile Include="Subtitles\AssParser.cs" />
     <Compile Include="Subtitles\SsaParser.cs" />
     <Compile Include="Subtitles\SubtitleEncoder.cs" />
-    <Compile Include="Subtitles\SubtitleTrackInfo.cs" />
     <Compile Include="Subtitles\TtmlWriter.cs" />
     <Compile Include="Subtitles\VttWriter.cs" />
   </ItemGroup>
diff --git a/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs b/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
index e711c02b6..6d723a087 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
@@ -6,6 +6,7 @@ using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
+using MediaBrowser.Model.MediaInfo;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
 {
diff --git a/MediaBrowser.MediaEncoding/Subtitles/ISubtitleParser.cs b/MediaBrowser.MediaEncoding/Subtitles/ISubtitleParser.cs
index 5b072a450..75de81f46 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/ISubtitleParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/ISubtitleParser.cs
@@ -1,5 +1,6 @@
 using System.IO;
 using System.Threading;
+using MediaBrowser.Model.MediaInfo;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
 {
diff --git a/MediaBrowser.MediaEncoding/Subtitles/ISubtitleWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/ISubtitleWriter.cs
index eb29e6c17..e28da9185 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/ISubtitleWriter.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/ISubtitleWriter.cs
@@ -1,5 +1,6 @@
 using System.IO;
 using System.Threading;
+using MediaBrowser.Model.MediaInfo;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
 {
diff --git a/MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs
index a4fc5d795..474f712f9 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Model.Serialization;
+using MediaBrowser.Model.MediaInfo;
+using MediaBrowser.Model.Serialization;
 using System.IO;
 using System.Text;
 using System.Threading;
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs b/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
index 9751176cb..d40d4afa7 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
@@ -6,6 +6,7 @@ using System.Globalization;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Threading;
+using MediaBrowser.Model.MediaInfo;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
 {
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs
index 3e574f931..c05929fde 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
+using MediaBrowser.Model.MediaInfo;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
 {
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs b/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
index bfc6c60fc..6c760658d 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
@@ -3,6 +3,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Threading;
+using MediaBrowser.Model.MediaInfo;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
 {
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleTrackInfo.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleTrackInfo.cs
deleted file mode 100644
index 67d70ed6e..000000000
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleTrackInfo.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-
-namespace MediaBrowser.MediaEncoding.Subtitles
-{
-    public class SubtitleTrackInfo
-    {
-        public List<SubtitleTrackEvent> TrackEvents { get; set; }
-
-        public SubtitleTrackInfo()
-        {
-            TrackEvents = new List<SubtitleTrackEvent>();
-        }
-    }
-
-    public class SubtitleTrackEvent
-    {
-        public string Id { get; set; }
-        public string Text { get; set; }
-        public long StartPositionTicks { get; set; }
-        public long EndPositionTicks { get; set; }
-    }
-}
diff --git a/MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs
index 955b36ecd..c32005f89 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs
@@ -3,6 +3,7 @@ using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
+using MediaBrowser.Model.MediaInfo;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
 {
diff --git a/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs
index fa53e4d13..092add992 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs
@@ -3,6 +3,7 @@ using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
+using MediaBrowser.Model.MediaInfo;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
 {
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index a1b7ce396..90a185a97 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -821,6 +821,12 @@
     <Compile Include="..\MediaBrowser.Model\MediaInfo\SubtitleFormat.cs">
       <Link>MediaInfo\SubtitleFormat.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\MediaInfo\SubtitleTrackEvent.cs">
+      <Link>MediaInfo\SubtitleTrackEvent.cs</Link>
+    </Compile>
+    <Compile Include="..\MediaBrowser.Model\MediaInfo\SubtitleTrackInfo.cs">
+      <Link>MediaInfo\SubtitleTrackInfo.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\MediaInfo\TransportStreamTimestamp.cs">
       <Link>MediaInfo\TransportStreamTimestamp.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
index d4a373733..e7878fb1b 100644
--- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
+++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
@@ -777,6 +777,12 @@
     <Compile Include="..\MediaBrowser.Model\MediaInfo\SubtitleFormat.cs">
       <Link>MediaInfo\SubtitleFormat.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\MediaInfo\SubtitleTrackEvent.cs">
+      <Link>MediaInfo\SubtitleTrackEvent.cs</Link>
+    </Compile>
+    <Compile Include="..\MediaBrowser.Model\MediaInfo\SubtitleTrackInfo.cs">
+      <Link>MediaInfo\SubtitleTrackInfo.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\MediaInfo\TransportStreamTimestamp.cs">
       <Link>MediaInfo\TransportStreamTimestamp.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index b36fa2362..5c7caf407 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -169,6 +169,8 @@
     <Compile Include="Configuration\MetadataPluginType.cs" />
     <Compile Include="Dlna\SubtitleProfile.cs" />
     <Compile Include="MediaInfo\MediaProtocol.cs" />
+    <Compile Include="MediaInfo\SubtitleTrackEvent.cs" />
+    <Compile Include="MediaInfo\SubtitleTrackInfo.cs" />
     <Compile Include="Net\HttpResponse.cs" />
     <Compile Include="Net\MimeTypes.cs" />
     <Compile Include="Notifications\NotificationOption.cs" />
diff --git a/MediaBrowser.Model/MediaInfo/SubtitleTrackEvent.cs b/MediaBrowser.Model/MediaInfo/SubtitleTrackEvent.cs
new file mode 100644
index 000000000..b4ab6ed97
--- /dev/null
+++ b/MediaBrowser.Model/MediaInfo/SubtitleTrackEvent.cs
@@ -0,0 +1,11 @@
+
+namespace MediaBrowser.Model.MediaInfo
+{
+    public class SubtitleTrackEvent
+    {
+        public string Id { get; set; }
+        public string Text { get; set; }
+        public long StartPositionTicks { get; set; }
+        public long EndPositionTicks { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/MediaInfo/SubtitleTrackInfo.cs b/MediaBrowser.Model/MediaInfo/SubtitleTrackInfo.cs
new file mode 100644
index 000000000..765cfe32f
--- /dev/null
+++ b/MediaBrowser.Model/MediaInfo/SubtitleTrackInfo.cs
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+
+namespace MediaBrowser.Model.MediaInfo
+{
+    public class SubtitleTrackInfo
+    {
+        public List<SubtitleTrackEvent> TrackEvents { get; set; }
+
+        public SubtitleTrackInfo()
+        {
+            TrackEvents = new List<SubtitleTrackEvent>();
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
index db8a2d4fd..abebd26cc 100644
--- a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
+++ b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
@@ -122,7 +122,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 }).Items;
 
                 // Add search hints based on item name
-                hints.AddRange(mediaItems.Where(i => (user == null || i.IsVisibleStandalone(user)) && !(i is CollectionFolder)).Select(item =>
+                hints.AddRange(mediaItems.Where(i => IncludeInSearch(i) && (user == null || i.IsVisibleStandalone(user)) && !(i is CollectionFolder)).Select(item =>
                 {
                     var index = GetIndex(item.Name, searchTerm, terms);
 
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 788d12cbb..9ce239eb9 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -1001,6 +1001,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
             }
 
             dict["Recording"] = new[] { typeof(LiveTvAudioRecording).FullName, typeof(LiveTvVideoRecording).FullName };
+            dict["Program"] = new[] { typeof(LiveTvProgram).FullName };
+            dict["TvChannel"] = new[] { typeof(LiveTvChannel).FullName };
 
             return dict;
         }
diff --git a/MediaBrowser.Tests/MediaEncoding/Subtitles/AssParserTests.cs b/MediaBrowser.Tests/MediaEncoding/Subtitles/AssParserTests.cs
index 02fd66b20..d5a62802d 100644
--- a/MediaBrowser.Tests/MediaEncoding/Subtitles/AssParserTests.cs
+++ b/MediaBrowser.Tests/MediaEncoding/Subtitles/AssParserTests.cs
@@ -1,5 +1,6 @@
 using System.Text;
 using MediaBrowser.MediaEncoding.Subtitles;
+using MediaBrowser.Model.MediaInfo;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Collections.Generic;
 using System.IO;
diff --git a/MediaBrowser.Tests/MediaEncoding/Subtitles/SrtParserTests.cs b/MediaBrowser.Tests/MediaEncoding/Subtitles/SrtParserTests.cs
index 8ea4398e9..07717a328 100644
--- a/MediaBrowser.Tests/MediaEncoding/Subtitles/SrtParserTests.cs
+++ b/MediaBrowser.Tests/MediaEncoding/Subtitles/SrtParserTests.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Threading;
 using MediaBrowser.MediaEncoding.Subtitles;
 using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.MediaInfo;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace MediaBrowser.Tests.MediaEncoding.Subtitles
diff --git a/MediaBrowser.Tests/MediaEncoding/Subtitles/VttWriterTest.cs b/MediaBrowser.Tests/MediaEncoding/Subtitles/VttWriterTest.cs
index 7a4823ecf..924a1736f 100644
--- a/MediaBrowser.Tests/MediaEncoding/Subtitles/VttWriterTest.cs
+++ b/MediaBrowser.Tests/MediaEncoding/Subtitles/VttWriterTest.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using System.Threading;
 using MediaBrowser.MediaEncoding.Subtitles;
+using MediaBrowser.Model.MediaInfo;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace MediaBrowser.Tests.MediaEncoding.Subtitles {
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index 7f7aa4a2d..3be24ddf1 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -304,11 +304,11 @@ namespace MediaBrowser.WebDashboard.Api
                     }
                 }
 
-                var version = GetType().Assembly.GetName().Version;
+                var versionString = !string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase) ? "?v=" + appVersion : string.Empty;
 
                 var imports = new[]
                 {
-                    "vulcanize-out.html?v=" + appVersion
+                    "vulcanize-out.html" + versionString
                 };
                 var importsHtml = string.Join("", imports.Select(i => "<link rel=\"import\" href=\"" + i + "\">").ToArray());
 
@@ -316,7 +316,7 @@ namespace MediaBrowser.WebDashboard.Api
                 // In chrome it is causing the body to be hidden while loading, which leads to width-check methods to return 0 for everything
                 //imports = "";
 
-                html = html.Replace("<head>", "<head>" + GetMetaTags(mode) + GetCommonCss(mode, version) + GetInitialJavascript(mode, version) + importsHtml + GetCommonJavascript(mode, version));
+                html = html.Replace("<head>", "<head>" + GetMetaTags(mode) + GetCommonCss(mode, appVersion) + GetInitialJavascript(mode, appVersion) + importsHtml + GetCommonJavascript(mode, appVersion));
 
                 var bytes = Encoding.UTF8.GetBytes(html);
 
@@ -412,7 +412,7 @@ namespace MediaBrowser.WebDashboard.Api
         /// <param name="mode">The mode.</param>
         /// <param name="version">The version.</param>
         /// <returns>System.String.</returns>
-        private string GetCommonCss(string mode, Version version)
+        private string GetCommonCss(string mode, string version)
         {
             var versionString = !string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase) ? "?v=" + version : string.Empty;
 
@@ -433,7 +433,7 @@ namespace MediaBrowser.WebDashboard.Api
         /// <param name="mode">The mode.</param>
         /// <param name="version">The version.</param>
         /// <returns>System.String.</returns>
-        private string GetInitialJavascript(string mode, Version version)
+        private string GetInitialJavascript(string mode, string version)
         {
             var builder = new StringBuilder();
 
@@ -457,7 +457,7 @@ namespace MediaBrowser.WebDashboard.Api
         /// <param name="mode">The mode.</param>
         /// <param name="version">The version.</param>
         /// <returns>System.String.</returns>
-        private string GetCommonJavascript(string mode, Version version)
+        private string GetCommonJavascript(string mode, string version)
         {
             var builder = new StringBuilder();
 
-- 
cgit v1.2.3


From cf27ac47a8366ea1710908c4aa1093a6a85d7139 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 22 Jul 2015 11:52:13 -0400
Subject: fix unveil when tabbing away and back

---
 MediaBrowser.Server.Implementations/Library/SearchEngine.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
index abebd26cc..21e92786d 100644
--- a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
+++ b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
@@ -130,7 +130,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 }));
             }
 
-            if (query.IncludeArtists)
+            if (query.IncludeArtists && (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains("MusicArtist", StringComparer.OrdinalIgnoreCase)))
             {
                 // Find artists
                 var artists = items.OfType<Audio>()
@@ -159,7 +159,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 }
             }
 
-            if (query.IncludeGenres)
+            if (query.IncludeGenres && (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains("Genre", StringComparer.OrdinalIgnoreCase)))
             {
                 // Find genres, from non-audio items
                 var genres = items.Where(i => !(i is IHasMusicGenres) && !(i is Game))
@@ -240,7 +240,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 }
             }
 
-            if (query.IncludeStudios)
+            if (query.IncludeStudios && (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains("Studio", StringComparer.OrdinalIgnoreCase)))
             {
                 // Find studios
                 var studios = items.SelectMany(i => i.Studios)
@@ -268,7 +268,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 }
             }
 
-            if (query.IncludePeople)
+            if (query.IncludePeople && (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains("Person", StringComparer.OrdinalIgnoreCase)))
             {
                 var itemIds = items.Select(i => i.Id).ToList();
 
-- 
cgit v1.2.3


From f9f29de05e318c2de4bee37eea6f19ce955a657c Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 23 Jul 2015 01:26:21 -0400
Subject: fix SetInitialItemValues not getting called on multi-item resolution

---
 .../Library/Resolvers/Movies/MovieResolver.cs          | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index a6b8c44b6..0d1e4202c 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -46,6 +46,24 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
             List<FileSystemInfo> files,
             string collectionType,
             IDirectoryService directoryService)
+        {
+            var result = ResolveMultipleInternal(parent, files, collectionType, directoryService);
+
+            if (result != null)
+            {
+                foreach (var item in result.Items)
+                {
+                    SetInitialItemValues((Video)item, null);
+                }
+            }
+
+            return result;
+        }
+
+        private MultiItemResolverResult ResolveMultipleInternal(Folder parent,
+            List<FileSystemInfo> files,
+            string collectionType,
+            IDirectoryService directoryService)
         {
             if (IsInvalid(parent, collectionType, files))
             {
-- 
cgit v1.2.3


From ffd9460d51980a550ef5460e5df4e942b63077a7 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 23 Jul 2015 12:32:34 -0400
Subject: add hdhomerun auto-discovery

---
 MediaBrowser.Controller/Dlna/IDeviceDiscovery.cs   |  10 +
 .../MediaBrowser.Controller.csproj                 |   1 +
 MediaBrowser.Dlna/Channels/DlnaChannelFactory.cs   |  10 +-
 MediaBrowser.Dlna/Main/DlnaEntryPoint.cs           |  24 +--
 MediaBrowser.Dlna/PlayTo/PlayToController.cs       |   5 +-
 MediaBrowser.Dlna/PlayTo/PlayToManager.cs          |   4 +-
 MediaBrowser.Dlna/Ssdp/DeviceDiscovery.cs          |  19 +-
 .../Library/Resolvers/TV/SeriesResolver.cs         |   9 +-
 .../LiveTv/Listings/SchedulesDirect.cs             |   2 +-
 .../LiveTv/TunerHosts/HdHomerun.cs                 | 230 --------------------
 .../TunerHosts/HdHomerun/HdHomerunDiscovery.cs     | 114 ++++++++++
 .../LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs   | 235 +++++++++++++++++++++
 .../MediaBrowser.Server.Implementations.csproj     |   3 +-
 .../ApplicationHost.cs                             |   2 +
 14 files changed, 396 insertions(+), 272 deletions(-)
 create mode 100644 MediaBrowser.Controller/Dlna/IDeviceDiscovery.cs
 delete mode 100644 MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun.cs
 create mode 100644 MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunDiscovery.cs
 create mode 100644 MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Controller/Dlna/IDeviceDiscovery.cs b/MediaBrowser.Controller/Dlna/IDeviceDiscovery.cs
new file mode 100644
index 000000000..e8083b363
--- /dev/null
+++ b/MediaBrowser.Controller/Dlna/IDeviceDiscovery.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace MediaBrowser.Controller.Dlna
+{
+    public interface IDeviceDiscovery
+    {
+        event EventHandler<SsdpMessageEventArgs> DeviceDiscovered;
+        event EventHandler<SsdpMessageEventArgs> DeviceLeft;
+    }
+}
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 603f756af..dd9383827 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -113,6 +113,7 @@
     <Compile Include="Dlna\EventSubscriptionResponse.cs" />
     <Compile Include="Dlna\IConnectionManager.cs" />
     <Compile Include="Dlna\IContentDirectory.cs" />
+    <Compile Include="Dlna\IDeviceDiscovery.cs" />
     <Compile Include="Dlna\IDlnaManager.cs" />
     <Compile Include="Dlna\IEventManager.cs" />
     <Compile Include="Dlna\IMediaReceiverRegistrar.cs" />
diff --git a/MediaBrowser.Dlna/Channels/DlnaChannelFactory.cs b/MediaBrowser.Dlna/Channels/DlnaChannelFactory.cs
index 7e896492d..f26ceff90 100644
--- a/MediaBrowser.Dlna/Channels/DlnaChannelFactory.cs
+++ b/MediaBrowser.Dlna/Channels/DlnaChannelFactory.cs
@@ -24,7 +24,7 @@ namespace MediaBrowser.Dlna.Channels
         private readonly ILogger _logger;
         private readonly IHttpClient _httpClient;
 
-        private DeviceDiscovery _deviceDiscovery;
+        private readonly IDeviceDiscovery _deviceDiscovery;
 
         private readonly SemaphoreSlim _syncLock = new SemaphoreSlim(1, 1);
         private List<Device> _servers = new List<Device>();
@@ -33,21 +33,21 @@ namespace MediaBrowser.Dlna.Channels
 
         private Func<List<string>> _localServersLookup;
 
-        public DlnaChannelFactory(IServerConfigurationManager config, IHttpClient httpClient, ILogger logger)
+        public DlnaChannelFactory(IServerConfigurationManager config, IHttpClient httpClient, ILogger logger, IDeviceDiscovery deviceDiscovery)
         {
             _config = config;
             _httpClient = httpClient;
             _logger = logger;
+            _deviceDiscovery = deviceDiscovery;
             Instance = this;
         }
 
-        internal void Start(DeviceDiscovery deviceDiscovery, Func<List<string>> localServersLookup)
+        internal void Start(Func<List<string>> localServersLookup)
         {
             _localServersLookup = localServersLookup;
 
-            _deviceDiscovery = deviceDiscovery;
             //deviceDiscovery.DeviceDiscovered += deviceDiscovery_DeviceDiscovered;
-            deviceDiscovery.DeviceLeft += deviceDiscovery_DeviceLeft;
+            _deviceDiscovery.DeviceLeft += deviceDiscovery_DeviceLeft;
         }
 
         async void deviceDiscovery_DeviceDiscovered(object sender, SsdpMessageEventArgs e)
diff --git a/MediaBrowser.Dlna/Main/DlnaEntryPoint.cs b/MediaBrowser.Dlna/Main/DlnaEntryPoint.cs
index f9f9c3f18..bdb778cab 100644
--- a/MediaBrowser.Dlna/Main/DlnaEntryPoint.cs
+++ b/MediaBrowser.Dlna/Main/DlnaEntryPoint.cs
@@ -38,7 +38,7 @@ namespace MediaBrowser.Dlna.Main
         private readonly IMediaSourceManager _mediaSourceManager;
 
         private readonly SsdpHandler _ssdpHandler;
-        private DeviceDiscovery _deviceDiscovery;
+        private readonly IDeviceDiscovery _deviceDiscovery;
 
         private readonly List<string> _registeredServerIds = new List<string>();
         private bool _dlnaServerStarted;
@@ -56,7 +56,7 @@ namespace MediaBrowser.Dlna.Main
             IUserDataManager userDataManager, 
             ILocalizationManager localization, 
             IMediaSourceManager mediaSourceManager, 
-            ISsdpHandler ssdpHandler)
+            ISsdpHandler ssdpHandler, IDeviceDiscovery deviceDiscovery)
         {
             _config = config;
             _appHost = appHost;
@@ -70,6 +70,7 @@ namespace MediaBrowser.Dlna.Main
             _userDataManager = userDataManager;
             _localization = localization;
             _mediaSourceManager = mediaSourceManager;
+            _deviceDiscovery = deviceDiscovery;
             _ssdpHandler = (SsdpHandler)ssdpHandler;
             _logger = logManager.GetLogger("Dlna");
         }
@@ -81,7 +82,7 @@ namespace MediaBrowser.Dlna.Main
 
             _config.NamedConfigurationUpdated += _config_NamedConfigurationUpdated;
 
-            DlnaChannelFactory.Instance.Start(_deviceDiscovery, () => _registeredServerIds);
+            DlnaChannelFactory.Instance.Start(() => _registeredServerIds);
         }
 
         void _config_NamedConfigurationUpdated(object sender, ConfigurationUpdateEventArgs e)
@@ -125,9 +126,7 @@ namespace MediaBrowser.Dlna.Main
             {
                 _ssdpHandler.Start();
 
-                _deviceDiscovery = new DeviceDiscovery(_logger, _config, _ssdpHandler, _appHost);
-
-                _deviceDiscovery.Start();
+                ((DeviceDiscovery)_deviceDiscovery).Start(_ssdpHandler);
             }
             catch (Exception ex)
             {
@@ -135,18 +134,6 @@ namespace MediaBrowser.Dlna.Main
             }
         }
 
-        private void DisposeDeviceDiscovery()
-        {
-            try
-            {
-                _deviceDiscovery.Dispose();
-            }
-            catch (Exception ex)
-            {
-                _logger.ErrorException("Error disposing device discovery", ex);
-            }
-        }
-
         public void StartDlnaServer()
         {
             try
@@ -240,7 +227,6 @@ namespace MediaBrowser.Dlna.Main
         {
             DisposeDlnaServer();
             DisposePlayToManager();
-            DisposeDeviceDiscovery();
         }
 
         public void DisposeDlnaServer()
diff --git a/MediaBrowser.Dlna/PlayTo/PlayToController.cs b/MediaBrowser.Dlna/PlayTo/PlayToController.cs
index f6cf2f02d..941b2aeca 100644
--- a/MediaBrowser.Dlna/PlayTo/PlayToController.cs
+++ b/MediaBrowser.Dlna/PlayTo/PlayToController.cs
@@ -5,7 +5,6 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Dlna.Didl;
-using MediaBrowser.Dlna.Ssdp;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
@@ -35,7 +34,7 @@ namespace MediaBrowser.Dlna.PlayTo
         private readonly ILocalizationManager _localization;
         private readonly IMediaSourceManager _mediaSourceManager;
 
-        private readonly DeviceDiscovery _deviceDiscovery;
+        private readonly IDeviceDiscovery _deviceDiscovery;
         private readonly string _serverAddress;
         private readonly string _accessToken;
 
@@ -58,7 +57,7 @@ namespace MediaBrowser.Dlna.PlayTo
 
         private Timer _updateTimer;
 
-        public PlayToController(SessionInfo session, ISessionManager sessionManager, ILibraryManager libraryManager, ILogger logger, IDlnaManager dlnaManager, IUserManager userManager, IImageProcessor imageProcessor, string serverAddress, string accessToken, DeviceDiscovery deviceDiscovery, IUserDataManager userDataManager, ILocalizationManager localization, IMediaSourceManager mediaSourceManager)
+        public PlayToController(SessionInfo session, ISessionManager sessionManager, ILibraryManager libraryManager, ILogger logger, IDlnaManager dlnaManager, IUserManager userManager, IImageProcessor imageProcessor, string serverAddress, string accessToken, IDeviceDiscovery deviceDiscovery, IUserDataManager userDataManager, ILocalizationManager localization, IMediaSourceManager mediaSourceManager)
         {
             _session = session;
             _sessionManager = sessionManager;
diff --git a/MediaBrowser.Dlna/PlayTo/PlayToManager.cs b/MediaBrowser.Dlna/PlayTo/PlayToManager.cs
index 5d37767a2..6c79007c4 100644
--- a/MediaBrowser.Dlna/PlayTo/PlayToManager.cs
+++ b/MediaBrowser.Dlna/PlayTo/PlayToManager.cs
@@ -32,13 +32,13 @@ namespace MediaBrowser.Dlna.PlayTo
         private readonly IUserDataManager _userDataManager;
         private readonly ILocalizationManager _localization;
 
-        private readonly DeviceDiscovery _deviceDiscovery;
+        private readonly IDeviceDiscovery _deviceDiscovery;
         private readonly IMediaSourceManager _mediaSourceManager;
 
         private readonly List<string> _nonRendererUrls = new List<string>();
         private Timer _clearNonRenderersTimer;
 
-        public PlayToManager(ILogger logger, ISessionManager sessionManager, ILibraryManager libraryManager, IUserManager userManager, IDlnaManager dlnaManager, IServerApplicationHost appHost, IImageProcessor imageProcessor, DeviceDiscovery deviceDiscovery, IHttpClient httpClient, IServerConfigurationManager config, IUserDataManager userDataManager, ILocalizationManager localization, IMediaSourceManager mediaSourceManager)
+        public PlayToManager(ILogger logger, ISessionManager sessionManager, ILibraryManager libraryManager, IUserManager userManager, IDlnaManager dlnaManager, IServerApplicationHost appHost, IImageProcessor imageProcessor, IDeviceDiscovery deviceDiscovery, IHttpClient httpClient, IServerConfigurationManager config, IUserDataManager userDataManager, ILocalizationManager localization, IMediaSourceManager mediaSourceManager)
         {
             _logger = logger;
             _sessionManager = sessionManager;
diff --git a/MediaBrowser.Dlna/Ssdp/DeviceDiscovery.cs b/MediaBrowser.Dlna/Ssdp/DeviceDiscovery.cs
index 3befa221b..c9b983bae 100644
--- a/MediaBrowser.Dlna/Ssdp/DeviceDiscovery.cs
+++ b/MediaBrowser.Dlna/Ssdp/DeviceDiscovery.cs
@@ -14,31 +14,31 @@ using System.Threading.Tasks;
 
 namespace MediaBrowser.Dlna.Ssdp
 {
-    public class DeviceDiscovery : IDisposable
+    public class DeviceDiscovery : IDeviceDiscovery, IDisposable
     {
         private bool _disposed;
 
         private readonly ILogger _logger;
         private readonly IServerConfigurationManager _config;
-        private readonly SsdpHandler _ssdpHandler;
+        private SsdpHandler _ssdpHandler;
         private readonly CancellationTokenSource _tokenSource;
         private readonly IServerApplicationHost _appHost;
 
         public event EventHandler<SsdpMessageEventArgs> DeviceDiscovered;
         public event EventHandler<SsdpMessageEventArgs> DeviceLeft;
 
-        public DeviceDiscovery(ILogger logger, IServerConfigurationManager config, SsdpHandler ssdpHandler, IServerApplicationHost appHost)
+        public DeviceDiscovery(ILogger logger, IServerConfigurationManager config, IServerApplicationHost appHost)
         {
             _tokenSource = new CancellationTokenSource();
 
             _logger = logger;
             _config = config;
-            _ssdpHandler = ssdpHandler;
             _appHost = appHost;
         }
 
-        public void Start()
+        public void Start(SsdpHandler ssdpHandler)
         {
+            _ssdpHandler = ssdpHandler;
             _ssdpHandler.MessageReceived += _ssdpHandler_MessageReceived;
 
             foreach (var network in GetNetworkInterfaces())
@@ -71,7 +71,7 @@ namespace MediaBrowser.Dlna.Ssdp
                 }
             }
         }
-        
+
         void _ssdpHandler_MessageReceived(object sender, SsdpMessageEventArgs e)
         {
             string nts;
@@ -199,7 +199,7 @@ namespace MediaBrowser.Dlna.Ssdp
             socket.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.MulticastTimeToLive, 4);
 
             socket.Bind(localEndpoint);
-            
+
             return socket;
         }
 
@@ -248,7 +248,10 @@ namespace MediaBrowser.Dlna.Ssdp
 
         public void Dispose()
         {
-            _ssdpHandler.MessageReceived -= _ssdpHandler_MessageReceived;
+            if (_ssdpHandler != null)
+            {
+                _ssdpHandler.MessageReceived -= _ssdpHandler_MessageReceived;
+            }
 
             if (!_disposed)
             {
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
index 70ab105b2..f12022dc7 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
@@ -125,7 +125,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
 
                 if ((attributes & FileAttributes.Directory) == FileAttributes.Directory)
                 {
-                    if (IsSeasonFolder(child.FullName, isTvContentType))
+                    if (IsSeasonFolder(child.FullName, isTvContentType, libraryManager))
                     {
                         //logger.Debug("{0} is a series because of season folder {1}.", path, child.FullName);
                         return true;
@@ -188,10 +188,13 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
         /// </summary>
         /// <param name="path">The path.</param>
         /// <param name="isTvContentType">if set to <c>true</c> [is tv content type].</param>
+        /// <param name="libraryManager">The library manager.</param>
         /// <returns><c>true</c> if [is season folder] [the specified path]; otherwise, <c>false</c>.</returns>
-        private static bool IsSeasonFolder(string path, bool isTvContentType)
+        private static bool IsSeasonFolder(string path, bool isTvContentType, ILibraryManager libraryManager)
         {
-            var seasonNumber = new SeasonPathParser(new ExtendedNamingOptions(), new RegexProvider()).Parse(path, isTvContentType, isTvContentType).SeasonNumber;
+            var namingOptions = ((LibraryManager)libraryManager).GetNamingOptions();
+
+            var seasonNumber = new SeasonPathParser(namingOptions, new RegexProvider()).Parse(path, isTvContentType, isTvContentType).SeasonNumber;
 
             return seasonNumber.HasValue;
         }
diff --git a/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs b/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
index 2656397bb..668f023d2 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
@@ -350,7 +350,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
                 {
                     url = apiUrl + "/image/" + images.data[logoIndex].uri;
                 }
-                _logger.Debug("URL for image is : " + url);
+                //_logger.Debug("URL for image is : " + url);
             }
             return url;
         }
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun.cs
deleted file mode 100644
index 9aacd0c1e..000000000
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.LiveTv;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.MediaInfo;
-using MediaBrowser.Model.Serialization;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
-{
-    public class HdHomerun : ITunerHost
-    {
-        private readonly IHttpClient _httpClient;
-        private readonly ILogger _logger;
-        private readonly IJsonSerializer _jsonSerializer;
-        private readonly IConfigurationManager _config;
-
-        public HdHomerun(IHttpClient httpClient, ILogger logger, IJsonSerializer jsonSerializer, IConfigurationManager config)
-        {
-            _httpClient = httpClient;
-            _logger = logger;
-            _jsonSerializer = jsonSerializer;
-            _config = config;
-        }
-
-        public string Name
-        {
-            get { return "HD Homerun"; }
-        }
-
-        public string Type
-        {
-            get { return "hdhomerun"; }
-        }
-
-        public async Task<IEnumerable<ChannelInfo>> GetChannels(TunerHostInfo info, CancellationToken cancellationToken)
-        {
-            var options = new HttpRequestOptions
-            {
-                Url = string.Format("{0}/lineup.json", GetApiUrl(info)),
-                CancellationToken = cancellationToken
-            };
-            using (var stream = await _httpClient.Get(options))
-            {
-                var root = _jsonSerializer.DeserializeFromStream<List<Channels>>(stream);
-
-                if (root != null)
-                {
-                    return root.Select(i => new ChannelInfo
-                    {
-                        Name = i.GuideName,
-                        Number = i.GuideNumber.ToString(CultureInfo.InvariantCulture),
-                        Id = i.GuideNumber.ToString(CultureInfo.InvariantCulture),
-                        IsFavorite = i.Favorite
-
-                    });
-                }
-                return new List<ChannelInfo>();
-            }
-        }
-
-        public async Task<List<LiveTvTunerInfo>> GetTunerInfos(TunerHostInfo info, CancellationToken cancellationToken)
-        {
-            string model = null;
-
-            using (var stream = await _httpClient.Get(new HttpRequestOptions()
-            {
-                Url = string.Format("{0}/", GetApiUrl(info)),
-                CancellationToken = cancellationToken
-            }))
-            {
-                using (var sr = new StreamReader(stream, System.Text.Encoding.UTF8))
-                {
-                    while (!sr.EndOfStream)
-                    {
-                        string line = StripXML(sr.ReadLine());
-                        if (line.StartsWith("Model:")) { model = line.Replace("Model: ", ""); }
-                        //if (line.StartsWith("Device ID:")) { deviceID = line.Replace("Device ID: ", ""); }
-                        //if (line.StartsWith("Firmware:")) { firmware = line.Replace("Firmware: ", ""); }
-                    }
-                }
-            }
-
-            using (var stream = await _httpClient.Get(new HttpRequestOptions()
-            {
-                Url = string.Format("{0}/tuners.html", GetApiUrl(info)),
-                CancellationToken = cancellationToken
-            }))
-            {
-                var tuners = new List<LiveTvTunerInfo>();
-                using (var sr = new StreamReader(stream, System.Text.Encoding.UTF8))
-                {
-                    while (!sr.EndOfStream)
-                    {
-                        string line = StripXML(sr.ReadLine());
-                        if (line.Contains("Channel"))
-                        {
-                            LiveTvTunerStatus status;
-                            var index = line.IndexOf("Channel", StringComparison.OrdinalIgnoreCase);
-                            var name = line.Substring(0, index - 1);
-                            var currentChannel = line.Substring(index + 7);
-                            if (currentChannel != "none") { status = LiveTvTunerStatus.LiveTv; } else { status = LiveTvTunerStatus.Available; }
-                            tuners.Add(new LiveTvTunerInfo()
-                            {
-                                Name = name,
-                                SourceType = string.IsNullOrWhiteSpace(model) ? Name : model,
-                                ProgramName = currentChannel,
-                                Status = status
-                            });
-                        }
-                    }
-                }
-                return tuners;
-            }
-        }
-
-        public string GetApiUrl(TunerHostInfo info)
-        {
-            var url = info.Url;
-
-            if (!url.StartsWith("http", StringComparison.OrdinalIgnoreCase))
-            {
-                url = "http://" + url;
-            }
-
-            return url.TrimEnd('/');
-        }
-
-        private static string StripXML(string source)
-        {
-            char[] buffer = new char[source.Length];
-            int bufferIndex = 0;
-            bool inside = false;
-
-            for (int i = 0; i < source.Length; i++)
-            {
-                char let = source[i];
-                if (let == '<')
-                {
-                    inside = true;
-                    continue;
-                }
-                if (let == '>')
-                {
-                    inside = false;
-                    continue;
-                }
-                if (!inside)
-                {
-                    buffer[bufferIndex] = let;
-                    bufferIndex++;
-                }
-            }
-            return new string(buffer, 0, bufferIndex);
-        }
-
-        private class Channels
-        {
-            public string GuideNumber { get; set; }
-            public string GuideName { get; set; }
-            public string URL { get; set; }
-            public bool Favorite { get; set; }
-            public bool DRM { get; set; }
-        }
-
-        private LiveTvOptions GetConfiguration()
-        {
-            return _config.GetConfiguration<LiveTvOptions>("livetv");
-        }
-
-        public List<TunerHostInfo> GetTunerHosts()
-        {
-            return GetConfiguration().TunerHosts.Where(i => string.Equals(i.Type, Type, StringComparison.OrdinalIgnoreCase)).ToList();
-        }
-
-        public async Task<MediaSourceInfo> GetChannelStream(TunerHostInfo info, string channelId, string streamId, CancellationToken cancellationToken)
-        {
-            var channels = await GetChannels(info, cancellationToken).ConfigureAwait(false);
-            var tuners = await GetTunerInfos(info, cancellationToken).ConfigureAwait(false);
-
-            var channel = channels.FirstOrDefault(c => string.Equals(c.Id, channelId, StringComparison.OrdinalIgnoreCase));
-            if (channel != null)
-            {
-                if (tuners.FindIndex(t => t.Status == LiveTvTunerStatus.Available) >= 0)
-                {
-                    return new MediaSourceInfo
-                    {
-                        Path = GetApiUrl(info) + "/auto/v" + channelId,
-                        Protocol = MediaProtocol.Http,
-                        MediaStreams = new List<MediaStream>
-                        {
-                            new MediaStream
-                            {
-                                Type = MediaStreamType.Video,
-                                // Set the index to -1 because we don't know the exact index of the video stream within the container
-                                Index = -1,
-                                IsInterlaced = true
-                            },
-                            new MediaStream
-                            {
-                                Type = MediaStreamType.Audio,
-                                // Set the index to -1 because we don't know the exact index of the audio stream within the container
-                                Index = -1
-
-                            }
-                        }
-                    };
-                }
-
-                throw new ApplicationException("No tuners avaliable.");
-            } 
-            throw new ApplicationException("Channel not found.");
-        }
-
-
-        public async Task Validate(TunerHostInfo info)
-        {
-            await GetChannels(info, CancellationToken.None).ConfigureAwait(false);
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunDiscovery.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunDiscovery.cs
new file mode 100644
index 000000000..41652ae9f
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunDiscovery.cs
@@ -0,0 +1,114 @@
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Dlna;
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Controller.Plugins;
+using MediaBrowser.Model.Extensions;
+using MediaBrowser.Model.LiveTv;
+using MediaBrowser.Model.Logging;
+using System;
+using System.Linq;
+using System.Threading;
+
+namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
+{
+    public class HdHomerunDiscovery : IServerEntryPoint
+    {
+        private readonly IDeviceDiscovery _deviceDiscovery;
+        private readonly IServerConfigurationManager _config;
+        private readonly ILogger _logger;
+        private readonly ILiveTvManager _liveTvManager;
+        private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
+
+        public HdHomerunDiscovery(IDeviceDiscovery deviceDiscovery, IServerConfigurationManager config, ILogger logger, ILiveTvManager liveTvManager)
+        {
+            _deviceDiscovery = deviceDiscovery;
+            _config = config;
+            _logger = logger;
+            _liveTvManager = liveTvManager;
+        }
+
+        public void Run()
+        {
+            _deviceDiscovery.DeviceDiscovered += _deviceDiscovery_DeviceDiscovered;
+        }
+
+        void _deviceDiscovery_DeviceDiscovered(object sender, SsdpMessageEventArgs e)
+        {
+            string server = null;
+            if (e.Headers.TryGetValue("SERVER", out server) && server.IndexOf("HDHomeRun", StringComparison.OrdinalIgnoreCase) != -1)
+            {
+                string location;
+                if (e.Headers.TryGetValue("Location", out location))
+                {
+                    _logger.Debug("HdHomerun found at {0}", location);
+
+                    // Just get the beginning of the url
+                    Uri uri;
+                    if (Uri.TryCreate(location, UriKind.Absolute, out uri))
+                    {
+                        var apiUrl = location.Replace(uri.LocalPath, String.Empty, StringComparison.OrdinalIgnoreCase)
+                                .TrimEnd('/');
+
+                        _logger.Debug("HdHomerun api url: {0}", apiUrl);
+                        AddDevice(apiUrl);
+                    }
+                }
+            }
+        }
+
+        private async void AddDevice(string url)
+        {
+            await _semaphore.WaitAsync().ConfigureAwait(false);
+
+            try
+            {
+                var options = GetConfiguration();
+
+                if (options.TunerHosts.Any(i =>
+                            string.Equals(i.Type, HdHomerunHost.DeviceType, StringComparison.OrdinalIgnoreCase) &&
+                            UriEquals(i.Url, url)))
+                {
+                    return;
+                }
+
+                await _liveTvManager.SaveTunerHost(new TunerHostInfo
+                {
+                    Type = HdHomerunHost.DeviceType,
+                    Url = url
+
+                }).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error saving device", ex);
+            }
+            finally
+            {
+                _semaphore.Release();
+            }
+        }
+
+        private bool UriEquals(string savedUri, string location)
+        {
+            if (!savedUri.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+            {
+                savedUri = "http://" + savedUri;
+            }
+
+            savedUri = savedUri.TrimEnd('/');
+            location = location.TrimEnd('/');
+
+            return string.Equals(location, savedUri, StringComparison.OrdinalIgnoreCase);
+        }
+
+        private LiveTvOptions GetConfiguration()
+        {
+            return _config.GetConfiguration<LiveTvOptions>("livetv");
+        }
+
+        public void Dispose()
+        {
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
new file mode 100644
index 000000000..187569ab4
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
@@ -0,0 +1,235 @@
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.LiveTv;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.MediaInfo;
+using MediaBrowser.Model.Serialization;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
+{
+    public class HdHomerunHost : ITunerHost
+    {
+        private readonly IHttpClient _httpClient;
+        private readonly ILogger _logger;
+        private readonly IJsonSerializer _jsonSerializer;
+        private readonly IConfigurationManager _config;
+
+        public HdHomerunHost(IHttpClient httpClient, ILogger logger, IJsonSerializer jsonSerializer, IConfigurationManager config)
+        {
+            _httpClient = httpClient;
+            _logger = logger;
+            _jsonSerializer = jsonSerializer;
+            _config = config;
+        }
+
+        public string Name
+        {
+            get { return "HD Homerun"; }
+        }
+
+        public string Type
+        {
+            get { return DeviceType; }
+        }
+
+        public static string DeviceType
+        {
+            get { return "hdhomerun"; }
+        }
+
+        public async Task<IEnumerable<ChannelInfo>> GetChannels(TunerHostInfo info, CancellationToken cancellationToken)
+        {
+            var options = new HttpRequestOptions
+            {
+                Url = string.Format("{0}/lineup.json", GetApiUrl(info)),
+                CancellationToken = cancellationToken
+            };
+            using (var stream = await _httpClient.Get(options))
+            {
+                var root = _jsonSerializer.DeserializeFromStream<List<Channels>>(stream);
+
+                if (root != null)
+                {
+                    return root.Select(i => new ChannelInfo
+                    {
+                        Name = i.GuideName,
+                        Number = i.GuideNumber.ToString(CultureInfo.InvariantCulture),
+                        Id = i.GuideNumber.ToString(CultureInfo.InvariantCulture),
+                        IsFavorite = i.Favorite
+
+                    });
+                }
+                return new List<ChannelInfo>();
+            }
+        }
+
+        public async Task<List<LiveTvTunerInfo>> GetTunerInfos(TunerHostInfo info, CancellationToken cancellationToken)
+        {
+            string model = null;
+
+            using (var stream = await _httpClient.Get(new HttpRequestOptions()
+            {
+                Url = string.Format("{0}/", GetApiUrl(info)),
+                CancellationToken = cancellationToken
+            }))
+            {
+                using (var sr = new StreamReader(stream, System.Text.Encoding.UTF8))
+                {
+                    while (!sr.EndOfStream)
+                    {
+                        string line = StripXML(sr.ReadLine());
+                        if (line.StartsWith("Model:")) { model = line.Replace("Model: ", ""); }
+                        //if (line.StartsWith("Device ID:")) { deviceID = line.Replace("Device ID: ", ""); }
+                        //if (line.StartsWith("Firmware:")) { firmware = line.Replace("Firmware: ", ""); }
+                    }
+                }
+            }
+
+            using (var stream = await _httpClient.Get(new HttpRequestOptions()
+            {
+                Url = string.Format("{0}/tuners.html", GetApiUrl(info)),
+                CancellationToken = cancellationToken
+            }))
+            {
+                var tuners = new List<LiveTvTunerInfo>();
+                using (var sr = new StreamReader(stream, System.Text.Encoding.UTF8))
+                {
+                    while (!sr.EndOfStream)
+                    {
+                        string line = StripXML(sr.ReadLine());
+                        if (line.Contains("Channel"))
+                        {
+                            LiveTvTunerStatus status;
+                            var index = line.IndexOf("Channel", StringComparison.OrdinalIgnoreCase);
+                            var name = line.Substring(0, index - 1);
+                            var currentChannel = line.Substring(index + 7);
+                            if (currentChannel != "none") { status = LiveTvTunerStatus.LiveTv; } else { status = LiveTvTunerStatus.Available; }
+                            tuners.Add(new LiveTvTunerInfo()
+                            {
+                                Name = name,
+                                SourceType = string.IsNullOrWhiteSpace(model) ? Name : model,
+                                ProgramName = currentChannel,
+                                Status = status
+                            });
+                        }
+                    }
+                }
+                return tuners;
+            }
+        }
+
+        public string GetApiUrl(TunerHostInfo info)
+        {
+            var url = info.Url;
+
+            if (!url.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+            {
+                url = "http://" + url;
+            }
+
+            return url.TrimEnd('/');
+        }
+
+        private static string StripXML(string source)
+        {
+            char[] buffer = new char[source.Length];
+            int bufferIndex = 0;
+            bool inside = false;
+
+            for (int i = 0; i < source.Length; i++)
+            {
+                char let = source[i];
+                if (let == '<')
+                {
+                    inside = true;
+                    continue;
+                }
+                if (let == '>')
+                {
+                    inside = false;
+                    continue;
+                }
+                if (!inside)
+                {
+                    buffer[bufferIndex] = let;
+                    bufferIndex++;
+                }
+            }
+            return new string(buffer, 0, bufferIndex);
+        }
+
+        private class Channels
+        {
+            public string GuideNumber { get; set; }
+            public string GuideName { get; set; }
+            public string URL { get; set; }
+            public bool Favorite { get; set; }
+            public bool DRM { get; set; }
+        }
+
+        private LiveTvOptions GetConfiguration()
+        {
+            return _config.GetConfiguration<LiveTvOptions>("livetv");
+        }
+
+        public List<TunerHostInfo> GetTunerHosts()
+        {
+            return GetConfiguration().TunerHosts.Where(i => string.Equals(i.Type, Type, StringComparison.OrdinalIgnoreCase)).ToList();
+        }
+
+        public async Task<MediaSourceInfo> GetChannelStream(TunerHostInfo info, string channelId, string streamId, CancellationToken cancellationToken)
+        {
+            var channels = await GetChannels(info, cancellationToken).ConfigureAwait(false);
+            var tuners = await GetTunerInfos(info, cancellationToken).ConfigureAwait(false);
+
+            var channel = channels.FirstOrDefault(c => string.Equals(c.Id, channelId, StringComparison.OrdinalIgnoreCase));
+            if (channel != null)
+            {
+                if (tuners.FindIndex(t => t.Status == LiveTvTunerStatus.Available) >= 0)
+                {
+                    return new MediaSourceInfo
+                    {
+                        Path = GetApiUrl(info) + "/auto/v" + channelId,
+                        Protocol = MediaProtocol.Http,
+                        MediaStreams = new List<MediaStream>
+                        {
+                            new MediaStream
+                            {
+                                Type = MediaStreamType.Video,
+                                // Set the index to -1 because we don't know the exact index of the video stream within the container
+                                Index = -1,
+                                IsInterlaced = true
+                            },
+                            new MediaStream
+                            {
+                                Type = MediaStreamType.Audio,
+                                // Set the index to -1 because we don't know the exact index of the audio stream within the container
+                                Index = -1
+
+                            }
+                        }
+                    };
+                }
+
+                throw new ApplicationException("No tuners avaliable.");
+            } 
+            throw new ApplicationException("Channel not found.");
+        }
+
+
+        public async Task Validate(TunerHostInfo info)
+        {
+            await GetChannels(info, CancellationToken.None).ConfigureAwait(false);
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index dc149318b..c77c112a6 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -226,7 +226,8 @@
     <Compile Include="LiveTv\LiveTvDtoService.cs" />
     <Compile Include="LiveTv\LiveTvManager.cs" />
     <Compile Include="LiveTv\LiveTvMediaSourceProvider.cs" />
-    <Compile Include="LiveTv\TunerHosts\HdHomerun.cs" />
+    <Compile Include="LiveTv\TunerHosts\HdHomerun\HdHomerunHost.cs" />
+    <Compile Include="LiveTv\TunerHosts\HdHomerun\HdHomerunDiscovery.cs" />
     <Compile Include="LiveTv\TunerHosts\M3UTunerHost.cs" />
     <Compile Include="LiveTv\ProgramImageProvider.cs" />
     <Compile Include="LiveTv\RecordingImageProvider.cs" />
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index adef0a45f..5fd1dca43 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -514,6 +514,8 @@ namespace MediaBrowser.Server.Startup.Common
             SubtitleManager = new SubtitleManager(LogManager.GetLogger("SubtitleManager"), FileSystemManager, LibraryMonitor, LibraryManager, MediaSourceManager);
             RegisterSingleInstance(SubtitleManager);
 
+            RegisterSingleInstance<IDeviceDiscovery>(new DeviceDiscovery(LogManager.GetLogger("IDeviceDiscovery"), ServerConfigurationManager, this));
+
             ChapterManager = new ChapterManager(LibraryManager, LogManager.GetLogger("ChapterManager"), ServerConfigurationManager, ItemRepository);
             RegisterSingleInstance(ChapterManager);
 
-- 
cgit v1.2.3


From ba9ed26c4a60b29f25c0cf53d215b617142c0fc3 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 23 Jul 2015 19:40:54 -0400
Subject: update emby tv

---
 MediaBrowser.Api/Playback/BaseStreamingService.cs  |   2 +-
 MediaBrowser.Api/Playback/StreamState.cs           |   2 +-
 MediaBrowser.Controller/LiveTv/ITunerHost.cs       |   8 ++
 MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs  |   2 +-
 MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs  |   2 +-
 MediaBrowser.Model/Dto/MediaSourceInfo.cs          |   4 +-
 MediaBrowser.Model/LiveTv/LiveTvOptions.cs         |   1 +
 .../Library/MediaSourceManager.cs                  |   2 +-
 .../LiveTv/EmbyTV/EmbyTV.cs                        | 130 +++++++++++++++++----
 .../LiveTv/EmbyTV/ItemDataProvider.cs              |   5 +-
 .../LiveTv/Listings/SchedulesDirect.cs             |  51 ++++++--
 .../LiveTv/LiveTvManager.cs                        |   4 +-
 .../LiveTv/LiveTvMediaSourceProvider.cs            |  24 ++--
 .../TunerHosts/HdHomerun/HdHomerunDiscovery.cs     |  12 +-
 .../LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs   |  62 ++++++----
 .../LiveTv/TunerHosts/M3UTunerHost.cs              |  10 +-
 .../Localization/Server/server.json                |   2 +-
 17 files changed, 236 insertions(+), 87 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index e7885a3f8..8505b5d3a 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -924,7 +924,7 @@ namespace MediaBrowser.Api.Playback
                 state.IsoMount = await IsoManager.Mount(state.MediaPath, cancellationTokenSource.Token).ConfigureAwait(false);
             }
 
-            if (state.MediaSource.RequiresOpening)
+            if (state.MediaSource.RequiresOpening ?? false)
             {
                 var liveStreamResponse = await MediaSourceManager.OpenLiveStream(new LiveStreamRequest
                 {
diff --git a/MediaBrowser.Api/Playback/StreamState.cs b/MediaBrowser.Api/Playback/StreamState.cs
index 02b7720a4..4df696096 100644
--- a/MediaBrowser.Api/Playback/StreamState.cs
+++ b/MediaBrowser.Api/Playback/StreamState.cs
@@ -185,7 +185,7 @@ namespace MediaBrowser.Api.Playback
 
         private async void DisposeLiveStream()
         {
-            if (MediaSource.RequiresClosing && string.IsNullOrWhiteSpace(Request.LiveStreamId))
+            if ((MediaSource.RequiresClosing ?? false) && string.IsNullOrWhiteSpace(Request.LiveStreamId))
             {
                 try
                 {
diff --git a/MediaBrowser.Controller/LiveTv/ITunerHost.cs b/MediaBrowser.Controller/LiveTv/ITunerHost.cs
index 38ed43bd9..c9a96a9ca 100644
--- a/MediaBrowser.Controller/LiveTv/ITunerHost.cs
+++ b/MediaBrowser.Controller/LiveTv/ITunerHost.cs
@@ -47,6 +47,14 @@ namespace MediaBrowser.Controller.LiveTv
         /// <returns>Task&lt;MediaSourceInfo&gt;.</returns>
         Task<MediaSourceInfo> GetChannelStream(TunerHostInfo info, string channelId, string streamId, CancellationToken cancellationToken);
         /// <summary>
+        /// Gets the channel stream media sources.
+        /// </summary>
+        /// <param name="info">The information.</param>
+        /// <param name="channelId">The channel identifier.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task&lt;List&lt;MediaSourceInfo&gt;&gt;.</returns>
+        Task<List<MediaSourceInfo>> GetChannelStreamMediaSources(TunerHostInfo info, string channelId, CancellationToken cancellationToken);
+        /// <summary>
         /// Validates the specified information.
         /// </summary>
         /// <param name="info">The information.</param>
diff --git a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
index fbfe79272..9153045e6 100644
--- a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
@@ -436,7 +436,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 state.IsoMount = await IsoManager.Mount(state.MediaPath, cancellationToken).ConfigureAwait(false);
             }
 
-            if (state.MediaSource.RequiresOpening)
+            if (state.MediaSource.RequiresOpening ?? false)
             {
                 var liveStreamResponse = await MediaSourceManager.OpenLiveStream(new LiveStreamRequest
                 {
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
index efce5abb0..bb32ac95b 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
@@ -137,7 +137,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
         private async void DisposeLiveStream()
         {
-            if (MediaSource.RequiresClosing)
+            if (MediaSource.RequiresClosing ?? false)
             {
                 try
                 {
diff --git a/MediaBrowser.Model/Dto/MediaSourceInfo.cs b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
index 8897edcbd..75edc6a52 100644
--- a/MediaBrowser.Model/Dto/MediaSourceInfo.cs
+++ b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
@@ -26,9 +26,9 @@ namespace MediaBrowser.Model.Dto
         public bool SupportsDirectStream { get; set; }
         public bool SupportsDirectPlay { get; set; }
 
-        public bool RequiresOpening { get; set; }
+        public bool? RequiresOpening { get; set; }
         public string OpenToken { get; set; }
-        public bool RequiresClosing { get; set; }
+        public bool? RequiresClosing { get; set; }
         public string LiveStreamId { get; set; }
         public int? BufferMs { get; set; }
 
diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
index 90cd8924d..3fc841645 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
@@ -34,5 +34,6 @@ namespace MediaBrowser.Model.LiveTv
         public string Password { get; set; }
         public string ListingsId { get; set; }
         public string ZipCode { get; set; }
+        public string Country { get; set; }
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
index 9b46a8057..765acd578 100644
--- a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
@@ -439,7 +439,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 LiveStreamInfo current;
                 if (_openStreams.TryGetValue(id, out current))
                 {
-                    if (current.MediaSource.RequiresClosing)
+                    if (current.MediaSource.RequiresClosing ?? false)
                     {
                         var tuple = GetProvider(id);
 
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 37b6bf086..c32b8da10 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Common;
 using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.LiveTv;
@@ -74,20 +75,17 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             var status = new LiveTvServiceStatusInfo();
             var list = new List<LiveTvTunerInfo>();
 
-            foreach (var host in _liveTvManager.TunerHosts)
+            foreach (var hostInstance in GetTunerHosts())
             {
-                foreach (var hostInstance in host.GetTunerHosts())
+                try
                 {
-                    try
-                    {
-                        var tuners = await host.GetTunerInfos(hostInstance, cancellationToken).ConfigureAwait(false);
+                    var tuners = await hostInstance.Item1.GetTunerInfos(hostInstance.Item2, cancellationToken).ConfigureAwait(false);
 
-                        list.AddRange(tuners);
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.ErrorException("Error getting tuners", ex);
-                    }
+                    list.AddRange(tuners);
+                }
+                catch (Exception ex)
+                {
+                    _logger.ErrorException("Error getting tuners", ex);
                 }
             }
 
@@ -102,20 +100,23 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
         {
             var list = new List<ChannelInfo>();
 
-            foreach (var host in _liveTvManager.TunerHosts)
+            foreach (var hostInstance in GetTunerHosts())
             {
-                foreach (var hostInstance in host.GetTunerHosts())
+                try
                 {
-                    try
-                    {
-                        var channels = await host.GetChannels(hostInstance, cancellationToken).ConfigureAwait(false);
+                    var channels = await hostInstance.Item1.GetChannels(hostInstance.Item2, cancellationToken).ConfigureAwait(false);
+                    var newChannels = channels.ToList();
 
-                        list.AddRange(channels);
-                    }
-                    catch (Exception ex)
+                    foreach (var channel in newChannels)
                     {
-                        _logger.ErrorException("Error getting channels", ex);
+                        channel.Id = hostInstance.Item1.Type.GetMD5().ToString("N") + "-" + channel.Id;
                     }
+
+                    list.AddRange(newChannels);
+                }
+                catch (Exception ex)
+                {
+                    _logger.ErrorException("Error getting channels", ex);
                 }
             }
 
@@ -130,6 +131,19 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             return list;
         }
 
+        private List<Tuple<ITunerHost, TunerHostInfo>> GetTunerHosts()
+        {
+            return GetConfiguration().TunerHosts
+                .Select(i =>
+                {
+                    var provider = _liveTvManager.TunerHosts.FirstOrDefault(l => string.Equals(l.Type, i.Type, StringComparison.OrdinalIgnoreCase));
+
+                    return provider == null ? null : new Tuple<ITunerHost, TunerHostInfo>(provider, i);
+                })
+                .Where(i => i != null)
+                .ToList();
+        }
+
         public Task CancelSeriesTimerAsync(string timerId, CancellationToken cancellationToken)
         {
             var remove = _seriesTimerProvider.GetAll().SingleOrDefault(r => r.Id == timerId);
@@ -255,14 +269,27 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             return Task.FromResult((IEnumerable<SeriesTimerInfo>)_seriesTimerProvider.GetAll());
         }
 
+        private string GetOriginalChannelId(string channelId)
+        {
+            var parts = channelId.Split('-');
+
+            return string.Join("-", parts.Skip(1).ToArray());
+        }
+
         public async Task<IEnumerable<ProgramInfo>> GetProgramsAsync(string channelId, DateTime startDateUtc, DateTime endDateUtc, CancellationToken cancellationToken)
         {
             foreach (var provider in GetListingProviders())
             {
-                var programs = await provider.Item1.GetProgramsAsync(provider.Item2, channelId, startDateUtc, endDateUtc, cancellationToken)
+                var programs = await provider.Item1.GetProgramsAsync(provider.Item2, GetOriginalChannelId(channelId), startDateUtc, endDateUtc, cancellationToken)
                         .ConfigureAwait(false);
                 var list = programs.ToList();
 
+                // Replace the value that came from the provider with a normalized value
+                foreach (var program in list)
+                {
+                    program.ChannelId = channelId;
+                }
+
                 if (list.Count > 0)
                 {
                     return list;
@@ -290,14 +317,67 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             throw new NotImplementedException();
         }
 
-        public Task<MediaSourceInfo> GetChannelStream(string channelId, string streamId, CancellationToken cancellationToken)
+        public async Task<MediaSourceInfo> GetChannelStream(string channelId, string streamId, CancellationToken cancellationToken)
         {
-            throw new NotImplementedException();
+            _logger.Info("Streaming Channel " + channelId);
+
+            var configurationId = channelId.Split('-')[0];
+
+            foreach (var hostInstance in GetTunerHosts())
+            {
+                if (!string.Equals(configurationId, hostInstance.Item1.Type.GetMD5().ToString("N"), StringComparison.OrdinalIgnoreCase))
+                {
+                    continue;
+                }
+
+                if (!string.IsNullOrWhiteSpace(streamId))
+                {
+                    var originalStreamId = string.Join("-", streamId.Split('-').Skip(1).ToArray());
+
+                    if (!string.Equals(hostInstance.Item2.Id, originalStreamId, StringComparison.OrdinalIgnoreCase))
+                    {
+                        continue;
+                    }
+                }
+
+                MediaSourceInfo mediaSourceInfo = null;
+                try
+                {
+                    mediaSourceInfo = await hostInstance.Item1.GetChannelStream(hostInstance.Item2, GetOriginalChannelId(channelId), streamId, cancellationToken).ConfigureAwait(false);
+                }
+                catch (ApplicationException e)
+                {
+                    _logger.Info(e.Message);
+                    continue;
+                }
+
+                mediaSourceInfo.Id = Guid.NewGuid().ToString("N");
+                return mediaSourceInfo;
+            }
+
+            throw new ApplicationException("Tuner not found.");
         }
 
-        public Task<List<MediaSourceInfo>> GetChannelStreamMediaSources(string channelId, CancellationToken cancellationToken)
+        public async Task<List<MediaSourceInfo>> GetChannelStreamMediaSources(string channelId, CancellationToken cancellationToken)
         {
-            throw new NotImplementedException();
+            var configurationId = channelId.Split('-')[0];
+
+            foreach (var hostInstance in GetTunerHosts())
+            {
+                if (string.Equals(configurationId, hostInstance.Item1.Type.GetMD5().ToString("N"), StringComparison.OrdinalIgnoreCase))
+                {
+                    var sources = await hostInstance.Item1.GetChannelStreamMediaSources(hostInstance.Item2, GetOriginalChannelId(channelId), cancellationToken).ConfigureAwait(false);
+
+                    foreach (var source in sources)
+                    {
+                        source.Id = hostInstance.Item2.Id + "-" + source.Id;
+                    }
+
+                    return sources;
+                }
+            }
+
+            throw new ApplicationException("Tuner not found.");
         }
 
         public Task<List<MediaSourceInfo>> GetRecordingStreamMediaSources(string recordingId, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
index e7feeee5a..75dec5f97 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
@@ -68,9 +68,12 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
 
         private void UpdateList(List<T> newList)
         {
+            var file = _dataPath + ".json";
+            Directory.CreateDirectory(Path.GetDirectoryName(file));
+
             lock (_fileDataLock)
             {
-                _jsonSerializer.SerializeToFile(newList, _dataPath + ".json");
+                _jsonSerializer.SerializeToFile(newList, file);
                 _items = newList;
             }
         }
diff --git a/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs b/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
index ed265d416..72a965c6a 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
@@ -218,7 +218,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
         private ProgramInfo GetProgram(string channel, ScheduleDirect.Program programInfo,
             ScheduleDirect.ProgramDetails details)
         {
-            _logger.Debug("Show type is: " + (details.showType ?? "No ShowType"));
+            //_logger.Debug("Show type is: " + (details.showType ?? "No ShowType"));
             DateTime startAt = DateTime.ParseExact(programInfo.airDateTime, "yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'",
                 CultureInfo.InvariantCulture);
             DateTime endAt = startAt.AddSeconds(programInfo.duration);
@@ -401,7 +401,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
             _logger.Info("Headends on account ");
 
             var countryParam = string.Equals("ca", country, StringComparison.OrdinalIgnoreCase)
-                ? "Canada"
+                ? "can"
                 : "USA";
 
             var options = new HttpRequestOptions()
@@ -562,6 +562,44 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
             get { return "SchedulesDirect"; }
         }
 
+        private async Task<bool> HasLineup(ListingsProviderInfo info, CancellationToken cancellationToken)
+        {
+            var token = await GetToken(info, cancellationToken);
+
+            _logger.Info("Headends on account ");
+
+            var options = new HttpRequestOptions()
+            {
+                Url = ApiUrl + "/lineups",
+                UserAgent = UserAgent,
+                CancellationToken = cancellationToken
+            };
+
+            options.RequestHeaders["token"] = token;
+
+            using (Stream responce = await _httpClient.Get(options).ConfigureAwait(false))
+            {
+                var root = _jsonSerializer.DeserializeFromStream<ScheduleDirect.Lineups>(responce);
+
+                return root.lineups.Any(i => string.Equals(info.ListingsId, i.lineup, StringComparison.OrdinalIgnoreCase));
+            }
+        }
+
+        public async Task Validate(ListingsProviderInfo info)
+        {
+            var hasLineup = await HasLineup(info, CancellationToken.None).ConfigureAwait(false);
+
+            if (!hasLineup)
+            {
+                await AddLineupToAccount(info, CancellationToken.None).ConfigureAwait(false);
+            }
+        }
+
+        public Task<List<NameIdPair>> GetLineups(ListingsProviderInfo info, string country, string location)
+        {
+            return GetHeadends(info, country, location, CancellationToken.None);
+        }
+
         public class ScheduleDirect
         {
             public class Token
@@ -841,14 +879,5 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
 
         }
 
-        public async Task Validate(ListingsProviderInfo info)
-        {
-            //await AddLineupToAccount(info, CancellationToken.None).ConfigureAwait(false);
-        }
-
-        public Task<List<NameIdPair>> GetLineups(ListingsProviderInfo info, string country, string location)
-        {
-            return GetHeadends(info, country, location, CancellationToken.None);
-        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 5be90e6cc..6ef565129 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -367,7 +367,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                     info = await service.GetChannelStream(channel.ExternalId, mediaSourceId, cancellationToken).ConfigureAwait(false);
                     info.RequiresClosing = true;
 
-                    if (info.RequiresClosing)
+                    if (info.RequiresClosing ?? false)
                     {
                         var idPrefix = service.GetType().FullName.GetMD5().ToString("N") + "_";
 
@@ -384,7 +384,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                     info = await service.GetRecordingStream(recording.ExternalId, null, cancellationToken).ConfigureAwait(false);
                     info.RequiresClosing = true;
 
-                    if (info.RequiresClosing)
+                    if (info.RequiresClosing ?? false)
                     {
                         var idPrefix = service.GetType().FullName.GetMD5().ToString("N") + "_";
 
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
index 5ebb79629..cf34b6b99 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
@@ -53,7 +53,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
         // Do not use a pipe here because Roku http requests to the server will fail, without any explicit error message.
         private const char StreamIdDelimeter = '_';
-        private const string StreamIdDelimeterString = "|";
+        private const string StreamIdDelimeterString = "_";
         
         private async Task<IEnumerable<MediaSourceInfo>> GetMediaSourcesInternal(ILiveTvItem item, CancellationToken cancellationToken)
         {
@@ -86,14 +86,22 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             foreach (var source in list)
             {
                 source.Type = MediaSourceType.Default;
-                source.RequiresOpening = true;
-                source.BufferMs = source.BufferMs ?? 1500;
 
-                var openKeys = new List<string>();
-                openKeys.Add(item.GetType().Name);
-                openKeys.Add(item.Id.ToString("N"));
-                openKeys.Add(source.Id ?? string.Empty);
-                source.OpenToken = string.Join(StreamIdDelimeterString, openKeys.ToArray());
+                if (!source.RequiresOpening.HasValue)
+                {
+                    source.RequiresOpening = true;
+                }
+
+                if (source.RequiresOpening.HasValue && source.RequiresOpening.Value)
+                {
+                    var openKeys = new List<string>();
+                    openKeys.Add(item.GetType().Name);
+                    openKeys.Add(item.Id.ToString("N"));
+                    openKeys.Add(source.Id ?? string.Empty);
+                    source.OpenToken = string.Join(StreamIdDelimeterString, openKeys.ToArray());
+                }
+
+                source.BufferMs = source.BufferMs ?? 1500;
 
                 // Dummy this up so that direct play checks can still run
                 if (string.IsNullOrEmpty(source.Path) && source.Protocol == MediaProtocol.Http)
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunDiscovery.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunDiscovery.cs
index 4777003d6..cc2bb2d52 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunDiscovery.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunDiscovery.cs
@@ -72,6 +72,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                     return;
                 }
 
+                // Strip off the port
+                url = new Uri(url).GetComponents(UriComponents.AbsoluteUri & ~UriComponents.Port, UriFormat.UriEscaped);
+
                 await _liveTvManager.SaveTunerHost(new TunerHostInfo
                 {
                     Type = HdHomerunHost.DeviceType,
@@ -103,13 +106,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
 
             url = url.TrimEnd('/');
 
-            // If there isn't a port, add the default port of 80
-            if (url.Split(':').Length < 3)
-            {
-                url += ":80";
-            }
-
-            return url;
+            // Strip off the port
+            return new Uri(url).GetComponents(UriComponents.AbsoluteUri & ~UriComponents.Port, UriFormat.UriEscaped);
         }
 
         private LiveTvOptions GetConfiguration()
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
index 187569ab4..d9f1541c8 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
@@ -51,7 +51,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
         {
             var options = new HttpRequestOptions
             {
-                Url = string.Format("{0}/lineup.json", GetApiUrl(info)),
+                Url = string.Format("{0}/lineup.json", GetApiUrl(info, false)),
                 CancellationToken = cancellationToken
             };
             using (var stream = await _httpClient.Get(options))
@@ -79,7 +79,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
 
             using (var stream = await _httpClient.Get(new HttpRequestOptions()
             {
-                Url = string.Format("{0}/", GetApiUrl(info)),
+                Url = string.Format("{0}/", GetApiUrl(info, false)),
                 CancellationToken = cancellationToken
             }))
             {
@@ -97,7 +97,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
 
             using (var stream = await _httpClient.Get(new HttpRequestOptions()
             {
-                Url = string.Format("{0}/tuners.html", GetApiUrl(info)),
+                Url = string.Format("{0}/tuners.html", GetApiUrl(info, false)),
                 CancellationToken = cancellationToken
             }))
             {
@@ -128,7 +128,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             }
         }
 
-        public string GetApiUrl(TunerHostInfo info)
+        private string GetApiUrl(TunerHostInfo info, bool isPlayback)
         {
             var url = info.Url;
 
@@ -137,7 +137,16 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                 url = "http://" + url;
             }
 
-            return url.TrimEnd('/');
+            var uri = new Uri(url);
+
+            if (isPlayback)
+            {
+                var builder = new UriBuilder(uri);
+                builder.Port = 5004;
+                uri = builder.Uri;
+            }
+
+            return uri.AbsoluteUri.TrimEnd('/');
         }
 
         private static string StripXML(string source)
@@ -187,21 +196,13 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             return GetConfiguration().TunerHosts.Where(i => string.Equals(i.Type, Type, StringComparison.OrdinalIgnoreCase)).ToList();
         }
 
-        public async Task<MediaSourceInfo> GetChannelStream(TunerHostInfo info, string channelId, string streamId, CancellationToken cancellationToken)
+        private MediaSourceInfo GetMediaSource(TunerHostInfo info, string channelId, string profile)
         {
-            var channels = await GetChannels(info, cancellationToken).ConfigureAwait(false);
-            var tuners = await GetTunerInfos(info, cancellationToken).ConfigureAwait(false);
-
-            var channel = channels.FirstOrDefault(c => string.Equals(c.Id, channelId, StringComparison.OrdinalIgnoreCase));
-            if (channel != null)
+            var mediaSource = new MediaSourceInfo
             {
-                if (tuners.FindIndex(t => t.Status == LiveTvTunerStatus.Available) >= 0)
-                {
-                    return new MediaSourceInfo
-                    {
-                        Path = GetApiUrl(info) + "/auto/v" + channelId,
-                        Protocol = MediaProtocol.Http,
-                        MediaStreams = new List<MediaStream>
+                Path = GetApiUrl(info, true) + "/auto/v" + channelId,
+                Protocol = MediaProtocol.Http,
+                MediaStreams = new List<MediaStream>
                         {
                             new MediaStream
                             {
@@ -217,15 +218,28 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                                 Index = -1
 
                             }
-                        }
-                    };
-                }
+                        },
+                RequiresOpening = false,
+                RequiresClosing = false,
+                BufferMs = 1000
+            };
 
-                throw new ApplicationException("No tuners avaliable.");
-            } 
-            throw new ApplicationException("Channel not found.");
+            return mediaSource;
         }
 
+        public Task<List<MediaSourceInfo>> GetChannelStreamMediaSources(TunerHostInfo info, string channelId, CancellationToken cancellationToken)
+        {
+            var list = new List<MediaSourceInfo>();
+
+            list.Add(GetMediaSource(info, channelId, null));
+
+            return Task.FromResult(list);
+        }
+
+        public async Task<MediaSourceInfo> GetChannelStream(TunerHostInfo info, string channelId, string streamId, CancellationToken cancellationToken)
+        {
+            return GetMediaSource(info, channelId, null);
+        }
 
         public async Task Validate(TunerHostInfo info)
         {
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
index e91bd0f0b..91f25bbee 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
@@ -171,7 +171,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
                             Index = -1
 
                         }
-                    }
+                    },
+                    RequiresOpening = false,
+                    RequiresClosing = false
                 };
             }
             throw new ApplicationException("Host doesnt provide this channel");
@@ -193,5 +195,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
                 throw new FileNotFoundException();
             }
         }
+
+
+        public Task<List<MediaSourceInfo>> GetChannelStreamMediaSources(TunerHostInfo info, string channelId, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 24df7c983..194d406f3 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -1489,5 +1489,5 @@
     "GuideProviderListingsStep": "Step 2: Select Listings",
     "GuideProviderLoginStep": "Step 1: Login",
     "LabelLineup": "Lineup",
-    "MessageTunerDeviceNotListed": "Is your tuner device not listed? Try installing an external service plugin for more Live TV options."
+    "MessageTunerDeviceNotListed": "Is your tuner device not listed? Try installing an external service provider for more Live TV options."
 }
-- 
cgit v1.2.3


From 77afd4ba544abf2c92cd6d098e997dfc2d9b39c9 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 24 Jul 2015 11:20:11 -0400
Subject: update live tv

---
 .../HttpClientManager/HttpClientManager.cs           |  2 +-
 MediaBrowser.Model/Session/GeneralCommandType.cs     |  4 +++-
 MediaBrowser.Model/Session/PlaybackProgressInfo.cs   | 12 ++++++++++++
 .../Library/UserViewManager.cs                       |  2 +-
 .../LiveTv/LiveTvManager.cs                          | 20 ++++++++++----------
 .../LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs     |  3 ++-
 .../Playlists/PlaylistManager.cs                     | 15 +++++++++------
 .../ApplicationHost.cs                               |  2 +-
 8 files changed, 39 insertions(+), 21 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs b/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs
index 18441161f..89f405e8a 100644
--- a/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs
+++ b/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs
@@ -127,7 +127,7 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager
 
         private WebRequest GetRequest(HttpRequestOptions options, string method, bool enableHttpCompression)
         {
-            var request = WebRequest.Create(options.Url);
+            var request = CreateWebRequest(options.Url);
             var httpWebRequest = request as HttpWebRequest;
 
             if (httpWebRequest != null)
diff --git a/MediaBrowser.Model/Session/GeneralCommandType.cs b/MediaBrowser.Model/Session/GeneralCommandType.cs
index f8773a246..dcb3b20ca 100644
--- a/MediaBrowser.Model/Session/GeneralCommandType.cs
+++ b/MediaBrowser.Model/Session/GeneralCommandType.cs
@@ -33,6 +33,8 @@
         ToggleFullscreen = 25,
         DisplayContent = 26,
         GoToSearch = 27,
-        DisplayMessage = 28
+        DisplayMessage = 28,
+        SetRepeatAll = 29,
+        SetRepeatOne = 30
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/Session/PlaybackProgressInfo.cs b/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
index a7ca09c15..345931a62 100644
--- a/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
+++ b/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
@@ -88,5 +88,17 @@ namespace MediaBrowser.Model.Session
         /// </summary>
         /// <value>The play session identifier.</value>
         public string PlaySessionId { get; set; }
+        /// <summary>
+        /// Gets or sets the repeat mode.
+        /// </summary>
+        /// <value>The repeat mode.</value>
+        public RepeatMode RepeatMode { get; set; }
+    }
+
+    public enum RepeatMode
+    {
+        RepeatNone = 0,
+        RepeatAll = 1,
+        RepeatOne = 2
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
index 69600f0fe..14c5c9a03 100644
--- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
@@ -99,7 +99,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 list.Add(await GetUserView(parents, list, CollectionType.TvShows, string.Empty, user, cancellationToken).ConfigureAwait(false));
             }
 
-            parents = foldersWithViewTypes.Where(i => string.Equals(i.CollectionType, CollectionType.Music, StringComparison.OrdinalIgnoreCase) || string.Equals(i.CollectionType, CollectionType.MusicVideos, StringComparison.OrdinalIgnoreCase) || string.IsNullOrWhiteSpace(i.CollectionType))
+            parents = foldersWithViewTypes.Where(i => string.Equals(i.CollectionType, CollectionType.Music, StringComparison.OrdinalIgnoreCase) || string.IsNullOrWhiteSpace(i.CollectionType))
                 .ToList();
 
             if (parents.Count > 0)
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 6ef565129..3ca60ec51 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -544,16 +544,16 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             var replaceImages = new List<ImageType>();
 
-            if (!string.Equals(item.ProviderImageUrl, channelInfo.ImageUrl, StringComparison.OrdinalIgnoreCase))
-            {
-                isNew = true;
-                replaceImages.Add(ImageType.Primary);
-            }
-            if (!string.Equals(item.ProviderImagePath, channelInfo.ImagePath, StringComparison.OrdinalIgnoreCase))
-            {
-                isNew = true;
-                replaceImages.Add(ImageType.Primary);
-            }
+            //if (!string.Equals(item.ProviderImageUrl, channelInfo.ImageUrl, StringComparison.OrdinalIgnoreCase))
+            //{
+            //    isNew = true;
+            //    replaceImages.Add(ImageType.Primary);
+            //}
+            //if (!string.Equals(item.ProviderImagePath, channelInfo.ImagePath, StringComparison.OrdinalIgnoreCase))
+            //{
+            //    isNew = true;
+            //    replaceImages.Add(ImageType.Primary);
+            //}
 
             item.ProviderImageUrl = channelInfo.ImageUrl;
             item.HasProviderImage = channelInfo.HasImage;
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
index 50303a89a..eb8f8f80e 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
@@ -325,7 +325,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
 
                 if (model.IndexOf("hdtc", StringComparison.OrdinalIgnoreCase) != -1)
                 {
-                    list.Add(GetMediaSource(info, channelId, "heavy"));
+                    list.Insert(0, GetMediaSource(info, channelId, "heavy"));
+
                     list.Add(GetMediaSource(info, channelId, "internet480"));
                     list.Add(GetMediaSource(info, channelId, "internet360"));
                     list.Add(GetMediaSource(info, channelId, "internet240"));
diff --git a/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs b/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
index 311cb9b51..857cf743f 100644
--- a/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
+++ b/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
@@ -23,14 +23,16 @@ namespace MediaBrowser.Server.Implementations.Playlists
         private readonly ILibraryMonitor _iLibraryMonitor;
         private readonly ILogger _logger;
         private readonly IUserManager _userManager;
+        private readonly IProviderManager _providerManager;
 
-        public PlaylistManager(ILibraryManager libraryManager, IFileSystem fileSystem, ILibraryMonitor iLibraryMonitor, ILogger logger, IUserManager userManager)
+        public PlaylistManager(ILibraryManager libraryManager, IFileSystem fileSystem, ILibraryMonitor iLibraryMonitor, ILogger logger, IUserManager userManager, IProviderManager providerManager)
         {
             _libraryManager = libraryManager;
             _fileSystem = fileSystem;
             _iLibraryMonitor = iLibraryMonitor;
             _logger = logger;
             _userManager = userManager;
+            _providerManager = providerManager;
         }
 
         public IEnumerable<Playlist> GetPlaylists(string userId)
@@ -193,11 +195,11 @@ namespace MediaBrowser.Server.Implementations.Playlists
             playlist.LinkedChildren.AddRange(list);
 
             await playlist.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
-            await playlist.RefreshMetadata(new MetadataRefreshOptions
+
+            _providerManager.QueueRefresh(playlist.Id, new MetadataRefreshOptions
             {
                 ForceSave = true
-
-            }, CancellationToken.None).ConfigureAwait(false);
+            });
         }
 
         public async Task RemoveFromPlaylist(string playlistId, IEnumerable<string> entryIds)
@@ -220,10 +222,11 @@ namespace MediaBrowser.Server.Implementations.Playlists
                 .ToList();
 
             await playlist.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
-            await playlist.RefreshMetadata(new MetadataRefreshOptions
+
+            _providerManager.QueueRefresh(playlist.Id, new MetadataRefreshOptions
             {
                 ForceSave = true
-            }, CancellationToken.None).ConfigureAwait(false);
+            });
         }
 
         public Folder GetPlaylistsFolder(string userId)
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index 5fd1dca43..5e5babbb4 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -493,7 +493,7 @@ namespace MediaBrowser.Server.Startup.Common
             CollectionManager = new CollectionManager(LibraryManager, FileSystemManager, LibraryMonitor, LogManager.GetLogger("CollectionManager"));
             RegisterSingleInstance(CollectionManager);
 
-            PlaylistManager = new PlaylistManager(LibraryManager, FileSystemManager, LibraryMonitor, LogManager.GetLogger("PlaylistManager"), UserManager);
+            PlaylistManager = new PlaylistManager(LibraryManager, FileSystemManager, LibraryMonitor, LogManager.GetLogger("PlaylistManager"), UserManager, ProviderManager);
             RegisterSingleInstance<IPlaylistManager>(PlaylistManager);
 
             LiveTvManager = new LiveTvManager(this, ServerConfigurationManager, Logger, ItemRepository, ImageProcessor, UserDataManager, DtoService, UserManager, LibraryManager, TaskManager, LocalizationManager, JsonSerializer, ProviderManager);
-- 
cgit v1.2.3


From d440e89c507ba1c764c24d53bfe85d747b7beb8b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 27 Jul 2015 01:03:34 -0400
Subject: update schedules direct page

---
 .../Entities/UserViewBuilder.cs                    |   2 +-
 .../Folders/UserViewMetadataService.cs             |  13 +++
 .../Dto/DtoService.cs                              |  27 ++---
 .../Library/LibraryManager.cs                      |   4 +-
 .../Localization/JavaScript/javascript.json        |   7 +-
 .../Localization/Server/server.json                |   4 +-
 .../MediaBrowser.Server.Implementations.csproj     |   1 +
 .../Photos/BaseDynamicImageProvider.cs             |  54 +++++++---
 .../UserViews/CollectionFolderImageProvider.cs     | 114 +++++++++++++++++++++
 .../UserViews/DynamicImageProvider.cs              |  16 +--
 10 files changed, 196 insertions(+), 46 deletions(-)
 create mode 100644 MediaBrowser.Server.Implementations/UserViews/CollectionFolderImageProvider.cs

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
index b2d359277..0733b65b1 100644
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -66,7 +66,7 @@ namespace MediaBrowser.Controller.Entities
                     {
                         var result = await _channelManager.GetChannelsInternal(new ChannelQuery
                         {
-                            UserId = user.Id.ToString("N"),
+                            UserId = user == null ? null : user.Id.ToString("N"),
                             Limit = query.Limit,
                             StartIndex = query.StartIndex
 
diff --git a/MediaBrowser.Providers/Folders/UserViewMetadataService.cs b/MediaBrowser.Providers/Folders/UserViewMetadataService.cs
index 1dc09e01d..70b86830f 100644
--- a/MediaBrowser.Providers/Folders/UserViewMetadataService.cs
+++ b/MediaBrowser.Providers/Folders/UserViewMetadataService.cs
@@ -21,4 +21,17 @@ namespace MediaBrowser.Providers.Folders
             ProviderUtils.MergeBaseItemData(source, target, lockedFields, replaceData, mergeMetadataSettings);
         }
     }
+
+    public class CollectionFolderMetadataService : MetadataService<CollectionFolder, ItemLookupInfo>
+    {
+        public CollectionFolderMetadataService(IServerConfigurationManager serverConfigurationManager, ILogger logger, IProviderManager providerManager, IProviderRepository providerRepo, IFileSystem fileSystem, IUserDataManager userDataManager, ILibraryManager libraryManager)
+            : base(serverConfigurationManager, logger, providerManager, providerRepo, fileSystem, userDataManager, libraryManager)
+        {
+        }
+
+        protected override void MergeData(MetadataResult<CollectionFolder> source, MetadataResult<CollectionFolder> target, List<MetadataFields> lockedFields, bool replaceData, bool mergeMetadataSettings)
+        {
+            ProviderUtils.MergeBaseItemData(source, target, lockedFields, replaceData, mergeMetadataSettings);
+        }
+    }
 }
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index 257e0feb1..aade00aa4 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -187,7 +187,7 @@ namespace MediaBrowser.Server.Implementations.Dto
         {
             if (!options.Fields.Contains(ItemFields.SyncInfo))
             {
-                return new SyncedItemProgress[]{};
+                return new SyncedItemProgress[] { };
             }
 
             var deviceId = options.DeviceId;
@@ -281,7 +281,7 @@ namespace MediaBrowser.Server.Implementations.Dto
             }
         }
 
-        private BaseItemDto GetBaseItemDtoInternal(BaseItem item, DtoOptions options, Dictionary<string,SyncedItemProgress> syncProgress, User user = null, BaseItem owner = null)
+        private BaseItemDto GetBaseItemDtoInternal(BaseItem item, DtoOptions options, Dictionary<string, SyncedItemProgress> syncProgress, User user = null, BaseItem owner = null)
         {
             var fields = options.Fields;
 
@@ -1629,7 +1629,7 @@ namespace MediaBrowser.Server.Implementations.Dto
         /// <param name="fields">The fields.</param>
         /// <param name="syncProgress">The synchronize progress.</param>
         /// <returns>Task.</returns>
-        private void SetSpecialCounts(Folder folder, User user, BaseItemDto dto, List<ItemFields> fields, Dictionary<string,SyncedItemProgress> syncProgress)
+        private void SetSpecialCounts(Folder folder, User user, BaseItemDto dto, List<ItemFields> fields, Dictionary<string, SyncedItemProgress> syncProgress)
         {
             var recursiveItemCount = 0;
             var unplayed = 0;
@@ -1640,21 +1640,14 @@ namespace MediaBrowser.Server.Implementations.Dto
             double totalSyncPercent = 0;
             var addSyncInfo = fields.Contains(ItemFields.SyncInfo);
 
-            IEnumerable<BaseItem> children;
-
-            var season = folder as Season;
-
-            if (season != null)
+            var children = folder.GetItems(new InternalItemsQuery
             {
-                children = season
-                    .GetEpisodes(user)
-                    .Where(i => i.LocationType != LocationType.Virtual);
-            }
-            else
-            {
-                children = folder
-                    .GetRecursiveChildren(user, i => !i.IsFolder && i.LocationType != LocationType.Virtual);
-            }
+                IsFolder = false,
+                Recursive = true,
+                IsVirtualUnaired = false,
+                IsMissing = false
+
+            }).Result.Items;
 
             // Loop through each recursive child
             foreach (var child in children)
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index bdc94b88b..8d51e3e92 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1615,7 +1615,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 .FirstOrDefault(i => !string.IsNullOrWhiteSpace(i));
         }
 
-        private readonly TimeSpan _viewRefreshInterval = TimeSpan.FromHours(24);
+        private readonly TimeSpan _viewRefreshInterval = TimeSpan.FromHours(.01);
 
         public async Task<UserView> GetNamedView(User user,
             string name,
@@ -1666,7 +1666,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 await item.UpdateToRepository(ItemUpdateType.MetadataEdit, cancellationToken).ConfigureAwait(false);
             }
 
-            if (!refresh && item != null)
+            if (!refresh)
             {
                 refresh = (DateTime.UtcNow - item.DateLastSaved) >= _viewRefreshInterval;
             }
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
index 55236c2c6..acd54cb0f 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -825,5 +825,10 @@
     "ErrorSavingTvProvider": "There was an error saving the TV provider. Please ensure it is accessible and try again.",
     "ErrorGettingTvLineups": "There was an error downloading tv lineups. Please ensure your username and password are correct and try again.",
     "MessageCreateAccountAt": "Create an account at {0}",
-    "ErrorPleaseSelectLineup": "Please select a lineup and try again. If no lineups are available, then please check that your username, password, and postal code is correct."
+    "ErrorPleaseSelectLineup": "Please select a lineup and try again. If no lineups are available, then please check that your username, password, and postal code is correct.",
+    "HeaderTryCinemaMode": "Try Cinema Mode",
+    "ButtonBecomeSupporter": "Become an Emby Supporter",
+    "ButtonClosePlayVideo": "Close and play my video",
+    "MessageDidYouKnowCinemaMode":  "Did you know that by becoming an Emby Supporter, you can enhance your experience with features like Cinema Mode?",
+    "MessageDidYouKnowCinemaMode2":  "Cinema Mode gives you the true cinema experience with trailers and custom intros before the main feature."
 }
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index e06bcea34..1b1b3e0e2 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -1486,8 +1486,8 @@
     "HeaderGuideProviders": "Guide Providers",
     "AddGuideProviderHelp": "Add a source for TV Guide information",
     "LabelZipCode": "Zip Code:",
-    "GuideProviderListingsStep": "Step 2: Select Listings",
-    "GuideProviderLoginStep": "Step 1: Login",
+    "GuideProviderSelectListings": "Select Listings",
+    "GuideProviderLogin": "Login",
     "LabelLineup": "Lineup:",
     "MessageTunerDeviceNotListed": "Is your tuner device not listed? Try installing an external service provider for more Live TV options.",
     "LabelImportOnlyFavoriteChannels": "Restrict to channels marked as favorite",
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 0d8b74873..03becc81d 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -242,6 +242,7 @@
     <Compile Include="Sorting\StartDateComparer.cs" />
     <Compile Include="Sync\SyncHelper.cs" />
     <Compile Include="Sync\SyncJobOptions.cs" />
+    <Compile Include="UserViews\CollectionFolderImageProvider.cs" />
     <Compile Include="UserViews\DynamicImageProvider.cs" />
     <Compile Include="News\NewsEntryPoint.cs" />
     <Compile Include="News\NewsService.cs" />
diff --git a/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs b/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs
index ef12544ba..eb25c7d79 100644
--- a/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs
@@ -53,10 +53,23 @@ namespace MediaBrowser.Server.Implementations.Photos
                 return ItemUpdateType.None;
             }
 
-            var primaryResult = await FetchAsync(item, ImageType.Primary, options, cancellationToken).ConfigureAwait(false);
-            var thumbResult = await FetchAsync(item, ImageType.Thumb, options, cancellationToken).ConfigureAwait(false);
+            var updateType = ItemUpdateType.None;
+            var supportedImages = GetSupportedImages(item).ToList();
 
-            return primaryResult | thumbResult;
+            if (supportedImages.Contains(ImageType.Primary))
+            {
+                var primaryResult = await FetchAsync(item, ImageType.Primary, options, cancellationToken).ConfigureAwait(false);
+                updateType = updateType | primaryResult;
+            }
+
+            if (supportedImages.Contains(ImageType.Thumb))
+            {
+                var thumbResult = await FetchAsync(item, ImageType.Thumb, options, cancellationToken).ConfigureAwait(false);
+                updateType = updateType | thumbResult;
+            }
+
+
+            return updateType;
         }
 
         protected async Task<ItemUpdateType> FetchAsync(IHasImages item, ImageType imageType, MetadataRefreshOptions options, CancellationToken cancellationToken)
@@ -168,7 +181,7 @@ namespace MediaBrowser.Server.Implementations.Photos
                 return false;
             }
 
-            var drawText = !(item is UserView);
+            var drawText = !(item is UserView) && !(item is ICollectionFolder);
 
             if (imageType == ImageType.Thumb)
             {
@@ -181,14 +194,11 @@ namespace MediaBrowser.Server.Implementations.Photos
                 {
                     return await CreateSquareCollage(item, itemsWithImages, outputPath, drawText).ConfigureAwait(false);
                 }
-                else if (item is PhotoAlbum || item is Playlist)
+                if (item is PhotoAlbum || item is Playlist)
                 {
                     return await CreateSquareCollage(item, itemsWithImages, outputPath, drawText).ConfigureAwait(false);
                 }
-                else
-                {
-                    return await CreatePosterCollage(item, itemsWithImages, outputPath).ConfigureAwait(false);
-                }
+                return await CreatePosterCollage(item, itemsWithImages, outputPath).ConfigureAwait(false);
             }
 
             throw new ArgumentException("Unexpected image type");
@@ -203,15 +213,35 @@ namespace MediaBrowser.Server.Implementations.Photos
                 return false;
             }
 
-            if (item is UserView)
+            var supportedImages = GetSupportedImages(item).ToList();
+
+            if (item is UserView || item is ICollectionFolder)
             {
-                return HasChanged(item, ImageType.Primary);
+                if (supportedImages.Contains(ImageType.Primary) && HasChanged(item, ImageType.Primary))
+                {
+                    return true;
+                }
+                if (supportedImages.Contains(ImageType.Thumb) && HasChanged(item, ImageType.Thumb))
+                {
+                    return true;
+                }
+
+                return false;
             }
 
             var items = GetItemsWithImages(item).Result;
             var cacheKey = GetConfigurationCacheKey(items, item.Name);
 
-            return HasChanged(item, ImageType.Primary, cacheKey) || HasChanged(item, ImageType.Thumb, cacheKey);
+            if (supportedImages.Contains(ImageType.Primary) && HasChanged(item, ImageType.Primary, cacheKey))
+            {
+                return true;
+            }
+            if (supportedImages.Contains(ImageType.Thumb) && HasChanged(item, ImageType.Thumb, cacheKey))
+            {
+                return true;
+            }
+
+            return false;
         }
 
         protected bool HasChanged(IHasImages item, ImageType type, string cacheKey)
diff --git a/MediaBrowser.Server.Implementations/UserViews/CollectionFolderImageProvider.cs b/MediaBrowser.Server.Implementations/UserViews/CollectionFolderImageProvider.cs
new file mode 100644
index 000000000..39dbcf226
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/UserViews/CollectionFolderImageProvider.cs
@@ -0,0 +1,114 @@
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.IO;
+using MediaBrowser.Controller.Drawing;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Server.Implementations.Photos;
+using MoreLinq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Server.Implementations.UserViews
+{
+    public class CollectionFolderImageProvider : BaseDynamicImageProvider<CollectionFolder>
+    {
+        public CollectionFolderImageProvider(IFileSystem fileSystem, IProviderManager providerManager, IApplicationPaths applicationPaths, IImageProcessor imageProcessor) : base(fileSystem, providerManager, applicationPaths, imageProcessor)
+        {
+        }
+
+        public override IEnumerable<ImageType> GetSupportedImages(IHasImages item)
+        {
+            return new List<ImageType>
+                {
+                    ImageType.Primary
+                };
+        }
+
+        protected override async Task<List<BaseItem>> GetItemsWithImages(IHasImages item)
+        {
+            var view = (CollectionFolder)item;
+
+            var recursive = !new[] { CollectionType.Playlists, CollectionType.Channels }.Contains(view.CollectionType ?? string.Empty, StringComparer.OrdinalIgnoreCase);
+
+            var result = await view.GetItems(new InternalItemsQuery
+            {
+                CollapseBoxSetItems = false,
+                Recursive = recursive,
+                ExcludeItemTypes = new[] { "UserView", "CollectionFolder", "Playlist" }
+
+            }).ConfigureAwait(false);
+
+            var items = result.Items.Select(i =>
+            {
+                var episode = i as Episode;
+                if (episode != null)
+                {
+                    var series = episode.Series;
+                    if (series != null)
+                    {
+                        return series;
+                    }
+                    var episodeSeason = episode.Season;
+                    if (episodeSeason != null)
+                    {
+                        return episodeSeason;
+                    }
+
+                    return episode;
+                }
+
+                var season = i as Season;
+                if (season != null)
+                {
+                    var series = season.Series;
+                    if (series != null)
+                    {
+                        return series;
+                    }
+
+                    return season;
+                }
+
+                var audio = i as Audio;
+                if (audio != null)
+                {
+                    var album = audio.AlbumEntity;
+                    if (album != null && album.HasImage(ImageType.Primary))
+                    {
+                        return album;
+                    }
+                }
+
+                return i;
+
+            }).DistinctBy(i => i.Id);
+
+            return GetFinalItems(items.Where(i => i.HasImage(ImageType.Primary) || i.HasImage(ImageType.Thumb)).ToList(), 8);
+        }
+
+        public override bool Supports(IHasImages item)
+        {
+            return item is CollectionFolder;
+        }
+
+        protected override async Task<bool> CreateImage(IHasImages item, List<BaseItem> itemsWithImages, string outputPath, ImageType imageType, int imageIndex)
+        {
+            if (imageType == ImageType.Primary)
+            {
+                if (itemsWithImages.Count == 0)
+                {
+                    return false;
+                }
+
+                return await CreateThumbCollage(item, itemsWithImages, outputPath, 960, 540, false, item.Name).ConfigureAwait(false);
+            }
+
+            return await base.CreateImage(item, itemsWithImages, outputPath, imageType, imageIndex).ConfigureAwait(false);
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs b/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
index 918d07f97..3d77f831e 100644
--- a/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
@@ -49,11 +49,6 @@ namespace MediaBrowser.Server.Implementations.UserViews
         {
             var view = (UserView)item;
 
-            if (!view.UserId.HasValue)
-            {
-                return new List<BaseItem>();
-            }
-
             if (string.Equals(view.ViewType, CollectionType.LiveTv, StringComparison.OrdinalIgnoreCase))
             {
                 return new List<BaseItem>();
@@ -66,7 +61,7 @@ namespace MediaBrowser.Server.Implementations.UserViews
             {
                 var userItemsResult = await view.GetItems(new InternalItemsQuery
                 {
-                    User = _userManager.GetUserById(view.UserId.Value),
+                    User = view.UserId.HasValue ? _userManager.GetUserById(view.UserId.Value) : null,
                     CollapseBoxSetItems = false
                 });
 
@@ -78,7 +73,7 @@ namespace MediaBrowser.Server.Implementations.UserViews
 
             var result = await view.GetItems(new InternalItemsQuery
             {
-                User = _userManager.GetUserById(view.UserId.Value),
+                User = view.UserId.HasValue ? _userManager.GetUserById(view.UserId.Value) : null,
                 CollapseBoxSetItems = false,
                 Recursive = recursive,
                 ExcludeItemTypes = new[] { "UserView", "CollectionFolder", "Playlist" }
@@ -141,8 +136,7 @@ namespace MediaBrowser.Server.Implementations.UserViews
         public override bool Supports(IHasImages item)
         {
             var view = item as UserView;
-
-            if (view != null && view.UserId.HasValue)
+            if (view != null)
             {
                 var supported = new[]
                 {
@@ -182,10 +176,10 @@ namespace MediaBrowser.Server.Implementations.UserViews
                     SpecialFolder.MusicFavoriteArtists,
                     SpecialFolder.MusicFavoriteAlbums,
                     SpecialFolder.MusicFavoriteSongs
+
                 };
 
-                return (IsUsingCollectionStrip(view) || supported.Contains(view.ViewType, StringComparer.OrdinalIgnoreCase)) &&
-                    _userManager.GetUserById(view.UserId.Value) != null;
+                return (IsUsingCollectionStrip(view) || supported.Contains(view.ViewType, StringComparer.OrdinalIgnoreCase));
             }
 
             return false;
-- 
cgit v1.2.3


From d95057f13bb6d8bfe04ce20138f8cd2fc66c3519 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 28 Jul 2015 15:42:24 -0400
Subject: rework settings page

---
 MediaBrowser.Controller/Entities/BaseItem.cs           |  5 +++++
 MediaBrowser.Controller/Entities/InternalItemsQuery.cs |  4 ++--
 MediaBrowser.Controller/LiveTv/LiveTvProgram.cs        | 14 ++++++++++++++
 .../MediaEncoding/ISubtitleEncoder.cs                  | 18 ------------------
 .../Subtitles/SubtitleEncoder.cs                       | 17 +++++------------
 .../IO/LibraryMonitor.cs                               | 16 ++++++++++++++--
 .../Library/LibraryManager.cs                          | 15 +++++++++------
 .../Localization/Core/core.json                        |  4 +---
 .../MediaBrowser.WebDashboard.csproj                   |  1 +
 9 files changed, 51 insertions(+), 43 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 3062c00e7..c4917b0d1 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1124,6 +1124,11 @@ namespace MediaBrowser.Controller.Entities
                 rating = OfficialRatingForComparison;
             }
 
+            if (string.IsNullOrWhiteSpace(rating))
+            {
+                return null;
+            }
+
             return LocalizationManager.GetRatingLevel(rating);
         }
 
diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
index c9603c7e3..227a6bd0e 100644
--- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
+++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
@@ -1,6 +1,6 @@
-using System.Collections.Generic;
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Entities;
 using System;
+using System.Collections.Generic;
 
 namespace MediaBrowser.Controller.Entities
 {
diff --git a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs
index 8232c5c7a..b54a7aaee 100644
--- a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs
+++ b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs
@@ -227,5 +227,19 @@ namespace MediaBrowser.Controller.LiveTv
             info.IsMovie = IsMovie; 
             return info;
         }
+
+        public override bool SupportsPeople
+        {
+            get
+            {
+                // Optimization
+                if (IsNews || IsSports)
+                {
+                    return false;
+                }
+
+                return base.SupportsPeople;
+            }
+        }
     }
 }
diff --git a/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs b/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
index e4a2cd007..826711e51 100644
--- a/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
+++ b/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
@@ -7,24 +7,6 @@ namespace MediaBrowser.Controller.MediaEncoding
 {
     public interface ISubtitleEncoder
     {
-        /// <summary>
-        /// Converts the subtitles.
-        /// </summary>
-        /// <param name="stream">The stream.</param>
-        /// <param name="inputFormat">The input format.</param>
-        /// <param name="outputFormat">The output format.</param>
-        /// <param name="startTimeTicks">The start time ticks.</param>
-        /// <param name="endTimeTicks">The end time ticks.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task{Stream}.</returns>
-        Task<Stream> ConvertSubtitles(
-            Stream stream,
-            string inputFormat,
-            string outputFormat,
-            long startTimeTicks,
-            long? endTimeTicks,
-            CancellationToken cancellationToken);
-
         /// <summary>
         /// Gets the subtitles.
         /// </summary>
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index 60b70ad08..fe616c63e 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -53,7 +53,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             }
         }
 
-        public async Task<Stream> ConvertSubtitles(Stream stream,
+        private async Task<Stream> ConvertSubtitles(Stream stream,
             string inputFormat,
             string outputFormat,
             long startTimeTicks,
@@ -64,7 +64,9 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
             try
             {
-                var trackInfo = await GetTrackInfo(stream, inputFormat, cancellationToken).ConfigureAwait(false);
+                var reader = GetReader(inputFormat, true);
+
+                var trackInfo = reader.Parse(stream, cancellationToken);
 
                 FilterEvents(trackInfo, startTimeTicks, endTimeTicks, false);
 
@@ -190,7 +192,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             {
                 throw new ArgumentNullException("charset");
             }
-
+            
             try
             {
                 return Encoding.GetEncoding(charset);
@@ -257,15 +259,6 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             return new Tuple<string, MediaProtocol, string, bool>(subtitleStream.Path, protocol, currentFormat, true);
         }
 
-        private async Task<SubtitleTrackInfo> GetTrackInfo(Stream stream,
-            string inputFormat,
-            CancellationToken cancellationToken)
-        {
-            var reader = GetReader(inputFormat, true);
-
-            return reader.Parse(stream, cancellationToken);
-        }
-
         private ISubtitleParser GetReader(string format, bool throwIfMissing)
         {
             if (string.IsNullOrEmpty(format))
diff --git a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
index d6a1be962..26ccdfc9a 100644
--- a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
+++ b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.IO;
+using System.ComponentModel;
+using MediaBrowser.Common.IO;
 using MediaBrowser.Common.ScheduledTasks;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
@@ -338,7 +339,7 @@ namespace MediaBrowser.Server.Implementations.IO
             }
             catch
             {
-                
+
             }
             finally
             {
@@ -370,6 +371,17 @@ namespace MediaBrowser.Server.Implementations.IO
             Logger.ErrorException("Error in Directory watcher for: " + dw.Path, ex);
 
             DisposeWatcher(dw);
+
+            if (ex is Win32Exception)
+            {
+                Logger.Info("Disabling realtime monitor to prevent future instability");
+
+                if (ConfigurationManager.Configuration.EnableLibraryMonitor == AutoOnOff.Auto)
+                {
+                    ConfigurationManager.Configuration.EnableLibraryMonitor = AutoOnOff.Disabled;
+                    Stop();
+                }
+            }
         }
 
         /// <summary>
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 8d51e3e92..497a198fd 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -2071,14 +2071,17 @@ namespace MediaBrowser.Server.Implementations.Library
 
         public List<PersonInfo> GetPeople(BaseItem item)
         {
-            var people = GetPeople(new InternalPeopleQuery
+            if (item.SupportsPeople)
             {
-                ItemId = item.Id
-            });
+                var people = GetPeople(new InternalPeopleQuery
+                {
+                    ItemId = item.Id
+                });
 
-            if (people.Count > 0)
-            {
-                return people;
+                if (people.Count > 0)
+                {
+                    return people;
+                }
             }
 
             return item.People ?? new List<PersonInfo>();
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/core.json b/MediaBrowser.Server.Implementations/Localization/Core/core.json
index 44a10f0a9..4eb66929d 100644
--- a/MediaBrowser.Server.Implementations/Localization/Core/core.json
+++ b/MediaBrowser.Server.Implementations/Localization/Core/core.json
@@ -173,7 +173,5 @@
     "HeaderProducer": "Producers",
     "HeaderWriter": "Writers",
     "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-
-
+    "HeaderCommunityRatings": "Community ratings"
 }
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index f585a7c26..3e67540d8 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -204,6 +204,7 @@
     <Content Include="dashboard-ui\mypreferenceshome.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\mypreferencesmenu.html" />
     <Content Include="dashboard-ui\scripts\actionsheet.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-- 
cgit v1.2.3


From 7a74213914fd5ca166f148ec47d65c7041082847 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 28 Jul 2015 15:54:45 -0400
Subject: update subtitle conversion

---
 MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
index 765acd578..87e71e327 100644
--- a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
@@ -72,6 +72,12 @@ namespace MediaBrowser.Server.Implementations.Library
 
         private bool InternalTextStreamSupportsExternalStream(MediaStream stream)
         {
+            // These usually have styles and fonts that won't convert to text very well
+            if (string.Equals(stream.Codec, "ass", StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+
             return true;
         }
 
@@ -463,7 +469,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 _liveStreamSemaphore.Release();
             }
         }
-        
+
         // Do not use a pipe here because Roku http requests to the server will fail, without any explicit error message.
         private const char LiveStreamIdDelimeter = '_';
 
-- 
cgit v1.2.3


From 8f75454d76c9c21018476fd278f91ae69f9268c0 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 29 Jul 2015 16:31:15 -0400
Subject: update image processing

---
 Emby.Drawing/ImageMagick/StripCollageBuilder.cs       |  4 ++--
 MediaBrowser.Api/UserLibrary/ItemsService.cs          |  1 -
 MediaBrowser.Api/UserLibrary/UserViewsService.cs      |  2 +-
 MediaBrowser.Controller/Entities/ICollectionFolder.cs | 14 ++++++++++++++
 MediaBrowser.Controller/Entities/UserViewBuilder.cs   |  5 +----
 .../Channels/ChannelManager.cs                        |  2 +-
 .../Collections/ManualCollectionsFolder.cs            |  1 -
 MediaBrowser.Server.Implementations/Dto/DtoService.cs | 14 ++++++++------
 .../Library/LibraryManager.cs                         |  2 +-
 .../Library/UserViewManager.cs                        | 19 +++++++++----------
 .../LiveTv/EmbyTV/EmbyTV.cs                           | 15 +++++++++------
 .../LiveTv/Listings/SchedulesDirect.cs                | 13 ++++++++++---
 .../Photos/BaseDynamicImageProvider.cs                |  6 +++---
 .../Playlists/ManualPlaylistsFolder.cs                |  4 +---
 14 files changed, 60 insertions(+), 42 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/Emby.Drawing/ImageMagick/StripCollageBuilder.cs b/Emby.Drawing/ImageMagick/StripCollageBuilder.cs
index a50a75ccd..7ed0f36e2 100644
--- a/Emby.Drawing/ImageMagick/StripCollageBuilder.cs
+++ b/Emby.Drawing/ImageMagick/StripCollageBuilder.cs
@@ -285,14 +285,14 @@ namespace Emby.Drawing.ImageMagick
 
         private MagickWand BuildThumbCollageWand(List<string> paths, int width, int height)
         {
-            var inputPaths = ImageHelpers.ProjectPaths(paths, 8);
+            var inputPaths = ImageHelpers.ProjectPaths(paths, 4);
             using (var wandImages = new MagickWand(inputPaths.ToArray()))
             {
                 var wand = new MagickWand(width, height);
                 wand.OpenImage("gradient:#111111-#111111");
                 using (var draw = new DrawingWand())
                 {
-                    var iSlice = Convert.ToInt32(width * .1166666667);
+                    var iSlice = Convert.ToInt32(width * .1166666667 * 2);
                     int iTrans = Convert.ToInt32(height * .25);
                     int iHeight = Convert.ToInt32(height * .62);
                     var horizontalImagePadding = Convert.ToInt32(width * 0.0125);
diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs
index 881cec7ba..b412a6480 100644
--- a/MediaBrowser.Api/UserLibrary/ItemsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs
@@ -2,7 +2,6 @@
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Localization;
diff --git a/MediaBrowser.Api/UserLibrary/UserViewsService.cs b/MediaBrowser.Api/UserLibrary/UserViewsService.cs
index 43d8dbc16..a49ab8556 100644
--- a/MediaBrowser.Api/UserLibrary/UserViewsService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserViewsService.cs
@@ -89,7 +89,7 @@ namespace MediaBrowser.Api.UserLibrary
             var views = user.RootFolder
                 .GetChildren(user, true)
                 .OfType<ICollectionFolder>()
-                .Where(i => IsEligibleForSpecialView(i))
+                .Where(IsEligibleForSpecialView)
                 .ToList();
 
             var list = views
diff --git a/MediaBrowser.Controller/Entities/ICollectionFolder.cs b/MediaBrowser.Controller/Entities/ICollectionFolder.cs
index f46d7ed6f..b55ca0a17 100644
--- a/MediaBrowser.Controller/Entities/ICollectionFolder.cs
+++ b/MediaBrowser.Controller/Entities/ICollectionFolder.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace MediaBrowser.Controller.Entities
 {
@@ -14,4 +15,17 @@ namespace MediaBrowser.Controller.Entities
         Guid Id { get; }
         IEnumerable<string> PhysicalLocations { get; }
     }
+
+    public static class CollectionFolderExtensions
+    {
+        public static string GetViewType(this ICollectionFolder folder, User user)
+        {
+            if (user.Configuration.PlainFolderViews.Contains(folder.Id.ToString("N"), StringComparer.OrdinalIgnoreCase))
+            {
+                return null;
+            }
+
+            return folder.CollectionType;
+        }
+    }
 }
diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
index 0733b65b1..462f66e20 100644
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -264,10 +264,7 @@ namespace MediaBrowser.Controller.Entities
 
         private async Task<QueryResult<BaseItem>> FindPlaylists(Folder parent, User user, InternalItemsQuery query)
         {
-            var collectionFolders = user.RootFolder.GetChildren(user, true).Select(i => i.Id).ToList();
-
-            var list = _playlistManager.GetPlaylists(user.Id.ToString("N"))
-                .Where(i => i.GetChildren(user, true).Any(media => _libraryManager.GetCollectionFolders(media).Select(c => c.Id).Any(collectionFolders.Contains)));
+            var list = _playlistManager.GetPlaylists(user.Id.ToString("N"));
 
             return GetResult(list, parent, query);
         }
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
index 3e58e3bd5..179eb5629 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
@@ -476,7 +476,7 @@ namespace MediaBrowser.Server.Implementations.Channels
 
         public Channel GetChannel(string id)
         {
-            return (Channel)_libraryManager.GetItemById(new Guid(id));
+            return _libraryManager.GetItemById(new Guid(id)) as Channel;
         }
 
         public IEnumerable<ChannelFeatures> GetAllChannelFeatures()
diff --git a/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs b/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs
index 8f5d8fe9b..d62918d56 100644
--- a/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs
+++ b/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs
@@ -1,5 +1,4 @@
 using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Movies;
 using System.Linq;
 
 namespace MediaBrowser.Server.Implementations.Collections
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index aade00aa4..31f1b17dd 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -351,6 +351,14 @@ namespace MediaBrowser.Server.Implementations.Dto
 
             AttachBasicFields(dto, item, owner, options);
 
+            var collectionFolder = item as ICollectionFolder;
+            if (collectionFolder != null)
+            {
+                dto.CollectionType = user == null ?
+                    collectionFolder.CollectionType :
+                    collectionFolder.GetViewType(user);
+            }
+
             var playlist = item as Playlist;
             if (playlist != null)
             {
@@ -1066,12 +1074,6 @@ namespace MediaBrowser.Server.Implementations.Dto
                 dto.DisplayOrder = hasDisplayOrder.DisplayOrder;
             }
 
-            var collectionFolder = item as ICollectionFolder;
-            if (collectionFolder != null)
-            {
-                dto.CollectionType = collectionFolder.CollectionType;
-            }
-
             var userView = item as UserView;
             if (userView != null)
             {
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 497a198fd..40d93e8ef 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1615,7 +1615,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 .FirstOrDefault(i => !string.IsNullOrWhiteSpace(i));
         }
 
-        private readonly TimeSpan _viewRefreshInterval = TimeSpan.FromHours(.01);
+        private readonly TimeSpan _viewRefreshInterval = TimeSpan.FromHours(24);
 
         public async Task<UserView> GetNamedView(User user,
             string name,
diff --git a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
index 14c5c9a03..61b28a072 100644
--- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
@@ -91,7 +91,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 list.AddRange(standaloneFolders);
             }
 
-            var parents = foldersWithViewTypes.Where(i => string.Equals(i.CollectionType, CollectionType.TvShows, StringComparison.OrdinalIgnoreCase) || string.IsNullOrWhiteSpace(i.CollectionType))
+            var parents = foldersWithViewTypes.Where(i => string.Equals(i.GetViewType(user), CollectionType.TvShows, StringComparison.OrdinalIgnoreCase) || string.IsNullOrWhiteSpace(i.GetViewType(user)))
                 .ToList();
 
             if (parents.Count > 0)
@@ -99,7 +99,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 list.Add(await GetUserView(parents, list, CollectionType.TvShows, string.Empty, user, cancellationToken).ConfigureAwait(false));
             }
 
-            parents = foldersWithViewTypes.Where(i => string.Equals(i.CollectionType, CollectionType.Music, StringComparison.OrdinalIgnoreCase) || string.IsNullOrWhiteSpace(i.CollectionType))
+            parents = foldersWithViewTypes.Where(i => string.Equals(i.GetViewType(user), CollectionType.Music, StringComparison.OrdinalIgnoreCase) || string.IsNullOrWhiteSpace(i.GetViewType(user)))
                 .ToList();
 
             if (parents.Count > 0)
@@ -107,7 +107,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 list.Add(await GetUserView(parents, list, CollectionType.Music, string.Empty, user, cancellationToken).ConfigureAwait(false));
             }
 
-            parents = foldersWithViewTypes.Where(i => string.Equals(i.CollectionType, CollectionType.Movies, StringComparison.OrdinalIgnoreCase) || string.IsNullOrWhiteSpace(i.CollectionType))
+            parents = foldersWithViewTypes.Where(i => string.Equals(i.GetViewType(user), CollectionType.Movies, StringComparison.OrdinalIgnoreCase) || string.IsNullOrWhiteSpace(i.GetViewType(user)))
                .ToList();
 
             if (parents.Count > 0)
@@ -115,7 +115,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 list.Add(await GetUserView(parents, list, CollectionType.Movies, string.Empty, user, cancellationToken).ConfigureAwait(false));
             }
 
-            parents = foldersWithViewTypes.Where(i => string.Equals(i.CollectionType, CollectionType.Games, StringComparison.OrdinalIgnoreCase))
+            parents = foldersWithViewTypes.Where(i => string.Equals(i.GetViewType(user), CollectionType.Games, StringComparison.OrdinalIgnoreCase))
                .ToList();
 
             if (parents.Count > 0)
@@ -123,7 +123,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 list.Add(await GetUserView(parents, list, CollectionType.Games, string.Empty, user, cancellationToken).ConfigureAwait(false));
             }
 
-            parents = foldersWithViewTypes.Where(i => string.Equals(i.CollectionType, CollectionType.BoxSets, StringComparison.OrdinalIgnoreCase))
+            parents = foldersWithViewTypes.Where(i => string.Equals(i.GetViewType(user), CollectionType.BoxSets, StringComparison.OrdinalIgnoreCase))
                .ToList();
 
             if (parents.Count > 0)
@@ -131,7 +131,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 list.Add(await GetUserView(parents, list, CollectionType.BoxSets, string.Empty, user, cancellationToken).ConfigureAwait(false));
             }
 
-            parents = foldersWithViewTypes.Where(i => string.Equals(i.CollectionType, CollectionType.Playlists, StringComparison.OrdinalIgnoreCase))
+            parents = foldersWithViewTypes.Where(i => string.Equals(i.GetViewType(user), CollectionType.Playlists, StringComparison.OrdinalIgnoreCase))
                .ToList();
 
             if (parents.Count > 0)
@@ -204,8 +204,9 @@ namespace MediaBrowser.Server.Implementations.Library
         public async Task<UserView> GetUserView(List<ICollectionFolder> parents, List<Folder> currentViews, string viewType, string sortName, User user, CancellationToken cancellationToken)
         {
             var name = _localizationManager.GetLocalizedString("ViewType" + viewType);
+            var enableUserSpecificViews = _config.Configuration.EnableUserSpecificUserViews;
 
-            if (parents.Count == 1 && parents.All(i => string.Equals(i.CollectionType, viewType, StringComparison.OrdinalIgnoreCase)))
+            if (parents.Count == 1 && parents.All(i => string.Equals((enableUserSpecificViews ? i.CollectionType : i.GetViewType(user)), viewType, StringComparison.OrdinalIgnoreCase)))
             {
                 if (!string.IsNullOrWhiteSpace(parents[0].Name))
                 {
@@ -221,7 +222,7 @@ namespace MediaBrowser.Server.Implementations.Library
                     return await GetUserView(parentId, name, viewType, enableRichView, sortName, user, cancellationToken).ConfigureAwait(false);
                 }
 
-                if (_config.Configuration.EnableUserSpecificUserViews)
+                if (enableUserSpecificViews)
                 {
                     viewType = enableRichView ? viewType : null;
                     var view = await _libraryManager.GetNamedView(user, name, viewType, sortName, cancellationToken).ConfigureAwait(false);
@@ -233,8 +234,6 @@ namespace MediaBrowser.Server.Implementations.Library
                     }
                     return view;
                 }
-
-                return await _libraryManager.GetNamedView(user, name, viewType, sortName, cancellationToken).ConfigureAwait(false);
             }
 
             return await _libraryManager.GetNamedView(user, name, viewType, sortName, cancellationToken).ConfigureAwait(false);
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 2319a6c2c..c323f8e0d 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common;
+using System.Globalization;
+using MediaBrowser.Common;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
@@ -453,11 +454,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             }
 
             var mediaStreamInfo = await GetChannelStream(timer.ChannelId, null, CancellationToken.None);
-            var duration = (timer.EndDate - DateTime.UtcNow).TotalSeconds + timer.PostPaddingSeconds;
+            var duration = (timer.EndDate - DateTime.UtcNow).Add(TimeSpan.FromSeconds(timer.PostPaddingSeconds));
 
             HttpRequestOptions httpRequestOptions = new HttpRequestOptions()
             {
-                Url = mediaStreamInfo.Path + "?duration=" + duration
+                Url = mediaStreamInfo.Path + "?duration=" + duration.TotalSeconds.ToString(CultureInfo.InvariantCulture)
             };
 
             var info = GetProgramInfoFromCache(timer.ChannelId, timer.ProgramId);
@@ -516,13 +517,15 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             try
             {
                 httpRequestOptions.BufferContent = false;
-                httpRequestOptions.CancellationToken = cancellationToken;
+                var durationToken = new CancellationTokenSource(duration);
+                var linkedToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, durationToken.Token).Token;
+                httpRequestOptions.CancellationToken = linkedToken;
                 _logger.Info("Writing file to path: " + recordPath);
                 using (var response = await _httpClient.SendAsync(httpRequestOptions, "GET"))
                 {
                     using (var output = File.Open(recordPath, FileMode.Create, FileAccess.Write, FileShare.Read))
                     {
-                        await response.Content.CopyToAsync(output, 4096, cancellationToken);
+                        await response.Content.CopyToAsync(output, 4096, linkedToken);
                     }
                 }
 
@@ -530,7 +533,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             }
             catch (OperationCanceledException)
             {
-                recording.Status = RecordingStatus.Cancelled;
+                recording.Status = RecordingStatus.Completed;
             }
             catch
             {
diff --git a/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs b/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
index ffafe5979..655feedae 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.Net;
+using MediaBrowser.Common;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.LiveTv;
@@ -20,19 +21,25 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
         private readonly ILogger _logger;
         private readonly IJsonSerializer _jsonSerializer;
         private readonly IHttpClient _httpClient;
-        private const string UserAgent = "EmbyTV";
         private readonly SemaphoreSlim _tokenSemaphore = new SemaphoreSlim(1, 1);
+        private readonly IApplicationHost _appHost;
 
         private const string ApiUrl = "https://json.schedulesdirect.org/20141201";
 
         private readonly ConcurrentDictionary<string, ScheduleDirect.Station> _channelPair =
             new ConcurrentDictionary<string, ScheduleDirect.Station>();
 
-        public SchedulesDirect(ILogger logger, IJsonSerializer jsonSerializer, IHttpClient httpClient)
+        public SchedulesDirect(ILogger logger, IJsonSerializer jsonSerializer, IHttpClient httpClient, IApplicationHost appHost)
         {
             _logger = logger;
             _jsonSerializer = jsonSerializer;
             _httpClient = httpClient;
+            _appHost = appHost;
+        }
+
+        private string UserAgent
+        {
+            get { return "Emby/" + _appHost.ApplicationVersion; }
         }
 
         private List<string> GetScheduleRequestDates(DateTime startDateUtc, DateTime endDateUtc)
diff --git a/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs b/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs
index eb25c7d79..642753fa6 100644
--- a/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs
@@ -118,7 +118,7 @@ namespace MediaBrowser.Server.Implementations.Photos
 
         protected Task<bool> CreateThumbCollage(IHasImages primaryItem, List<BaseItem> items, string outputPath, bool drawText)
         {
-            return CreateCollage(primaryItem, items, outputPath, 960, 540, drawText, primaryItem.Name);
+            return CreateCollage(primaryItem, items, outputPath, 640, 360, drawText, primaryItem.Name);
         }
 
         protected virtual IEnumerable<string> GetStripCollageImagePaths(IHasImages primaryItem, IEnumerable<BaseItem> items)
@@ -130,12 +130,12 @@ namespace MediaBrowser.Server.Implementations.Photos
 
         protected Task<bool> CreatePosterCollage(IHasImages primaryItem, List<BaseItem> items, string outputPath)
         {
-            return CreateCollage(primaryItem, items, outputPath, 600, 900, true, primaryItem.Name);
+            return CreateCollage(primaryItem, items, outputPath, 400, 600, true, primaryItem.Name);
         }
 
         protected Task<bool> CreateSquareCollage(IHasImages primaryItem, List<BaseItem> items, string outputPath, bool drawText)
         {
-            return CreateCollage(primaryItem, items, outputPath, 800, 800, drawText, primaryItem.Name);
+            return CreateCollage(primaryItem, items, outputPath, 600, 600, drawText, primaryItem.Name);
         }
 
         protected Task<bool> CreateThumbCollage(IHasImages primaryItem, List<BaseItem> items, string outputPath, int width, int height, bool drawText, string text)
diff --git a/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs b/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
index 2f3a1dd0c..3ec41b6dc 100644
--- a/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
+++ b/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
@@ -16,9 +16,7 @@ namespace MediaBrowser.Server.Implementations.Playlists
 
         public override bool IsVisible(User user)
         {
-            return base.IsVisible(user) && GetChildren(user, false)
-                .OfType<Playlist>()
-                .Any(i => i.IsVisible(user));
+            return base.IsVisible(user) && GetChildren(user, false).Any();
         }
 
         protected override IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
-- 
cgit v1.2.3


From edecae6ed5bcd7159ac2ba2c12d8d38824915129 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 2 Aug 2015 13:02:23 -0400
Subject: improve guide loading performance

---
 Emby.Drawing/ImageProcessor.cs                     | 26 +++----
 MediaBrowser.Api/LiveTv/LiveTvService.cs           | 80 +++++++++++++++++++---
 MediaBrowser.Controller/LiveTv/ILiveTvManager.cs   | 15 ++--
 MediaBrowser.Dlna/Didl/DidlBuilder.cs              | 18 ++---
 MediaBrowser.Model/Channels/ChannelQuery.cs        | 14 +++-
 MediaBrowser.Model/LiveTv/ProgramQuery.cs          | 10 +++
 .../LiveTv/RecommendedProgramQuery.cs              | 14 +++-
 MediaBrowser.Model/LiveTv/RecordingQuery.cs        | 14 +++-
 .../Dto/DtoService.cs                              |  5 --
 .../Library/MediaSourceManager.cs                  |  4 ++
 .../LiveTv/LiveTvDtoService.cs                     |  5 +-
 .../LiveTv/LiveTvManager.cs                        | 14 ++--
 12 files changed, 166 insertions(+), 53 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs
index 2ba4f5aab..1e4537bae 100644
--- a/Emby.Drawing/ImageProcessor.cs
+++ b/Emby.Drawing/ImageProcessor.cs
@@ -410,18 +410,20 @@ namespace Emby.Drawing
         {
             ImageSize size;
 
-            try
-            {
-                size = ImageHeader.GetDimensions(path, _logger, _fileSystem);
-            }
-            catch
-            {
-                _logger.Info("Failed to read image header for {0}. Doing it the slow way.", path);
-
-                CheckDisposed();
-
-                size = _imageEncoder.GetImageSize(path);
-            }
+            size = ImageHeader.GetDimensions(path, _logger, _fileSystem);
+            //try
+            //{
+            //    size = ImageHeader.GetDimensions(path, _logger, _fileSystem);
+            //}
+            //catch
+            //{
+            //    return;
+            //    //_logger.Info("Failed to read image header for {0}. Doing it the slow way.", path);
+
+            //    //CheckDisposed();
+
+            //    //size = _imageEncoder.GetImageSize(path);
+            //}
 
             StartSaveImageSizeTimer();
 
diff --git a/MediaBrowser.Api/LiveTv/LiveTvService.cs b/MediaBrowser.Api/LiveTv/LiveTvService.cs
index 6814ad751..3ff4c4828 100644
--- a/MediaBrowser.Api/LiveTv/LiveTvService.cs
+++ b/MediaBrowser.Api/LiveTv/LiveTvService.cs
@@ -29,7 +29,7 @@ namespace MediaBrowser.Api.LiveTv
 
     [Route("/LiveTv/Channels", "GET", Summary = "Gets available live tv channels.")]
     [Authenticated]
-    public class GetChannels : IReturn<QueryResult<ChannelInfoDto>>
+    public class GetChannels : IReturn<QueryResult<ChannelInfoDto>>, IHasDtoOptions
     {
         [ApiMember(Name = "Type", Description = "Optional filter by channel type.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
         public ChannelType? Type { get; set; }
@@ -62,6 +62,22 @@ namespace MediaBrowser.Api.LiveTv
 
         [ApiMember(Name = "EnableFavoriteSorting", Description = "Incorporate favorite and like status into channel sorting.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
         public bool EnableFavoriteSorting { get; set; }
+
+        [ApiMember(Name = "EnableImages", Description = "Optional, include image information in output", IsRequired = false, DataType = "boolean", ParameterType = "query", Verb = "GET")]
+        public bool? EnableImages { get; set; }
+
+        [ApiMember(Name = "ImageTypeLimit", Description = "Optional, the max number of images to return, per image type", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
+        public int? ImageTypeLimit { get; set; }
+
+        [ApiMember(Name = "EnableImageTypes", Description = "Optional. The image types to include in the output.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
+        public string EnableImageTypes { get; set; }
+
+        /// <summary>
+        /// Fields to return within the items, in addition to basic information
+        /// </summary>
+        /// <value>The fields.</value>
+        [ApiMember(Name = "Fields", Description = "Optional. Specify additional fields of information to return in the output. This allows multiple, comma delimeted. Options: Budget, Chapters, CriticRatingSummary, DateCreated, Genres, HomePageUrl, IndexOptions, MediaStreams, Overview, ParentId, Path, People, ProviderIds, PrimaryImageAspectRatio, Revenue, SortName, Studios, Taglines", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
+        public string Fields { get; set; }
     }
 
     [Route("/LiveTv/Channels/{Id}", "GET", Summary = "Gets a live tv channel")]
@@ -81,7 +97,7 @@ namespace MediaBrowser.Api.LiveTv
 
     [Route("/LiveTv/Recordings", "GET", Summary = "Gets live tv recordings")]
     [Authenticated]
-    public class GetRecordings : IReturn<QueryResult<BaseItemDto>>
+    public class GetRecordings : IReturn<QueryResult<BaseItemDto>>, IHasDtoOptions
     {
         [ApiMember(Name = "ChannelId", Description = "Optional filter by channel id.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
         public string ChannelId { get; set; }
@@ -106,6 +122,22 @@ namespace MediaBrowser.Api.LiveTv
 
         [ApiMember(Name = "SeriesTimerId", Description = "Optional filter by recordings belonging to a series timer", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
         public string SeriesTimerId { get; set; }
+
+        [ApiMember(Name = "EnableImages", Description = "Optional, include image information in output", IsRequired = false, DataType = "boolean", ParameterType = "query", Verb = "GET")]
+        public bool? EnableImages { get; set; }
+
+        [ApiMember(Name = "ImageTypeLimit", Description = "Optional, the max number of images to return, per image type", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
+        public int? ImageTypeLimit { get; set; }
+
+        [ApiMember(Name = "EnableImageTypes", Description = "Optional. The image types to include in the output.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
+        public string EnableImageTypes { get; set; }
+
+        /// <summary>
+        /// Fields to return within the items, in addition to basic information
+        /// </summary>
+        /// <value>The fields.</value>
+        [ApiMember(Name = "Fields", Description = "Optional. Specify additional fields of information to return in the output. This allows multiple, comma delimeted. Options: Budget, Chapters, CriticRatingSummary, DateCreated, Genres, HomePageUrl, IndexOptions, MediaStreams, Overview, ParentId, Path, People, ProviderIds, PrimaryImageAspectRatio, Revenue, SortName, Studios, Taglines", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
+        public string Fields { get; set; }
     }
 
     [Route("/LiveTv/Recordings/Groups", "GET", Summary = "Gets live tv recording groups")]
@@ -164,7 +196,7 @@ namespace MediaBrowser.Api.LiveTv
 
     [Route("/LiveTv/Programs", "GET,POST", Summary = "Gets available live tv epgs..")]
     [Authenticated]
-    public class GetPrograms : IReturn<QueryResult<BaseItemDto>>
+    public class GetPrograms : IReturn<QueryResult<BaseItemDto>>, IHasDtoOptions
     {
         [ApiMember(Name = "ChannelIds", Description = "The channels to return guide information for.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET,POST")]
         public string ChannelIds { get; set; }
@@ -207,11 +239,27 @@ namespace MediaBrowser.Api.LiveTv
 
         [ApiMember(Name = "Genres", Description = "The genres to return guide information for.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET,POST")]
         public string Genres { get; set; }
+
+        [ApiMember(Name = "EnableImages", Description = "Optional, include image information in output", IsRequired = false, DataType = "boolean", ParameterType = "query", Verb = "GET")]
+        public bool? EnableImages { get; set; }
+
+        [ApiMember(Name = "ImageTypeLimit", Description = "Optional, the max number of images to return, per image type", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
+        public int? ImageTypeLimit { get; set; }
+
+        [ApiMember(Name = "EnableImageTypes", Description = "Optional. The image types to include in the output.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
+        public string EnableImageTypes { get; set; }
+
+        /// <summary>
+        /// Fields to return within the items, in addition to basic information
+        /// </summary>
+        /// <value>The fields.</value>
+        [ApiMember(Name = "Fields", Description = "Optional. Specify additional fields of information to return in the output. This allows multiple, comma delimeted. Options: Budget, Chapters, CriticRatingSummary, DateCreated, Genres, HomePageUrl, IndexOptions, MediaStreams, Overview, ParentId, Path, People, ProviderIds, PrimaryImageAspectRatio, Revenue, SortName, Studios, Taglines", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
+        public string Fields { get; set; }
     }
 
     [Route("/LiveTv/Programs/Recommended", "GET", Summary = "Gets available live tv epgs..")]
     [Authenticated]
-    public class GetRecommendedPrograms : IReturn<QueryResult<BaseItemDto>>
+    public class GetRecommendedPrograms : IReturn<QueryResult<BaseItemDto>>, IHasDtoOptions
     {
         [ApiMember(Name = "UserId", Description = "Optional filter by user id.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET,POST")]
         public string UserId { get; set; }
@@ -230,6 +278,22 @@ namespace MediaBrowser.Api.LiveTv
 
         [ApiMember(Name = "IsMovie", Description = "Optional filter for movies.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
         public bool? IsMovie { get; set; }
+
+        [ApiMember(Name = "EnableImages", Description = "Optional, include image information in output", IsRequired = false, DataType = "boolean", ParameterType = "query", Verb = "GET")]
+        public bool? EnableImages { get; set; }
+
+        [ApiMember(Name = "ImageTypeLimit", Description = "Optional, the max number of images to return, per image type", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
+        public int? ImageTypeLimit { get; set; }
+
+        [ApiMember(Name = "EnableImageTypes", Description = "Optional. The image types to include in the output.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
+        public string EnableImageTypes { get; set; }
+
+        /// <summary>
+        /// Fields to return within the items, in addition to basic information
+        /// </summary>
+        /// <value>The fields.</value>
+        [ApiMember(Name = "Fields", Description = "Optional. Specify additional fields of information to return in the output. This allows multiple, comma delimeted. Options: Budget, Chapters, CriticRatingSummary, DateCreated, Genres, HomePageUrl, IndexOptions, MediaStreams, Overview, ParentId, Path, People, ProviderIds, PrimaryImageAspectRatio, Revenue, SortName, Studios, Taglines", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
+        public string Fields { get; set; }
     }
 
     [Route("/LiveTv/Programs/{Id}", "GET", Summary = "Gets a live tv program")]
@@ -490,7 +554,7 @@ namespace MediaBrowser.Api.LiveTv
                 IsDisliked = request.IsDisliked,
                 EnableFavoriteSorting = request.EnableFavoriteSorting
 
-            }, CancellationToken.None).ConfigureAwait(false);
+            }, GetDtoOptions(request), CancellationToken.None).ConfigureAwait(false);
 
             return ToOptimizedSerializedResultUsingCache(result);
         }
@@ -546,7 +610,7 @@ namespace MediaBrowser.Api.LiveTv
             query.IsSports = request.IsSports;
             query.Genres = (request.Genres ?? String.Empty).Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
 
-            var result = await _liveTvManager.GetPrograms(query, CancellationToken.None).ConfigureAwait(false);
+            var result = await _liveTvManager.GetPrograms(query, GetDtoOptions(request), CancellationToken.None).ConfigureAwait(false);
 
             return ToOptimizedResult(result);
         }
@@ -563,7 +627,7 @@ namespace MediaBrowser.Api.LiveTv
                 IsSports = request.IsSports
             };
 
-            var result = await _liveTvManager.GetRecommendedPrograms(query, CancellationToken.None).ConfigureAwait(false);
+            var result = await _liveTvManager.GetRecommendedPrograms(query, GetDtoOptions(request), CancellationToken.None).ConfigureAwait(false);
 
             return ToOptimizedResult(result);
         }
@@ -575,7 +639,7 @@ namespace MediaBrowser.Api.LiveTv
 
         public async Task<object> Get(GetRecordings request)
         {
-            var options = new DtoOptions();
+            var options = GetDtoOptions(request);
             options.DeviceId = AuthorizationContext.GetAuthorizationInfo(Request).DeviceId;
 
             var result = await _liveTvManager.GetRecordings(new RecordingQuery
diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
index 53ad6dbdc..889875383 100644
--- a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
+++ b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
@@ -69,9 +69,10 @@ namespace MediaBrowser.Controller.LiveTv
         /// Gets the channels.
         /// </summary>
         /// <param name="query">The query.</param>
+        /// <param name="options">The options.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>IEnumerable{Channel}.</returns>
-        Task<QueryResult<ChannelInfoDto>> GetChannels(LiveTvChannelQuery query, CancellationToken cancellationToken);
+        Task<QueryResult<ChannelInfoDto>> GetChannels(LiveTvChannelQuery query, DtoOptions options, CancellationToken cancellationToken);
 
         /// <summary>
         /// Gets the recording.
@@ -173,14 +174,15 @@ namespace MediaBrowser.Controller.LiveTv
         /// <param name="user">The user.</param>
         /// <returns>Task{ProgramInfoDto}.</returns>
         Task<BaseItemDto> GetProgram(string id, CancellationToken cancellationToken, User user = null);
-        
+
         /// <summary>
         /// Gets the programs.
         /// </summary>
         /// <param name="query">The query.</param>
+        /// <param name="options">The options.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>IEnumerable{ProgramInfo}.</returns>
-        Task<QueryResult<BaseItemDto>> GetPrograms(ProgramQuery query, CancellationToken cancellationToken);
+        Task<QueryResult<BaseItemDto>> GetPrograms(ProgramQuery query, DtoOptions options, CancellationToken cancellationToken);
 
         /// <summary>
         /// Updates the timer.
@@ -240,10 +242,10 @@ namespace MediaBrowser.Controller.LiveTv
         /// Gets the recommended programs.
         /// </summary>
         /// <param name="query">The query.</param>
+        /// <param name="options">The options.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{QueryResult{ProgramInfoDto}}.</returns>
-        Task<QueryResult<BaseItemDto>> GetRecommendedPrograms(RecommendedProgramQuery query,
-            CancellationToken cancellationToken);
+        Task<QueryResult<BaseItemDto>> GetRecommendedPrograms(RecommendedProgramQuery query, DtoOptions options, CancellationToken cancellationToken);
 
         /// <summary>
         /// Gets the recommended programs internal.
@@ -251,8 +253,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// <param name="query">The query.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task&lt;QueryResult&lt;LiveTvProgram&gt;&gt;.</returns>
-        Task<QueryResult<LiveTvProgram>> GetRecommendedProgramsInternal(RecommendedProgramQuery query,
-            CancellationToken cancellationToken);
+        Task<QueryResult<LiveTvProgram>> GetRecommendedProgramsInternal(RecommendedProgramQuery query, CancellationToken cancellationToken);
 
         /// <summary>
         /// Gets the live tv information.
diff --git a/MediaBrowser.Dlna/Didl/DidlBuilder.cs b/MediaBrowser.Dlna/Didl/DidlBuilder.cs
index 0e4cf7392..25514f1dc 100644
--- a/MediaBrowser.Dlna/Didl/DidlBuilder.cs
+++ b/MediaBrowser.Dlna/Didl/DidlBuilder.cs
@@ -971,17 +971,17 @@ namespace MediaBrowser.Dlna.Didl
             int? width = null;
             int? height = null;
 
-            try
-            {
-                var size = _imageProcessor.GetImageSize(imageInfo);
+            //try
+            //{
+            //    var size = _imageProcessor.GetImageSize(imageInfo);
 
-                width = Convert.ToInt32(size.Width);
-                height = Convert.ToInt32(size.Height);
-            }
-            catch
-            {
+            //    width = Convert.ToInt32(size.Width);
+            //    height = Convert.ToInt32(size.Height);
+            //}
+            //catch
+            //{
 
-            }
+            //}
 
             return new ImageDownloadInfo
             {
diff --git a/MediaBrowser.Model/Channels/ChannelQuery.cs b/MediaBrowser.Model/Channels/ChannelQuery.cs
index 3c6e43fde..b63d797f4 100644
--- a/MediaBrowser.Model/Channels/ChannelQuery.cs
+++ b/MediaBrowser.Model/Channels/ChannelQuery.cs
@@ -1,7 +1,19 @@
-namespace MediaBrowser.Model.Channels
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
+
+namespace MediaBrowser.Model.Channels
 {
     public class ChannelQuery
     {
+        /// <summary>
+        /// Fields to return within the items, in addition to basic information
+        /// </summary>
+        /// <value>The fields.</value>
+        public ItemFields[] Fields { get; set; }
+        public bool? EnableImages { get; set; }
+        public int? ImageTypeLimit { get; set; }
+        public ImageType[] EnableImageTypes { get; set; }
+        
         /// <summary>
         /// Gets or sets the user identifier.
         /// </summary>
diff --git a/MediaBrowser.Model/LiveTv/ProgramQuery.cs b/MediaBrowser.Model/LiveTv/ProgramQuery.cs
index c19ba54bd..3f652ea6f 100644
--- a/MediaBrowser.Model/LiveTv/ProgramQuery.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramQuery.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Model.Entities;
 using System;
+using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Model.LiveTv
 {
@@ -15,6 +16,15 @@ namespace MediaBrowser.Model.LiveTv
             Genres = new string[] { };
         }
 
+        /// <summary>
+        /// Fields to return within the items, in addition to basic information
+        /// </summary>
+        /// <value>The fields.</value>
+        public ItemFields[] Fields { get; set; }
+        public bool? EnableImages { get; set; }
+        public int? ImageTypeLimit { get; set; }
+        public ImageType[] EnableImageTypes { get; set; }
+        
         /// <summary>
         /// Gets or sets the channel ids.
         /// </summary>
diff --git a/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs b/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs
index 4a8ae2365..09d45066b 100644
--- a/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs
+++ b/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs
@@ -1,7 +1,19 @@
-namespace MediaBrowser.Model.LiveTv
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
+
+namespace MediaBrowser.Model.LiveTv
 {
     public class RecommendedProgramQuery
     {
+        /// <summary>
+        /// Fields to return within the items, in addition to basic information
+        /// </summary>
+        /// <value>The fields.</value>
+        public ItemFields[] Fields { get; set; }
+        public bool? EnableImages { get; set; }
+        public int? ImageTypeLimit { get; set; }
+        public ImageType[] EnableImageTypes { get; set; }
+        
         /// <summary>
         /// Gets or sets the user identifier.
         /// </summary>
diff --git a/MediaBrowser.Model/LiveTv/RecordingQuery.cs b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
index daa137db6..0cf997602 100644
--- a/MediaBrowser.Model/LiveTv/RecordingQuery.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
@@ -1,4 +1,7 @@
-namespace MediaBrowser.Model.LiveTv
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
+
+namespace MediaBrowser.Model.LiveTv
 {
     /// <summary>
     /// Class RecordingQuery.
@@ -58,5 +61,14 @@
         /// </summary>
         /// <value>The series timer identifier.</value>
         public string SeriesTimerId { get; set; }
+
+        /// <summary>
+        /// Fields to return within the items, in addition to basic information
+        /// </summary>
+        /// <value>The fields.</value>
+        public ItemFields[] Fields { get; set; }
+        public bool? EnableImages { get; set; }
+        public int? ImageTypeLimit { get; set; }
+        public ImageType[] EnableImageTypes { get; set; }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index 31f1b17dd..2ff9a2813 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -1767,11 +1767,6 @@ namespace MediaBrowser.Server.Implementations.Dto
             {
                 size = _imageProcessor.GetImageSize(imageInfo);
             }
-            catch (FileNotFoundException)
-            {
-                _logger.Error("Image file does not exist: {0}", path);
-                return;
-            }
             catch (Exception ex)
             {
                 _logger.ErrorException("Failed to determine primary image aspect ratio for {0}", ex, path);
diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
index 87e71e327..2263b3e1f 100644
--- a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
@@ -77,6 +77,10 @@ namespace MediaBrowser.Server.Implementations.Library
             {
                 return false;
             }
+            if (string.Equals(stream.Codec, "ssa", StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
 
             return true;
         }
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
index 72fea2c79..9ffd8a500 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
@@ -198,10 +198,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv
         /// Gets the channel info dto.
         /// </summary>
         /// <param name="info">The info.</param>
+        /// <param name="options">The options.</param>
         /// <param name="currentProgram">The current program.</param>
         /// <param name="user">The user.</param>
         /// <returns>ChannelInfoDto.</returns>
-        public ChannelInfoDto GetChannelInfoDto(LiveTvChannel info, LiveTvProgram currentProgram, User user = null)
+        public ChannelInfoDto GetChannelInfoDto(LiveTvChannel info, DtoOptions options, LiveTvProgram currentProgram, User user = null)
         {
             var dto = new ChannelInfoDto
             {
@@ -238,7 +239,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             if (currentProgram != null)
             {
-                dto.CurrentProgram = _dtoService.GetBaseItemDto(currentProgram, new DtoOptions(), user);
+                dto.CurrentProgram = _dtoService.GetBaseItemDto(currentProgram, options, user);
             }
 
             return dto;
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index d8954724a..f73e648fa 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -238,7 +238,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             return result;
         }
 
-        public async Task<QueryResult<ChannelInfoDto>> GetChannels(LiveTvChannelQuery query, CancellationToken cancellationToken)
+        public async Task<QueryResult<ChannelInfoDto>> GetChannels(LiveTvChannelQuery query, DtoOptions options, CancellationToken cancellationToken)
         {
             var user = string.IsNullOrEmpty(query.UserId) ? null : _userManager.GetUserById(query.UserId);
 
@@ -261,7 +261,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 var channelIdString = channel.Id.ToString("N");
                 var currentProgram = programs.FirstOrDefault(i => string.Equals(i.ChannelId, channelIdString, StringComparison.OrdinalIgnoreCase));
 
-                returnList.Add(_tvDtoService.GetChannelInfoDto(channel, currentProgram, user));
+                returnList.Add(_tvDtoService.GetChannelInfoDto(channel, options, currentProgram, user));
             }
 
             var result = new QueryResult<ChannelInfoDto>
@@ -762,7 +762,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             return dto;
         }
 
-        public async Task<QueryResult<BaseItemDto>> GetPrograms(ProgramQuery query, CancellationToken cancellationToken)
+        public async Task<QueryResult<BaseItemDto>> GetPrograms(ProgramQuery query, DtoOptions options, CancellationToken cancellationToken)
         {
             var internalQuery = new InternalItemsQuery
             {
@@ -822,7 +822,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 .Select(i =>
                 {
                     RefreshIfNeeded(i);
-                    return _dtoService.GetBaseItemDto(i, new DtoOptions(), user);
+                    return _dtoService.GetBaseItemDto(i, options, user);
                 })
                 .ToArray();
 
@@ -907,14 +907,14 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             return result;
         }
 
-        public async Task<QueryResult<BaseItemDto>> GetRecommendedPrograms(RecommendedProgramQuery query, CancellationToken cancellationToken)
+        public async Task<QueryResult<BaseItemDto>> GetRecommendedPrograms(RecommendedProgramQuery query, DtoOptions options, CancellationToken cancellationToken)
         {
             var internalResult = await GetRecommendedProgramsInternal(query, cancellationToken).ConfigureAwait(false);
 
             var user = _userManager.GetUserById(query.UserId);
 
             var returnArray = internalResult.Items
-                .Select(i => _dtoService.GetBaseItemDto(i, new DtoOptions(), user))
+                .Select(i => _dtoService.GetBaseItemDto(i, options, user))
                 .ToArray();
 
             await AddRecordingInfo(returnArray, cancellationToken).ConfigureAwait(false);
@@ -1712,7 +1712,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 .OrderBy(i => i.StartDate)
                 .FirstOrDefault();
 
-            var dto = _tvDtoService.GetChannelInfoDto(channel, currentProgram, user);
+            var dto = _tvDtoService.GetChannelInfoDto(channel, new DtoOptions(), currentProgram, user);
 
             return dto;
         }
-- 
cgit v1.2.3


From 47b1a4cafd0cc1882503e46fb8a5082a3b061078 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 2 Aug 2015 15:08:55 -0400
Subject: update image processing

---
 Emby.Drawing/ImageProcessor.cs                           | 16 +++++++++++++++-
 MediaBrowser.Api/Playback/BaseStreamingService.cs        |  2 +-
 MediaBrowser.Api/Playback/StreamState.cs                 |  2 +-
 MediaBrowser.Api/StartupWizardService.cs                 |  1 +
 MediaBrowser.Controller/Library/IMetadataFileSaver.cs    |  5 +++++
 MediaBrowser.LocalMetadata/Savers/EpisodeXmlSaver.cs     |  9 +++++++--
 MediaBrowser.LocalMetadata/Savers/MovieXmlSaver.cs       |  9 +++++++--
 MediaBrowser.LocalMetadata/Savers/SeriesXmlSaver.cs      |  9 +++++++--
 MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs        |  2 +-
 MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs        |  2 +-
 MediaBrowser.Model/Configuration/ServerConfiguration.cs  |  2 ++
 MediaBrowser.Model/Dto/MediaSourceInfo.cs                |  4 ++--
 MediaBrowser.Providers/Manager/ProviderManager.cs        |  8 +++++++-
 .../Library/MediaSourceManager.cs                        |  2 +-
 .../LiveTv/LiveTvManager.cs                              |  4 ++--
 .../LiveTv/LiveTvMediaSourceProvider.cs                  |  8 ++++++--
 Nuget/MediaBrowser.Common.Internal.nuspec                |  4 ++--
 Nuget/MediaBrowser.Common.nuspec                         |  2 +-
 Nuget/MediaBrowser.Model.Signed.nuspec                   |  2 +-
 Nuget/MediaBrowser.Server.Core.nuspec                    |  4 ++--
 20 files changed, 72 insertions(+), 25 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs
index 1e4537bae..9db2c1c20 100644
--- a/Emby.Drawing/ImageProcessor.cs
+++ b/Emby.Drawing/ImageProcessor.cs
@@ -189,7 +189,21 @@ namespace Emby.Drawing
                 dateModified = tuple.Item2;
             }
 
-            var originalImageSize = GetImageSize(originalImagePath, dateModified);
+            ImageSize originalImageSize;
+
+            try
+            {
+                originalImageSize = GetImageSize(originalImagePath, dateModified);
+            }
+            catch
+            {
+                // This is an arbitrary default, but don't fail the whole process over this
+                originalImageSize = new ImageSize
+                {
+                    Width = 100,
+                    Height = 100
+                };
+            }
 
             // Determine the output size based on incoming parameters
             var newSize = DrawingUtils.Resize(originalImageSize, options.Width, options.Height, options.MaxWidth, options.MaxHeight);
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 3bef397f9..f108b344f 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -854,7 +854,7 @@ namespace MediaBrowser.Api.Playback
                 state.IsoMount = await IsoManager.Mount(state.MediaPath, cancellationTokenSource.Token).ConfigureAwait(false);
             }
 
-            if (state.MediaSource.RequiresOpening ?? false)
+            if (state.MediaSource.RequiresOpening)
             {
                 var liveStreamResponse = await MediaSourceManager.OpenLiveStream(new LiveStreamRequest
                 {
diff --git a/MediaBrowser.Api/Playback/StreamState.cs b/MediaBrowser.Api/Playback/StreamState.cs
index 4df696096..34dc5ea12 100644
--- a/MediaBrowser.Api/Playback/StreamState.cs
+++ b/MediaBrowser.Api/Playback/StreamState.cs
@@ -185,7 +185,7 @@ namespace MediaBrowser.Api.Playback
 
         private async void DisposeLiveStream()
         {
-            if ((MediaSource.RequiresClosing ?? false) && string.IsNullOrWhiteSpace(Request.LiveStreamId))
+            if ((MediaSource.RequiresClosing) && string.IsNullOrWhiteSpace(Request.LiveStreamId))
             {
                 try
                 {
diff --git a/MediaBrowser.Api/StartupWizardService.cs b/MediaBrowser.Api/StartupWizardService.cs
index 6ee8d3603..277e02bf9 100644
--- a/MediaBrowser.Api/StartupWizardService.cs
+++ b/MediaBrowser.Api/StartupWizardService.cs
@@ -67,6 +67,7 @@ namespace MediaBrowser.Api
             _config.Configuration.EnableLibraryMetadataSubFolder = true;
             _config.Configuration.EnableUserSpecificUserViews = true;
             _config.Configuration.EnableCustomPathSubFolders = true;
+            _config.Configuration.DisableXmlSavers = true;
             _config.SaveConfiguration();
         }
 
diff --git a/MediaBrowser.Controller/Library/IMetadataFileSaver.cs b/MediaBrowser.Controller/Library/IMetadataFileSaver.cs
index 0883da48f..e09e58302 100644
--- a/MediaBrowser.Controller/Library/IMetadataFileSaver.cs
+++ b/MediaBrowser.Controller/Library/IMetadataFileSaver.cs
@@ -11,4 +11,9 @@ namespace MediaBrowser.Controller.Library
         /// <returns>System.String.</returns>
         string GetSavePath(IHasMetadata item);
     }
+
+    public interface IConfigurableProvider
+    {
+        bool IsEnabled { get; }
+    }
 }
\ No newline at end of file
diff --git a/MediaBrowser.LocalMetadata/Savers/EpisodeXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/EpisodeXmlSaver.cs
index 7a2a97c0c..96d95d40b 100644
--- a/MediaBrowser.LocalMetadata/Savers/EpisodeXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/EpisodeXmlSaver.cs
@@ -12,7 +12,7 @@ using System.Threading;
 
 namespace MediaBrowser.LocalMetadata.Savers
 {
-    public class EpisodeXmlSaver : IMetadataFileSaver
+    public class EpisodeXmlProvider : IMetadataFileSaver, IConfigurableProvider
     {
         private readonly IItemRepository _itemRepository;
 
@@ -20,7 +20,7 @@ namespace MediaBrowser.LocalMetadata.Savers
         private readonly IServerConfigurationManager _config;
         private readonly ILibraryManager _libraryManager;
 
-        public EpisodeXmlSaver(IItemRepository itemRepository, IServerConfigurationManager config, ILibraryManager libraryManager)
+        public EpisodeXmlProvider(IItemRepository itemRepository, IServerConfigurationManager config, ILibraryManager libraryManager)
         {
             _itemRepository = itemRepository;
             _config = config;
@@ -51,6 +51,11 @@ namespace MediaBrowser.LocalMetadata.Savers
             }
         }
 
+        public bool IsEnabled
+        {
+            get { return !_config.Configuration.DisableXmlSavers; }
+        }
+
         /// <summary>
         /// Saves the specified item.
         /// </summary>
diff --git a/MediaBrowser.LocalMetadata/Savers/MovieXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/MovieXmlSaver.cs
index dc5b45259..a6fba3e9b 100644
--- a/MediaBrowser.LocalMetadata/Savers/MovieXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/MovieXmlSaver.cs
@@ -15,13 +15,13 @@ namespace MediaBrowser.LocalMetadata.Savers
     /// <summary>
     /// Saves movie.xml for movies, trailers and music videos
     /// </summary>
-    public class MovieXmlSaver : IMetadataFileSaver
+    public class MovieXmlProvider : IMetadataFileSaver, IConfigurableProvider
     {
         private readonly IItemRepository _itemRepository;
         private readonly IServerConfigurationManager _config;
         private readonly ILibraryManager _libraryManager;
 
-        public MovieXmlSaver(IItemRepository itemRepository, IServerConfigurationManager config, ILibraryManager libraryManager)
+        public MovieXmlProvider(IItemRepository itemRepository, IServerConfigurationManager config, ILibraryManager libraryManager)
         {
             _itemRepository = itemRepository;
             _config = config;
@@ -36,6 +36,11 @@ namespace MediaBrowser.LocalMetadata.Savers
             }
         }
 
+        public bool IsEnabled
+        {
+            get { return !_config.Configuration.DisableXmlSavers; }
+        }
+
         /// <summary>
         /// Determines whether [is enabled for] [the specified item].
         /// </summary>
diff --git a/MediaBrowser.LocalMetadata/Savers/SeriesXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/SeriesXmlSaver.cs
index 45aff5e2c..44b1cd8d3 100644
--- a/MediaBrowser.LocalMetadata/Savers/SeriesXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/SeriesXmlSaver.cs
@@ -12,12 +12,12 @@ using System.Threading;
 
 namespace MediaBrowser.LocalMetadata.Savers
 {
-    public class SeriesXmlSaver : IMetadataFileSaver
+    public class SeriesXmlProvider : IMetadataFileSaver, IConfigurableProvider
     {
         private readonly IServerConfigurationManager _config;
         private readonly ILibraryManager _libraryManager;
 
-        public SeriesXmlSaver(IServerConfigurationManager config, ILibraryManager libraryManager)
+        public SeriesXmlProvider(IServerConfigurationManager config, ILibraryManager libraryManager)
         {
             _config = config;
             _libraryManager = libraryManager;
@@ -47,6 +47,11 @@ namespace MediaBrowser.LocalMetadata.Savers
             return item is Series && updateType >= ItemUpdateType.MetadataDownload;
         }
 
+        public bool IsEnabled
+        {
+            get { return !_config.Configuration.DisableXmlSavers; }
+        }
+
         private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
 
         /// <summary>
diff --git a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
index 140e84963..dd88512fb 100644
--- a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
@@ -436,7 +436,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 state.IsoMount = await IsoManager.Mount(state.MediaPath, cancellationToken).ConfigureAwait(false);
             }
 
-            if (state.MediaSource.RequiresOpening ?? false)
+            if (state.MediaSource.RequiresOpening)
             {
                 var liveStreamResponse = await MediaSourceManager.OpenLiveStream(new LiveStreamRequest
                 {
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
index 2eeb580e3..806910d89 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
@@ -136,7 +136,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
         private async void DisposeLiveStream()
         {
-            if (MediaSource.RequiresClosing ?? false)
+            if (MediaSource.RequiresClosing)
             {
                 try
                 {
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 0a2fabc1b..072416684 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -213,6 +213,8 @@ namespace MediaBrowser.Model.Configuration
 
         public int SharingExpirationDays { get; set; }
 
+        public bool DisableXmlSavers { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
         /// </summary>
diff --git a/MediaBrowser.Model/Dto/MediaSourceInfo.cs b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
index 75edc6a52..8897edcbd 100644
--- a/MediaBrowser.Model/Dto/MediaSourceInfo.cs
+++ b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
@@ -26,9 +26,9 @@ namespace MediaBrowser.Model.Dto
         public bool SupportsDirectStream { get; set; }
         public bool SupportsDirectPlay { get; set; }
 
-        public bool? RequiresOpening { get; set; }
+        public bool RequiresOpening { get; set; }
         public string OpenToken { get; set; }
-        public bool? RequiresClosing { get; set; }
+        public bool RequiresClosing { get; set; }
         public string LiveStreamId { get; set; }
         public int? BufferMs { get; set; }
 
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index beef968fb..453e07987 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -106,9 +106,15 @@ namespace MediaBrowser.Providers.Manager
             _identityProviders = identityProviders.ToArray();
             _identityConverters = identityConverters.ToArray();
             _metadataProviders = metadataProviders.ToArray();
-            _savers = metadataSavers.ToArray();
             _imageSavers = imageSavers.ToArray();
             _externalIds = externalIds.OrderBy(i => i.Name).ToArray();
+
+            _savers = metadataSavers.Where(i =>
+            {
+                var configurable = i as IConfigurableProvider;
+
+                return configurable == null || configurable.IsEnabled;
+            }).ToArray();
         }
 
         public Task<ItemUpdateType> RefreshSingleItem(IHasMetadata item, MetadataRefreshOptions options, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
index 2263b3e1f..c5ff100f9 100644
--- a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
@@ -449,7 +449,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 LiveStreamInfo current;
                 if (_openStreams.TryGetValue(id, out current))
                 {
-                    if (current.MediaSource.RequiresClosing ?? false)
+                    if (current.MediaSource.RequiresClosing)
                     {
                         var tuple = GetProvider(id);
 
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index f73e648fa..b4669f53e 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -368,7 +368,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                     info = await service.GetChannelStream(channel.ExternalId, mediaSourceId, cancellationToken).ConfigureAwait(false);
                     info.RequiresClosing = true;
 
-                    if (info.RequiresClosing ?? false)
+                    if (info.RequiresClosing)
                     {
                         var idPrefix = service.GetType().FullName.GetMD5().ToString("N") + "_";
 
@@ -385,7 +385,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                     info = await service.GetRecordingStream(recording.ExternalId, null, cancellationToken).ConfigureAwait(false);
                     info.RequiresClosing = true;
 
-                    if (info.RequiresClosing ?? false)
+                    if (info.RequiresClosing)
                     {
                         var idPrefix = service.GetType().FullName.GetMD5().ToString("N") + "_";
 
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
index cf34b6b99..66a21830e 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
@@ -59,6 +59,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
         {
             IEnumerable<MediaSourceInfo> sources;
 
+            var forceRequireOpening = false;
+
             try
             {
                 if (item is ILiveTvRecording)
@@ -78,6 +80,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
                 sources = _mediaSourceManager.GetStaticMediaSources(hasMediaSources, false)
                    .ToList();
+
+                forceRequireOpening = true;
             }
 
             var list = sources.ToList();
@@ -87,12 +91,12 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             {
                 source.Type = MediaSourceType.Default;
 
-                if (!source.RequiresOpening.HasValue)
+                if (source.RequiresOpening || forceRequireOpening)
                 {
                     source.RequiresOpening = true;
                 }
 
-                if (source.RequiresOpening.HasValue && source.RequiresOpening.Value)
+                if (source.RequiresOpening)
                 {
                     var openKeys = new List<string>();
                     openKeys.Add(item.GetType().Name);
diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec
index fffb68e36..c43b90c8c 100644
--- a/Nuget/MediaBrowser.Common.Internal.nuspec
+++ b/Nuget/MediaBrowser.Common.Internal.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common.Internal</id>
-        <version>3.0.629</version>
+        <version>3.0.631</version>
         <title>MediaBrowser.Common.Internal</title>
         <authors>Luke</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains common components shared by Emby Theater and Emby Server. Not intended for plugin developer consumption.</description>
         <copyright>Copyright © Emby 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.629" />
+            <dependency id="MediaBrowser.Common" version="3.0.631" />
             <dependency id="NLog" version="3.2.1" />
             <dependency id="SimpleInjector" version="2.8.0" />
         </dependencies>
diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec
index 856e63199..32e3b2fc6 100644
--- a/Nuget/MediaBrowser.Common.nuspec
+++ b/Nuget/MediaBrowser.Common.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>3.0.629</version>
+        <version>3.0.631</version>
         <title>MediaBrowser.Common</title>
         <authors>Emby Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
diff --git a/Nuget/MediaBrowser.Model.Signed.nuspec b/Nuget/MediaBrowser.Model.Signed.nuspec
index 30175007d..fc33477a9 100644
--- a/Nuget/MediaBrowser.Model.Signed.nuspec
+++ b/Nuget/MediaBrowser.Model.Signed.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Model.Signed</id>
-        <version>3.0.629</version>
+        <version>3.0.631</version>
         <title>MediaBrowser.Model - Signed Edition</title>
         <authors>Emby Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec
index c688c6f2c..704c30f95 100644
--- a/Nuget/MediaBrowser.Server.Core.nuspec
+++ b/Nuget/MediaBrowser.Server.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Server.Core</id>
-        <version>3.0.629</version>
+        <version>3.0.631</version>
         <title>Media Browser.Server.Core</title>
         <authors>Emby Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains core components required to build plugins for Emby Server.</description>
         <copyright>Copyright © Emby 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.629" />
+            <dependency id="MediaBrowser.Common" version="3.0.631" />
 			<dependency id="Interfaces.IO" version="1.0.0.5" />
         </dependencies>
     </metadata>
-- 
cgit v1.2.3


From 7caedd1aee55f0fc4a5521b78b2366c091130dfe Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 4 Aug 2015 23:43:54 -0400
Subject: added recording logging

---
 MediaBrowser.Api/Library/LibraryService.cs                    | 3 ++-
 MediaBrowser.Server.Implementations/Library/LibraryManager.cs | 2 +-
 MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs   | 5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs
index 91f15c8a4..50c4ad14f 100644
--- a/MediaBrowser.Api/Library/LibraryService.cs
+++ b/MediaBrowser.Api/Library/LibraryService.cs
@@ -262,7 +262,7 @@ namespace MediaBrowser.Api.Library
         /// Initializes a new instance of the <see cref="LibraryService" /> class.
         /// </summary>
         public LibraryService(IItemRepository itemRepo, ILibraryManager libraryManager, IUserManager userManager,
-                              IDtoService dtoService, IUserDataManager userDataManager, IAuthorizationContext authContext, IActivityManager activityManager, ILocalizationManager localization)
+                              IDtoService dtoService, IUserDataManager userDataManager, IAuthorizationContext authContext, IActivityManager activityManager, ILocalizationManager localization, ILiveTvManager liveTv)
         {
             _itemRepo = itemRepo;
             _libraryManager = libraryManager;
@@ -272,6 +272,7 @@ namespace MediaBrowser.Api.Library
             _authContext = authContext;
             _activityManager = activityManager;
             _localization = localization;
+            _liveTv = liveTv;
         }
 
         public object Get(GetMediaFolders request)
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 40d93e8ef..e89c83397 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1217,7 +1217,7 @@ namespace MediaBrowser.Server.Implementations.Library
         {
             var result = ItemRepository.GetItemIdsList(query);
 
-            var items = result.Select(GetItemById).ToArray();
+            var items = result.Select(GetItemById).Where(i => i != null).ToArray();
 
             return new QueryResult<BaseItem>
             {
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index b96e3b26c..c90b9eacb 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -541,13 +541,16 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
                 }
 
                 recording.Status = RecordingStatus.Completed;
+                _logger.Info("Recording completed");
             }
             catch (OperationCanceledException)
             {
+                _logger.Info("Recording cancelled");
                 recording.Status = RecordingStatus.Completed;
             }
-            catch
+            catch (Exception ex)
             {
+                _logger.ErrorException("Error recording", ex);
                 recording.Status = RecordingStatus.Error;
             }
 
-- 
cgit v1.2.3


From 96346fc88ced93cc068ae9610900b3a1420f2130 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 5 Aug 2015 21:21:18 -0400
Subject: update globalize

---
 MediaBrowser.Api/UserLibrary/ArtistsService.cs     | 41 ++---------
 .../Entities/Audio/MusicAlbum.cs                   |  6 ++
 .../Entities/UserViewBuilder.cs                    | 84 +++++-----------------
 MediaBrowser.Controller/Library/ILibraryManager.cs | 13 +++-
 .../Music/MusicBrainzAlbumProvider.cs              |  2 +-
 .../Library/LibraryManager.cs                      | 83 +++++++++++++++------
 .../Library/Validators/ArtistsValidator.cs         | 10 +--
 .../LiveTv/LiveTvManager.cs                        | 42 ++++++++---
 .../UserViews/DynamicImageProvider.cs              |  6 --
 9 files changed, 138 insertions(+), 149 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/UserLibrary/ArtistsService.cs b/MediaBrowser.Api/UserLibrary/ArtistsService.cs
index 2393d0533..f027fe9df 100644
--- a/MediaBrowser.Api/UserLibrary/ArtistsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ArtistsService.cs
@@ -6,7 +6,6 @@ using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
 using ServiceStack;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -128,44 +127,14 @@ namespace MediaBrowser.Api.UserLibrary
         {
             if (request is GetAlbumArtists)
             {
-                return items
-                    .Where(i => !i.IsFolder)
-                    .OfType<IHasAlbumArtist>()
-                    .SelectMany(i => i.AlbumArtists)
-                    .DistinctNames()
-                    .Select(name =>
-                    {
-                        try
-                        {
-                            return LibraryManager.GetArtist(name);
-                        }
-                        catch (Exception ex)
-                        {
-                            Logger.ErrorException("Error getting artist {0}", ex, name);
-                            return null;
-                        }
-
-                    }).Where(i => i != null);
+                return LibraryManager.GetAlbumArtists(items
+                   .Where(i => !i.IsFolder)
+                   .OfType<IHasAlbumArtist>());
             }
 
-            return items
+            return LibraryManager.GetArtists(items
                 .Where(i => !i.IsFolder)
-                .OfType<IHasArtist>()
-                .SelectMany(i => i.AllArtists)
-                .DistinctNames()
-                .Select(name =>
-                {
-                    try
-                    {
-                        return LibraryManager.GetArtist(name);
-                    }
-                    catch (Exception ex)
-                    {
-                        Logger.ErrorException("Error getting artist {0}", ex, name);
-                        return null;
-                    }
-
-                }).Where(i => i != null);
+                .OfType<IHasArtist>());
         }
     }
 }
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index 8a77d7616..807beee52 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -54,6 +54,12 @@ namespace MediaBrowser.Controller.Entities.Audio
             get { return AlbumArtists.FirstOrDefault(); }
         }
 
+        [IgnoreDataMember]
+        public override bool SupportsPeople
+        {
+            get { return false; }
+        }
+
         public List<string> AlbumArtists { get; set; }
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
index 462f66e20..ba2820bc1 100644
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -341,95 +341,43 @@ namespace MediaBrowser.Controller.Entities
             var items = GetRecursiveChildren(queryParent, user, new[] { CollectionType.Music, CollectionType.MusicVideos })
                 .Where(i => !i.IsFolder)
                 .Where(i => i.Genres.Contains(displayParent.Name, StringComparer.OrdinalIgnoreCase))
-                .OfType<IHasAlbumArtist>()
-                .SelectMany(i => i.AlbumArtists)
-                .DistinctNames()
-                .Select(i =>
-                {
-                    try
-                    {
-                        return _libraryManager.GetArtist(i);
-                    }
-                    catch
-                    {
-                        // Already logged at lower levels
-                        return null;
-                    }
-                })
-                .Where(i => i != null);
+                .OfType<IHasAlbumArtist>();
 
-            return GetResult(items, queryParent, query);
+            var artists = _libraryManager.GetAlbumArtists(items);
+
+            return GetResult(artists, queryParent, query);
         }
 
         private QueryResult<BaseItem> GetMusicAlbumArtists(Folder parent, User user, InternalItemsQuery query)
         {
-            var artists = GetRecursiveChildren(parent, user, new[] { CollectionType.Music, CollectionType.MusicVideos })
+            var items = GetRecursiveChildren(parent, user, new[] { CollectionType.Music, CollectionType.MusicVideos })
                 .Where(i => !i.IsFolder)
-                .OfType<IHasAlbumArtist>()
-                .SelectMany(i => i.AlbumArtists)
-                .DistinctNames()
-                .Select(i =>
-                {
-                    try
-                    {
-                        return _libraryManager.GetArtist(i);
-                    }
-                    catch
-                    {
-                        // Already logged at lower levels
-                        return null;
-                    }
-                })
-                .Where(i => i != null);
+                .OfType<IHasAlbumArtist>();
+
+            var artists = _libraryManager.GetAlbumArtists(items);
 
             return GetResult(artists, parent, query);
         }
 
         private QueryResult<BaseItem> GetMusicArtists(Folder parent, User user, InternalItemsQuery query)
         {
-            var artists = GetRecursiveChildren(parent, user, new[] { CollectionType.Music, CollectionType.MusicVideos })
+            var items = GetRecursiveChildren(parent, user, new[] { CollectionType.Music, CollectionType.MusicVideos })
                 .Where(i => !i.IsFolder)
-                .OfType<IHasArtist>()
-                .SelectMany(i => i.Artists)
-                .DistinctNames()
-                .Select(i =>
-                {
-                    try
-                    {
-                        return _libraryManager.GetArtist(i);
-                    }
-                    catch
-                    {
-                        // Already logged at lower levels
-                        return null;
-                    }
-                })
-                .Where(i => i != null);
+                .OfType<IHasArtist>();
 
+            var artists = _libraryManager.GetArtists(items);
+            
             return GetResult(artists, parent, query);
         }
 
         private QueryResult<BaseItem> GetFavoriteArtists(Folder parent, User user, InternalItemsQuery query)
         {
-            var artists = GetRecursiveChildren(parent, user, new[] { CollectionType.Music, CollectionType.MusicVideos })
+            var items = GetRecursiveChildren(parent, user, new[] { CollectionType.Music, CollectionType.MusicVideos })
                 .Where(i => !i.IsFolder)
-                .OfType<IHasAlbumArtist>()
-                .SelectMany(i => i.AlbumArtists)
-                .DistinctNames()
-                .Select(i =>
-                {
-                    try
-                    {
-                        return _libraryManager.GetArtist(i);
-                    }
-                    catch
-                    {
-                        // Already logged at lower levels
-                        return null;
-                    }
-                })
-                .Where(i => i != null && _userDataManager.GetUserData(user.Id, i.GetUserDataKey()).IsFavorite);
+                .OfType<IHasAlbumArtist>();
 
+            var artists = _libraryManager.GetAlbumArtists(items).Where(i => _userDataManager.GetUserData(user.Id, i.GetUserDataKey()).IsFavorite);
+            
             return GetResult(artists, parent, query);
         }
 
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 77c07dfd4..9c52fd2dc 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -61,7 +61,18 @@ namespace MediaBrowser.Controller.Library
         /// <param name="name">The name.</param>
         /// <returns>Task{Artist}.</returns>
         MusicArtist GetArtist(string name);
-
+        /// <summary>
+        /// Gets the album artists.
+        /// </summary>
+        /// <param name="items">The items.</param>
+        /// <returns>IEnumerable&lt;MusicArtist&gt;.</returns>
+        IEnumerable<MusicArtist> GetAlbumArtists(IEnumerable<IHasAlbumArtist> items);
+        /// <summary>
+        /// Gets the artists.
+        /// </summary>
+        /// <param name="items">The items.</param>
+        /// <returns>IEnumerable&lt;MusicArtist&gt;.</returns>
+        IEnumerable<MusicArtist> GetArtists(IEnumerable<IHasArtist> items);
         /// <summary>
         /// Gets a Studio
         /// </summary>
diff --git a/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs b/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
index 664eff004..6748c2ba5 100644
--- a/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
+++ b/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
@@ -280,7 +280,7 @@ namespace MediaBrowser.Providers.Music
         {
             // MusicBrainz is extremely adamant about limiting to one request per second
 
-            await Task.Delay(800, cancellationToken).ConfigureAwait(false);
+            await Task.Delay(1000, cancellationToken).ConfigureAwait(false);
 
             var doc = new XmlDocument();
 
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index e89c83397..c9a5cb731 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -939,26 +939,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 }
             }
 
-            var fileInfo = new DirectoryInfo(path);
-
-            var isNew = false;
-
-            if (!fileInfo.Exists)
-            {
-                try
-                {
-                    fileInfo = Directory.CreateDirectory(path);
-                }
-                catch (UnauthorizedAccessException ex)
-                {
-                    _logger.Error("Error creating directory {0}", ex, path);
-                    throw new Exception(string.Format("Error creating directory {0}", path), ex);
-                }
-
-                isNew = true;
-            }
-
-            var item = isNew ? null : GetItemById(id) as T;
+            var item = GetItemById(id) as T;
 
             if (item == null)
             {
@@ -966,8 +947,8 @@ namespace MediaBrowser.Server.Implementations.Library
                 {
                     Name = name,
                     Id = id,
-                    DateCreated = _fileSystem.GetCreationTimeUtc(fileInfo),
-                    DateModified = _fileSystem.GetLastWriteTimeUtc(fileInfo),
+                    DateCreated = DateTime.UtcNow,
+                    DateModified = DateTime.UtcNow,
                     Path = path
                 };
             }
@@ -980,6 +961,59 @@ namespace MediaBrowser.Server.Implementations.Library
             return item;
         }
 
+        public IEnumerable<MusicArtist> GetAlbumArtists(IEnumerable<IHasAlbumArtist> items)
+        {
+            var names = items
+                .SelectMany(i => i.AlbumArtists)
+                .DistinctNames()
+                .Select(i =>
+                {
+                    try
+                    {
+                        var artist = GetArtist(i);
+
+                        return artist;
+                    }
+                    catch
+                    {
+                        // Already logged at lower levels
+                        return null;
+                    }
+                })
+                .Where(i => i != null);
+
+            return names;
+        }
+
+        public IEnumerable<MusicArtist> GetArtists(IEnumerable<IHasArtist> items)
+        {
+            var names = items
+                .SelectMany(i => i.AllArtists)
+                .DistinctNames()
+                .Select(i =>
+                {
+                    try
+                    {
+                        var artist = GetArtist(i);
+
+                        return artist;
+                    }
+                    catch
+                    {
+                        // Already logged at lower levels
+                        return null;
+                    }
+                })
+                .Where(i => i != null);
+
+            return names;
+        }
+
+        private void SetPropertiesFromSongs(MusicArtist artist, IEnumerable<IHasMetadata> items)
+        {
+            
+        }
+        
         /// <summary>
         /// Validate and refresh the People sub-set of the IBN.
         /// The items are stored in the db but not loaded into memory until actually requested by an operation.
@@ -2118,6 +2152,11 @@ namespace MediaBrowser.Server.Implementations.Library
 
         public Task UpdatePeople(BaseItem item, List<PersonInfo> people)
         {
+            if (!item.SupportsPeople)
+            {
+                return Task.FromResult(true);
+            }
+
             return ItemRepository.UpdatePeople(item.Id, people);
         }
     }
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs
index c9440bb27..68d351b44 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs
@@ -48,26 +48,22 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 .Cast<IHasArtist>()
                 .ToList();
 
-            var allArtists = allSongs.SelectMany(i => i.AllArtists)
-                .DistinctNames()
-                .ToList();
+            var allArtists = _libraryManager.GetArtists(allSongs).ToList();
 
             var numComplete = 0;
             var numArtists = allArtists.Count;
 
-            foreach (var artist in allArtists)
+            foreach (var artistItem in allArtists)
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
                 try
                 {
-                    var artistItem = _libraryManager.GetArtist(artist);
-
                     await artistItem.RefreshMetadata(cancellationToken).ConfigureAwait(false);
                 }
                 catch (IOException ex)
                 {
-                    _logger.ErrorException("Error validating Artist {0}", ex, artist);
+                    _logger.ErrorException("Error validating Artist {0}", ex, artistItem.Name);
                 }
 
                 // Update progress
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 6861901ac..aa883ce75 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -1398,14 +1398,40 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             dto.EpisodeTitle = program.EpisodeTitle;
             dto.ChannelType = program.ChannelType;
             dto.Audio = program.Audio;
-            dto.IsHD = program.IsHD;
-            dto.IsMovie = program.IsMovie;
-            dto.IsSeries = program.IsSeries;
-            dto.IsSports = program.IsSports;
-            dto.IsLive = program.IsLive;
-            dto.IsNews = program.IsNews;
-            dto.IsKids = program.IsKids;
-            dto.IsPremiere = program.IsPremiere;
+
+            if (program.IsHD.HasValue && program.IsHD.Value)
+            {
+                dto.IsHD = program.IsHD;
+            }
+            if (program.IsMovie)
+            {
+                dto.IsMovie = program.IsMovie;
+            }
+            if (program.IsSeries)
+            {
+                dto.IsSeries = program.IsSeries;
+            }
+            if (program.IsSports)
+            {
+                dto.IsSports = program.IsSports;
+            }
+            if (program.IsLive)
+            {
+                dto.IsLive = program.IsLive;
+            }
+            if (program.IsNews)
+            {
+                dto.IsNews = program.IsNews;
+            }
+            if (program.IsKids)
+            {
+                dto.IsKids = program.IsKids;
+            }
+            if (program.IsPremiere)
+            {
+                dto.IsPremiere = program.IsPremiere;
+            }
+
             dto.OriginalAirDate = program.OriginalAirDate;
 
             if (channel != null)
diff --git a/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs b/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
index 0162b8802..ca2568a0f 100644
--- a/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
@@ -155,12 +155,6 @@ namespace MediaBrowser.Server.Implementations.UserViews
                     SpecialFolder.MovieMovies,
                     SpecialFolder.MovieResume,
 
-                    SpecialFolder.GameFavorites,
-                    SpecialFolder.GameGenres,
-                    SpecialFolder.GameSystems,
-                    SpecialFolder.LatestGames,
-                    SpecialFolder.RecentlyPlayedGames,
-
                     SpecialFolder.MusicArtists,
                     SpecialFolder.MusicAlbumArtists,
                     SpecialFolder.MusicAlbums,
-- 
cgit v1.2.3


From 1936d6db43e10cc6f45fa72fde4b1628e06b8abd Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 10 Aug 2015 13:37:50 -0400
Subject: update search hints

---
 MediaBrowser.Api/Playback/BaseStreamingService.cs  |   5 +
 MediaBrowser.Api/SearchService.cs                  |   9 ++
 .../Configuration/BaseApplicationConfiguration.cs  |   2 -
 MediaBrowser.Model/Search/SearchHint.cs            |  12 ++
 .../Library/Resolvers/TV/SeriesResolver.cs         |  10 +-
 .../LiveTv/Listings/Emby/EmbyListings.cs           |  59 +++++++++
 .../Listings/Emby/EmbyListingsNorthAmerica.cs      | 144 +++++++++++++++++++++
 .../LiveTv/Listings/Emby/IEmbyListingProvider.cs   |  18 +++
 .../MediaBrowser.Server.Implementations.csproj     |   3 +
 .../ApplicationHost.cs                             |  21 ++-
 .../MediaBrowser.WebDashboard.csproj               |   6 +
 11 files changed, 276 insertions(+), 13 deletions(-)
 create mode 100644 MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/EmbyListings.cs
 create mode 100644 MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/EmbyListingsNorthAmerica.cs
 create mode 100644 MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/IEmbyListingProvider.cs

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index f108b344f..8f5301642 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -1748,6 +1748,11 @@ namespace MediaBrowser.Api.Playback
                 return false;
             }
 
+            if (videoStream.IsAnamorphic ?? false)
+            {
+                return false;
+            }
+            
             // Can't stream copy if we're burning in subtitles
             if (request.SubtitleStreamIndex.HasValue)
             {
diff --git a/MediaBrowser.Api/SearchService.cs b/MediaBrowser.Api/SearchService.cs
index 9d1aef300..302b8d834 100644
--- a/MediaBrowser.Api/SearchService.cs
+++ b/MediaBrowser.Api/SearchService.cs
@@ -4,6 +4,7 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Search;
@@ -171,6 +172,8 @@ namespace MediaBrowser.Api
                 ProductionYear = item.ProductionYear
             };
 
+            result.ChannelId = item.ChannelId;
+
             var primaryImageTag = _imageProcessor.GetImageCacheTag(item, ImageType.Primary);
 
             if (primaryImageTag != null)
@@ -218,6 +221,12 @@ namespace MediaBrowser.Api
                 result.Artists = song.Artists.ToArray();
             }
 
+            if (!string.IsNullOrWhiteSpace(item.ChannelId))
+            {
+                var channel = _libraryManager.GetItemById(item.ChannelId);
+                result.ChannelName = channel == null ? null : channel.Name;
+            }
+
             return result;
         }
 
diff --git a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
index 1a05f38fa..2b53c6688 100644
--- a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
@@ -63,8 +63,6 @@ namespace MediaBrowser.Model.Configuration
         {
             EnableAutoUpdate = true;
             LogFileRetentionDays = 3;
-
-            EnableDebugLevelLogging = true;
         }
     }
 }
diff --git a/MediaBrowser.Model/Search/SearchHint.cs b/MediaBrowser.Model/Search/SearchHint.cs
index 4eced7706..d51c0325d 100644
--- a/MediaBrowser.Model/Search/SearchHint.cs
+++ b/MediaBrowser.Model/Search/SearchHint.cs
@@ -132,5 +132,17 @@ namespace MediaBrowser.Model.Search
         /// </summary>
         /// <value>The episode count.</value>
         public int? EpisodeCount { get; set; }
+
+        /// <summary>
+        /// Gets or sets the channel identifier.
+        /// </summary>
+        /// <value>The channel identifier.</value>
+        public string ChannelId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the channel.
+        /// </summary>
+        /// <value>The name of the channel.</value>
+        public string ChannelName { get; set; }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
index f12022dc7..c5565eb53 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
@@ -110,11 +110,11 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
             {
                 var attributes = child.Attributes;
 
-                if ((attributes & FileAttributes.Hidden) == FileAttributes.Hidden)
-                {
-                    //logger.Debug("Igoring series file or folder marked hidden: {0}", child.FullName);
-                    continue;
-                }
+                //if ((attributes & FileAttributes.Hidden) == FileAttributes.Hidden)
+                //{
+                //    //logger.Debug("Igoring series file or folder marked hidden: {0}", child.FullName);
+                //    continue;
+                //}
 
                 // Can't enforce this because files saved by Bitcasa are always marked System
                 //if ((attributes & FileAttributes.System) == FileAttributes.System)
diff --git a/MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/EmbyListings.cs b/MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/EmbyListings.cs
new file mode 100644
index 000000000..5edebb393
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/EmbyListings.cs
@@ -0,0 +1,59 @@
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.LiveTv;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Model.Serialization;
+
+namespace MediaBrowser.Server.Implementations.LiveTv.Listings.Emby
+{
+    public class EmbyGuide : IListingsProvider
+    {
+        private readonly IHttpClient _httpClient;
+        private readonly IJsonSerializer _jsonSerializer;
+
+        public EmbyGuide(IHttpClient httpClient, IJsonSerializer jsonSerializer)
+        {
+            _httpClient = httpClient;
+            _jsonSerializer = jsonSerializer;
+        }
+
+        public string Name
+        {
+            get { return "Emby Guide"; }
+        }
+
+        public string Type
+        {
+            get { return "emby"; }
+        }
+
+        public Task<IEnumerable<ProgramInfo>> GetProgramsAsync(ListingsProviderInfo info, string channelNumber, DateTime startDateUtc, DateTime endDateUtc, CancellationToken cancellationToken)
+        {
+            return GetListingsProvider(info.Country).GetProgramsAsync(info, channelNumber, startDateUtc, endDateUtc, cancellationToken);
+        }
+
+        public Task AddMetadata(ListingsProviderInfo info, List<ChannelInfo> channels, CancellationToken cancellationToken)
+        {
+            return GetListingsProvider(info.Country).AddMetadata(info, channels, cancellationToken);
+        }
+
+        public Task Validate(ListingsProviderInfo info, bool validateLogin, bool validateListings)
+        {
+            return GetListingsProvider(info.Country).Validate(info, validateLogin, validateListings);
+        }
+
+        public Task<List<NameIdPair>> GetLineups(ListingsProviderInfo info, string country, string location)
+        {
+            return GetListingsProvider(country).GetLineups(info, country, location);
+        }
+
+        private IEmbyListingProvider GetListingsProvider(string country)
+        {
+            return new EmbyListingsNorthAmerica(_httpClient, _jsonSerializer);
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/EmbyListingsNorthAmerica.cs b/MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/EmbyListingsNorthAmerica.cs
new file mode 100644
index 000000000..99bd5325e
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/EmbyListingsNorthAmerica.cs
@@ -0,0 +1,144 @@
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.LiveTv;
+using MediaBrowser.Model.Serialization;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Server.Implementations.LiveTv.Listings.Emby
+{
+    public class EmbyListingsNorthAmerica : IEmbyListingProvider
+    {
+        private readonly IHttpClient _httpClient;
+        private readonly IJsonSerializer _jsonSerializer;
+
+        public EmbyListingsNorthAmerica(IHttpClient httpClient, IJsonSerializer jsonSerializer)
+        {
+            _httpClient = httpClient;
+            _jsonSerializer = jsonSerializer;
+        }
+
+        public async Task<IEnumerable<ProgramInfo>> GetProgramsAsync(ListingsProviderInfo info, string channelNumber, DateTime startDateUtc, DateTime endDateUtc, CancellationToken cancellationToken)
+        {
+            return new List<ProgramInfo>();
+        }
+
+        public async Task AddMetadata(ListingsProviderInfo info, List<ChannelInfo> channels, CancellationToken cancellationToken)
+        {
+            var response = await GetResponse<LineupDetailResponse>("https://data.emby.media/service/lineups?id=" + info.ListingsId).ConfigureAwait(false);
+
+            foreach (var channel in channels)
+            {
+
+            }
+        }
+
+        public Task Validate(ListingsProviderInfo info, bool validateLogin, bool validateListings)
+        {
+            return Task.FromResult(true);
+        }
+
+        public async Task<List<NameIdPair>> GetLineups(ListingsProviderInfo info, string country, string location)
+        {
+            var response = await GetResponse<LineupInfo[]>("https://data.emby.media/service/lineups?id=" + location).ConfigureAwait(false);
+
+            return response.Select(i => new NameIdPair
+            {
+
+                Name = GetName(i),
+                Id = i.lineupID
+
+            }).ToList();
+        }
+
+        private string GetName(LineupInfo info)
+        {
+            var name = info.lineupName;
+
+            if (string.Equals(info.lineupType, "cab", StringComparison.OrdinalIgnoreCase))
+            {
+                name += " - Cable";
+            }
+            else if (string.Equals(info.lineupType, "sat", StringComparison.OrdinalIgnoreCase))
+            {
+                name += " - SAT";
+            }
+            else if (string.Equals(info.lineupType, "ota", StringComparison.OrdinalIgnoreCase))
+            {
+                name += " - OTA";
+            }
+
+            return name;
+        }
+
+        private async Task<T> GetResponse<T>(string url)
+            where T : class
+        {
+            using (var stream = await _httpClient.Get(new HttpRequestOptions
+            {
+                Url = url
+
+            }).ConfigureAwait(false))
+            {
+                using (var reader = new StreamReader(stream))
+                {
+                    var path = await reader.ReadToEndAsync().ConfigureAwait(false);
+
+                    // location = zip code
+                    using (var secondStream = await _httpClient.Get(new HttpRequestOptions
+                    {
+                        Url = "https://data.emby.media" + path
+
+                    }).ConfigureAwait(false))
+                    {
+                        return _jsonSerializer.DeserializeFromStream<T>(secondStream);
+                    }
+                }
+            }
+        }
+
+        private class LineupInfo
+        {
+            public string lineupID { get; set; }
+            public string lineupName { get; set; }
+            public string lineupType { get; set; }
+            public string providerID { get; set; }
+            public string providerName { get; set; }
+            public string serviceArea { get; set; }
+            public string country { get; set; }
+        }
+
+        private class Station
+        {
+            public string number { get; set; }
+            public int channelNumber { get; set; }
+            public int subChannelNumber { get; set; }
+            public int stationID { get; set; }
+            public string name { get; set; }
+            public string callsign { get; set; }
+            public string network { get; set; }
+            public string stationType { get; set; }
+            public int NTSC_TSID { get; set; }
+            public int DTV_TSID { get; set; }
+            public string webLink { get; set; }
+            public string logoFilename { get; set; }
+        }
+
+        private class LineupDetailResponse
+        {
+            public string lineupID { get; set; }
+            public string lineupName { get; set; }
+            public string lineupType { get; set; }
+            public string providerID { get; set; }
+            public string providerName { get; set; }
+            public string serviceArea { get; set; }
+            public string country { get; set; }
+            public List<Station> stations { get; set; }
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/IEmbyListingProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/IEmbyListingProvider.cs
new file mode 100644
index 000000000..83477acfc
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/LiveTv/Listings/Emby/IEmbyListingProvider.cs
@@ -0,0 +1,18 @@
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.LiveTv;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Server.Implementations.LiveTv.Listings.Emby
+{
+    public interface IEmbyListingProvider
+    {
+        Task<IEnumerable<ProgramInfo>> GetProgramsAsync(ListingsProviderInfo info, string channelNumber, DateTime startDateUtc, DateTime endDateUtc, CancellationToken cancellationToken);
+        Task AddMetadata(ListingsProviderInfo info, List<ChannelInfo> channels, CancellationToken cancellationToken);
+        Task Validate(ListingsProviderInfo info, bool validateLogin, bool validateListings);
+        Task<List<NameIdPair>> GetLineups(ListingsProviderInfo info, string country, string location);
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 7eddf5ed1..2571f9b2c 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -222,6 +222,9 @@
     <Compile Include="LiveTv\EmbyTV\RecordingHelper.cs" />
     <Compile Include="LiveTv\EmbyTV\SeriesTimerManager.cs" />
     <Compile Include="LiveTv\EmbyTV\TimerManager.cs" />
+    <Compile Include="LiveTv\Listings\Emby\EmbyListings.cs" />
+    <Compile Include="LiveTv\Listings\Emby\EmbyListingsNorthAmerica.cs" />
+    <Compile Include="LiveTv\Listings\Emby\IEmbyListingProvider.cs" />
     <Compile Include="LiveTv\Listings\SchedulesDirect.cs" />
     <Compile Include="LiveTv\Listings\XmlTv.cs" />
     <Compile Include="LiveTv\LiveTvConfigurationFactory.cs" />
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index b554e0d1c..60ff36c6d 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -529,7 +529,7 @@ namespace MediaBrowser.Server.Startup.Common
             var sharingRepo = new SharingRepository(LogManager, ApplicationPaths);
             await sharingRepo.Initialize().ConfigureAwait(false);
             RegisterSingleInstance<ISharingManager>(new SharingManager(sharingRepo, ServerConfigurationManager, LibraryManager, this));
-            
+
             RegisterSingleInstance<ISsdpHandler>(new SsdpHandler(LogManager.GetLogger("SsdpHandler"), ServerConfigurationManager, this));
 
             var activityLogRepo = await GetActivityLogRepository().ConfigureAwait(false);
@@ -1088,15 +1088,24 @@ namespace MediaBrowser.Server.Startup.Common
         {
             get
             {
-                // Return the first matched address, if found, or the first known local address
-                var address = LocalIpAddress;
+                try
+                {
+                    // Return the first matched address, if found, or the first known local address
+                    var address = LocalIpAddress;
 
-                if (!string.IsNullOrWhiteSpace(address))
+                    if (!string.IsNullOrWhiteSpace(address))
+                    {
+                        address = GetLocalApiUrl(address);
+                    }
+
+                    return address;
+                }
+                catch (Exception ex)
                 {
-                    address = GetLocalApiUrl(address);
+                    Logger.ErrorException("Error getting local Ip address information", ex);
                 }
 
-                return address;
+                return null;
             }
         }
 
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index a1e232257..e8a2e8673 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -183,6 +183,9 @@
     <Content Include="dashboard-ui\livetvguideprovider-scd.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\livetvguideprovider.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\livetvtunerprovider-hdhomerun.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -213,6 +216,9 @@
     <Content Include="dashboard-ui\scripts\livetvguideprovider-scd.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\scripts\livetvguideprovider.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\scripts\livetvtunerprovider-hdhomerun.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-- 
cgit v1.2.3


From ec5619e0f960a2abc2226f81fcfcb82ae9fc295a Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 14 Aug 2015 13:24:07 -0400
Subject: restore polymer changes

---
 Emby.Drawing/ImageProcessor.cs                     |  2 +-
 MediaBrowser.Controller/Entities/UserView.cs       |  6 ++--
 .../Dto/DtoService.cs                              |  2 +-
 .../Library/LibraryManager.cs                      |  3 +-
 .../Photos/BaseDynamicImageProvider.cs             | 25 +++++++--------
 .../UserViews/CollectionFolderImageProvider.cs     |  2 +-
 .../UserViews/DynamicImageProvider.cs              | 37 ++--------------------
 7 files changed, 19 insertions(+), 58 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs
index e6aaaa797..970b463cd 100644
--- a/Emby.Drawing/ImageProcessor.cs
+++ b/Emby.Drawing/ImageProcessor.cs
@@ -422,7 +422,7 @@ namespace Emby.Drawing
                 {
                     throw;
                 }
-                _logger.Info("Failed to read image header for {0}. Doing it the slow way.", path);
+                //_logger.Info("Failed to read image header for {0}. Doing it the slow way.", path);
 
                 CheckDisposed();
 
diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs
index dad6de01a..ce4de613e 100644
--- a/MediaBrowser.Controller/Entities/UserView.cs
+++ b/MediaBrowser.Controller/Entities/UserView.cs
@@ -1,10 +1,10 @@
-using System.Runtime.Serialization;
-using MediaBrowser.Controller.Playlists;
+using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Controller.TV;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Querying;
 using System;
 using System.Collections.Generic;
+using System.Runtime.Serialization;
 using System.Threading.Tasks;
 
 namespace MediaBrowser.Controller.Entities
@@ -14,8 +14,6 @@ namespace MediaBrowser.Controller.Entities
         public string ViewType { get; set; }
         public Guid ParentId { get; set; }
 
-        public Guid? UserId { get; set; }
-
         public static ITVSeriesManager TVSeriesManager;
         public static IPlaylistManager PlaylistManager;
 
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index 2ff9a2813..1dbdf90a7 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -1769,7 +1769,7 @@ namespace MediaBrowser.Server.Implementations.Dto
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Failed to determine primary image aspect ratio for {0}", ex, path);
+                //_logger.ErrorException("Failed to determine primary image aspect ratio for {0}", ex, path);
                 return;
             }
 
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index c9a5cb731..dfcc1370e 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1773,8 +1773,7 @@ namespace MediaBrowser.Server.Implementations.Library
                     DateCreated = DateTime.UtcNow,
                     Name = name,
                     ViewType = viewType,
-                    ForcedSortName = sortName,
-                    UserId = user.Id
+                    ForcedSortName = sortName
                 };
 
                 if (!string.IsNullOrWhiteSpace(parentId))
diff --git a/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs b/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs
index 642753fa6..4b7e1c3a7 100644
--- a/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs
@@ -116,9 +116,9 @@ namespace MediaBrowser.Server.Implementations.Photos
             return parts.GetMD5().ToString("N");
         }
 
-        protected Task<bool> CreateThumbCollage(IHasImages primaryItem, List<BaseItem> items, string outputPath, bool drawText)
+        protected Task<bool> CreateThumbCollage(IHasImages primaryItem, List<BaseItem> items, string outputPath)
         {
-            return CreateCollage(primaryItem, items, outputPath, 640, 360, drawText, primaryItem.Name);
+            return CreateCollage(primaryItem, items, outputPath, 640, 360);
         }
 
         protected virtual IEnumerable<string> GetStripCollageImagePaths(IHasImages primaryItem, IEnumerable<BaseItem> items)
@@ -130,20 +130,20 @@ namespace MediaBrowser.Server.Implementations.Photos
 
         protected Task<bool> CreatePosterCollage(IHasImages primaryItem, List<BaseItem> items, string outputPath)
         {
-            return CreateCollage(primaryItem, items, outputPath, 400, 600, true, primaryItem.Name);
+            return CreateCollage(primaryItem, items, outputPath, 400, 600);
         }
 
-        protected Task<bool> CreateSquareCollage(IHasImages primaryItem, List<BaseItem> items, string outputPath, bool drawText)
+        protected Task<bool> CreateSquareCollage(IHasImages primaryItem, List<BaseItem> items, string outputPath)
         {
-            return CreateCollage(primaryItem, items, outputPath, 600, 600, drawText, primaryItem.Name);
+            return CreateCollage(primaryItem, items, outputPath, 600, 600);
         }
 
-        protected Task<bool> CreateThumbCollage(IHasImages primaryItem, List<BaseItem> items, string outputPath, int width, int height, bool drawText, string text)
+        protected Task<bool> CreateThumbCollage(IHasImages primaryItem, List<BaseItem> items, string outputPath, int width, int height)
         {
-            return CreateCollage(primaryItem, items, outputPath, width, height, drawText, text);
+            return CreateCollage(primaryItem, items, outputPath, width, height);
         }
 
-        private Task<bool> CreateCollage(IHasImages primaryItem, List<BaseItem> items, string outputPath, int width, int height, bool drawText, string text)
+        private Task<bool> CreateCollage(IHasImages primaryItem, List<BaseItem> items, string outputPath, int width, int height)
         {
             Directory.CreateDirectory(Path.GetDirectoryName(outputPath));
 
@@ -152,7 +152,6 @@ namespace MediaBrowser.Server.Implementations.Photos
                 Height = height,
                 Width = width,
                 OutputPath = outputPath,
-                Text = drawText ? text : null,
                 InputPaths = GetStripCollageImagePaths(primaryItem, items).ToArray()
             };
 
@@ -181,22 +180,20 @@ namespace MediaBrowser.Server.Implementations.Photos
                 return false;
             }
 
-            var drawText = !(item is UserView) && !(item is ICollectionFolder);
-
             if (imageType == ImageType.Thumb)
             {
-                return await CreateThumbCollage(item, itemsWithImages, outputPath, drawText).ConfigureAwait(false);
+                return await CreateThumbCollage(item, itemsWithImages, outputPath).ConfigureAwait(false);
             }
 
             if (imageType == ImageType.Primary)
             {
                 if (item is UserView)
                 {
-                    return await CreateSquareCollage(item, itemsWithImages, outputPath, drawText).ConfigureAwait(false);
+                    return await CreateSquareCollage(item, itemsWithImages, outputPath).ConfigureAwait(false);
                 }
                 if (item is PhotoAlbum || item is Playlist)
                 {
-                    return await CreateSquareCollage(item, itemsWithImages, outputPath, drawText).ConfigureAwait(false);
+                    return await CreateSquareCollage(item, itemsWithImages, outputPath).ConfigureAwait(false);
                 }
                 return await CreatePosterCollage(item, itemsWithImages, outputPath).ConfigureAwait(false);
             }
diff --git a/MediaBrowser.Server.Implementations/UserViews/CollectionFolderImageProvider.cs b/MediaBrowser.Server.Implementations/UserViews/CollectionFolderImageProvider.cs
index 39dbcf226..7054515b6 100644
--- a/MediaBrowser.Server.Implementations/UserViews/CollectionFolderImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/UserViews/CollectionFolderImageProvider.cs
@@ -105,7 +105,7 @@ namespace MediaBrowser.Server.Implementations.UserViews
                     return false;
                 }
 
-                return await CreateThumbCollage(item, itemsWithImages, outputPath, 960, 540, false, item.Name).ConfigureAwait(false);
+                return await CreateThumbCollage(item, itemsWithImages, outputPath, 960, 540).ConfigureAwait(false);
             }
 
             return await base.CreateImage(item, itemsWithImages, outputPath, imageType, imageIndex).ConfigureAwait(false);
diff --git a/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs b/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
index ca2568a0f..7fbd2b26c 100644
--- a/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
@@ -61,7 +61,6 @@ namespace MediaBrowser.Server.Implementations.UserViews
             {
                 var userItemsResult = await view.GetItems(new InternalItemsQuery
                 {
-                    User = view.UserId.HasValue ? _userManager.GetUserById(view.UserId.Value) : null,
                     CollapseBoxSetItems = false
                 });
 
@@ -73,7 +72,6 @@ namespace MediaBrowser.Server.Implementations.UserViews
 
             var result = await view.GetItems(new InternalItemsQuery
             {
-                User = view.UserId.HasValue ? _userManager.GetUserById(view.UserId.Value) : null,
                 CollapseBoxSetItems = false,
                 Recursive = recursive,
                 ExcludeItemTypes = new[] { "UserView", "CollectionFolder", "Playlist" }
@@ -138,38 +136,7 @@ namespace MediaBrowser.Server.Implementations.UserViews
             var view = item as UserView;
             if (view != null)
             {
-                var supported = new[]
-                {
-                    SpecialFolder.TvFavoriteEpisodes,
-                    SpecialFolder.TvFavoriteSeries,
-                    SpecialFolder.TvGenres,
-                    SpecialFolder.TvLatest,
-                    SpecialFolder.TvNextUp,
-                    SpecialFolder.TvResume,
-                    SpecialFolder.TvShowSeries,
-
-                    SpecialFolder.MovieCollections,
-                    SpecialFolder.MovieFavorites,
-                    SpecialFolder.MovieGenres,
-                    SpecialFolder.MovieLatest,
-                    SpecialFolder.MovieMovies,
-                    SpecialFolder.MovieResume,
-
-                    SpecialFolder.MusicArtists,
-                    SpecialFolder.MusicAlbumArtists,
-                    SpecialFolder.MusicAlbums,
-                    SpecialFolder.MusicGenres,
-                    SpecialFolder.MusicLatest,
-                    SpecialFolder.MusicPlaylists,
-                    SpecialFolder.MusicSongs,
-                    SpecialFolder.MusicFavorites,
-                    SpecialFolder.MusicFavoriteArtists,
-                    SpecialFolder.MusicFavoriteAlbums,
-                    SpecialFolder.MusicFavoriteSongs
-
-                };
-
-                return (IsUsingCollectionStrip(view) || supported.Contains(view.ViewType, StringComparer.OrdinalIgnoreCase));
+                return (IsUsingCollectionStrip(view));
             }
 
             return false;
@@ -207,7 +174,7 @@ namespace MediaBrowser.Server.Implementations.UserViews
                     return false;
                 }
 
-                return await CreateThumbCollage(item, itemsWithImages, outputPath, 960, 540, false, item.Name).ConfigureAwait(false);
+                return await CreateThumbCollage(item, itemsWithImages, outputPath, 960, 540).ConfigureAwait(false);
             }
 
             return await base.CreateImage(item, itemsWithImages, outputPath, imageType, imageIndex).ConfigureAwait(false);
-- 
cgit v1.2.3


From 032891c9f3327ca626938ca175d7d4623e6a27d0 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 14 Aug 2015 14:00:26 -0400
Subject: update user views

---
 .../Entities/UserViewBuilder.cs                    | 86 ++++++++++------------
 MediaBrowser.Controller/Library/ILibraryManager.cs | 32 +++++++-
 .../Library/IUserViewManager.cs                    |  5 +-
 .../Channels/ChannelManager.cs                     |  3 +-
 .../Library/LibraryManager.cs                      | 83 ++++++++++++++++++++-
 .../Library/UserViewManager.cs                     | 12 +--
 .../LiveTv/LiveTvManager.cs                        |  3 +-
 7 files changed, 161 insertions(+), 63 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
index ba2820bc1..cee5dadd2 100644
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -285,14 +285,14 @@ namespace MediaBrowser.Controller.Entities
 
             var list = new List<BaseItem>();
 
-            list.Add(await GetUserView(SpecialFolder.MusicLatest, user, "0", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.MusicPlaylists, user, "1", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.MusicAlbums, user, "2", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.MusicAlbumArtists, user, "3", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.MusicLatest, "0", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.MusicPlaylists, "1", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.MusicAlbums, "2", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.MusicAlbumArtists, "3", parent).ConfigureAwait(false));
             //list.Add(await GetUserView(SpecialFolder.MusicArtists, user, "4", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.MusicSongs, user, "5", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.MusicGenres, user, "6", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.MusicFavorites, user, "7", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.MusicSongs, "5", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.MusicGenres, "6", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.MusicFavorites, "7", parent).ConfigureAwait(false));
 
             return GetResult(list, parent, query);
         }
@@ -301,9 +301,9 @@ namespace MediaBrowser.Controller.Entities
         {
             var list = new List<BaseItem>();
 
-            list.Add(await GetUserView(SpecialFolder.MusicFavoriteAlbums, user, "0", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.MusicFavoriteArtists, user, "1", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.MusicFavoriteSongs, user, "2", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.MusicFavoriteAlbums, "0", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.MusicFavoriteArtists, "1", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.MusicFavoriteSongs, "2", parent).ConfigureAwait(false));
 
             return GetResult(list, parent, query);
         }
@@ -329,7 +329,7 @@ namespace MediaBrowser.Controller.Entities
 
                 })
                 .Where(i => i != null)
-                .Select(i => GetUserView(i.Name, SpecialFolder.MusicGenre, user, i.SortName, parent));
+                .Select(i => GetUserView(i.Name, SpecialFolder.MusicGenre, i.SortName, parent));
 
             var genres = await Task.WhenAll(tasks).ConfigureAwait(false);
 
@@ -366,7 +366,7 @@ namespace MediaBrowser.Controller.Entities
                 .OfType<IHasArtist>();
 
             var artists = _libraryManager.GetArtists(items);
-            
+
             return GetResult(artists, parent, query);
         }
 
@@ -377,7 +377,7 @@ namespace MediaBrowser.Controller.Entities
                 .OfType<IHasAlbumArtist>();
 
             var artists = _libraryManager.GetAlbumArtists(items).Where(i => _userDataManager.GetUserData(user.Id, i.GetUserDataKey()).IsFavorite);
-            
+
             return GetResult(artists, parent, query);
         }
 
@@ -443,12 +443,12 @@ namespace MediaBrowser.Controller.Entities
 
             var list = new List<BaseItem>();
 
-            list.Add(await GetUserView(SpecialFolder.MovieResume, user, "0", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.MovieLatest, user, "1", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.MovieMovies, user, "2", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.MovieCollections, user, "3", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.MovieFavorites, user, "4", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.MovieGenres, user, "5", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.MovieResume, "0", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.MovieLatest, "1", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.MovieMovies, "2", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.MovieCollections, "3", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.MovieFavorites, "4", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.MovieGenres, "5", parent).ConfigureAwait(false));
 
             return GetResult(list, parent, query);
         }
@@ -554,7 +554,7 @@ namespace MediaBrowser.Controller.Entities
 
                 })
                 .Where(i => i != null)
-                .Select(i => GetUserView(i.Name, SpecialFolder.MovieGenre, user, i.SortName, parent));
+                .Select(i => GetUserView(i.Name, SpecialFolder.MovieGenre, i.SortName, parent));
 
             var genres = await Task.WhenAll(tasks).ConfigureAwait(false);
 
@@ -616,13 +616,13 @@ namespace MediaBrowser.Controller.Entities
 
             var list = new List<BaseItem>();
 
-            list.Add(await GetUserView(SpecialFolder.TvResume, user, "0", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.TvNextUp, user, "1", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.TvLatest, user, "2", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.TvShowSeries, user, "3", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.TvFavoriteSeries, user, "4", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.TvFavoriteEpisodes, user, "5", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.TvGenres, user, "6", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.TvResume, "0", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.TvNextUp, "1", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.TvLatest, "2", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.TvShowSeries, "3", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.TvFavoriteSeries, "4", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.TvFavoriteEpisodes, "5", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.TvGenres, "6", parent).ConfigureAwait(false));
 
             return GetResult(list, parent, query);
         }
@@ -637,11 +637,11 @@ namespace MediaBrowser.Controller.Entities
 
             var list = new List<BaseItem>();
 
-            list.Add(await GetUserView(SpecialFolder.LatestGames, user, "0", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.RecentlyPlayedGames, user, "1", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.GameFavorites, user, "2", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.GameSystems, user, "3", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.GameGenres, user, "4", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.LatestGames, "0", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.RecentlyPlayedGames, "1", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.GameFavorites, "2", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.GameSystems, "3", parent).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.GameGenres, "4", parent).ConfigureAwait(false));
 
             return GetResult(list, parent, query);
         }
@@ -739,7 +739,7 @@ namespace MediaBrowser.Controller.Entities
 
                 })
                 .Where(i => i != null)
-                .Select(i => GetUserView(i.Name, SpecialFolder.TvGenre, user, i.SortName, parent));
+                .Select(i => GetUserView(i.Name, SpecialFolder.TvGenre, i.SortName, parent));
 
             var genres = await Task.WhenAll(tasks).ConfigureAwait(false);
 
@@ -791,7 +791,7 @@ namespace MediaBrowser.Controller.Entities
 
                 })
                 .Where(i => i != null)
-                .Select(i => GetUserView(i.Name, SpecialFolder.GameGenre, user, i.SortName, parent));
+                .Select(i => GetUserView(i.Name, SpecialFolder.GameGenre, i.SortName, parent));
 
             var genres = await Task.WhenAll(tasks).ConfigureAwait(false);
 
@@ -1871,26 +1871,20 @@ namespace MediaBrowser.Controller.Entities
             var list = new List<BaseItem>();
 
             //list.Add(await GetUserSubView(SpecialFolder.LiveTvNowPlaying, user, "0", parent).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.LiveTvChannels, user, string.Empty, user.RootFolder).ConfigureAwait(false));
-            list.Add(await GetUserView(SpecialFolder.LiveTvRecordingGroups, user, string.Empty, user.RootFolder).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.LiveTvChannels, string.Empty, user.RootFolder).ConfigureAwait(false));
+            list.Add(await GetUserView(SpecialFolder.LiveTvRecordingGroups, string.Empty, user.RootFolder).ConfigureAwait(false));
 
             return GetResult(list, queryParent, query);
         }
 
-        private async Task<UserView> GetUserView(string name, string type, User user, string sortName, BaseItem parent)
+        private Task<UserView> GetUserView(string name, string type, string sortName, BaseItem parent)
         {
-            var view = await _userViewManager.GetUserSubView(name, parent.Id.ToString("N"), type, user, sortName, CancellationToken.None)
-                        .ConfigureAwait(false);
-
-            return view;
+            return _userViewManager.GetUserSubView(name, parent.Id.ToString("N"), type, sortName, CancellationToken.None);
         }
 
-        private async Task<UserView> GetUserView(string type, User user, string sortName, BaseItem parent)
+        private Task<UserView> GetUserView(string type, string sortName, BaseItem parent)
         {
-            var view = await _userViewManager.GetUserSubView(parent.Id.ToString("N"), type, user, sortName, CancellationToken.None)
-                        .ConfigureAwait(false);
-
-            return view;
+            return _userViewManager.GetUserSubView(parent.Id.ToString("N"), type, sortName, CancellationToken.None);
         }
 
         public static bool IsYearMismatched(BaseItem item, ILibraryManager libraryManager)
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 9c52fd2dc..6906a25fb 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -351,7 +351,37 @@ namespace MediaBrowser.Controller.Library
         Task<UserView> GetNamedView(User user,
             string name, 
             string viewType, 
-            string sortName, 
+            string sortName,
+            CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Gets the named view.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="viewType">Type of the view.</param>
+        /// <param name="sortName">Name of the sort.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task&lt;UserView&gt;.</returns>
+        Task<UserView> GetNamedView(string name,
+            string viewType,
+            string sortName,
+            CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Gets the named view.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="parentId">The parent identifier.</param>
+        /// <param name="viewType">Type of the view.</param>
+        /// <param name="sortName">Name of the sort.</param>
+        /// <param name="uniqueId">The unique identifier.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task&lt;UserView&gt;.</returns>
+        Task<UserView> GetNamedView(string name,
+            string parentId,
+            string viewType,
+            string sortName,
+            string uniqueId,
             CancellationToken cancellationToken);
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Library/IUserViewManager.cs b/MediaBrowser.Controller/Library/IUserViewManager.cs
index f0b862c2d..5391d113e 100644
--- a/MediaBrowser.Controller/Library/IUserViewManager.cs
+++ b/MediaBrowser.Controller/Library/IUserViewManager.cs
@@ -12,10 +12,9 @@ namespace MediaBrowser.Controller.Library
     {
         Task<IEnumerable<Folder>> GetUserViews(UserViewQuery query, CancellationToken cancellationToken);
 
-        Task<UserView> GetUserSubView(string name, string parentId, string type, User user, string sortName,
-            CancellationToken cancellationToken);
+        Task<UserView> GetUserSubView(string name, string parentId, string type, string sortName, CancellationToken cancellationToken);
 
-        Task<UserView> GetUserSubView(string category, string type, User user, string sortName, CancellationToken cancellationToken);
+        Task<UserView> GetUserSubView(string category, string type, string sortName, CancellationToken cancellationToken);
 
         List<Tuple<BaseItem, List<BaseItem>>> GetLatestItems(LatestItemsQuery request);
     }
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
index fbecaa65d..cbbed856c 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
@@ -1407,9 +1407,8 @@ namespace MediaBrowser.Server.Implementations.Channels
         public async Task<Folder> GetInternalChannelFolder(string userId, CancellationToken cancellationToken)
         {
             var name = _localization.GetLocalizedString("ViewTypeChannels");
-            var user = _userManager.GetUserById(userId);
 
-            return await _libraryManager.GetNamedView(user, name, "channels", "zz_" + name, cancellationToken).ConfigureAwait(false);
+            return await _libraryManager.GetNamedView(name, "channels", "zz_" + name, cancellationToken).ConfigureAwait(false);
         }
 
         public async Task DownloadChannelItem(IChannelMediaItem item, string destination,
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index dfcc1370e..1d2e5e322 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1651,7 +1651,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
         private readonly TimeSpan _viewRefreshInterval = TimeSpan.FromHours(24);
 
-        public async Task<UserView> GetNamedView(User user,
+        public Task<UserView> GetNamedView(User user,
             string name,
             string viewType,
             string sortName,
@@ -1659,10 +1659,17 @@ namespace MediaBrowser.Server.Implementations.Library
         {
             if (ConfigurationManager.Configuration.EnableUserSpecificUserViews)
             {
-                return await GetNamedViewInternal(user, name, null, viewType, sortName, null, cancellationToken)
-                            .ConfigureAwait(false);
+                return GetNamedViewInternal(user, name, null, viewType, sortName, null, cancellationToken);
             }
 
+            return GetNamedView(name, viewType, sortName, cancellationToken);
+        }
+
+        public async Task<UserView> GetNamedView(string name,
+            string viewType,
+            string sortName,
+            CancellationToken cancellationToken)
+        {
             var path = Path.Combine(ConfigurationManager.ApplicationPaths.ItemsByNamePath,
                             "views");
 
@@ -1806,6 +1813,76 @@ namespace MediaBrowser.Server.Implementations.Library
             return item;
         }
 
+        public async Task<UserView> GetNamedView(string name,
+            string parentId,
+            string viewType,
+            string sortName,
+            string uniqueId,
+            CancellationToken cancellationToken)
+        {
+            if (string.IsNullOrWhiteSpace(name))
+            {
+                throw new ArgumentNullException("name");
+            }
+
+            var idValues = "37_namedview_" + name + (parentId ?? string.Empty);
+            if (!string.IsNullOrWhiteSpace(uniqueId))
+            {
+                idValues += uniqueId;
+            }
+
+            var id = GetNewItemId(idValues, typeof(UserView));
+
+            var path = Path.Combine(ConfigurationManager.ApplicationPaths.InternalMetadataPath, "views", id.ToString("N"));
+
+            var item = GetItemById(id) as UserView;
+
+            var isNew = false;
+
+            if (item == null)
+            {
+                Directory.CreateDirectory(path);
+
+                item = new UserView
+                {
+                    Path = path,
+                    Id = id,
+                    DateCreated = DateTime.UtcNow,
+                    Name = name,
+                    ViewType = viewType,
+                    ForcedSortName = sortName
+                };
+
+                if (!string.IsNullOrWhiteSpace(parentId))
+                {
+                    item.ParentId = new Guid(parentId);
+                }
+
+                await CreateItem(item, cancellationToken).ConfigureAwait(false);
+
+                isNew = true;
+            }
+
+            if (!string.Equals(viewType, item.ViewType, StringComparison.OrdinalIgnoreCase))
+            {
+                item.ViewType = viewType;
+                await item.UpdateToRepository(ItemUpdateType.MetadataEdit, cancellationToken).ConfigureAwait(false);
+            }
+
+            var refresh = isNew || (DateTime.UtcNow - item.DateLastSaved) >= _viewRefreshInterval;
+
+            if (refresh)
+            {
+                _providerManagerFactory().QueueRefresh(item.Id, new MetadataRefreshOptions
+                {
+                    // Need to force save to increment DateLastSaved
+                    ForceSave = true
+                });
+            }
+
+            return item;
+        }
+
         public bool IsVideoFile(string path)
         {
             var resolver = new VideoResolver(GetNamingOptions(), new PatternsLogger());
diff --git a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
index 61b28a072..c32dc0d41 100644
--- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
@@ -167,8 +167,8 @@ namespace MediaBrowser.Server.Implementations.Library
 
                 if (_liveTvManager.GetEnabledUsers().Select(i => i.Id.ToString("N")).Contains(query.UserId))
                 {
-                    //list.Add(await _liveTvManager.GetInternalLiveTvFolder(query.UserId, cancellationToken).ConfigureAwait(false));
-                    list.Add(await GetUserView(new List<ICollectionFolder>(), list, CollectionType.LiveTv, string.Empty, user, cancellationToken).ConfigureAwait(false));
+                    var name = _localizationManager.GetLocalizedString("ViewType" + CollectionType.LiveTv);
+                    list.Add(await _libraryManager.GetNamedView(name, CollectionType.LiveTv, string.Empty, cancellationToken).ConfigureAwait(false));
                 }
             }
 
@@ -187,18 +187,18 @@ namespace MediaBrowser.Server.Implementations.Library
                 .ThenBy(i => i.SortName);
         }
 
-        public Task<UserView> GetUserSubView(string name, string parentId, string type, User user, string sortName, CancellationToken cancellationToken)
+        public Task<UserView> GetUserSubView(string name, string parentId, string type, string sortName, CancellationToken cancellationToken)
         {
             var uniqueId = parentId + "subview" + type;
 
-            return _libraryManager.GetNamedView(user, name, parentId, type, sortName, uniqueId, cancellationToken);
+            return _libraryManager.GetNamedView(name, parentId, type, sortName, uniqueId, cancellationToken);
         }
 
-        public Task<UserView> GetUserSubView(string parentId, string type, User user, string sortName, CancellationToken cancellationToken)
+        public Task<UserView> GetUserSubView(string parentId, string type, string sortName, CancellationToken cancellationToken)
         {
             var name = _localizationManager.GetLocalizedString("ViewType" + type);
 
-            return GetUserSubView(name, parentId, type, user, sortName, cancellationToken);
+            return GetUserSubView(name, parentId, type, sortName, cancellationToken);
         }
 
         public async Task<UserView> GetUserView(List<ICollectionFolder> parents, List<Folder> currentViews, string viewType, string sortName, User user, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 389eda904..cc3c06dd4 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -2204,8 +2204,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
         public async Task<Folder> GetInternalLiveTvFolder(string userId, CancellationToken cancellationToken)
         {
             var name = _localization.GetLocalizedString("ViewTypeLiveTV");
-            var user = _userManager.GetUserById(userId);
-            return await _libraryManager.GetNamedView(user, name, "livetv", "zz_" + name, cancellationToken).ConfigureAwait(false);
+            return await _libraryManager.GetNamedView(name, "livetv", "zz_" + name, cancellationToken).ConfigureAwait(false);
         }
 
         public async Task<TunerHostInfo> SaveTunerHost(TunerHostInfo info)
-- 
cgit v1.2.3


From 45c8f51a9c56471e2306ad6fd71ab4b51ee8047f Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 14 Aug 2015 14:30:08 -0400
Subject: update user views

---
 MediaBrowser.Controller/Channels/IChannelManager.cs           |  3 +--
 MediaBrowser.Controller/Entities/UserView.cs                  |  2 ++
 .../Channels/ChannelManager.cs                                |  4 ++--
 MediaBrowser.Server.Implementations/Library/LibraryManager.cs |  3 +--
 .../Library/UserViewManager.cs                                | 11 ++++++-----
 .../UserViews/DynamicImageProvider.cs                         |  1 +
 6 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Controller/Channels/IChannelManager.cs b/MediaBrowser.Controller/Channels/IChannelManager.cs
index f5c4ab373..8d3e0f596 100644
--- a/MediaBrowser.Controller/Channels/IChannelManager.cs
+++ b/MediaBrowser.Controller/Channels/IChannelManager.cs
@@ -121,10 +121,9 @@ namespace MediaBrowser.Controller.Channels
         /// <summary>
         /// Gets the channel folder.
         /// </summary>
-        /// <param name="userId">The user identifier.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>BaseItemDto.</returns>
-        Task<Folder> GetInternalChannelFolder(string userId, CancellationToken cancellationToken);
+        Task<Folder> GetInternalChannelFolder(CancellationToken cancellationToken);
 
         /// <summary>
         /// Gets the channel folder.
diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs
index ce4de613e..488e54cc3 100644
--- a/MediaBrowser.Controller/Entities/UserView.cs
+++ b/MediaBrowser.Controller/Entities/UserView.cs
@@ -14,6 +14,8 @@ namespace MediaBrowser.Controller.Entities
         public string ViewType { get; set; }
         public Guid ParentId { get; set; }
 
+        public Guid? UserId { get; set; }
+        
         public static ITVSeriesManager TVSeriesManager;
         public static IPlaylistManager PlaylistManager;
 
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
index cbbed856c..f670176e6 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
@@ -1399,12 +1399,12 @@ namespace MediaBrowser.Server.Implementations.Channels
         {
             var user = string.IsNullOrEmpty(userId) ? null : _userManager.GetUserById(userId);
 
-            var folder = await GetInternalChannelFolder(userId, cancellationToken).ConfigureAwait(false);
+            var folder = await GetInternalChannelFolder(cancellationToken).ConfigureAwait(false);
 
             return _dtoService.GetBaseItemDto(folder, new DtoOptions(), user);
         }
 
-        public async Task<Folder> GetInternalChannelFolder(string userId, CancellationToken cancellationToken)
+        public async Task<Folder> GetInternalChannelFolder(CancellationToken cancellationToken)
         {
             var name = _localization.GetLocalizedString("ViewTypeChannels");
 
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 1d2e5e322..c316aab25 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1670,8 +1670,7 @@ namespace MediaBrowser.Server.Implementations.Library
             string sortName,
             CancellationToken cancellationToken)
         {
-            var path = Path.Combine(ConfigurationManager.ApplicationPaths.ItemsByNamePath,
-                            "views");
+            var path = Path.Combine(ConfigurationManager.ApplicationPaths.ItemsByNamePath, "views");
 
             path = Path.Combine(path, _fileSystem.GetValidFilename(viewType));
 
diff --git a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
index c32dc0d41..5d753826a 100644
--- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
@@ -141,12 +141,13 @@ namespace MediaBrowser.Server.Implementations.Library
 
             if (user.Configuration.DisplayFoldersView)
             {
-                list.Add(await GetUserView(new List<ICollectionFolder>(), list, CollectionType.Folders, "zz_" + CollectionType.Folders, user, cancellationToken).ConfigureAwait(false));
+                var name = _localizationManager.GetLocalizedString("ViewType" + CollectionType.Folders);
+                list.Add(await _libraryManager.GetNamedView(name, CollectionType.Folders, string.Empty, cancellationToken).ConfigureAwait(false));
             }
 
             if (query.IncludeExternalContent)
             {
-                var channelResult = await _channelManager.GetChannels(new ChannelQuery
+                var channelResult = await _channelManager.GetChannelsInternal(new ChannelQuery
                 {
                     UserId = query.UserId
 
@@ -155,14 +156,14 @@ namespace MediaBrowser.Server.Implementations.Library
                 var channels = channelResult.Items;
 
                 var embeddedChannels = channels
-                    .Where(i => user.Configuration.DisplayChannelsWithinViews.Contains(i.Id))
+                    .Where(i => user.Configuration.DisplayChannelsWithinViews.Contains(i.Id.ToString("N")))
                     .ToList();
 
-                list.AddRange(embeddedChannels.Select(i => _channelManager.GetChannel(i.Id)));
+                list.AddRange(embeddedChannels);
 
                 if (channels.Length > embeddedChannels.Count)
                 {
-                    list.Add(await _channelManager.GetInternalChannelFolder(query.UserId, cancellationToken).ConfigureAwait(false));
+                    list.Add(await _channelManager.GetInternalChannelFolder(cancellationToken).ConfigureAwait(false));
                 }
 
                 if (_liveTvManager.GetEnabledUsers().Select(i => i.Id.ToString("N")).Contains(query.UserId))
diff --git a/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs b/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
index 7fbd2b26c..b11a7d167 100644
--- a/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
@@ -72,6 +72,7 @@ namespace MediaBrowser.Server.Implementations.UserViews
 
             var result = await view.GetItems(new InternalItemsQuery
             {
+                User = (view.UserId.HasValue ? _userManager.GetUserById(view.UserId.Value) : null),
                 CollapseBoxSetItems = false,
                 Recursive = recursive,
                 ExcludeItemTypes = new[] { "UserView", "CollectionFolder", "Playlist" }
-- 
cgit v1.2.3


From 9c879eefc33df13b7dac555e159d5c4ccf09213e Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 14 Aug 2015 15:14:54 -0400
Subject: update channel settings

---
 MediaBrowser.Controller/LiveTv/ILiveTvManager.cs               | 3 +--
 MediaBrowser.Model/Configuration/UserConfiguration.cs          | 1 +
 MediaBrowser.Server.Implementations/Library/LibraryManager.cs  | 2 +-
 MediaBrowser.Server.Implementations/Library/UserViewManager.cs | 5 ++---
 MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs    | 6 +++---
 5 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
index e568b2eae..df09d39b2 100644
--- a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
+++ b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
@@ -273,10 +273,9 @@ namespace MediaBrowser.Controller.LiveTv
         /// <summary>
         /// Gets the live tv folder.
         /// </summary>
-        /// <param name="userId">The user identifier.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>BaseItemDto.</returns>
-        Task<Folder> GetInternalLiveTvFolder(string userId, CancellationToken cancellationToken);
+        Task<Folder> GetInternalLiveTvFolder(CancellationToken cancellationToken);
 
         /// <summary>
         /// Gets the live tv folder.
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 9dd84bc7d..349780958 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -50,6 +50,7 @@ namespace MediaBrowser.Model.Configuration
         public string[] PlainFolderViews { get; set; }
 
         public bool HidePlayedInLatest { get; set; }
+        public bool DisplayChannelsInline { get; set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="UserConfiguration" /> class.
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index c316aab25..0cfd38479 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1824,7 +1824,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 throw new ArgumentNullException("name");
             }
 
-            var idValues = "37_namedview_" + name + (parentId ?? string.Empty);
+            var idValues = "37_namedview_" + name + (parentId ?? string.Empty) + (viewType ?? string.Empty);
             if (!string.IsNullOrWhiteSpace(uniqueId))
             {
                 idValues += uniqueId;
diff --git a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
index 5d753826a..a609c53ab 100644
--- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
@@ -156,7 +156,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 var channels = channelResult.Items;
 
                 var embeddedChannels = channels
-                    .Where(i => user.Configuration.DisplayChannelsWithinViews.Contains(i.Id.ToString("N")))
+                    .Where(i => user.Configuration.DisplayChannelsInline || user.Configuration.DisplayChannelsWithinViews.Contains(i.Id.ToString("N")))
                     .ToList();
 
                 list.AddRange(embeddedChannels);
@@ -168,8 +168,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
                 if (_liveTvManager.GetEnabledUsers().Select(i => i.Id.ToString("N")).Contains(query.UserId))
                 {
-                    var name = _localizationManager.GetLocalizedString("ViewType" + CollectionType.LiveTv);
-                    list.Add(await _libraryManager.GetNamedView(name, CollectionType.LiveTv, string.Empty, cancellationToken).ConfigureAwait(false));
+                    list.Add(await _liveTvManager.GetInternalLiveTvFolder(CancellationToken.None).ConfigureAwait(false));
                 }
             }
 
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index cc3c06dd4..782473bea 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -2196,15 +2196,15 @@ namespace MediaBrowser.Server.Implementations.LiveTv
         {
             var user = string.IsNullOrEmpty(userId) ? null : _userManager.GetUserById(userId);
 
-            var folder = await GetInternalLiveTvFolder(userId, cancellationToken).ConfigureAwait(false);
+            var folder = await GetInternalLiveTvFolder(cancellationToken).ConfigureAwait(false);
 
             return _dtoService.GetBaseItemDto(folder, new DtoOptions(), user);
         }
 
-        public async Task<Folder> GetInternalLiveTvFolder(string userId, CancellationToken cancellationToken)
+        public async Task<Folder> GetInternalLiveTvFolder(CancellationToken cancellationToken)
         {
             var name = _localization.GetLocalizedString("ViewTypeLiveTV");
-            return await _libraryManager.GetNamedView(name, "livetv", "zz_" + name, cancellationToken).ConfigureAwait(false);
+            return await _libraryManager.GetNamedView(name, "livetv", name, cancellationToken).ConfigureAwait(false);
         }
 
         public async Task<TunerHostInfo> SaveTunerHost(TunerHostInfo info)
-- 
cgit v1.2.3


From 66ccb313c2037ddbce7a101c97bc5746547b3243 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 17 Aug 2015 12:52:56 -0400
Subject: recording fixes

---
 .../Library/UserViewManager.cs                                |  1 -
 MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs   | 11 ++++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
index a609c53ab..43f77ec49 100644
--- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
@@ -224,7 +224,6 @@ namespace MediaBrowser.Server.Implementations.Library
 
                 if (enableUserSpecificViews)
                 {
-                    viewType = enableRichView ? viewType : null;
                     var view = await _libraryManager.GetNamedView(user, name, viewType, sortName, cancellationToken).ConfigureAwait(false);
 
                     if (view.ParentId != parentId)
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 5779be84f..14c3887df 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -177,6 +177,12 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
 
         public Task CancelSeriesTimerAsync(string timerId, CancellationToken cancellationToken)
         {
+            var timers = _timerProvider.GetAll().Where(i => string.Equals(i.SeriesTimerId, timerId, StringComparison.OrdinalIgnoreCase));
+            foreach (var timer in timers)
+            {
+                CancelTimerInternal(timer.Id);
+            }
+
             var remove = _seriesTimerProvider.GetAll().FirstOrDefault(r => string.Equals(r.Id, timerId, StringComparison.OrdinalIgnoreCase));
             if (remove != null)
             {
@@ -583,7 +589,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
                 {
                     using (var output = File.Open(recordPath, FileMode.Create, FileAccess.Write, FileShare.Read))
                     {
-                        await response.Content.CopyToAsync(output, 131072, linkedToken);
+                        await response.Content.CopyToAsync(output, StreamDefaults.DefaultCopyToBufferSize, linkedToken);
                     }
                 }
 
@@ -659,6 +665,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
 
         private IEnumerable<TimerInfo> GetTimersForSeries(SeriesTimerInfo seriesTimer, IEnumerable<ProgramInfo> allPrograms, IReadOnlyList<RecordingInfo> currentRecordings)
         {
+            // Exclude programs that have already ended
+            allPrograms = allPrograms.Where(i => i.EndDate > DateTime.UtcNow);
+
             allPrograms = GetProgramsForSeries(seriesTimer, allPrograms);
 
             var recordingShowIds = currentRecordings.Select(i => i.ShowId).ToList();
-- 
cgit v1.2.3


From 3787af4c9c22af35a22fa599809221c70eed173d Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 19 Aug 2015 19:57:27 -0400
Subject: update guide

---
 MediaBrowser.Api/Music/InstantMixService.cs        |  3 +-
 MediaBrowser.Controller/Library/ILibraryManager.cs |  7 ++
 MediaBrowser.Controller/Library/IMusicManager.cs   |  4 +-
 .../Library/LibraryManager.cs                      | 86 ++++++++++------------
 .../Library/MusicManager.cs                        |  6 +-
 .../LiveTv/LiveTvManager.cs                        | 14 ++--
 .../LiveTv/TunerHosts/BaseTunerHost.cs             | 17 ++++-
 .../LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs   |  9 ++-
 .../LiveTv/TunerHosts/M3UTunerHost.cs              |  2 +-
 9 files changed, 76 insertions(+), 72 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/Music/InstantMixService.cs b/MediaBrowser.Api/Music/InstantMixService.cs
index 506b7bc3a..905ead86c 100644
--- a/MediaBrowser.Api/Music/InstantMixService.cs
+++ b/MediaBrowser.Api/Music/InstantMixService.cs
@@ -138,8 +138,9 @@ namespace MediaBrowser.Api.Music
         public object Get(GetInstantMixFromArtist request)
         {
             var user = _userManager.GetUserById(request.UserId);
+            var artist = _libraryManager.GetArtist(request.Name);
 
-            var items = _musicManager.GetInstantMixFromArtist(request.Name, user);
+            var items = _musicManager.GetInstantMixFromArtist(artist, user);
 
             return GetResult(items, user, request);
         }
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 6906a25fb..9331ca759 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -502,5 +502,12 @@ namespace MediaBrowser.Controller.Library
         /// <param name="query">The query.</param>
         /// <returns>List&lt;System.String&gt;.</returns>
         List<string> GetPeopleNames(InternalPeopleQuery query);
+
+        /// <summary>
+        /// Queries the items.
+        /// </summary>
+        /// <param name="query">The query.</param>
+        /// <returns>QueryResult&lt;BaseItem&gt;.</returns>
+        QueryResult<BaseItem> QueryItems(InternalItemsQuery query);
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Library/IMusicManager.cs b/MediaBrowser.Controller/Library/IMusicManager.cs
index 0ce0687cc..9baf8b6f1 100644
--- a/MediaBrowser.Controller/Library/IMusicManager.cs
+++ b/MediaBrowser.Controller/Library/IMusicManager.cs
@@ -16,10 +16,10 @@ namespace MediaBrowser.Controller.Library
         /// <summary>
         /// Gets the instant mix from artist.
         /// </summary>
-        /// <param name="name">The name.</param>
+        /// <param name="artist">The artist.</param>
         /// <param name="user">The user.</param>
         /// <returns>IEnumerable{Audio}.</returns>
-        IEnumerable<Audio> GetInstantMixFromArtist(string name, User user);
+        IEnumerable<Audio> GetInstantMixFromArtist(MusicArtist artist, User user);
         /// <summary>
         /// Gets the instant mix from genre.
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 0cfd38479..a67e3d732 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -3,12 +3,14 @@ using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Progress;
 using MediaBrowser.Common.ScheduledTasks;
+using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Resolvers;
@@ -243,10 +245,6 @@ namespace MediaBrowser.Server.Implementations.Library
             }
         }
 
-        /// <summary>
-        /// The _items by name path
-        /// </summary>
-        private string _itemsByNamePath;
         /// <summary>
         /// The _season zero display name
         /// </summary>
@@ -260,7 +258,6 @@ namespace MediaBrowser.Server.Implementations.Library
         private void RecordConfigurationValues(ServerConfiguration configuration)
         {
             _seasonZeroDisplayName = configuration.SeasonZeroDisplayName;
-            _itemsByNamePath = ConfigurationManager.ApplicationPaths.ItemsByNamePath;
             _wizardCompleted = configuration.IsStartupWizardCompleted;
         }
 
@@ -273,56 +270,24 @@ namespace MediaBrowser.Server.Implementations.Library
         {
             var config = ConfigurationManager.Configuration;
 
-            var ibnPathChanged = !string.Equals(_itemsByNamePath, ConfigurationManager.ApplicationPaths.ItemsByNamePath, StringComparison.Ordinal);
-
-            if (ibnPathChanged)
-            {
-                RemoveItemsByNameFromCache();
-            }
-
             var newSeasonZeroName = ConfigurationManager.Configuration.SeasonZeroDisplayName;
             var seasonZeroNameChanged = !string.Equals(_seasonZeroDisplayName, newSeasonZeroName, StringComparison.Ordinal);
             var wizardChanged = config.IsStartupWizardCompleted != _wizardCompleted;
 
             RecordConfigurationValues(config);
 
-            Task.Run(async () =>
+            if (seasonZeroNameChanged || wizardChanged)
             {
-                if (seasonZeroNameChanged)
-                {
-                    await UpdateSeasonZeroNames(newSeasonZeroName, CancellationToken.None).ConfigureAwait(false);
-                }
-
-                if (seasonZeroNameChanged || ibnPathChanged || wizardChanged)
-                {
-                    _taskManager.CancelIfRunningAndQueue<RefreshMediaLibraryTask>();
-                }
-            });
-        }
+                _taskManager.CancelIfRunningAndQueue<RefreshMediaLibraryTask>();
+            }
 
-        private void RemoveItemsByNameFromCache()
-        {
-            RemoveItemsFromCache(i => i is Person);
-            RemoveItemsFromCache(i => i is Year);
-            RemoveItemsFromCache(i => i is Genre);
-            RemoveItemsFromCache(i => i is MusicGenre);
-            RemoveItemsFromCache(i => i is GameGenre);
-            RemoveItemsFromCache(i => i is Studio);
-            RemoveItemsFromCache(i =>
+            if (seasonZeroNameChanged)
             {
-                var artist = i as MusicArtist;
-                return artist != null && artist.IsAccessedByName;
-            });
-        }
-
-        private void RemoveItemsFromCache(Func<BaseItem, bool> remove)
-        {
-            var items = _libraryItemsCache.ToList().Where(i => remove(i.Value)).ToList();
+                Task.Run(async () =>
+                {
+                    await UpdateSeasonZeroNames(newSeasonZeroName, CancellationToken.None).ConfigureAwait(false);
 
-            foreach (var item in items)
-            {
-                BaseItem value;
-                _libraryItemsCache.TryRemove(item.Key, out value);
+                });
             }
         }
 
@@ -374,6 +339,21 @@ namespace MediaBrowser.Server.Implementations.Library
 
         private void RegisterItem(Guid id, BaseItem item)
         {
+            if (item is LiveTvProgram)
+            {
+                return;
+            }
+            if (item is IChannelItem)
+            {
+                return;
+            }
+            if (item is IItemByName)
+            {
+                if (!(item is MusicArtist))
+                {
+                    return;
+                }
+            }
             LibraryItemsCache.AddOrUpdate(id, item, delegate { return item; });
         }
 
@@ -951,11 +931,14 @@ namespace MediaBrowser.Server.Implementations.Library
                     DateModified = DateTime.UtcNow,
                     Path = path
                 };
-            }
 
-            if (isArtist)
-            {
-                (item as MusicArtist).IsAccessedByName = true;
+                if (isArtist)
+                {
+                    (item as MusicArtist).IsAccessedByName = true;
+                }
+
+                var task = item.UpdateToRepository(ItemUpdateType.None, CancellationToken.None);
+                Task.WaitAll(task);
             }
 
             return item;
@@ -1259,6 +1242,11 @@ namespace MediaBrowser.Server.Implementations.Library
             };
         }
 
+        public QueryResult<BaseItem> QueryItems(InternalItemsQuery query)
+        {
+            return ItemRepository.GetItems(query);
+        }
+
         public List<Guid> GetItemIds(InternalItemsQuery query)
         {
             return ItemRepository.GetItemIdsList(query);
diff --git a/MediaBrowser.Server.Implementations/Library/MusicManager.cs b/MediaBrowser.Server.Implementations/Library/MusicManager.cs
index 1a9e98268..b83256342 100644
--- a/MediaBrowser.Server.Implementations/Library/MusicManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MusicManager.cs
@@ -27,10 +27,8 @@ namespace MediaBrowser.Server.Implementations.Library
             return list.Concat(GetInstantMixFromGenres(item.Genres, user));
         }
 
-        public IEnumerable<Audio> GetInstantMixFromArtist(string name, User user)
+        public IEnumerable<Audio> GetInstantMixFromArtist(MusicArtist artist, User user)
         {
-            var artist = _libraryManager.GetArtist(name);
-
             var genres = user.RootFolder
                 .GetRecursiveChildren(user, i => i is Audio)
                 .Cast<Audio>()
@@ -107,7 +105,7 @@ namespace MediaBrowser.Server.Implementations.Library
             var artist = item as MusicArtist;
             if (artist != null)
             {
-                return GetInstantMixFromArtist(artist.Name, user);
+                return GetInstantMixFromArtist(artist, user);
             }
 
             var song = item as Audio;
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 26007f145..cabe04f0f 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -1,5 +1,4 @@
-using System.IO;
-using MediaBrowser.Common;
+using MediaBrowser.Common;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.IO;
@@ -26,6 +25,7 @@ using MoreLinq;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -59,8 +59,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
         private readonly SemaphoreSlim _refreshRecordingsLock = new SemaphoreSlim(1, 1);
 
-        private readonly ConcurrentDictionary<Guid, Guid> _refreshedPrograms = new ConcurrentDictionary<Guid, Guid>();
-
         private readonly List<ITunerHost> _tunerHosts = new List<ITunerHost>();
         private readonly List<IListingsProvider> _listingProviders = new List<IListingsProvider>();
         private readonly IFileSystem _fileSystem;
@@ -253,7 +251,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             var now = DateTime.UtcNow;
 
-            var programs = _libraryManager.GetItems(new InternalItemsQuery
+            var programs = _libraryManager.QueryItems(new InternalItemsQuery
             {
                 IncludeItemTypes = new[] { typeof(LiveTvProgram).Name },
                 MaxStartDate = now,
@@ -799,7 +797,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 }
             }
 
-            IEnumerable<LiveTvProgram> programs = _libraryManager.GetItems(internalQuery).Items.Cast<LiveTvProgram>();
+            IEnumerable<LiveTvProgram> programs = _libraryManager.QueryItems(internalQuery).Items.Cast<LiveTvProgram>();
 
             programs = _libraryManager.Sort(programs, user, query.SortBy, query.SortOrder ?? SortOrder.Ascending)
                 .Cast<LiveTvProgram>();
@@ -869,7 +867,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 }
             }
 
-            IEnumerable<LiveTvProgram> programs = _libraryManager.GetItems(internalQuery).Items.Cast<LiveTvProgram>();
+            IEnumerable<LiveTvProgram> programs = _libraryManager.QueryItems(internalQuery).Items.Cast<LiveTvProgram>();
 
             var programList = programs.ToList();
 
@@ -1081,8 +1079,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             await CleanDatabaseInternal(newChannelIdList, new[] { typeof(LiveTvChannel).Name }, progress, cancellationToken).ConfigureAwait(false);
             await CleanDatabaseInternal(newProgramIdList, new[] { typeof(LiveTvProgram).Name }, progress, cancellationToken).ConfigureAwait(false);
 
-            _refreshedPrograms.Clear();
-
             // Load these now which will prefetch metadata
             var dtoOptions = new DtoOptions();
             dtoOptions.Fields.Remove(ItemFields.SyncInfo);
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
index fb6fa9084..649cecc85 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
@@ -176,7 +176,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
 
                     if (stream != null)
                     {
-                        return null;
+                        return stream;
                     }
                 }
             }
@@ -184,7 +184,20 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
             throw new LiveTvConflictException();
         }
 
-        protected abstract Task<bool> IsAvailable(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken);
+        protected async Task<bool> IsAvailable(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken)
+        {
+            try
+            {
+                return await IsAvailableInternal(tuner, channelId, cancellationToken).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                Logger.ErrorException("Error checking tuner availability", ex);
+                return false;
+            }
+        }
+
+        protected abstract Task<bool> IsAvailableInternal(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken);
 
         protected abstract bool IsValidChannelId(string channelId);
 
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
index 307a61588..5890e24eb 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
@@ -128,7 +128,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                             var name = line.Substring(0, index - 1);
                             var currentChannel = line.Substring(index + 7);
                             if (currentChannel != "none") { status = LiveTvTunerStatus.LiveTv; } else { status = LiveTvTunerStatus.Available; }
-                            tuners.Add(new LiveTvTunerInfo()
+                            tuners.Add(new LiveTvTunerInfo
                             {
                                 Name = name,
                                 SourceType = string.IsNullOrWhiteSpace(model) ? Name : model,
@@ -385,10 +385,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             await GetChannels(info, false, CancellationToken.None).ConfigureAwait(false);
         }
 
-        protected override async Task<bool> IsAvailable(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken)
+        protected override async Task<bool> IsAvailableInternal(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken)
         {
-            // TODO
-            return true;
+            var info = await GetTunerInfos(tuner, cancellationToken).ConfigureAwait(false);
+
+            return info.Any(i => i.Status == LiveTvTunerStatus.Available);
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
index bd0feb573..e19b17ca4 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
@@ -210,7 +210,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
             throw new NotImplementedException();
         }
 
-        protected override Task<bool> IsAvailable(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken)
+        protected override Task<bool> IsAvailableInternal(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken)
         {
             return Task.FromResult(true);
         }
-- 
cgit v1.2.3


From de133cb8aa2b078ba653ee7c3e1cef4fd16996d6 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 21 Aug 2015 22:59:10 -0400
Subject: update search

---
 MediaBrowser.Controller/Entities/BaseItem.cs       |   1 +
 MediaBrowser.Controller/LiveTv/LiveTvProgram.cs    |   6 +
 MediaBrowser.Controller/LiveTv/ProgramInfo.cs      |   5 +
 .../Library/SearchEngine.cs                        | 272 ++++++---------------
 .../Library/Validators/GameGenresValidator.cs      |  27 +-
 .../Library/Validators/GenresValidator.cs          |  27 +-
 .../Library/Validators/MusicGenresValidator.cs     |  28 ++-
 .../Library/Validators/StudiosValidator.cs         |  28 ++-
 .../LiveTv/EmbyTV/EmbyTV.cs                        |  18 +-
 .../LiveTv/Listings/SchedulesDirect.cs             |   5 +-
 .../LiveTv/LiveTvManager.cs                        |   9 +-
 MediaBrowser.WebDashboard/Api/PackageCreator.cs    |   2 +-
 .../MediaBrowser.WebDashboard.csproj               |  18 +-
 13 files changed, 224 insertions(+), 222 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index c4917b0d1..cd5c39173 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -485,6 +485,7 @@ namespace MediaBrowser.Controller.Entities
         /// Gets or sets the parent.
         /// </summary>
         /// <value>The parent.</value>
+        [IgnoreDataMember]
         public Folder Parent
         {
             get
diff --git a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs
index 14944d36f..12052905f 100644
--- a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs
+++ b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs
@@ -30,6 +30,12 @@ namespace MediaBrowser.Controller.LiveTv
             return GetClientTypeName() + "-" + Name;
         }
 
+        /// <summary>
+        /// Gets or sets the etag.
+        /// </summary>
+        /// <value>The etag.</value>
+        public string Etag { get; set; }
+        
         /// <summary>
         /// Id of the program.
         /// </summary>
diff --git a/MediaBrowser.Controller/LiveTv/ProgramInfo.cs b/MediaBrowser.Controller/LiveTv/ProgramInfo.cs
index 467264e7a..a6a3e6108 100644
--- a/MediaBrowser.Controller/LiveTv/ProgramInfo.cs
+++ b/MediaBrowser.Controller/LiveTv/ProgramInfo.cs
@@ -180,6 +180,11 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <value>The episode number.</value>
         public int? EpisodeNumber { get; set; }
+        /// <summary>
+        /// Gets or sets the etag.
+        /// </summary>
+        /// <value>The etag.</value>
+        public string Etag { get; set; }
         
         public ProgramInfo()
         {
diff --git a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
index 21e92786d..d4ff89b4f 100644
--- a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
+++ b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
@@ -33,26 +33,17 @@ namespace MediaBrowser.Server.Implementations.Library
 
         public async Task<QueryResult<SearchHintInfo>> GetSearchHints(SearchQuery query)
         {
-            IEnumerable<BaseItem> inputItems;
-
-            Func<BaseItem, bool> filter = i => !(i is ICollectionFolder);
-
             User user = null;
 
             if (string.IsNullOrWhiteSpace(query.UserId))
             {
-                inputItems = _libraryManager.RootFolder.GetRecursiveChildren(filter);
             }
             else
             {
                 user = _userManager.GetUserById(query.UserId);
-
-                inputItems = user.RootFolder.GetRecursiveChildren(user, filter);
             }
 
-            inputItems = _libraryManager.ReplaceVideosWithPrimaryVersions(inputItems);
-
-            var results = await GetSearchHints(inputItems, query, user).ConfigureAwait(false);
+            var results = await GetSearchHints(query, user).ConfigureAwait(false);
 
             var searchResultArray = results.ToArray();
             results = searchResultArray;
@@ -77,15 +68,22 @@ namespace MediaBrowser.Server.Implementations.Library
             };
         }
 
+        private void AddIfMissing(List<string> list, string value)
+        {
+            if (!list.Contains(value, StringComparer.OrdinalIgnoreCase))
+            {
+                list.Add(value);
+            }
+        }
+
         /// <summary>
         /// Gets the search hints.
         /// </summary>
-        /// <param name="inputItems">The input items.</param>
         /// <param name="query">The query.</param>
         /// <param name="user">The user.</param>
         /// <returns>IEnumerable{SearchHintResult}.</returns>
         /// <exception cref="System.ArgumentNullException">searchTerm</exception>
-        private Task<IEnumerable<SearchHintInfo>> GetSearchHints(IEnumerable<BaseItem> inputItems, SearchQuery query, User user)
+        private Task<IEnumerable<SearchHintInfo>> GetSearchHints(SearchQuery query, User user)
         {
             var searchTerm = query.SearchTerm;
 
@@ -100,207 +98,80 @@ namespace MediaBrowser.Server.Implementations.Library
 
             var hints = new List<Tuple<BaseItem, string, int>>();
 
-            var items = inputItems.Where(i => !(i is MusicArtist)).ToList();
+            var excludeItemTypes = new List<string>();
+            var includeItemTypes = (query.IncludeItemTypes ?? new string[] { }).ToList();
 
-            if (query.IncludeMedia)
-            {
-                var mediaItems = _libraryManager.GetItems(new InternalItemsQuery
-                {
-                    NameContains = searchTerm,
-                    ExcludeItemTypes = new[]
-                    {
-                        typeof (Person).Name,
-                        typeof (Genre).Name,
-                        typeof (MusicArtist).Name,
-                        typeof (GameGenre).Name,
-                        typeof (MusicGenre).Name,
-                        typeof (Year).Name,
-                        typeof (Studio).Name
-                    },
-                    IncludeItemTypes = query.IncludeItemTypes
-
-                }).Items;
-
-                // Add search hints based on item name
-                hints.AddRange(mediaItems.Where(i => IncludeInSearch(i) && (user == null || i.IsVisibleStandalone(user)) && !(i is CollectionFolder)).Select(item =>
-                {
-                    var index = GetIndex(item.Name, searchTerm, terms);
+            excludeItemTypes.Add(typeof(Year).Name);
 
-                    return new Tuple<BaseItem, string, int>(item, index.Item1, index.Item2);
-                }));
-            }
-
-            if (query.IncludeArtists && (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains("MusicArtist", StringComparer.OrdinalIgnoreCase)))
+            if (query.IncludeGenres && (includeItemTypes.Count == 0 || includeItemTypes.Contains("Genre", StringComparer.OrdinalIgnoreCase)))
             {
-                // Find artists
-                var artists = items.OfType<Audio>()
-                    .SelectMany(i => i.AllArtists)
-                    .Where(i => !string.IsNullOrWhiteSpace(i))
-                    .DistinctNames()
-                    .ToList();
-
-                foreach (var item in artists)
+                if (!query.IncludeMedia)
                 {
-                    var index = GetIndex(item, searchTerm, terms);
-
-                    if (index.Item2 != -1)
-                    {
-                        try
-                        {
-                            var artist = _libraryManager.GetArtist(item);
-
-                            hints.Add(new Tuple<BaseItem, string, int>(artist, index.Item1, index.Item2));
-                        }
-                        catch (Exception ex)
-                        {
-                            _logger.ErrorException("Error getting {0}", ex, item);
-                        }
-                    }
+                    AddIfMissing(includeItemTypes, typeof(Genre).Name);
+                    AddIfMissing(includeItemTypes, typeof(GameGenre).Name);
+                    AddIfMissing(includeItemTypes, typeof(MusicGenre).Name);
                 }
             }
-
-            if (query.IncludeGenres && (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains("Genre", StringComparer.OrdinalIgnoreCase)))
+            else
             {
-                // Find genres, from non-audio items
-                var genres = items.Where(i => !(i is IHasMusicGenres) && !(i is Game))
-                    .SelectMany(i => i.Genres)
-                    .Where(i => !string.IsNullOrWhiteSpace(i))
-                    .Distinct(StringComparer.OrdinalIgnoreCase)
-                    .ToList();
-
-                foreach (var item in genres)
-                {
-                    var index = GetIndex(item, searchTerm, terms);
-
-                    if (index.Item2 != -1)
-                    {
-                        try
-                        {
-                            var genre = _libraryManager.GetGenre(item);
-
-                            hints.Add(new Tuple<BaseItem, string, int>(genre, index.Item1, index.Item2));
-                        }
-                        catch (Exception ex)
-                        {
-                            _logger.ErrorException("Error getting {0}", ex, item);
-                        }
-                    }
-                }
-
-                // Find music genres
-                var musicGenres = items.Where(i => i is IHasMusicGenres)
-                    .SelectMany(i => i.Genres)
-                    .Where(i => !string.IsNullOrWhiteSpace(i))
-                    .Distinct(StringComparer.OrdinalIgnoreCase)
-                    .ToList();
+                AddIfMissing(excludeItemTypes, typeof(Genre).Name);
+                AddIfMissing(excludeItemTypes, typeof(GameGenre).Name);
+                AddIfMissing(excludeItemTypes, typeof(MusicGenre).Name);
+            }
 
-                foreach (var item in musicGenres)
+            if (query.IncludePeople && (includeItemTypes.Count == 0 || includeItemTypes.Contains("People", StringComparer.OrdinalIgnoreCase)))
+            {
+                if (!query.IncludeMedia)
                 {
-                    var index = GetIndex(item, searchTerm, terms);
-
-                    if (index.Item2 != -1)
-                    {
-                        try
-                        {
-                            var genre = _libraryManager.GetMusicGenre(item);
-
-                            hints.Add(new Tuple<BaseItem, string, int>(genre, index.Item1, index.Item2));
-                        }
-                        catch (Exception ex)
-                        {
-                            _logger.ErrorException("Error getting {0}", ex, item);
-                        }
-                    }
+                    AddIfMissing(includeItemTypes, typeof(Person).Name);
                 }
+            }
+            else
+            {
+                AddIfMissing(excludeItemTypes, typeof(Person).Name);
+            }
 
-                // Find music genres
-                var gameGenres = items.OfType<Game>()
-                    .SelectMany(i => i.Genres)
-                    .Where(i => !string.IsNullOrWhiteSpace(i))
-                    .Distinct(StringComparer.OrdinalIgnoreCase)
-                    .ToList();
-
-                foreach (var item in gameGenres)
+            if (query.IncludeStudios && (includeItemTypes.Count == 0 || includeItemTypes.Contains("Studio", StringComparer.OrdinalIgnoreCase)))
+            {
+                if (!query.IncludeMedia)
                 {
-                    var index = GetIndex(item, searchTerm, terms);
-
-                    if (index.Item2 != -1)
-                    {
-                        try
-                        {
-                            var genre = _libraryManager.GetGameGenre(item);
-
-                            hints.Add(new Tuple<BaseItem, string, int>(genre, index.Item1, index.Item2));
-                        }
-                        catch (Exception ex)
-                        {
-                            _logger.ErrorException("Error getting {0}", ex, item);
-                        }
-                    }
+                    AddIfMissing(includeItemTypes, typeof(Studio).Name);
                 }
             }
-
-            if (query.IncludeStudios && (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains("Studio", StringComparer.OrdinalIgnoreCase)))
+            else
             {
-                // Find studios
-                var studios = items.SelectMany(i => i.Studios)
-                    .Where(i => !string.IsNullOrWhiteSpace(i))
-                    .Distinct(StringComparer.OrdinalIgnoreCase)
-                    .ToList();
+                AddIfMissing(excludeItemTypes, typeof(Studio).Name);
+            }
 
-                foreach (var item in studios)
+            if (query.IncludeArtists && (includeItemTypes.Count == 0 || includeItemTypes.Contains("MusicArtist", StringComparer.OrdinalIgnoreCase)))
+            {
+                if (!query.IncludeMedia)
                 {
-                    var index = GetIndex(item, searchTerm, terms);
-
-                    if (index.Item2 != -1)
-                    {
-                        try
-                        {
-                            var studio = _libraryManager.GetStudio(item);
-
-                            hints.Add(new Tuple<BaseItem, string, int>(studio, index.Item1, index.Item2));
-                        }
-                        catch (Exception ex)
-                        {
-                            _logger.ErrorException("Error getting {0}", ex, item);
-                        }
-                    }
+                    AddIfMissing(includeItemTypes, typeof(MusicArtist).Name);
                 }
             }
+            else
+            {
+                AddIfMissing(excludeItemTypes, typeof(MusicArtist).Name);
+            }
 
-            if (query.IncludePeople && (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains("Person", StringComparer.OrdinalIgnoreCase)))
+            var mediaItems = _libraryManager.GetItems(new InternalItemsQuery
             {
-                var itemIds = items.Select(i => i.Id).ToList();
+                NameContains = searchTerm,
+                ExcludeItemTypes = excludeItemTypes.ToArray(),
+                IncludeItemTypes = includeItemTypes.ToArray(),
+                MaxParentalRating = user == null ? null : user.Policy.MaxParentalRating,
+                Limit = query.Limit.HasValue ? query.Limit * 3 : null
 
-                // Find persons
-                var persons = _libraryManager.GetPeople(new InternalPeopleQuery
-                {
-                    NameContains = searchTerm
-                })
-                    .Where(i => itemIds.Contains(i.ItemId))
-                    .Select(i => i.Name)
-                    .Distinct(StringComparer.OrdinalIgnoreCase)
-                    .ToList();
-
-                foreach (var item in persons)
-                {
-                    var index = GetIndex(item, searchTerm, terms);
+            }).Items;
 
-                    if (index.Item2 != -1)
-                    {
-                        try
-                        {
-                            var person = _libraryManager.GetPerson(item);
-
-                            hints.Add(new Tuple<BaseItem, string, int>(person, index.Item1, index.Item2));
-                        }
-                        catch (Exception ex)
-                        {
-                            _logger.ErrorException("Error getting {0}", ex, item);
-                        }
-                    }
-                }
-            }
+            // Add search hints based on item name
+            hints.AddRange(mediaItems.Where(i => IncludeInSearch(i) && IsVisible(i, user) && !(i is CollectionFolder)).Select(item =>
+            {
+                var index = GetIndex(item.Name, searchTerm, terms);
+
+                return new Tuple<BaseItem, string, int>(item, index.Item1, index.Item2);
+            }));
 
             var returnValue = hints.Where(i => i.Item3 >= 0).OrderBy(i => i.Item3).Select(i => new SearchHintInfo
             {
@@ -311,13 +182,32 @@ namespace MediaBrowser.Server.Implementations.Library
             return Task.FromResult(returnValue);
         }
 
+        private bool IsVisible(BaseItem item, User user)
+        {
+            if (user == null)
+            {
+                return true;
+            }
+
+            if (item is IItemByName)
+            {
+                var dual = item as IHasDualAccess;
+                if (dual == null || dual.IsAccessedByName)
+                {
+                    return true;
+                }
+            }
+
+            return item.IsVisibleStandalone(user);
+        }
+
         private bool IncludeInSearch(BaseItem item)
         {
             var episode = item as Episode;
 
             if (episode != null)
             {
-                if (episode.IsVirtualUnaired || episode.IsMissingEpisode)
+                if (episode.IsMissingEpisode)
                 {
                     return false;
                 }
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs
index fe2e6a114..ee06fecdf 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.Entities;
+using System.Collections.Generic;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Logging;
 using System;
@@ -42,12 +43,16 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
             var numComplete = 0;
             var count = items.Count;
 
+            var validIds = new List<Guid>();
+
             foreach (var name in items)
             {
                 try
                 {
                     var itemByName = _libraryManager.GetGameGenre(name);
 
+                    validIds.Add(itemByName.Id);
+
                     await itemByName.RefreshMetadata(cancellationToken).ConfigureAwait(false);
                 }
                 catch (OperationCanceledException)
@@ -68,6 +73,26 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 progress.Report(percent);
             }
 
+            var allIds = _libraryManager.GetItemIds(new InternalItemsQuery
+            {
+                IncludeItemTypes = new[] { typeof(GameGenre).Name }
+            });
+
+            var invalidIds = allIds
+                .Except(validIds)
+                .ToList();
+
+            foreach (var id in invalidIds)
+            {
+                var item = _libraryManager.GetItemById(id);
+
+                await _libraryManager.DeleteItem(item, new DeleteOptions
+                {
+                    DeleteFileLocation = false
+
+                }).ConfigureAwait(false);
+            }
+
             progress.Report(100);
         }
     }
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs
index fac5cfc35..6ab70ea22 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.Entities;
+using System.Collections.Generic;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Logging;
@@ -43,12 +44,16 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
             var numComplete = 0;
             var count = items.Count;
 
+            var validIds = new List<Guid>();
+            
             foreach (var name in items)
             {
                 try
                 {
                     var itemByName = _libraryManager.GetGenre(name);
 
+                    validIds.Add(itemByName.Id);
+
                     await itemByName.RefreshMetadata(cancellationToken).ConfigureAwait(false);
                 }
                 catch (OperationCanceledException)
@@ -69,6 +74,26 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 progress.Report(percent);
             }
 
+            var allIds = _libraryManager.GetItemIds(new InternalItemsQuery
+            {
+                IncludeItemTypes = new[] { typeof(Genre).Name }
+            });
+
+            var invalidIds = allIds
+                .Except(validIds)
+                .ToList();
+
+            foreach (var id in invalidIds)
+            {
+                var item = _libraryManager.GetItemById(id);
+
+                await _libraryManager.DeleteItem(item, new DeleteOptions
+                {
+                    DeleteFileLocation = false
+
+                }).ConfigureAwait(false);
+            }
+
             progress.Report(100);
         }
     }
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs
index e3be75e9b..8be0f4349 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs
@@ -1,4 +1,6 @@
-using MediaBrowser.Controller.Entities.Audio;
+using System.Collections.Generic;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Logging;
 using System;
@@ -42,12 +44,16 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
             var numComplete = 0;
             var count = items.Count;
 
+            var validIds = new List<Guid>();
+
             foreach (var name in items)
             {
                 try
                 {
                     var itemByName = _libraryManager.GetMusicGenre(name);
 
+                    validIds.Add(itemByName.Id);
+
                     await itemByName.RefreshMetadata(cancellationToken).ConfigureAwait(false);
                 }
                 catch (OperationCanceledException)
@@ -68,6 +74,26 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 progress.Report(percent);
             }
 
+            var allIds = _libraryManager.GetItemIds(new InternalItemsQuery
+            {
+                IncludeItemTypes = new[] { typeof(MusicGenre).Name }
+            });
+
+            var invalidIds = allIds
+                .Except(validIds)
+                .ToList();
+
+            foreach (var id in invalidIds)
+            {
+                var item = _libraryManager.GetItemById(id);
+
+                await _libraryManager.DeleteItem(item, new DeleteOptions
+                {
+                    DeleteFileLocation = false
+
+                }).ConfigureAwait(false);
+            }
+
             progress.Report(100);
         }
     }
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs
index 066b96853..c90cbb2f0 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs
@@ -1,6 +1,8 @@
-using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Logging;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -41,12 +43,16 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
             var numComplete = 0;
             var count = items.Count;
 
+            var validIds = new List<Guid>();
+
             foreach (var name in items)
             {
                 try
                 {
                     var itemByName = _libraryManager.GetStudio(name);
 
+                    validIds.Add(itemByName.Id);
+
                     await itemByName.RefreshMetadata(cancellationToken).ConfigureAwait(false);
                 }
                 catch (OperationCanceledException)
@@ -67,6 +73,26 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 progress.Report(percent);
             }
 
+            var allIds = _libraryManager.GetItemIds(new InternalItemsQuery
+            {
+                IncludeItemTypes = new[] { typeof(Studio).Name }
+            });
+
+            var invalidIds = allIds
+                .Except(validIds)
+                .ToList();
+
+            foreach (var id in invalidIds)
+            {
+                var item = _libraryManager.GetItemById(id);
+
+                await _libraryManager.DeleteItem(item, new DeleteOptions
+                {
+                    DeleteFileLocation = false
+
+                }).ConfigureAwait(false);
+            }
+
             progress.Report(100);
         }
     }
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 708828d47..3c65ac739 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -627,31 +627,17 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
 
         private async Task UpdateTimersForSeriesTimer(List<ProgramInfo> epgData, SeriesTimerInfo seriesTimer)
         {
-            var newTimers = GetTimersForSeries(seriesTimer, epgData, _recordingProvider.GetAll()).ToList();
-
-            var existingTimers = _timerProvider.GetAll()
-                .Where(i => string.Equals(i.SeriesTimerId, seriesTimer.Id, StringComparison.OrdinalIgnoreCase))
-                .ToList();
-
             var registration = await GetRegistrationInfo("seriesrecordings").ConfigureAwait(false);
 
             if (registration.IsValid)
             {
+                var newTimers = GetTimersForSeries(seriesTimer, epgData, _recordingProvider.GetAll()).ToList();
+
                 foreach (var timer in newTimers)
                 {
                     _timerProvider.AddOrUpdate(timer);
                 }
             }
-
-            var newTimerIds = newTimers.Select(i => i.Id).ToList();
-
-            foreach (var timer in existingTimers)
-            {
-                if (!newTimerIds.Contains(timer.Id, StringComparer.OrdinalIgnoreCase))
-                {
-                    CancelTimerInternal(timer.Id);
-                }
-            }
         }
 
         private IEnumerable<TimerInfo> GetTimersForSeries(SeriesTimerInfo seriesTimer, IEnumerable<ProgramInfo> allPrograms, IReadOnlyList<RecordingInfo> currentRecordings)
diff --git a/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs b/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
index 7a6860d65..129f922b3 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
@@ -304,7 +304,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
                 IsKids = string.Equals(details.audience, "children", StringComparison.OrdinalIgnoreCase),
                 IsSports = showType.IndexOf("sports", StringComparison.OrdinalIgnoreCase) != -1,
                 IsMovie = showType.IndexOf("movie", StringComparison.OrdinalIgnoreCase) != -1 || showType.IndexOf("film", StringComparison.OrdinalIgnoreCase) != -1,
-                ShowId = programInfo.programID
+                ShowId = programInfo.programID,
+                Etag = programInfo.md5
             };
 
             if (programInfo.videoProperties != null)
@@ -408,7 +409,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
                 ;
             });
             imageIdString = imageIdString.TrimEnd(',') + "]";
-            _logger.Debug("Json for show images = " + imageIdString);
+
             var httpOptions = new HttpRequestOptions()
             {
                 Url = ApiUrl + "/metadata/programs",
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 4109617db..1721d6101 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -593,7 +593,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                     Name = info.Name,
                     Id = id,
                     DateCreated = DateTime.UtcNow,
-                    DateModified = DateTime.UtcNow
+                    DateModified = DateTime.UtcNow,
+                    Etag = info.Etag
                 };
             }
 
@@ -639,7 +640,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             }
             else
             {
-                await _libraryManager.UpdateItem(item, ItemUpdateType.MetadataImport, cancellationToken).ConfigureAwait(false);
+                if (string.IsNullOrWhiteSpace(info.Etag) || !string.Equals(info.Etag, item.Etag, StringComparison.OrdinalIgnoreCase))
+                {
+                    item.Etag = info.Etag;
+                    await _libraryManager.UpdateItem(item, ItemUpdateType.MetadataImport, cancellationToken).ConfigureAwait(false);
+                }
             }
 
             _providerManager.QueueRefresh(item.Id, new MetadataRefreshOptions());
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index 104d02bcf..463c8829c 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -61,7 +61,7 @@ namespace MediaBrowser.WebDashboard.Api
                 // jQuery ajax doesn't seem to handle if-modified-since correctly
                 if (IsFormat(path, "html"))
                 {
-                    if (IsCoreHtml(path))
+                    if (IsCoreHtml(path) && path.IndexOf(".template.html", StringComparison.OrdinalIgnoreCase) == -1)
                     {
                         resourceStream = await ModifyHtml(resourceStream, mode, appVersion, localizationCulture, enableMinification).ConfigureAwait(false);
                     }
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index e256cdb7c..4820535d0 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -186,9 +186,6 @@
     <Content Include="dashboard-ui\css\nowplayingbar.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\livetvguideprovider-scd.html">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\livetvguideprovider.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -222,9 +219,6 @@
     <Content Include="dashboard-ui\scripts\homeupcoming.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\scripts\livetvguideprovider-scd.js">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\scripts\livetvguideprovider.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -264,6 +258,9 @@
     <Content Include="dashboard-ui\scripts\slideshow.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\scripts\wizardlivetvguide.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\scripts\wizardlivetvtuner.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -377,6 +374,12 @@
     <Content Include="dashboard-ui\thirdparty\viblast\worker.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\tvproviders\schedulesdirect.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="dashboard-ui\tvproviders\schedulesdirect.template.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\voice\voice.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -1786,6 +1789,9 @@
     <Content Include="dashboard-ui\wizardagreement.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\wizardlivetvguide.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\wizardlivetvtuner.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-- 
cgit v1.2.3


From fafa879eef6c1fd7590bab78f842cf997251f5ab Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 22 Aug 2015 13:50:37 -0400
Subject: keep channels db clean

---
 .../Channels/ChannelPostScanTask.cs                | 61 +++++++++++++++++++++-
 .../Channels/RefreshChannelsScheduledTask.cs       |  6 ++-
 .../Library/Validators/GameGenresValidator.cs      |  2 +
 .../Library/Validators/GenresValidator.cs          |  2 +
 .../Library/Validators/MusicGenresValidator.cs     |  2 +
 .../Library/Validators/PeopleValidator.cs          | 42 +++++++++++++--
 .../Library/Validators/StudiosValidator.cs         |  2 +
 .../LiveTv/EmbyTV/EmbyTV.cs                        |  2 +-
 8 files changed, 110 insertions(+), 9 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs b/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs
index b9f03fbc6..976fa5615 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs
@@ -18,12 +18,14 @@ namespace MediaBrowser.Server.Implementations.Channels
         private readonly IChannelManager _channelManager;
         private readonly IUserManager _userManager;
         private readonly ILogger _logger;
+        private readonly ILibraryManager _libraryManager;
 
-        public ChannelPostScanTask(IChannelManager channelManager, IUserManager userManager, ILogger logger)
+        public ChannelPostScanTask(IChannelManager channelManager, IUserManager userManager, ILogger logger, ILibraryManager libraryManager)
         {
             _channelManager = channelManager;
             _userManager = userManager;
             _logger = logger;
+            _libraryManager = libraryManager;
         }
 
         public async Task Run(IProgress<double> progress, CancellationToken cancellationToken)
@@ -52,6 +54,8 @@ namespace MediaBrowser.Server.Implementations.Channels
                 progress.Report(percent * 100);
             }
 
+            await CleanDatabase(cancellationToken).ConfigureAwait(false);
+            
             progress.Report(100);
         }
 
@@ -63,7 +67,7 @@ namespace MediaBrowser.Server.Implementations.Channels
 
             return string.Join("|", channels.ToArray());
         }
-        
+
         private async Task DownloadContent(string user, CancellationToken cancellationToken, IProgress<double> progress)
         {
             var channels = await _channelManager.GetChannelsInternal(new ChannelQuery
@@ -116,6 +120,59 @@ namespace MediaBrowser.Server.Implementations.Channels
             progress.Report(100);
         }
 
+        private async Task CleanDatabase(CancellationToken cancellationToken)
+        {
+            var allChannels = await _channelManager.GetChannelsInternal(new ChannelQuery { }, cancellationToken);
+
+            var allIds = _libraryManager.GetItemIds(new InternalItemsQuery
+            {
+                IncludeItemTypes = new[] { typeof(Channel).Name }
+            });
+
+            var invalidIds = allIds
+                .Except(allChannels.Items.Select(i => i.Id).ToList())
+                .ToList();
+
+            foreach (var id in invalidIds)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                await CleanChannel(id, cancellationToken).ConfigureAwait(false);
+            }
+        }
+
+        private async Task CleanChannel(Guid id, CancellationToken cancellationToken)
+        {
+            _logger.Debug("Cleaning channel {0} from database", id);
+
+            // Delete all channel items
+            var allIds = _libraryManager.GetItemIds(new InternalItemsQuery
+            {
+                ChannelIds = new[] { id.ToString("N") }
+            });
+
+            foreach (var deleteId in allIds)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                await DeleteItem(deleteId).ConfigureAwait(false);
+            }
+
+            // Finally, delete the channel itself
+            await DeleteItem(id).ConfigureAwait(false);
+        }
+
+        private Task DeleteItem(Guid id)
+        {
+            var item = _libraryManager.GetItemById(id);
+
+            return _libraryManager.DeleteItem(item, new DeleteOptions
+            {
+                DeleteFileLocation = false
+
+            });
+        }
+
         private async Task GetAllItems(string user, string channelId, string folderId, int currentRefreshLevel, int maxRefreshLevel, IProgress<double> progress, CancellationToken cancellationToken)
         {
             var folderItems = new List<string>();
diff --git a/MediaBrowser.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs b/MediaBrowser.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
index df94580a5..005bbb852 100644
--- a/MediaBrowser.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
@@ -13,12 +13,14 @@ namespace MediaBrowser.Server.Implementations.Channels
         private readonly IChannelManager _channelManager;
         private readonly IUserManager _userManager;
         private readonly ILogger _logger;
+        private readonly ILibraryManager _libraryManager;
 
-        public RefreshChannelsScheduledTask(IChannelManager channelManager, IUserManager userManager, ILogger logger)
+        public RefreshChannelsScheduledTask(IChannelManager channelManager, IUserManager userManager, ILogger logger, ILibraryManager libraryManager)
         {
             _channelManager = channelManager;
             _userManager = userManager;
             _logger = logger;
+            _libraryManager = libraryManager;
         }
 
         public string Name
@@ -42,7 +44,7 @@ namespace MediaBrowser.Server.Implementations.Channels
 
             await manager.RefreshChannels(new Progress<double>(), cancellationToken).ConfigureAwait(false);
 
-            await new ChannelPostScanTask(_channelManager, _userManager, _logger).Run(progress, cancellationToken)
+            await new ChannelPostScanTask(_channelManager, _userManager, _logger, _libraryManager).Run(progress, cancellationToken)
                     .ConfigureAwait(false);
         }
 
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs
index ee06fecdf..b57e128d3 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs
@@ -84,6 +84,8 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
 
             foreach (var id in invalidIds)
             {
+                cancellationToken.ThrowIfCancellationRequested();
+                
                 var item = _libraryManager.GetItemById(id);
 
                 await _libraryManager.DeleteItem(item, new DeleteOptions
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs
index 6ab70ea22..11d4c9f16 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs
@@ -85,6 +85,8 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
 
             foreach (var id in invalidIds)
             {
+                cancellationToken.ThrowIfCancellationRequested();
+                
                 var item = _libraryManager.GetItemById(id);
 
                 await _libraryManager.DeleteItem(item, new DeleteOptions
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs
index 8be0f4349..0a66b4b41 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs
@@ -85,6 +85,8 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
 
             foreach (var id in invalidIds)
             {
+                cancellationToken.ThrowIfCancellationRequested();
+                
                 var item = _libraryManager.GetItemById(id);
 
                 await _libraryManager.DeleteItem(item, new DeleteOptions
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/PeopleValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/PeopleValidator.cs
index ef9dee8b5..a4c43af5d 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/PeopleValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/PeopleValidator.cs
@@ -92,15 +92,25 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
 
             foreach (var person in people)
             {
-                bool current;
-                if (!dict.TryGetValue(person.Name, out current) || !current)
+                var isMetadataEnabled = DownloadMetadata(person, peopleOptions);
+
+                bool currentValue;
+                if (dict.TryGetValue(person.Name, out currentValue))
+                {
+                    if (!currentValue && isMetadataEnabled)
+                    {
+                        dict[person.Name] = true;
+                    }
+                }
+                else
                 {
-                    dict[person.Name] = DownloadMetadata(person, peopleOptions);
+                    dict[person.Name] = isMetadataEnabled;
                 }
             }
 
             var numComplete = 0;
-
+            var validIds = new List<Guid>();
+            
             foreach (var person in dict)
             {
                 cancellationToken.ThrowIfCancellationRequested();
@@ -109,6 +119,8 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 {
                     var item = _libraryManager.GetPerson(person.Key);
 
+                    validIds.Add(item.Id);
+                    
                     var options = new MetadataRefreshOptions
                     {
                          MetadataRefreshMode = person.Value ? MetadataRefreshMode.Default : MetadataRefreshMode.ValidationOnly,
@@ -130,6 +142,28 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 progress.Report(100 * percent);
             }
 
+            var allIds = _libraryManager.GetItemIds(new InternalItemsQuery
+            {
+                IncludeItemTypes = new[] { typeof(Person).Name }
+            });
+
+            var invalidIds = allIds
+                .Except(validIds)
+                .ToList();
+
+            foreach (var id in invalidIds)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                var item = _libraryManager.GetItemById(id);
+
+                await _libraryManager.DeleteItem(item, new DeleteOptions
+                {
+                    DeleteFileLocation = false
+
+                }).ConfigureAwait(false);
+            }
+
             progress.Report(100);
 
             _logger.Info("People validation complete");
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs
index c90cbb2f0..c122d64d3 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs
@@ -84,6 +84,8 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
 
             foreach (var id in invalidIds)
             {
+                cancellationToken.ThrowIfCancellationRequested();
+                
                 var item = _libraryManager.GetItemById(id);
 
                 await _libraryManager.DeleteItem(item, new DeleteOptions
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 9b7e83894..d4b02568a 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -21,7 +21,7 @@ using System.Threading.Tasks;
 
 namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
 {
-    public class EmbyTV : ILiveTvService, IHasRegistrationInfo, IDisposable
+    public class EmbyTV : ILiveTvService/*, IHasRegistrationInfo*/, IDisposable
     {
         private readonly IApplicationHost _appHpst;
         private readonly ILogger _logger;
-- 
cgit v1.2.3


From 474cbbb87a51cb0fe82c408789c75b3971b58227 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 23 Aug 2015 22:08:20 -0400
Subject: added default padding settings

---
 MediaBrowser.Model/LiveTv/LiveTvOptions.cs                  |  5 ++++-
 .../Library/LibraryManager.cs                               |  2 +-
 .../Library/MediaSourceManager.cs                           |  5 ++++-
 MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs |  6 ++++--
 MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs |  3 +--
 .../LiveTv/LiveTvMediaSourceProvider.cs                     |  7 ++++++-
 .../LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs            | 13 +++++++++++--
 SharedVersion.cs                                            |  4 ++--
 8 files changed, 33 insertions(+), 12 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
index 7881231a2..2b45422ec 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
@@ -11,7 +11,10 @@ namespace MediaBrowser.Model.LiveTv
 
         public List<TunerHostInfo> TunerHosts { get; set; }
         public List<ListingsProviderInfo> ListingProviders { get; set; }
- 
+
+        public int PrePaddingSeconds { get; set; }
+        public int PostPaddingSeconds { get; set; }
+        
         public LiveTvOptions()
         {
             EnableMovieProviders = true;
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index a67e3d732..cc9d9551c 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -937,7 +937,7 @@ namespace MediaBrowser.Server.Implementations.Library
                     (item as MusicArtist).IsAccessedByName = true;
                 }
 
-                var task = item.UpdateToRepository(ItemUpdateType.None, CancellationToken.None);
+                var task = CreateItem(item, CancellationToken.None);
                 Task.WaitAll(task);
             }
 
diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
index c5ff100f9..1f4dff277 100644
--- a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
@@ -483,7 +483,10 @@ namespace MediaBrowser.Server.Implementations.Library
 
             var provider = _providers.FirstOrDefault(i => string.Equals(i.GetType().FullName.GetMD5().ToString("N"), keys[0], StringComparison.OrdinalIgnoreCase));
 
-            return new Tuple<IMediaSourceProvider, string>(provider, keys[1]);
+            var splitIndex = key.IndexOf(LiveStreamIdDelimeter);
+            var keyId = key.Substring(splitIndex + 1);
+
+            return new Tuple<IMediaSourceProvider, string>(provider, keyId);
         }
 
         private Timer _closeTimer;
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 96e14a21c..b69cdacef 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -339,10 +339,12 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
 
         public Task<SeriesTimerInfo> GetNewTimerDefaultsAsync(CancellationToken cancellationToken, ProgramInfo program = null)
         {
+            var config = GetConfiguration();
+
             var defaults = new SeriesTimerInfo()
             {
-                PostPaddingSeconds = 0,
-                PrePaddingSeconds = 0,
+                PostPaddingSeconds = Math.Max(config.PostPaddingSeconds, 0),
+                PrePaddingSeconds = Math.Max(config.PrePaddingSeconds, 0),
                 RecordAnyChannel = false,
                 RecordAnyTime = false,
                 RecordNewOnly = false
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 1721d6101..653adb716 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -889,8 +889,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             if (query.Limit.HasValue)
             {
-                programs = programs.Take(query.Limit.Value)
-                    .OrderBy(i => i.StartDate);
+                programs = programs.Take(query.Limit.Value);
             }
 
             programList = programs.ToList();
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
index 66a21830e..d9d9b76b9 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
@@ -125,7 +125,12 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             const bool isAudio = false;
 
             var keys = openToken.Split(new[] { StreamIdDelimeter }, 3);
-            var mediaSourceId = keys.Length >= 3 ? keys[2] : null;
+            string mediaSourceId = null;
+
+            if (keys.Length >= 3)
+            {
+                mediaSourceId = openToken.Substring(keys[0].Length + keys[1].Length + 2);
+            }
 
             if (string.Equals(keys[0], typeof(LiveTvChannel).Name, StringComparison.OrdinalIgnoreCase))
             {
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
index 5890e24eb..4bbbf5a4d 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
@@ -22,7 +22,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
         private readonly IHttpClient _httpClient;
         private readonly IJsonSerializer _jsonSerializer;
 
-        public HdHomerunHost(IConfigurationManager config, ILogger logger, IHttpClient httpClient, IJsonSerializer jsonSerializer) : base(config, logger)
+        public HdHomerunHost(IConfigurationManager config, ILogger logger, IHttpClient httpClient, IJsonSerializer jsonSerializer)
+            : base(config, logger)
         {
             _httpClient = httpClient;
             _jsonSerializer = jsonSerializer;
@@ -166,6 +167,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
         {
             var url = info.Url;
 
+            if (string.IsNullOrWhiteSpace(url))
+            {
+                throw new ArgumentException("Invalid tuner info");
+            }
+
             if (!url.StartsWith("http", StringComparison.OrdinalIgnoreCase))
             {
                 url = "http://" + url;
@@ -382,7 +388,10 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
 
         public async Task Validate(TunerHostInfo info)
         {
-            await GetChannels(info, false, CancellationToken.None).ConfigureAwait(false);
+            if (info.IsEnabled)
+            {
+                await GetChannels(info, false, CancellationToken.None).ConfigureAwait(false);
+            }
         }
 
         protected override async Task<bool> IsAvailableInternal(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken)
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 3d8be801e..2b8644211 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-//[assembly: AssemblyVersion("3.0.*")]
-[assembly: AssemblyVersion("3.0.5713.0")]
+[assembly: AssemblyVersion("3.0.*")]
+//[assembly: AssemblyVersion("3.0.5713.0")]
-- 
cgit v1.2.3


From 9e387b2ecf44bf5613221fdbfbb873d725abe7b0 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 24 Aug 2015 08:54:10 -0400
Subject: 3.0.5713.1

---
 MediaBrowser.Api/Playback/BaseStreamingService.cs            |  2 +-
 .../Library/MediaSourceManager.cs                            |  5 +++++
 .../LiveTv/LiveTvMediaSourceProvider.cs                      | 12 +++---------
 SharedVersion.cs                                             |  4 ++--
 4 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 6fba6052f..33f3210a9 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -854,7 +854,7 @@ namespace MediaBrowser.Api.Playback
                 state.IsoMount = await IsoManager.Mount(state.MediaPath, cancellationTokenSource.Token).ConfigureAwait(false);
             }
 
-            if (state.MediaSource.RequiresOpening)
+            if (state.MediaSource.RequiresOpening && string.IsNullOrWhiteSpace(state.Request.LiveStreamId))
             {
                 var liveStreamResponse = await MediaSourceManager.OpenLiveStream(new LiveStreamRequest
                 {
diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
index 1f4dff277..e3ec99392 100644
--- a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
@@ -479,6 +479,11 @@ namespace MediaBrowser.Server.Implementations.Library
 
         private Tuple<IMediaSourceProvider, string> GetProvider(string key)
         {
+            if (string.IsNullOrWhiteSpace(key))
+            {
+                throw new ArgumentException("key");
+            }
+
             var keys = key.Split(new[] { LiveStreamIdDelimeter }, 2);
 
             var provider = _providers.FirstOrDefault(i => string.Equals(i.GetType().FullName.GetMD5().ToString("N"), keys[0], StringComparison.OrdinalIgnoreCase));
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
index d9d9b76b9..ff102b0f7 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
@@ -90,6 +90,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             foreach (var source in list)
             {
                 source.Type = MediaSourceType.Default;
+                source.BufferMs = source.BufferMs ?? 1500;
 
                 if (source.RequiresOpening || forceRequireOpening)
                 {
@@ -103,9 +104,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                     openKeys.Add(item.Id.ToString("N"));
                     openKeys.Add(source.Id ?? string.Empty);
                     source.OpenToken = string.Join(StreamIdDelimeterString, openKeys.ToArray());
-                }
-
-                source.BufferMs = source.BufferMs ?? 1500;
+                } 
 
                 // Dummy this up so that direct play checks can still run
                 if (string.IsNullOrEmpty(source.Path) && source.Protocol == MediaProtocol.Http)
@@ -125,12 +124,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             const bool isAudio = false;
 
             var keys = openToken.Split(new[] { StreamIdDelimeter }, 3);
-            string mediaSourceId = null;
-
-            if (keys.Length >= 3)
-            {
-                mediaSourceId = openToken.Substring(keys[0].Length + keys[1].Length + 2);
-            }
+            var mediaSourceId = keys.Length >= 3 ? keys[2] : null;
 
             if (string.Equals(keys[0], typeof(LiveTvChannel).Name, StringComparison.OrdinalIgnoreCase))
             {
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 2b8644211..d77ca5d8f 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.0.*")]
-//[assembly: AssemblyVersion("3.0.5713.0")]
+//[assembly: AssemblyVersion("3.0.*")]
+[assembly: AssemblyVersion("3.0.5713.1")]
-- 
cgit v1.2.3


From a0c3bb03809612763f7b06d4f82d2a44a6ed4182 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 28 Aug 2015 00:19:08 -0400
Subject: update live tv image

---
 MediaBrowser.Api/Music/InstantMixService.cs        |  16 +++
 MediaBrowser.Api/Playback/Hls/BaseHlsService.cs    |   7 +-
 MediaBrowser.Controller/Entities/BaseItem.cs       |   4 +
 .../Entities/InternalItemsQuery.cs                 |   3 +-
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs |  15 ++-
 MediaBrowser.Model/ApiClient/IApiClient.cs         |  27 +---
 .../Folders/DefaultImageProvider.cs                | 147 +++++++++++++++++++++
 .../MediaBrowser.Providers.csproj                  |   1 +
 .../Connect/ConnectEntryPoint.cs                   |   2 +-
 .../Connect/ConnectManager.cs                      |   2 +-
 .../Library/MusicManager.cs                        |  18 +++
 .../MediaBrowser.Server.Implementations.csproj     |   8 --
 .../Persistence/CleanDatabaseScheduledTask.cs      |  46 ++++++-
 .../Persistence/SqliteItemRepository.cs            |   8 ++
 .../UserViews/DynamicImageProvider.cs              |  39 +-----
 .../UserViews/livetv/1.jpg                         | Bin 62382 -> 0 bytes
 .../UserViews/livetv/2.jpg                         | Bin 20550 -> 0 bytes
 .../UserViews/livetv/3.jpg                         | Bin 27983 -> 0 bytes
 .../UserViews/livetv/4.jpg                         | Bin 75468 -> 0 bytes
 .../UserViews/livetv/5.jpg                         | Bin 50933 -> 0 bytes
 .../UserViews/livetv/6.jpg                         | Bin 15931 -> 0 bytes
 .../UserViews/livetv/7.jpg                         | Bin 19916 -> 0 bytes
 .../UserViews/livetv/8.jpg                         | Bin 67721 -> 0 bytes
 23 files changed, 262 insertions(+), 81 deletions(-)
 create mode 100644 MediaBrowser.Providers/Folders/DefaultImageProvider.cs
 delete mode 100644 MediaBrowser.Server.Implementations/UserViews/livetv/1.jpg
 delete mode 100644 MediaBrowser.Server.Implementations/UserViews/livetv/2.jpg
 delete mode 100644 MediaBrowser.Server.Implementations/UserViews/livetv/3.jpg
 delete mode 100644 MediaBrowser.Server.Implementations/UserViews/livetv/4.jpg
 delete mode 100644 MediaBrowser.Server.Implementations/UserViews/livetv/5.jpg
 delete mode 100644 MediaBrowser.Server.Implementations/UserViews/livetv/6.jpg
 delete mode 100644 MediaBrowser.Server.Implementations/UserViews/livetv/7.jpg
 delete mode 100644 MediaBrowser.Server.Implementations/UserViews/livetv/8.jpg

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/Music/InstantMixService.cs b/MediaBrowser.Api/Music/InstantMixService.cs
index 905ead86c..d2a4aa60c 100644
--- a/MediaBrowser.Api/Music/InstantMixService.cs
+++ b/MediaBrowser.Api/Music/InstantMixService.cs
@@ -54,6 +54,11 @@ namespace MediaBrowser.Api.Music
         public string Id { get; set; }
     }
 
+    [Route("/Items/{Id}/InstantMix", "GET", Summary = "Creates an instant playlist based on a given item")]
+    public class GetInstantMixFromItem : BaseGetSimilarItemsFromItem
+    {
+    }
+
     [Authenticated]
     public class InstantMixService : BaseApiService
     {
@@ -71,6 +76,17 @@ namespace MediaBrowser.Api.Music
             _libraryManager = libraryManager;
         }
 
+        public object Get(GetInstantMixFromItem request)
+        {
+            var item = _libraryManager.GetItemById(request.Id);
+
+            var user = _userManager.GetUserById(request.UserId);
+
+            var items = _musicManager.GetInstantMixFromItem(item, user);
+
+            return GetResult(items, user, request);
+        }
+
         public object Get(GetInstantMixFromArtistId request)
         {
             var item = _libraryManager.GetItemById(request.Id);
diff --git a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
index 1a152790a..61fd7a55a 100644
--- a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using MediaBrowser.Common.IO;
+using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Dlna;
@@ -317,6 +316,7 @@ namespace MediaBrowser.Api.Playback.Hls
         {
             if (videoStream.KeyFrames == null || videoStream.KeyFrames.Count == 0)
             {
+                Logger.Debug("Cannot stream copy video due to missing keyframe info");
                 return false;
             }
 
@@ -326,8 +326,9 @@ namespace MediaBrowser.Api.Playback.Hls
                 var length = frame - previousSegment;
 
                 // Don't allow really long segments because this could result in long download times
-                if (length > 10000)
+                if (length > 12000)
                 {
+                    Logger.Debug("Cannot stream copy video due to long segment length of {0}ms", length);
                     return false;
                 }
                 previousSegment = frame;
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index a333fc6e9..594b5ca93 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -419,6 +419,10 @@ namespace MediaBrowser.Controller.Entities
 
                 return _sortName ?? (_sortName = CreateSortName());
             }
+            set
+            {
+                _sortName = value;
+            }
         }
 
         public string GetInternalMetadataPath()
diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
index 53667c6e1..0af4972f7 100644
--- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
+++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
@@ -97,7 +97,8 @@ namespace MediaBrowser.Controller.Entities
         public int? MaxParentalRating { get; set; }
 
         public bool? IsCurrentSchema { get; set; }
-        
+        public bool? HasDeadParentId { get; set; }
+    
         public InternalItemsQuery()
         {
             Tags = new string[] { };
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index d30b105a5..d21a9dc3b 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -244,7 +244,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                         {
                             foreach (var stream in mediaInfo.MediaStreams)
                             {
-                                if (stream.Type == MediaStreamType.Video && string.Equals(stream.Codec, "h264", StringComparison.OrdinalIgnoreCase))
+                                if (stream.Type == MediaStreamType.Video && string.Equals(stream.Codec, "h264", StringComparison.OrdinalIgnoreCase) && !stream.IsInterlaced)
                                 {
                                     try
                                     {
@@ -282,7 +282,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
         private async Task<List<int>> GetKeyFrames(string inputPath, int videoStreamIndex, CancellationToken cancellationToken)
         {
-            const string args = "-i {0} -select_streams v:{1} -show_packets -print_format compact -show_entries packet=flags -show_entries packet=pts_time";
+            inputPath = inputPath.Split(new[] { ':' }, 2).Last().Trim('"');
+
+            const string args = "-show_packets -print_format compact -select_streams v:{1} -show_entries packet=flags -show_entries packet=pts_time \"{0}\"";
 
             var process = new Process
             {
@@ -330,7 +332,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 {
                     StopProcess(processWrapper, 100, true);
                 }
-
+                //_logger.Debug("Found keyframes {0}", string.Join(",", lines.ToArray()));
                 return lines;
             }
         }
@@ -347,7 +349,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
                         var line = await reader.ReadLineAsync().ConfigureAwait(false);
 
-                        var values = (line ?? string.Empty).Split('|')
+                        if (string.IsNullOrWhiteSpace(line))
+                        {
+                            continue;
+                        }
+
+                        var values = line.Split('|')
                             .Where(i => !string.IsNullOrWhiteSpace(i))
                             .Select(i => i.Split('='))
                             .Where(i => i.Length == 2)
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index c2524378e..6107c0fbe 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -320,32 +320,11 @@ namespace MediaBrowser.Model.ApiClient
         Task<ItemsResult> GetUserViews(string userId, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
-        /// Gets the instant mix from song async.
+        /// Gets the instant mix from item asynchronous.
         /// </summary>
         /// <param name="query">The query.</param>
-        /// <returns>Task{ItemsResult}.</returns>
-        Task<ItemsResult> GetInstantMixFromSongAsync(SimilarItemsQuery query);
-
-        /// <summary>
-        /// Gets the instant mix from album async.
-        /// </summary>
-        /// <param name="query">The query.</param>
-        /// <returns>Task{ItemsResult}.</returns>
-        Task<ItemsResult> GetInstantMixFromAlbumAsync(SimilarItemsQuery query);
-
-        /// <summary>
-        /// Gets the instant mix from artist async.
-        /// </summary>
-        /// <param name="query">The query.</param>
-        /// <returns>Task{ItemsResult}.</returns>
-        Task<ItemsResult> GetInstantMixFromArtistAsync(SimilarItemsQuery query);
-
-        /// <summary>
-        /// Gets the instant mix from music genre async.
-        /// </summary>
-        /// <param name="query">The query.</param>
-        /// <returns>Task{ItemsResult}.</returns>
-        Task<ItemsResult> GetInstantMixFromMusicGenreAsync(SimilarItemsQuery query);
+        /// <returns>Task&lt;ItemsResult&gt;.</returns>
+        Task<ItemsResult> GetInstantMixFromItemAsync(SimilarItemsQuery query);
 
         /// <summary>
         /// Gets the similar movies async.
diff --git a/MediaBrowser.Providers/Folders/DefaultImageProvider.cs b/MediaBrowser.Providers/Folders/DefaultImageProvider.cs
new file mode 100644
index 000000000..1fbe20d7f
--- /dev/null
+++ b/MediaBrowser.Providers/Folders/DefaultImageProvider.cs
@@ -0,0 +1,147 @@
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Providers;
+using MediaBrowser.Providers.Genres;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Providers.Folders
+{
+    public class DefaultImageProvider : IRemoteImageProvider, IHasItemChangeMonitor
+    {
+        private readonly IHttpClient _httpClient;
+
+        public DefaultImageProvider(IHttpClient httpClient)
+        {
+            _httpClient = httpClient;
+        }
+
+        public IEnumerable<ImageType> GetSupportedImages(IHasImages item)
+        {
+            return new List<ImageType>
+            {
+                ImageType.Primary,
+                ImageType.Thumb
+            };
+        }
+
+        public Task<IEnumerable<RemoteImageInfo>> GetImages(IHasImages item, CancellationToken cancellationToken)
+        {
+            var view = item as UserView;
+
+            if (view != null)
+            {
+                return GetImages(view.ViewType, cancellationToken);
+            }
+
+            var folder = (ICollectionFolder)item;
+            return GetImages(folder.CollectionType, cancellationToken);
+        }
+
+        private Task<IEnumerable<RemoteImageInfo>> GetImages(string viewType, CancellationToken cancellationToken)
+        {
+            var url = GetImageUrl(viewType);
+
+            var list = new List<RemoteImageInfo>();
+
+            if (!string.IsNullOrWhiteSpace(url))
+            {
+                    list.AddRange(new List<RemoteImageInfo>{
+                     new RemoteImageInfo
+                     {
+                          ProviderName = Name,
+                          Url = url,
+                          Type = ImageType.Primary
+                     },
+
+                     new RemoteImageInfo
+                     {
+                          ProviderName = Name,
+                          Url = url,
+                          Type = ImageType.Thumb
+                     }
+                });
+            }
+
+            return Task.FromResult<IEnumerable<RemoteImageInfo>>(list);
+        }
+
+        private string GetImageUrl(string viewType)
+        {
+            const string urlPrefix = "https://raw.githubusercontent.com/MediaBrowser/Emby.Resources/master/images/folders/";
+
+            if (string.Equals(viewType, CollectionType.Books, StringComparison.OrdinalIgnoreCase))
+            {
+                //return urlPrefix + "books.png";
+            }
+            if (string.Equals(viewType, CollectionType.Games, StringComparison.OrdinalIgnoreCase))
+            {
+                //return urlPrefix + "games.png";
+            }
+            if (string.Equals(viewType, CollectionType.Music, StringComparison.OrdinalIgnoreCase))
+            {
+                //return urlPrefix + "music.png";
+            }
+            if (string.Equals(viewType, CollectionType.Photos, StringComparison.OrdinalIgnoreCase))
+            {
+                //return urlPrefix + "photos.png";
+            }
+            if (string.Equals(viewType, CollectionType.TvShows, StringComparison.OrdinalIgnoreCase))
+            {
+                //return urlPrefix + "tv.png";
+            }
+            if (string.Equals(viewType, CollectionType.Channels, StringComparison.OrdinalIgnoreCase))
+            {
+                //return urlPrefix + "channels.png";
+            }
+            if (string.Equals(viewType, CollectionType.LiveTv, StringComparison.OrdinalIgnoreCase))
+            {
+                return urlPrefix + "livetv.png";
+            }
+            if (string.Equals(viewType, CollectionType.Movies, StringComparison.OrdinalIgnoreCase))
+            {
+                //return urlPrefix + "movies.png";
+            }
+
+            return null;
+            //return urlPrefix + "generic.png";
+        }
+
+        public string Name
+        {
+            get { return "Default Image Provider"; }
+        }
+
+        public bool Supports(IHasImages item)
+        {
+            var view = item as UserView;
+
+            if (view != null)
+            {
+                return !view.UserId.HasValue;
+            }
+
+            return item is ICollectionFolder;
+        }
+
+        public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
+        {
+            return _httpClient.GetResponse(new HttpRequestOptions
+            {
+                CancellationToken = cancellationToken,
+                Url = url,
+                ResourcePool = GenreImageProvider.ImageDownloadResourcePool
+            });
+        }
+
+        public bool HasChanged(IHasMetadata item, MetadataStatus status, IDirectoryService directoryService)
+        {
+            return GetSupportedImages(item).Any(i => !item.HasImage(i));
+        }
+    }
+}
diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index 444567afa..1d323e567 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -83,6 +83,7 @@
     <Compile Include="BoxSets\MovieDbBoxSetProvider.cs" />
     <Compile Include="Channels\ChannelMetadataService.cs" />
     <Compile Include="Chapters\ChapterManager.cs" />
+    <Compile Include="Folders\DefaultImageProvider.cs" />
     <Compile Include="Folders\FolderMetadataService.cs" />
     <Compile Include="Channels\AudioChannelItemMetadataService.cs" />
     <Compile Include="Folders\UserViewMetadataService.cs" />
diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectEntryPoint.cs b/MediaBrowser.Server.Implementations/Connect/ConnectEntryPoint.cs
index 973519a77..8a659fb65 100644
--- a/MediaBrowser.Server.Implementations/Connect/ConnectEntryPoint.cs
+++ b/MediaBrowser.Server.Implementations/Connect/ConnectEntryPoint.cs
@@ -41,7 +41,7 @@ namespace MediaBrowser.Server.Implementations.Connect
             _timer = new Timer(TimerCallback, null, TimeSpan.FromSeconds(5), TimeSpan.FromHours(3));
         }
 
-        private readonly string[] _ipLookups = { "http://bot.whatismyipaddress.com", "https://connect.mediabrowser.tv/service/ip" };
+        private readonly string[] _ipLookups = { "http://bot.whatismyipaddress.com", "https://connect.emby.media/service/ip" };
 
         private async void TimerCallback(object state)
         {
diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
index 4569503c0..7cd96c5f3 100644
--- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
+++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
@@ -371,7 +371,7 @@ namespace MediaBrowser.Server.Implementations.Connect
 
         private string GetConnectUrl(string handler)
         {
-            return "https://connect.mediabrowser.tv/service/" + handler;
+            return "https://connect.emby.media/service/" + handler;
         }
 
         public async Task<UserLinkResult> LinkUser(string userId, string connectUsername)
diff --git a/MediaBrowser.Server.Implementations/Library/MusicManager.cs b/MediaBrowser.Server.Implementations/Library/MusicManager.cs
index b83256342..683e6c5cc 100644
--- a/MediaBrowser.Server.Implementations/Library/MusicManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MusicManager.cs
@@ -52,6 +52,18 @@ namespace MediaBrowser.Server.Implementations.Library
             return GetInstantMixFromGenres(genres, user);
         }
 
+        public IEnumerable<Audio> GetInstantMixFromFolder(Folder item, User user)
+        {
+            var genres = item
+                .GetRecursiveChildren(user, i => i is Audio)
+               .Cast<Audio>()
+               .SelectMany(i => i.Genres)
+               .Concat(item.Genres)
+               .DistinctNames();
+
+            return GetInstantMixFromGenres(genres, user);
+        }
+
         public IEnumerable<Audio> GetInstantMixFromPlaylist(Playlist item, User user)
         {
             var genres = item
@@ -113,6 +125,12 @@ namespace MediaBrowser.Server.Implementations.Library
             {
                 return GetInstantMixFromSong(song, user);
             }
+
+            var folder = item as Folder;
+            if (folder != null)
+            {
+                return GetInstantMixFromFolder(folder, user);
+            }
             
             return new Audio[] { };
         }
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index b2da2489d..f0312cef6 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -495,14 +495,6 @@
       <Link>swagger-ui\swagger-ui.min.js</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <EmbeddedResource Include="UserViews\livetv\1.jpg" />
-    <EmbeddedResource Include="UserViews\livetv\2.jpg" />
-    <EmbeddedResource Include="UserViews\livetv\3.jpg" />
-    <EmbeddedResource Include="UserViews\livetv\4.jpg" />
-    <EmbeddedResource Include="UserViews\livetv\5.jpg" />
-    <EmbeddedResource Include="UserViews\livetv\6.jpg" />
-    <EmbeddedResource Include="UserViews\livetv\7.jpg" />
-    <EmbeddedResource Include="UserViews\livetv\8.jpg" />
     <EmbeddedResource Include="Localization\iso6392.txt" />
     <EmbeddedResource Include="Localization\Ratings\be.txt" />
   </ItemGroup>
diff --git a/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs b/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
index 7a993b7db..d913063c8 100644
--- a/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
@@ -46,9 +46,16 @@ namespace MediaBrowser.Server.Implementations.Persistence
         public async Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
         {
             var innerProgress = new ActionableProgress<double>();
-            innerProgress.RegisterAction(progress.Report);
+            innerProgress.RegisterAction(p => progress.Report(.95 * p));
 
             await UpdateToLatestSchema(cancellationToken, innerProgress).ConfigureAwait(false);
+
+            innerProgress = new ActionableProgress<double>();
+            innerProgress.RegisterAction(p => progress.Report(95 + (.05 * p)));
+
+            //await CleanDeadItems(cancellationToken, innerProgress).ConfigureAwait(false);
+
+            progress.Report(100);
         }
 
         private async Task UpdateToLatestSchema(CancellationToken cancellationToken, IProgress<double> progress)
@@ -92,6 +99,43 @@ namespace MediaBrowser.Server.Implementations.Persistence
             progress.Report(100);
         }
 
+        private async Task CleanDeadItems(CancellationToken cancellationToken, IProgress<double> progress)
+        {
+            var itemIds = _libraryManager.GetItemIds(new InternalItemsQuery
+            {
+                HasDeadParentId = true
+            });
+
+            var numComplete = 0;
+            var numItems = itemIds.Count;
+
+            _logger.Debug("Cleaning {0} items with dead parent links", numItems);
+
+            foreach (var itemId in itemIds)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                var item = _libraryManager.GetItemById(itemId);
+
+                if (item != null)
+                {
+                    _logger.Debug("Cleaning item {0} type: {1} path: {2}", item.Name, item.GetType().Name, item.Path ?? string.Empty);
+
+                    await _libraryManager.DeleteItem(item, new DeleteOptions
+                    {
+                        DeleteFileLocation = false
+                    });
+                }
+
+                numComplete++;
+                double percent = numComplete;
+                percent /= numItems;
+                progress.Report(percent * 100);
+            }
+
+            progress.Report(100);
+        }
+
         public IEnumerable<ITaskTrigger> GetDefaultTriggers()
         {
             return new ITaskTrigger[] 
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 04f09602f..00ebf7ea6 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -1096,6 +1096,14 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 }
             }
 
+            if (query.HasDeadParentId.HasValue)
+            {
+                if (query.HasDeadParentId.Value)
+                {
+                    whereClauses.Add("ParentId NOT NULL AND ParentId NOT IN (select guid from TypedBaseItems)");
+                }
+            }
+
             if (addPaging)
             {
                 if (query.StartIndex.HasValue && query.StartIndex.Value > 0)
diff --git a/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs b/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
index b11a7d167..c2ddf3c43 100644
--- a/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
@@ -11,8 +11,6 @@ using MediaBrowser.Server.Implementations.Photos;
 using MoreLinq;
 using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -154,7 +152,6 @@ namespace MediaBrowser.Server.Implementations.UserViews
                 CollectionType.BoxSets,
                 CollectionType.Playlists,
                 CollectionType.Channels,
-                CollectionType.LiveTv,
                 CollectionType.Books,
                 CollectionType.Photos,
                 CollectionType.HomeVideos,
@@ -170,7 +167,7 @@ namespace MediaBrowser.Server.Implementations.UserViews
             var view = (UserView)item;
             if (imageType == ImageType.Primary && IsUsingCollectionStrip(view))
             {
-                if (itemsWithImages.Count == 0 && !string.Equals(view.ViewType, CollectionType.LiveTv, StringComparison.OrdinalIgnoreCase))
+                if (itemsWithImages.Count == 0)
                 {
                     return false;
                 }
@@ -180,39 +177,5 @@ namespace MediaBrowser.Server.Implementations.UserViews
 
             return await base.CreateImage(item, itemsWithImages, outputPath, imageType, imageIndex).ConfigureAwait(false);
         }
-
-        protected override IEnumerable<String> GetStripCollageImagePaths(IHasImages primaryItem, IEnumerable<BaseItem> items)
-        {
-            var userView = primaryItem as UserView;
-
-            if (userView != null && string.Equals(userView.ViewType, CollectionType.LiveTv, StringComparison.OrdinalIgnoreCase))
-            {
-                var list = new List<string>();
-                for (int i = 1; i <= 8; i++)
-                {
-                    list.Add(ExtractLiveTvResource(i.ToString(CultureInfo.InvariantCulture), ApplicationPaths));
-                }
-                return list;
-            }
-
-            return base.GetStripCollageImagePaths(primaryItem, items);
-        }
-
-        private string ExtractLiveTvResource(string name, IApplicationPaths paths)
-        {
-            var namespacePath = GetType().Namespace + ".livetv." + name + ".jpg";
-            var tempPath = Path.Combine(paths.TempDirectory, Guid.NewGuid().ToString("N") + ".jpg");
-            Directory.CreateDirectory(Path.GetDirectoryName(tempPath));
-
-            using (var stream = GetType().Assembly.GetManifestResourceStream(namespacePath))
-            {
-                using (var fileStream = new FileStream(tempPath, FileMode.Create, FileAccess.Write, FileShare.Read))
-                {
-                    stream.CopyTo(fileStream);
-                }
-            }
-
-            return tempPath;
-        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/UserViews/livetv/1.jpg b/MediaBrowser.Server.Implementations/UserViews/livetv/1.jpg
deleted file mode 100644
index 2594b68a4..000000000
Binary files a/MediaBrowser.Server.Implementations/UserViews/livetv/1.jpg and /dev/null differ
diff --git a/MediaBrowser.Server.Implementations/UserViews/livetv/2.jpg b/MediaBrowser.Server.Implementations/UserViews/livetv/2.jpg
deleted file mode 100644
index e5c87b96b..000000000
Binary files a/MediaBrowser.Server.Implementations/UserViews/livetv/2.jpg and /dev/null differ
diff --git a/MediaBrowser.Server.Implementations/UserViews/livetv/3.jpg b/MediaBrowser.Server.Implementations/UserViews/livetv/3.jpg
deleted file mode 100644
index c19f7e612..000000000
Binary files a/MediaBrowser.Server.Implementations/UserViews/livetv/3.jpg and /dev/null differ
diff --git a/MediaBrowser.Server.Implementations/UserViews/livetv/4.jpg b/MediaBrowser.Server.Implementations/UserViews/livetv/4.jpg
deleted file mode 100644
index 93ee18044..000000000
Binary files a/MediaBrowser.Server.Implementations/UserViews/livetv/4.jpg and /dev/null differ
diff --git a/MediaBrowser.Server.Implementations/UserViews/livetv/5.jpg b/MediaBrowser.Server.Implementations/UserViews/livetv/5.jpg
deleted file mode 100644
index 4c2cd580d..000000000
Binary files a/MediaBrowser.Server.Implementations/UserViews/livetv/5.jpg and /dev/null differ
diff --git a/MediaBrowser.Server.Implementations/UserViews/livetv/6.jpg b/MediaBrowser.Server.Implementations/UserViews/livetv/6.jpg
deleted file mode 100644
index 6f496b6ac..000000000
Binary files a/MediaBrowser.Server.Implementations/UserViews/livetv/6.jpg and /dev/null differ
diff --git a/MediaBrowser.Server.Implementations/UserViews/livetv/7.jpg b/MediaBrowser.Server.Implementations/UserViews/livetv/7.jpg
deleted file mode 100644
index e7dba2760..000000000
Binary files a/MediaBrowser.Server.Implementations/UserViews/livetv/7.jpg and /dev/null differ
diff --git a/MediaBrowser.Server.Implementations/UserViews/livetv/8.jpg b/MediaBrowser.Server.Implementations/UserViews/livetv/8.jpg
deleted file mode 100644
index c69ba908c..000000000
Binary files a/MediaBrowser.Server.Implementations/UserViews/livetv/8.jpg and /dev/null differ
-- 
cgit v1.2.3