Merge pull request #2262 from MediaBrowser/dev

Dev

7 files changed, 132 insertions, 53 deletions

diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
index ffb9c96e7..300973ce1 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
@@ -252,6 +252,42 @@ namespace MediaBrowser.Server.Implementations.Channels
             return item;
         }
 
+        private List<ChannelMediaInfo> GetSavedMediaSources(BaseItem item)
+        {
+            var path = Path.Combine(item.GetInternalMetadataPath(), "channelmediasources.json");
+
+            try
+            {
+                return _jsonSerializer.DeserializeFromFile<List<ChannelMediaInfo>>(path) ?? new List<ChannelMediaInfo>();
+            }
+            catch
+            {
+                return new List<ChannelMediaInfo>();
+            }
+        }
+
+        private void SaveMediaSources(BaseItem item, List<ChannelMediaInfo> mediaSources)
+        {
+            var path = Path.Combine(item.GetInternalMetadataPath(), "channelmediasources.json");
+
+            if (mediaSources == null || mediaSources.Count == 0)
+            {
+                try
+                {
+                    _fileSystem.DeleteFile(path);
+                }
+                catch
+                {
+                    
+                }
+                return;
+            }
+
+            _fileSystem.CreateDirectory(Path.GetDirectoryName(path));
+
+            _jsonSerializer.SerializeToFile(mediaSources, path);
+        }
+
         public async Task<IEnumerable<MediaSourceInfo>> GetStaticMediaSources(BaseItem item, bool includeCachedVersions, CancellationToken cancellationToken)
         {
             IEnumerable<ChannelMediaInfo> results = new List<ChannelMediaInfo>();
@@ -263,7 +299,7 @@ namespace MediaBrowser.Server.Implementations.Channels
             var audio = item as Audio;
             if (audio != null)
             {
-                results = audio.ChannelMediaSources ?? new List<ChannelMediaInfo>();
+                results = audio.ChannelMediaSources ?? GetSavedMediaSources(audio);
             }
 
             var sources = SortMediaInfoResults(results)
@@ -1385,7 +1421,6 @@ namespace MediaBrowser.Server.Implementations.Channels
             if (channelAudioItem != null)
             {
                 channelAudioItem.ExtraType = info.ExtraType;
-                channelAudioItem.ChannelMediaSources = info.MediaSources;
 
                 var mediaSource = info.MediaSources.FirstOrDefault();
                 item.Path = mediaSource == null ? null : mediaSource.Path;
@@ -1426,6 +1461,8 @@ namespace MediaBrowser.Server.Implementations.Channels
                 await item.UpdateToRepository(ItemUpdateType.None, cancellationToken).ConfigureAwait(false);
             }
 
+            SaveMediaSources(item, info.MediaSources);
+
             return item;
         }
 
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs b/MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs
index 96b8aad5d..51f5f57b3 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs
@@ -123,8 +123,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
                 return;
             }
 
-            var themeMedia = item as IThemeMedia;
-            if (themeMedia != null && themeMedia.IsThemeMedia)
+            if (item.IsThemeMedia)
             {
                 // Don't report theme song or local trailer playback
                 return;
@@ -156,8 +155,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
                 return;
             }
 
-            var themeMedia = item as IThemeMedia;
-            if (themeMedia != null && themeMedia.IsThemeMedia)
+            if (item.IsThemeMedia)
             {
                 // Don't report theme song or local trailer playback
                 return;
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
index 8f35f0e76..f3d1dc8f9 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
@@ -256,9 +256,8 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
             }
 
             var item = e.MediaInfo;
-            var themeMedia = item as IThemeMedia;
 
-            if (themeMedia != null && themeMedia.IsThemeMedia)
+            if ( item.IsThemeMedia)
             {
                 // Don't report theme song or local trailer playback
                 return;
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 295d78a5f..f3224127a 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -367,7 +367,6 @@
     <Compile Include="Persistence\SqliteUserDataRepository.cs" />
     <Compile Include="Persistence\SqliteUserRepository.cs" />
     <Compile Include="Sorting\StudioComparer.cs" />
-    <Compile Include="Sorting\VideoBitRateComparer.cs" />
     <Compile Include="Sync\AppSyncProvider.cs" />
     <Compile Include="Sync\CloudSyncProfile.cs" />
     <Compile Include="Sync\IHasSyncQuality.cs" />
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index ffae9a6f0..5fcd38f87 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -285,6 +285,10 @@ namespace MediaBrowser.Server.Implementations.Persistence
             _connection.AddColumn(Logger, "TypedBaseItems", "ProductionLocations", "Text");
             _connection.AddColumn(Logger, "TypedBaseItems", "ThemeSongIds", "Text");
             _connection.AddColumn(Logger, "TypedBaseItems", "ThemeVideoIds", "Text");
+            _connection.AddColumn(Logger, "TypedBaseItems", "TotalBitrate", "INT");
+            _connection.AddColumn(Logger, "TypedBaseItems", "ExtraType", "Text");
+            _connection.AddColumn(Logger, "TypedBaseItems", "Artists", "Text");
+            _connection.AddColumn(Logger, "TypedBaseItems", "AlbumArtists", "Text");
 
             _connection.AddColumn(Logger, "ItemValues", "CleanValue", "Text");
 
@@ -435,7 +439,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
             "Images",
             "ProductionLocations",
             "ThemeSongIds",
-            "ThemeVideoIds"
+            "ThemeVideoIds",
+            "TotalBitrate",
+            "ExtraType",
+            "Artists",
+            "AlbumArtists"
         };
 
         private readonly string[] _mediaStreamSaveColumns =
@@ -566,7 +574,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 "Images",
                 "ProductionLocations",
                 "ThemeSongIds",
-                "ThemeVideoIds"
+                "ThemeVideoIds",
+                "TotalBitrate",
+                "ExtraType",
+                "Artists",
+                "AlbumArtists"
             };
             _saveItemCommand = _connection.CreateCommand();
             _saveItemCommand.CommandText = "replace into TypedBaseItems (" + string.Join(",", saveColumns.ToArray()) + ") values (";
@@ -1046,6 +1058,35 @@ namespace MediaBrowser.Server.Implementations.Persistence
                         _saveItemCommand.GetParameter(index++).Value = null;
                     }
 
+                    _saveItemCommand.GetParameter(index++).Value = item.TotalBitrate;
+                    _saveItemCommand.GetParameter(index++).Value = item.ExtraType;
+
+                    var hasArtists = item as IHasArtist;
+                    if (hasArtists != null)
+                    {
+                        if (hasArtists.Artists.Count > 0)
+                        {
+                            _saveItemCommand.GetParameter(index++).Value = string.Join("|", hasArtists.Artists.ToArray());
+                        }
+                        else
+                        {
+                            _saveItemCommand.GetParameter(index++).Value = null;
+                        }
+                    }
+
+                    var hasAlbumArtists = item as IHasAlbumArtist;
+                    if (hasAlbumArtists != null)
+                    {
+                        if (hasAlbumArtists.AlbumArtists.Count > 0)
+                        {
+                            _saveItemCommand.GetParameter(index++).Value = string.Join("|", hasAlbumArtists.AlbumArtists.ToArray());
+                        }
+                        else
+                        {
+                            _saveItemCommand.GetParameter(index++).Value = null;
+                        }
+                    }
+
                     _saveItemCommand.Transaction = transaction;
 
                     _saveItemCommand.ExecuteNonQuery();
@@ -1305,6 +1346,25 @@ namespace MediaBrowser.Server.Implementations.Persistence
                     return false;
                 }
             }
+            if (_config.Configuration.SkipDeserializationForAudio)
+            {
+                if (type == typeof(Audio))
+                {
+                    return false;
+                }
+                if (type == typeof(LiveTvAudioRecording))
+                {
+                    return false;
+                }
+                if (type == typeof(AudioPodcast))
+                {
+                    return false;
+                }
+                if (type == typeof(MusicAlbum))
+                {
+                    return false;
+                }
+            }
 
             return true;
         }
@@ -1884,6 +1944,32 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 index++;
             }
 
+            if (!reader.IsDBNull(index))
+            {
+                item.TotalBitrate = reader.GetInt32(index);
+            }
+            index++;
+
+            if (!reader.IsDBNull(index))
+            {
+                item.ExtraType = (ExtraType)Enum.Parse(typeof(ExtraType), reader.GetString(index), true);
+            }
+            index++;
+
+            var hasArtists = item as IHasArtist;
+            if (hasArtists != null && !reader.IsDBNull(index))
+            {
+                hasArtists.Artists = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList();
+            }
+            index++;
+
+            var hasAlbumArtists = item as IHasAlbumArtist;
+            if (hasAlbumArtists != null && !reader.IsDBNull(index))
+            {
+                hasAlbumArtists.AlbumArtists = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList();
+            }
+            index++;
+
             if (string.IsNullOrWhiteSpace(item.Tagline))
             {
                 var movie = item as Movie;
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 9326c4f43..6d86ff091 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -1611,7 +1611,8 @@ namespace MediaBrowser.Server.Implementations.Session
                 IndexNumber = item.IndexNumber,
                 ParentIndexNumber = item.ParentIndexNumber,
                 PremiereDate = item.PremiereDate,
-                ProductionYear = item.ProductionYear
+                ProductionYear = item.ProductionYear,
+                IsThemeMedia = item.IsThemeMedia
             };
 
             info.PrimaryImageTag = GetImageCacheTag(item, ImageType.Primary);
diff --git a/MediaBrowser.Server.Implementations/Sorting/VideoBitRateComparer.cs b/MediaBrowser.Server.Implementations/Sorting/VideoBitRateComparer.cs
deleted file mode 100644
index cbf6ebac6..000000000
--- a/MediaBrowser.Server.Implementations/Sorting/VideoBitRateComparer.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Sorting;
-using MediaBrowser.Model.Querying;
-
-namespace MediaBrowser.Server.Implementations.Sorting
-{
-    class VideoBitRateComparer : IBaseItemComparer
-    {
-        /// <summary>
-        /// Compares the specified x.
-        /// </summary>
-        /// <param name="x">The x.</param>
-        /// <param name="y">The y.</param>
-        /// <returns>System.Int32.</returns>
-        public int Compare(BaseItem x, BaseItem y)
-        {
-            return GetValue(x).CompareTo(GetValue(y));
-        }
-
-        private int GetValue(BaseItem item)
-        {
-            var video = item as Video;
-
-            if (video != null)
-            {
-                return video.VideoBitRate ?? 0;
-            }
-
-            return 0;
-        }
-
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        public string Name
-        {
-            get { return ItemSortBy.VideoBitRate; }
-        }
-    }
-}