From a4d1c9e6e48f63121cc51abda61ed46d7f6a72cf Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 1 May 2016 17:48:37 -0400
Subject: update sqlite

---
 .../Persistence/DataExtensions.cs                  | 182 +++++++++++++++++
 .../Persistence/IDbConnector.cs                    |  10 +
 .../SqliteDisplayPreferencesRepository.cs          |   4 +-
 .../Persistence/SqliteExtensions.cs                | 218 ---------------------
 .../SqliteFileOrganizationRepository.cs            |   4 +-
 .../Persistence/SqliteProviderInfoRepository.cs    |   4 +-
 .../Persistence/SqliteUserDataRepository.cs        |   4 +-
 .../Persistence/SqliteUserRepository.cs            |   6 +-
 8 files changed, 203 insertions(+), 229 deletions(-)
 create mode 100644 MediaBrowser.Server.Implementations/Persistence/DataExtensions.cs
 create mode 100644 MediaBrowser.Server.Implementations/Persistence/IDbConnector.cs
 delete mode 100644 MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs

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

diff --git a/MediaBrowser.Server.Implementations/Persistence/DataExtensions.cs b/MediaBrowser.Server.Implementations/Persistence/DataExtensions.cs
new file mode 100644
index 000000000..103b75f84
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Persistence/DataExtensions.cs
@@ -0,0 +1,182 @@
+using System.Text;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Serialization;
+using System;
+using System.Data;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Server.Implementations.Persistence
+{
+    static class DataExtensions
+    {
+        /// <summary>
+        /// Determines whether the specified conn is open.
+        /// </summary>
+        /// <param name="conn">The conn.</param>
+        /// <returns><c>true</c> if the specified conn is open; otherwise, <c>false</c>.</returns>
+        public static bool IsOpen(this IDbConnection conn)
+        {
+            return conn.State == ConnectionState.Open;
+        }
+
+        public static IDataParameter GetParameter(this IDbCommand cmd, int index)
+        {
+            return (IDataParameter)cmd.Parameters[index];
+        }
+
+        public static IDataParameter Add(this IDataParameterCollection paramCollection, IDbCommand cmd, string name, DbType type)
+        {
+            var param = cmd.CreateParameter();
+
+            param.ParameterName = name;
+            param.DbType = type;
+
+            paramCollection.Add(param);
+
+            return param;
+        }
+
+        public static IDataParameter Add(this IDataParameterCollection paramCollection, IDbCommand cmd, string name)
+        {
+            var param = cmd.CreateParameter();
+
+            param.ParameterName = name;
+
+            paramCollection.Add(param);
+
+            return param;
+        }
+
+
+        /// <summary>
+        /// Gets a stream from a DataReader at a given ordinal
+        /// </summary>
+        /// <param name="reader">The reader.</param>
+        /// <param name="ordinal">The ordinal.</param>
+        /// <returns>Stream.</returns>
+        /// <exception cref="System.ArgumentNullException">reader</exception>
+        public static Stream GetMemoryStream(this IDataReader reader, int ordinal)
+        {
+            if (reader == null)
+            {
+                throw new ArgumentNullException("reader");
+            }
+
+            var memoryStream = new MemoryStream();
+            var num = 0L;
+            var array = new byte[4096];
+            long bytes;
+            do
+            {
+                bytes = reader.GetBytes(ordinal, num, array, 0, array.Length);
+                memoryStream.Write(array, 0, (int)bytes);
+                num += bytes;
+            }
+            while (bytes > 0L);
+            memoryStream.Position = 0;
+            return memoryStream;
+        }
+
+        /// <summary>
+        /// Runs the queries.
+        /// </summary>
+        /// <param name="connection">The connection.</param>
+        /// <param name="queries">The queries.</param>
+        /// <param name="logger">The logger.</param>
+        /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
+        /// <exception cref="System.ArgumentNullException">queries</exception>
+        public static void RunQueries(this IDbConnection connection, string[] queries, ILogger logger)
+        {
+            if (queries == null)
+            {
+                throw new ArgumentNullException("queries");
+            }
+
+            using (var tran = connection.BeginTransaction())
+            {
+                try
+                {
+                    using (var cmd = connection.CreateCommand())
+                    {
+                        foreach (var query in queries)
+                        {
+                            cmd.Transaction = tran;
+                            cmd.CommandText = query;
+                            cmd.ExecuteNonQuery();
+                        }
+                    }
+
+                    tran.Commit();
+                }
+                catch (Exception e)
+                {
+                    logger.ErrorException("Error running queries", e);
+                    tran.Rollback();
+                    throw;
+                }
+            }
+        }
+
+        public static void Attach(IDbConnection db, string path, string alias)
+        {
+            using (var cmd = db.CreateCommand())
+            {
+                cmd.CommandText = string.Format("attach '{0}' as {1};", path, alias);
+                cmd.ExecuteNonQuery();
+            }
+        }
+
+        /// <summary>
+        /// Serializes to bytes.
+        /// </summary>
+        /// <param name="json">The json.</param>
+        /// <param name="obj">The obj.</param>
+        /// <returns>System.Byte[][].</returns>
+        /// <exception cref="System.ArgumentNullException">obj</exception>
+        public static byte[] SerializeToBytes(this IJsonSerializer json, object obj)
+        {
+            if (obj == null)
+            {
+                throw new ArgumentNullException("obj");
+            }
+
+            using (var stream = new MemoryStream())
+            {
+                json.SerializeToStream(obj, stream);
+                return stream.ToArray();
+            }
+        }
+
+        public static void AddColumn(this IDbConnection connection, ILogger logger, string table, string columnName, string type)
+        {
+            using (var cmd = connection.CreateCommand())
+            {
+                cmd.CommandText = "PRAGMA table_info(" + table + ")";
+
+                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult))
+                {
+                    while (reader.Read())
+                    {
+                        if (!reader.IsDBNull(1))
+                        {
+                            var name = reader.GetString(1);
+
+                            if (string.Equals(name, columnName, StringComparison.OrdinalIgnoreCase))
+                            {
+                                return;
+                            }
+                        }
+                    }
+                }
+            }
+
+            var builder = new StringBuilder();
+
+            builder.AppendLine("alter table " + table);
+            builder.AppendLine("add column " + columnName + " " + type);
+
+            connection.RunQueries(new[] { builder.ToString() }, logger);
+        }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Persistence/IDbConnector.cs b/MediaBrowser.Server.Implementations/Persistence/IDbConnector.cs
new file mode 100644
index 000000000..cac9fe983
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Persistence/IDbConnector.cs
@@ -0,0 +1,10 @@
+using System.Data;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Server.Implementations.Persistence
+{
+    public interface IDbConnector
+    {
+        Task<IDbConnection> Connect(string dbPath);
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs
index 45e0304c1..6077cfdba 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs
@@ -52,11 +52,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
         /// Opens the connection to the database
         /// </summary>
         /// <returns>Task.</returns>
-        public async Task Initialize()
+        public async Task Initialize(IDbConnector dbConnector)
         {
             var dbFile = Path.Combine(_appPaths.DataPath, "displaypreferences.db");
 
-            _connection = await SqliteExtensions.ConnectToDb(dbFile, Logger).ConfigureAwait(false);
+            _connection = await dbConnector.Connect(dbFile).ConfigureAwait(false);
 
             string[] queries = {
 
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs
deleted file mode 100644
index 4fb1e07dd..000000000
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs
+++ /dev/null
@@ -1,218 +0,0 @@
-using System.Text;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Serialization;
-using System;
-using System.Data;
-using System.Data.SQLite;
-using System.IO;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Server.Implementations.Persistence
-{
-    /// <summary>
-    /// Class SQLiteExtensions
-    /// </summary>
-    static class SqliteExtensions
-    {
-        /// <summary>
-        /// Determines whether the specified conn is open.
-        /// </summary>
-        /// <param name="conn">The conn.</param>
-        /// <returns><c>true</c> if the specified conn is open; otherwise, <c>false</c>.</returns>
-        public static bool IsOpen(this IDbConnection conn)
-        {
-            return conn.State == ConnectionState.Open;
-        }
-
-        public static IDataParameter GetParameter(this IDbCommand cmd, int index)
-        {
-            return (IDataParameter)cmd.Parameters[index];
-        }
-        
-        public static IDataParameter Add(this IDataParameterCollection paramCollection, IDbCommand cmd, string name, DbType type)
-        {
-            var param = cmd.CreateParameter();
-           
-            param.ParameterName = name;
-            param.DbType = type;
-
-            paramCollection.Add(param);
-
-            return param;
-        }
-
-        public static IDataParameter Add(this IDataParameterCollection paramCollection, IDbCommand cmd, string name)
-        {
-            var param = cmd.CreateParameter();
-
-            param.ParameterName = name;
-
-            paramCollection.Add(param);
-            
-            return param;
-        }
-
-        
-        /// <summary>
-        /// Gets a stream from a DataReader at a given ordinal
-        /// </summary>
-        /// <param name="reader">The reader.</param>
-        /// <param name="ordinal">The ordinal.</param>
-        /// <returns>Stream.</returns>
-        /// <exception cref="System.ArgumentNullException">reader</exception>
-        public static Stream GetMemoryStream(this IDataReader reader, int ordinal)
-        {
-            if (reader == null)
-            {
-                throw new ArgumentNullException("reader");
-            }
-
-            var memoryStream = new MemoryStream();
-            var num = 0L;
-            var array = new byte[4096];
-            long bytes;
-            do
-            {
-                bytes = reader.GetBytes(ordinal, num, array, 0, array.Length);
-                memoryStream.Write(array, 0, (int)bytes);
-                num += bytes;
-            }
-            while (bytes > 0L);
-            memoryStream.Position = 0;
-            return memoryStream;
-        }
-
-        /// <summary>
-        /// Runs the queries.
-        /// </summary>
-        /// <param name="connection">The connection.</param>
-        /// <param name="queries">The queries.</param>
-        /// <param name="logger">The logger.</param>
-        /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
-        /// <exception cref="System.ArgumentNullException">queries</exception>
-        public static void RunQueries(this IDbConnection connection, string[] queries, ILogger logger)
-        {
-            if (queries == null)
-            {
-                throw new ArgumentNullException("queries");
-            }
-
-            using (var tran = connection.BeginTransaction())
-            {
-                try
-                {
-                    using (var cmd = connection.CreateCommand())
-                    {
-                        foreach (var query in queries)
-                        {
-                            cmd.Transaction = tran;
-                            cmd.CommandText = query;
-                            cmd.ExecuteNonQuery();
-                        }
-                    }
-
-                    tran.Commit();
-                }
-                catch (Exception e)
-                {
-                    logger.ErrorException("Error running queries", e);
-                    tran.Rollback();
-                    throw;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Connects to db.
-        /// </summary>
-        /// <param name="dbPath">The db path.</param>
-        /// <param name="logger">The logger.</param>
-        /// <returns>Task{IDbConnection}.</returns>
-        /// <exception cref="System.ArgumentNullException">dbPath</exception>
-        public static async Task<IDbConnection> ConnectToDb(string dbPath, ILogger logger)
-        {
-            if (string.IsNullOrEmpty(dbPath))
-            {
-                throw new ArgumentNullException("dbPath");
-            }
-
-            logger.Info("Sqlite {0} opening {1}", SQLiteConnection.SQLiteVersion, dbPath);
-
-            var connectionstr = new SQLiteConnectionStringBuilder
-            {
-                PageSize = 4096,
-                CacheSize = 2000,
-                SyncMode = SynchronizationModes.Full,
-                DataSource = dbPath,
-                JournalMode = SQLiteJournalModeEnum.Wal
-            };
-
-            var connection = new SQLiteConnection(connectionstr.ConnectionString);
-
-            await connection.OpenAsync().ConfigureAwait(false);
-
-            return connection;
-        }
-
-        public static void Attach(IDbConnection db, string path, string alias)
-        {
-            using (var cmd = db.CreateCommand())
-            {
-                cmd.CommandText = string.Format("attach '{0}' as {1};", path, alias);
-                cmd.ExecuteNonQuery();
-            }
-        }
-
-        /// <summary>
-        /// Serializes to bytes.
-        /// </summary>
-        /// <param name="json">The json.</param>
-        /// <param name="obj">The obj.</param>
-        /// <returns>System.Byte[][].</returns>
-        /// <exception cref="System.ArgumentNullException">obj</exception>
-        public static byte[] SerializeToBytes(this IJsonSerializer json, object obj)
-        {
-            if (obj == null)
-            {
-                throw new ArgumentNullException("obj");
-            }
-
-            using (var stream = new MemoryStream())
-            {
-                json.SerializeToStream(obj, stream);
-                return stream.ToArray();
-            }
-        }
-
-        public static void AddColumn(this IDbConnection connection, ILogger logger, string table, string columnName, string type)
-        {
-            using (var cmd = connection.CreateCommand())
-            {
-                cmd.CommandText = "PRAGMA table_info(" + table + ")";
-
-                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult))
-                {
-                    while (reader.Read())
-                    {
-                        if (!reader.IsDBNull(1))
-                        {
-                            var name = reader.GetString(1);
-
-                            if (string.Equals(name, columnName, StringComparison.OrdinalIgnoreCase))
-                            {
-                                return;
-                            }
-                        }
-                    }
-                }
-            }
-
-            var builder = new StringBuilder();
-
-            builder.AppendLine("alter table " + table);
-            builder.AppendLine("add column " + columnName + " " + type);
-
-            connection.RunQueries(new[] { builder.ToString() }, logger);
-        }
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteFileOrganizationRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteFileOrganizationRepository.cs
index 2d5aad04d..037776997 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteFileOrganizationRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteFileOrganizationRepository.cs
@@ -35,11 +35,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
         /// Opens the connection to the database
         /// </summary>
         /// <returns>Task.</returns>
-        public async Task Initialize()
+        public async Task Initialize(IDbConnector dbConnector)
         {
             var dbFile = Path.Combine(_appPaths.DataPath, "fileorganization.db");
 
-            _connection = await SqliteExtensions.ConnectToDb(dbFile, Logger).ConfigureAwait(false);
+            _connection = await dbConnector.Connect(dbFile).ConfigureAwait(false);
 
             string[] queries = {
 
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteProviderInfoRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteProviderInfoRepository.cs
index dbceda727..40d5c9586 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteProviderInfoRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteProviderInfoRepository.cs
@@ -39,11 +39,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
         /// Opens the connection to the database
         /// </summary>
         /// <returns>Task.</returns>
-        public async Task Initialize()
+        public async Task Initialize(IDbConnector dbConnector)
         {
             var dbFile = Path.Combine(_appPaths.DataPath, "refreshinfo.db");
 
-            _connection = await SqliteExtensions.ConnectToDb(dbFile, Logger).ConfigureAwait(false);
+            _connection = await dbConnector.Connect(dbFile).ConfigureAwait(false);
 
             string[] queries = {
 
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs
index 63c41c71f..33a2b1187 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs
@@ -37,11 +37,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
         /// Opens the connection to the database
         /// </summary>
         /// <returns>Task.</returns>
-        public async Task Initialize()
+        public async Task Initialize(IDbConnector dbConnector)
         {
             var dbFile = Path.Combine(_appPaths.DataPath, "userdata_v2.db");
 
-            _connection = await SqliteExtensions.ConnectToDb(dbFile, Logger).ConfigureAwait(false);
+            _connection = await dbConnector.Connect(dbFile).ConfigureAwait(false);
 
             string[] queries = {
 
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteUserRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteUserRepository.cs
index 9bd7e47f3..f7ca39a54 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteUserRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteUserRepository.cs
@@ -43,12 +43,12 @@ namespace MediaBrowser.Server.Implementations.Persistence
         /// Opens the connection to the database
         /// </summary>
         /// <returns>Task.</returns>
-        public async Task Initialize()
+        public async Task Initialize(IDbConnector dbConnector)
         {
             var dbFile = Path.Combine(_appPaths.DataPath, "users.db");
 
-            _connection = await SqliteExtensions.ConnectToDb(dbFile, Logger).ConfigureAwait(false);
-            
+            _connection = await dbConnector.Connect(dbFile).ConfigureAwait(false);
+
             string[] queries = {
 
                                 "create table if not exists users (guid GUID primary key, data BLOB)",
-- 
cgit v1.2.3


From 4ddde2cdc2ad3a951120853825df9f3588bc36e4 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 1 May 2016 18:11:24 -0400
Subject: introduce presentation unique key

---
 MediaBrowser.Api/Movies/MoviesService.cs           |   7 +-
 MediaBrowser.Api/VideosService.cs                  |  14 +-
 MediaBrowser.Controller/Entities/BaseItem.cs       |   6 +
 MediaBrowser.Controller/Entities/TV/Series.cs      |   6 +
 MediaBrowser.Controller/Entities/Video.cs          |  76 +++++++---
 .../Configuration/ServerConfiguration.cs           |   1 +
 .../Library/LibraryManager.cs                      |  24 +--
 .../Persistence/CleanDatabaseScheduledTask.cs      |   6 +
 .../Persistence/SqliteItemRepository.cs            | 168 ++++++++++++++++-----
 9 files changed, 212 insertions(+), 96 deletions(-)

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

diff --git a/MediaBrowser.Api/Movies/MoviesService.cs b/MediaBrowser.Api/Movies/MoviesService.cs
index bfbb3a6d7..1f0133e73 100644
--- a/MediaBrowser.Api/Movies/MoviesService.cs
+++ b/MediaBrowser.Api/Movies/MoviesService.cs
@@ -197,12 +197,7 @@ namespace MediaBrowser.Api.Movies
 
             var parentIds = new string[] { };
             var list = _libraryManager.GetItemList(query, parentIds)
-                .Where(i =>
-                {
-                    // Strip out secondary versions
-                    var v = i as Video;
-                    return v != null && !v.PrimaryVersionId.HasValue;
-                })
+                .DistinctBy(i => i.PresentationUniqueKey, StringComparer.OrdinalIgnoreCase)
                 .DistinctBy(i => i.GetProviderId(MetadataProviders.Imdb) ?? Guid.NewGuid().ToString("N"))
                 .ToList();
 
diff --git a/MediaBrowser.Api/VideosService.cs b/MediaBrowser.Api/VideosService.cs
index c6ec69c85..6cefda3a3 100644
--- a/MediaBrowser.Api/VideosService.cs
+++ b/MediaBrowser.Api/VideosService.cs
@@ -130,6 +130,7 @@ namespace MediaBrowser.Api
             var items = request.Ids.Split(',')
                 .Select(i => new Guid(i))
                 .Select(i => _libraryManager.GetItemById(i))
+                .OfType<Video>()
                 .ToList();
 
             if (items.Count < 2)
@@ -137,14 +138,7 @@ namespace MediaBrowser.Api
                 throw new ArgumentException("Please supply at least two videos to merge.");
             }
 
-            if (items.Any(i => !(i is Video)))
-            {
-                throw new ArgumentException("Only videos can be grouped together.");
-            }
-
-            var videos = items.Cast<Video>().ToList();
-
-            var videosWithVersions = videos.Where(i => i.MediaSourceCount > 1)
+            var videosWithVersions = items.Where(i => i.MediaSourceCount > 1)
                 .ToList();
 
             if (videosWithVersions.Count > 1)
@@ -156,7 +150,7 @@ namespace MediaBrowser.Api
 
             if (primaryVersion == null)
             {
-                primaryVersion = videos.OrderBy(i =>
+                primaryVersion = items.OrderBy(i =>
                 {
                     if (i.Video3DFormat.HasValue)
                     {
@@ -179,7 +173,7 @@ namespace MediaBrowser.Api
                     }).First();
             }
 
-            foreach (var item in videos.Where(i => i.Id != primaryVersion.Id))
+            foreach (var item in items.Where(i => i.Id != primaryVersion.Id))
             {
                 item.PrimaryVersionId = primaryVersion.Id;
 
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index f91b6b31e..6bf55e108 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1149,6 +1149,12 @@ namespace MediaBrowser.Controller.Entities
             get { return null; }
         }
 
+        [IgnoreDataMember]
+        public virtual string PresentationUniqueKey
+        {
+            get { return Id.ToString("N"); }
+        }
+
         private string _userDataKey;
         /// <summary>
         /// Gets the user data key.
diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index c03eed6c9..c062b5fba 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -91,6 +91,12 @@ namespace MediaBrowser.Controller.Entities.TV
             }
         }
 
+        [IgnoreDataMember]
+        public override string PresentationUniqueKey
+        {
+            get { return GetUserDataKey(); }
+        }
+
         /// <summary>
         /// Gets the user data key.
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index cdabaa84e..67b710534 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -44,6 +44,20 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
+        [IgnoreDataMember]
+        public override string PresentationUniqueKey
+        {
+            get
+            {
+                if (PrimaryVersionId.HasValue)
+                {
+                    return PrimaryVersionId.Value.ToString("N");
+                }
+
+                return base.PresentationUniqueKey;
+            }
+        }
+
         public long? Size { get; set; }
         public string Container { get; set; }
         public int? TotalBitrate { get; set; }
@@ -90,6 +104,14 @@ namespace MediaBrowser.Controller.Entities
         {
             get
             {
+                if (PrimaryVersionId.HasValue)
+                {
+                    var item = LibraryManager.GetItemById(PrimaryVersionId.Value) as Video;
+                    if (item != null)
+                    {
+                        return item.MediaSourceCount;
+                    }
+                }
                 return LinkedAlternateVersions.Count + LocalAlternateVersions.Count + 1;
             }
         }
@@ -192,21 +214,6 @@ namespace MediaBrowser.Controller.Entities
             return key;
         }
 
-        /// <summary>
-        /// Gets the linked children.
-        /// </summary>
-        /// <returns>IEnumerable{BaseItem}.</returns>
-        public IEnumerable<Video> GetAlternateVersions()
-        {
-            var filesWithinSameDirectory = GetLocalAlternateVersionIds()
-                .Select(i => LibraryManager.GetItemById(i))
-                .Where(i => i != null)
-                .OfType<Video>();
-
-            return filesWithinSameDirectory.Concat(GetLinkedAlternateVersions())
-                .OrderBy(i => i.SortName);
-        }
-
         public IEnumerable<Video> GetLinkedAlternateVersions()
         {
             var linkedVersions = LinkedAlternateVersions
@@ -506,6 +513,36 @@ namespace MediaBrowser.Controller.Entities
             }).FirstOrDefault();
         }
 
+        private List<Tuple<Video, MediaSourceType>> GetAllVideosForMediaSources()
+        {
+            var list = new List<Tuple<Video, MediaSourceType>>();
+
+            list.Add(new Tuple<Video, MediaSourceType>(this, MediaSourceType.Default));
+            list.AddRange(GetLinkedAlternateVersions().Select(i => new Tuple<Video, MediaSourceType>(i, MediaSourceType.Grouping)));
+
+            if (PrimaryVersionId.HasValue)
+            {
+                var primary = LibraryManager.GetItemById(PrimaryVersionId.Value) as Video;
+                if (primary != null)
+                {
+                    var existingIds = list.Select(i => i.Item1.Id).ToList();
+                    list.Add(new Tuple<Video, MediaSourceType>(primary, MediaSourceType.Grouping));
+                    list.AddRange(primary.GetLinkedAlternateVersions().Where(i => !existingIds.Contains(i.Id)).Select(i => new Tuple<Video, MediaSourceType>(i, MediaSourceType.Grouping)));
+                }
+            }
+
+            var localAlternates = list
+                .SelectMany(i => i.Item1.GetLocalAlternateVersionIds())
+                .Select(LibraryManager.GetItemById)
+                .Where(i => i != null)
+                .OfType<Video>()
+                .ToList();
+
+            list.AddRange(localAlternates.Select(i => new Tuple<Video, MediaSourceType>(i, MediaSourceType.Default)));
+
+            return list;
+        }
+
         public virtual IEnumerable<MediaSourceInfo> GetMediaSources(bool enablePathSubstitution)
         {
             if (SourceType == SourceType.Channel)
@@ -524,13 +561,8 @@ namespace MediaBrowser.Controller.Entities
                 };
             }
 
-            var item = this;
-
-            var result = item.GetAlternateVersions()
-                .Select(i => GetVersionInfo(enablePathSubstitution, i, MediaSourceType.Grouping))
-                .ToList();
-
-            result.Add(GetVersionInfo(enablePathSubstitution, item, MediaSourceType.Default));
+            var list = GetAllVideosForMediaSources();
+            var result = list.Select(i => GetVersionInfo(enablePathSubstitution, i.Item1, i.Item2)).ToList();
 
             return result.OrderBy(i =>
             {
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index ba3362332..b115440d6 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -201,6 +201,7 @@ namespace MediaBrowser.Model.Configuration
         public string[] Migrations { get; set; }
 
         public int MigrationVersion { get; set; }
+        public int SchemaVersion { get; set; }
 
         public bool DownloadImagesInAdvance { get; set; }
 
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index e1bcfa861..87fdc56b3 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -522,29 +522,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 throw new ArgumentNullException("items");
             }
 
-            var dict = new Dictionary<Guid, BaseItem>();
-
-            foreach (var item in items)
-            {
-                var video = item as Video;
-
-                if (video != null)
-                {
-                    if (video.PrimaryVersionId.HasValue)
-                    {
-                        var primary = GetItemById(video.PrimaryVersionId.Value) as Video;
-
-                        if (primary != null)
-                        {
-                            dict[primary.Id] = primary;
-                            continue;
-                        }
-                    }
-                }
-                dict[item.Id] = item;
-            }
-
-            return dict.Values;
+            return items.DistinctBy(i => i.PresentationUniqueKey, StringComparer.OrdinalIgnoreCase);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs b/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
index 031333f2c..2a2f9a09d 100644
--- a/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
@@ -110,6 +110,12 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 _config.SaveConfiguration();
             }
 
+            if (_config.Configuration.SchemaVersion < SqliteItemRepository.LatestSchemaVersion)
+            {
+                _config.Configuration.SchemaVersion = SqliteItemRepository.LatestSchemaVersion;
+                _config.SaveConfiguration();
+            }
+
             if (EnableUnavailableMessage)
             {
                 EnableUnavailableMessage = false;
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index a44d66c73..6afdb8d9f 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -20,6 +20,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Channels;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Model.LiveTv;
 
@@ -55,7 +56,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
         /// <summary>
         /// The _app paths
         /// </summary>
-        private readonly IApplicationPaths _appPaths;
+        private readonly IServerConfigurationManager _config;
 
         /// <summary>
         /// The _save item command
@@ -81,35 +82,31 @@ namespace MediaBrowser.Server.Implementations.Persistence
         private IDbCommand _updateInheritedRatingCommand;
         private IDbCommand _updateInheritedTagsCommand;
 
-        private const int LatestSchemaVersion = 65;
+        public const int LatestSchemaVersion = 66;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SqliteItemRepository"/> class.
         /// </summary>
-        /// <param name="appPaths">The app paths.</param>
-        /// <param name="jsonSerializer">The json serializer.</param>
-        /// <param name="logManager">The log manager.</param>
-        /// <exception cref="System.ArgumentNullException">
         /// appPaths
         /// or
         /// jsonSerializer
         /// </exception>
-        public SqliteItemRepository(IApplicationPaths appPaths, IJsonSerializer jsonSerializer, ILogManager logManager)
+        public SqliteItemRepository(IServerConfigurationManager config, IJsonSerializer jsonSerializer, ILogManager logManager)
             : base(logManager)
         {
-            if (appPaths == null)
+            if (config == null)
             {
-                throw new ArgumentNullException("appPaths");
+                throw new ArgumentNullException("config");
             }
             if (jsonSerializer == null)
             {
                 throw new ArgumentNullException("jsonSerializer");
             }
 
-            _appPaths = appPaths;
+            _config = config;
             _jsonSerializer = jsonSerializer;
 
-            _criticReviewsPath = Path.Combine(_appPaths.DataPath, "critic-reviews");
+            _criticReviewsPath = Path.Combine(_config.ApplicationPaths.DataPath, "critic-reviews");
         }
 
         private const string ChaptersTableName = "Chapters2";
@@ -118,11 +115,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
         /// Opens the connection to the database
         /// </summary>
         /// <returns>Task.</returns>
-        public async Task Initialize()
+        public async Task Initialize(IDbConnector dbConnector)
         {
-            var dbFile = Path.Combine(_appPaths.DataPath, "library.db");
+            var dbFile = Path.Combine(_config.ApplicationPaths.DataPath, "library.db");
 
-            _connection = await SqliteExtensions.ConnectToDb(dbFile, Logger).ConfigureAwait(false);
+            _connection = await dbConnector.Connect(dbFile).ConfigureAwait(false);
 
             var createMediaStreamsTableCommand
                = "create table if not exists mediastreams (ItemId GUID, StreamIndex INT, StreamType TEXT, Codec TEXT, Language TEXT, ChannelLayout TEXT, Profile TEXT, AspectRatio TEXT, Path TEXT, IsInterlaced BIT, BitRate INT NULL, Channels INT NULL, SampleRate INT NULL, IsDefault BIT, IsForced BIT, IsExternal BIT, Height INT NULL, Width INT NULL, AverageFrameRate FLOAT NULL, RealFrameRate FLOAT NULL, Level FLOAT NULL, PixelFormat TEXT, BitDepth INT NULL, IsAnamorphic BIT NULL, RefFrames INT NULL, CodecTag TEXT NULL, Comment TEXT NULL, NalLengthSize TEXT NULL, IsAvc BIT NULL, PRIMARY KEY (ItemId, StreamIndex))";
@@ -228,18 +225,27 @@ namespace MediaBrowser.Server.Implementations.Persistence
             _connection.AddColumn(Logger, "TypedBaseItems", "DateModifiedDuringLastRefresh", "DATETIME");
             _connection.AddColumn(Logger, "TypedBaseItems", "InheritedTags", "Text");
             _connection.AddColumn(Logger, "TypedBaseItems", "CleanName", "Text");
+            _connection.AddColumn(Logger, "TypedBaseItems", "PresentationUniqueKey", "Text");
+
+            string[] postQueries =
+                {
+                "create index if not exists idx_PresentationUniqueKey on TypedBaseItems(PresentationUniqueKey)",
+                "create index if not exists idx_Type on TypedBaseItems(Type)"
+            };
+
+            _connection.RunQueries(postQueries, Logger);
 
             PrepareStatements();
 
             new MediaStreamColumns(_connection, Logger).AddColumns();
 
-            var chapterDbFile = Path.Combine(_appPaths.DataPath, "chapters.db");
+            var chapterDbFile = Path.Combine(_config.ApplicationPaths.DataPath, "chapters.db");
             if (File.Exists(chapterDbFile))
             {
                 MigrateChapters(chapterDbFile);
             }
 
-            var mediaStreamsDbFile = Path.Combine(_appPaths.DataPath, "mediainfo.db");
+            var mediaStreamsDbFile = Path.Combine(_config.ApplicationPaths.DataPath, "mediainfo.db");
             if (File.Exists(mediaStreamsDbFile))
             {
                 MigrateMediaStreams(mediaStreamsDbFile);
@@ -252,7 +258,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
             {
                 var backupFile = file + ".bak";
                 File.Copy(file, backupFile, true);
-                SqliteExtensions.Attach(_connection, backupFile, "MediaInfoOld");
+                DataExtensions.Attach(_connection, backupFile, "MediaInfoOld");
 
                 var columns = string.Join(",", _mediaStreamSaveColumns);
 
@@ -278,7 +284,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
             {
                 var backupFile = file + ".bak";
                 File.Copy(file, backupFile, true);
-                SqliteExtensions.Attach(_connection, backupFile, "ChaptersOld");
+                DataExtensions.Attach(_connection, backupFile, "ChaptersOld");
 
                 string[] queries = {
                                 "REPLACE INTO "+ChaptersTableName+"(ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath) SELECT ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath FROM ChaptersOld.Chapters;"
@@ -469,7 +475,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 "CriticRatingSummary",
                 "DateModifiedDuringLastRefresh",
                 "InheritedTags",
-                "CleanName"
+                "CleanName",
+                "PresentationUniqueKey"
             };
             _saveItemCommand = _connection.CreateCommand();
             _saveItemCommand.CommandText = "replace into TypedBaseItems (" + string.Join(",", saveColumns.ToArray()) + ") values (";
@@ -803,6 +810,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
                     {
                         _saveItemCommand.GetParameter(index++).Value = item.Name.RemoveDiacritics();
                     }
+                    _saveItemCommand.GetParameter(index++).Value = item.PresentationUniqueKey;
 
                     _saveItemCommand.Transaction = transaction;
 
@@ -1463,6 +1471,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             CheckDisposed();
 
+            var now = DateTime.UtcNow;
+
             using (var cmd = _connection.CreateCommand())
             {
                 cmd.CommandText = "select " + string.Join(",", _retriveItemColumns) + " from TypedBaseItems";
@@ -1475,6 +1485,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
                 cmd.CommandText += whereText;
 
+                if (EnableGroupByPresentationUniqueKey(query) && _config.Configuration.SchemaVersion >= 66)
+                {
+                    cmd.CommandText += " Group by PresentationUniqueKey";
+                }
+
                 cmd.CommandText += GetOrderByText(query);
 
                 if (query.Limit.HasValue)
@@ -1482,10 +1497,12 @@ namespace MediaBrowser.Server.Implementations.Persistence
                     cmd.CommandText += " LIMIT " + query.Limit.Value.ToString(CultureInfo.InvariantCulture);
                 }
 
-                //Logger.Debug(cmd.CommandText);
-
                 using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult))
                 {
+                    Logger.Debug("GetItemList query time: {0}ms. Query: {1}", 
+                        Convert.ToInt32((DateTime.UtcNow - now).TotalMilliseconds),
+                        cmd.CommandText);
+
                     while (reader.Read())
                     {
                         var item = GetItem(reader);
@@ -1507,6 +1524,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             CheckDisposed();
 
+            var now = DateTime.UtcNow;
+
             using (var cmd = _connection.CreateCommand())
             {
                 cmd.CommandText = "select " + string.Join(",", _retriveItemColumns) + " from TypedBaseItems";
@@ -1525,6 +1544,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
                 cmd.CommandText += whereText;
 
+                if (EnableGroupByPresentationUniqueKey(query) && _config.Configuration.SchemaVersion >= 66)
+                {
+                    cmd.CommandText += " Group by PresentationUniqueKey";
+                }
+
                 cmd.CommandText += GetOrderByText(query);
 
                 if (query.Limit.HasValue)
@@ -1532,15 +1556,24 @@ namespace MediaBrowser.Server.Implementations.Persistence
                     cmd.CommandText += " LIMIT " + query.Limit.Value.ToString(CultureInfo.InvariantCulture);
                 }
 
-                cmd.CommandText += "; select count (guid) from TypedBaseItems" + whereTextWithoutPaging;
-
-                //Logger.Debug(cmd.CommandText);
+                if (_config.Configuration.SchemaVersion >= 66)
+                {
+                    cmd.CommandText += "; select count (distinct PresentationUniqueKey) from TypedBaseItems" + whereTextWithoutPaging;
+                }
+                else
+                {
+                    cmd.CommandText += "; select count (guid) from TypedBaseItems" + whereTextWithoutPaging;
+                }
 
                 var list = new List<BaseItem>();
                 var count = 0;
 
                 using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
                 {
+                    Logger.Debug("GetItems query time: {0}ms. Query: {1}",
+                        Convert.ToInt32((DateTime.UtcNow - now).TotalMilliseconds),
+                        cmd.CommandText);
+
                     while (reader.Read())
                     {
                         var item = GetItem(reader);
@@ -1608,6 +1641,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             CheckDisposed();
 
+            var now = DateTime.UtcNow;
+
             using (var cmd = _connection.CreateCommand())
             {
                 cmd.CommandText = "select guid from TypedBaseItems";
@@ -1620,6 +1655,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
                 cmd.CommandText += whereText;
 
+                if (EnableGroupByPresentationUniqueKey(query) && _config.Configuration.SchemaVersion >= 66)
+                {
+                    cmd.CommandText += " Group by PresentationUniqueKey";
+                }
+
                 cmd.CommandText += GetOrderByText(query);
 
                 if (query.Limit.HasValue)
@@ -1629,10 +1669,12 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
                 var list = new List<Guid>();
 
-                //Logger.Debug(cmd.CommandText);
-
                 using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult))
                 {
+                    Logger.Debug("GetItemIdsList query time: {0}ms. Query: {1}",
+                        Convert.ToInt32((DateTime.UtcNow - now).TotalMilliseconds),
+                        cmd.CommandText);
+
                     while (reader.Read())
                     {
                         list.Add(reader.GetGuid(0));
@@ -1662,7 +1704,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
                     string.Empty :
                     " where " + string.Join(" AND ", whereClauses.ToArray());
 
-                whereClauses = GetWhereClauses(query, cmd, true);
+                whereClauses = GetWhereClauses(query, cmd, true, false);
 
                 var whereText = whereClauses.Count == 0 ?
                     string.Empty :
@@ -1670,6 +1712,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
                 cmd.CommandText += whereText;
 
+                if (EnableGroupByPresentationUniqueKey(query) && _config.Configuration.SchemaVersion >= 66)
+                {
+                    cmd.CommandText += " Group by PresentationUniqueKey";
+                }
+
                 cmd.CommandText += GetOrderByText(query);
 
                 if (query.Limit.HasValue)
@@ -1721,6 +1768,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             CheckDisposed();
 
+            var now = DateTime.UtcNow;
+
             using (var cmd = _connection.CreateCommand())
             {
                 cmd.CommandText = "select guid from TypedBaseItems";
@@ -1739,6 +1788,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
                 cmd.CommandText += whereText;
 
+                if (EnableGroupByPresentationUniqueKey(query) && _config.Configuration.SchemaVersion >= 66)
+                {
+                    cmd.CommandText += " Group by PresentationUniqueKey";
+                }
+
                 cmd.CommandText += GetOrderByText(query);
 
                 if (query.Limit.HasValue)
@@ -1746,15 +1800,24 @@ namespace MediaBrowser.Server.Implementations.Persistence
                     cmd.CommandText += " LIMIT " + query.Limit.Value.ToString(CultureInfo.InvariantCulture);
                 }
 
-                cmd.CommandText += "; select count (guid) from TypedBaseItems" + whereTextWithoutPaging;
+                if (EnableGroupByPresentationUniqueKey(query) && _config.Configuration.SchemaVersion >= 66)
+                {
+                    cmd.CommandText += "; select count (distinct PresentationUniqueKey) from TypedBaseItems" + whereTextWithoutPaging;
+                }
+                else
+                {
+                    cmd.CommandText += "; select count (guid) from TypedBaseItems" + whereTextWithoutPaging;
+                }
 
                 var list = new List<Guid>();
                 var count = 0;
 
-                //Logger.Debug(cmd.CommandText);
-
                 using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
                 {
+                    Logger.Debug("GetItemIds query time: {0}ms. Query: {1}",
+                        Convert.ToInt32((DateTime.UtcNow - now).TotalMilliseconds),
+                        cmd.CommandText);
+
                     while (reader.Read())
                     {
                         list.Add(reader.GetGuid(0));
@@ -1774,7 +1837,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
             }
         }
 
-        private List<string> GetWhereClauses(InternalItemsQuery query, IDbCommand cmd, bool addPaging)
+        private List<string> GetWhereClauses(InternalItemsQuery query, IDbCommand cmd, bool addPaging, bool enablePresentationUniqueKey = true)
         {
             var whereClauses = new List<string>();
 
@@ -1998,7 +2061,14 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             if (!string.IsNullOrWhiteSpace(query.NameContains))
             {
-                whereClauses.Add("CleanName like @NameContains");
+                if (_config.Configuration.SchemaVersion >= 66)
+                {
+                    whereClauses.Add("CleanName like @NameContains");
+                }
+                else
+                {
+                    whereClauses.Add("Name like @NameContains");
+                }
                 cmd.Parameters.Add(cmd, "@NameContains", DbType.String).Value = "%" + query.NameContains + "%";
             }
 
@@ -2134,7 +2204,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 whereClauses.Add("MediaType in (" + val + ")");
             }
 
-            var enableItemsByName = query.IncludeItemsByName ?? query.IncludeItemTypes.Length > 0;
+            //var enableItemsByName = query.IncludeItemsByName ?? query.IncludeItemTypes.Length > 0;
+            var enableItemsByName = query.IncludeItemsByName ?? false;
 
             if (query.TopParentIds.Length == 1)
             {
@@ -2197,7 +2268,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
             excludeTagIndex = 0;
             foreach (var excludeTag in query.ExcludeInheritedTags)
             {
-                whereClauses.Add("(InheritedTags is null OR InheritedTags not like @excludeInheritedTag" + excludeTagIndex +")");
+                whereClauses.Add("(InheritedTags is null OR InheritedTags not like @excludeInheritedTag" + excludeTagIndex + ")");
                 cmd.Parameters.Add(cmd, "@excludeInheritedTag" + excludeTagIndex, DbType.String).Value = "%" + excludeTag + "%";
                 excludeTagIndex++;
             }
@@ -2210,6 +2281,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
                         string.Empty :
                         " where " + string.Join(" AND ", whereClauses.ToArray());
 
+                    if (enablePresentationUniqueKey && EnableGroupByPresentationUniqueKey(query) && _config.Configuration.SchemaVersion >= 66)
+                    {
+                        pagingWhereText += " Group by PresentationUniqueKey";
+                    }
+
                     var orderBy = GetOrderByText(query);
 
                     whereClauses.Add(string.Format("guid NOT IN (SELECT guid FROM TypedBaseItems {0}" + orderBy + " LIMIT {1})",
@@ -2221,6 +2297,28 @@ namespace MediaBrowser.Server.Implementations.Persistence
             return whereClauses;
         }
 
+        private bool EnableGroupByPresentationUniqueKey(InternalItemsQuery query)
+        {
+            if (query.IncludeItemTypes.Length == 0)
+            {
+                return true;
+            }
+
+            var types = new[] {
+                typeof(Episode).Name,
+                typeof(Video).Name ,
+                typeof(Movie).Name ,
+                typeof(MusicVideo).Name ,
+                typeof(Series).Name };
+
+            if (types.Any(i => query.IncludeItemTypes.Contains(i, StringComparer.OrdinalIgnoreCase)))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
         private static readonly Type[] KnownTypes =
         {
             typeof(LiveTvProgram),
@@ -2299,7 +2397,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
             try
             {
                 transaction = _connection.BeginTransaction();
-                
+
                 foreach (var item in newValues)
                 {
                     _updateInheritedTagsCommand.GetParameter(0).Value = item.Item1;
-- 
cgit v1.2.3


From 311dd50eb7ec777a055755c3791b115fa2c0d762 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 1 May 2016 21:46:08 -0400
Subject: support more filters at db level

---
 MediaBrowser.Controller/Entities/Folder.cs         | 29 ----------------------
 .../Persistence/SqliteItemRepository.cs            | 24 ++++++++++++++++++
 2 files changed, 24 insertions(+), 29 deletions(-)

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

diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 41f0c02bd..fca2c6e43 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -839,11 +839,6 @@ namespace MediaBrowser.Controller.Entities
                     Logger.Debug("Query requires post-filtering due to ItemSortBy.SeriesSortName");
                     return true;
                 }
-                if (query.SortBy.Contains(ItemSortBy.StartDate, StringComparer.OrdinalIgnoreCase))
-                {
-                    Logger.Debug("Query requires post-filtering due to ItemSortBy.StartDate");
-                    return true;
-                }
                 if (query.SortBy.Contains(ItemSortBy.Studio, StringComparer.OrdinalIgnoreCase))
                 {
                     Logger.Debug("Query requires post-filtering due to ItemSortBy.Studio");
@@ -1059,30 +1054,6 @@ namespace MediaBrowser.Controller.Entities
                 return true;
             }
 
-            if (!string.IsNullOrWhiteSpace(query.NameContains))
-            {
-                Logger.Debug("Query requires post-filtering due to NameContains");
-                return true;
-            }
-
-            if (!string.IsNullOrWhiteSpace(query.NameLessThan))
-            {
-                Logger.Debug("Query requires post-filtering due to NameLessThan");
-                return true;
-            }
-
-            if (!string.IsNullOrWhiteSpace(query.NameStartsWith))
-            {
-                Logger.Debug("Query requires post-filtering due to NameStartsWith");
-                return true;
-            }
-
-            if (!string.IsNullOrWhiteSpace(query.NameStartsWithOrGreater))
-            {
-                Logger.Debug("Query requires post-filtering due to NameStartsWithOrGreater");
-                return true;
-            }
-
             if (query.AirDays.Length > 0)
             {
                 Logger.Debug("Query requires post-filtering due to AirDays");
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 6afdb8d9f..87b3bffe4 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -2071,6 +2071,30 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 }
                 cmd.Parameters.Add(cmd, "@NameContains", DbType.String).Value = "%" + query.NameContains + "%";
             }
+            if (!string.IsNullOrWhiteSpace(query.NameStartsWith))
+            {
+                if (_config.Configuration.SchemaVersion >= 66)
+                {
+                    whereClauses.Add("CleanName like @NameStartsWith");
+                }
+                else
+                {
+                    whereClauses.Add("Name like @NameStartsWith");
+                }
+                cmd.Parameters.Add(cmd, "@NameStartsWith", DbType.String).Value = query.NameStartsWith + "%";
+            }
+            if (!string.IsNullOrWhiteSpace(query.NameStartsWithOrGreater))
+            {
+                whereClauses.Add("SortName >= @NameStartsWithOrGreater");
+                // lowercase this because SortName is stored as lowercase
+                cmd.Parameters.Add(cmd, "@NameStartsWithOrGreater", DbType.String).Value = query.NameStartsWithOrGreater.ToLower();
+            }
+            if (!string.IsNullOrWhiteSpace(query.NameLessThan))
+            {
+                whereClauses.Add("SortName < @NameLessThan");
+                // lowercase this because SortName is stored as lowercase
+                cmd.Parameters.Add(cmd, "@NameLessThan", DbType.String).Value = query.NameLessThan.ToLower();
+            }
 
             if (query.Genres.Length > 0)
             {
-- 
cgit v1.2.3


From cd02373e554df232d88063f41b8aee391f3e7667 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 2 May 2016 01:32:04 -0400
Subject: support pooling series and seasons

---
 .../Entities/InternalItemsQuery.cs                 |  1 +
 MediaBrowser.Controller/Entities/TV/Episode.cs     | 33 ++++-----
 MediaBrowser.Controller/Entities/TV/Season.cs      | 26 +++++--
 MediaBrowser.Controller/Entities/TV/Series.cs      | 63 ++++++++++++-----
 .../Persistence/SqliteItemRepository.cs            | 16 ++++-
 .../Sorting/AiredEpisodeOrderComparer.cs           | 10 +--
 .../TV/TVSeriesManager.cs                          | 82 +++++++++++++---------
 7 files changed, 153 insertions(+), 78 deletions(-)

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

diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
index f3b4f4053..b148251ff 100644
--- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
+++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
@@ -46,6 +46,7 @@ namespace MediaBrowser.Controller.Entities
         public string NameLessThan { get; set; }
         public string NameContains { get; set; }
 
+        public string PresentationUniqueKey { get; set; }
         public string Path { get; set; }
         
         public string Person { get; set; }
diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
index 3ad6170a5..605b838cd 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -58,25 +58,7 @@ namespace MediaBrowser.Controller.Entities.TV
         {
             get
             {
-                return AirsAfterSeasonNumber ?? AirsBeforeSeasonNumber ?? PhysicalSeasonNumber;
-            }
-        }
-
-        [IgnoreDataMember]
-        public int? PhysicalSeasonNumber
-        {
-            get
-            {
-                var value = ParentIndexNumber;
-
-                if (value.HasValue)
-                {
-                    return value;
-                }
-
-                var season = Season;
-
-                return season != null ? season.IndexNumber : null;
+                return AirsAfterSeasonNumber ?? AirsBeforeSeasonNumber ?? ParentIndexNumber;
             }
         }
 
@@ -316,6 +298,19 @@ namespace MediaBrowser.Controller.Entities.TV
                 Logger.ErrorException("Error in FillMissingEpisodeNumbersFromPath. Episode: {0}", ex, Path ?? Name ?? Id.ToString());
             }
 
+            if (!ParentIndexNumber.HasValue)
+            {
+                var season = Season;
+                if (season != null)
+                {
+                    if (season.ParentIndexNumber.HasValue)
+                    {
+                        ParentIndexNumber = season.ParentIndexNumber;
+                        hasChanges = true;
+                    }
+                }
+            }
+
             return hasChanges;
         }
     }
diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs
index ebd22c6c4..1f443071c 100644
--- a/MediaBrowser.Controller/Entities/TV/Season.cs
+++ b/MediaBrowser.Controller/Entities/TV/Season.cs
@@ -92,6 +92,24 @@ namespace MediaBrowser.Controller.Entities.TV
             }
         }
 
+        [IgnoreDataMember]
+        public override string PresentationUniqueKey
+        {
+            get
+            {
+                if (IndexNumber.HasValue)
+                {
+                    var series = Series;
+                    if (series != null)
+                    {
+                        return series.PresentationUniqueKey + "-" + (IndexNumber ?? 0).ToString("000");
+                    }
+                }
+
+                return base.PresentationUniqueKey;
+            }
+        }
+
         /// <summary>
         /// Creates the name of the sort.
         /// </summary>
@@ -169,16 +187,16 @@ namespace MediaBrowser.Controller.Entities.TV
 
         public IEnumerable<Episode> GetEpisodes(User user, bool includeMissingEpisodes, bool includeVirtualUnairedEpisodes)
         {
-            var episodes = GetRecursiveChildren(user)
-                .OfType<Episode>();
-
             var series = Series;
 
             if (IndexNumber.HasValue && series != null)
             {
-                return series.GetEpisodes(user, IndexNumber.Value, includeMissingEpisodes, includeVirtualUnairedEpisodes, episodes);
+                return series.GetEpisodes(user, IndexNumber.Value, includeMissingEpisodes, includeVirtualUnairedEpisodes);
             }
 
+            var episodes = GetRecursiveChildren(user)
+                .OfType<Episode>();
+
             if (series != null && series.ContainsEpisodesWithoutSeasonFolders)
             {
                 var seasonNumber = IndexNumber;
diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index c062b5fba..abca6a643 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -94,7 +94,7 @@ namespace MediaBrowser.Controller.Entities.TV
         [IgnoreDataMember]
         public override string PresentationUniqueKey
         {
-            get { return GetUserDataKey(); }
+            get { return GetUserDataKeys().First(); }
         }
 
         /// <summary>
@@ -191,8 +191,28 @@ namespace MediaBrowser.Controller.Entities.TV
 
         public IEnumerable<Season> GetSeasons(User user, bool includeMissingSeasons, bool includeVirtualUnaired)
         {
-            var seasons = base.GetChildren(user, true)
-                .OfType<Season>();
+            var seriesIds = LibraryManager.GetItemIds(new InternalItemsQuery(user)
+            {
+                PresentationUniqueKey = PresentationUniqueKey,
+                IncludeItemTypes = new[] { typeof(Series).Name }
+            });
+
+            IEnumerable<Season> seasons;
+
+            if (seriesIds.Count > 1)
+            {
+                seasons = LibraryManager.GetItemList(new InternalItemsQuery(user)
+                {
+                    AncestorIds = seriesIds.Select(i => i.ToString("N")).ToArray(),
+                    IncludeItemTypes = new[] { typeof(Season).Name },
+                    SortBy = new[] { ItemSortBy.SortName }
+
+                }).OfType<Season>();
+            }
+            else
+            {
+                seasons = base.GetChildren(user, true).OfType<Season>();
+            }
 
             if (!includeMissingSeasons && !includeVirtualUnaired)
             {
@@ -210,9 +230,7 @@ namespace MediaBrowser.Controller.Entities.TV
                 }
             }
 
-            return LibraryManager
-                .Sort(seasons, user, new[] { ItemSortBy.SortName }, SortOrder.Ascending)
-                .Cast<Season>();
+            return seasons;
         }
 
         public IEnumerable<Episode> GetEpisodes(User user)
@@ -321,18 +339,31 @@ namespace MediaBrowser.Controller.Entities.TV
 
         public IEnumerable<Episode> GetEpisodes(User user, int seasonNumber, bool includeMissingEpisodes, bool includeVirtualUnairedEpisodes)
         {
-            return GetEpisodes(user, seasonNumber, includeMissingEpisodes, includeVirtualUnairedEpisodes,
-                new List<Episode>());
-        }
+            var seriesIds = LibraryManager.GetItemIds(new InternalItemsQuery(user)
+            {
+                PresentationUniqueKey = PresentationUniqueKey,
+                IncludeItemTypes = new[] { typeof(Series).Name }
+            });
 
-        internal IEnumerable<Episode> GetEpisodes(User user, int seasonNumber, bool includeMissingEpisodes, bool includeVirtualUnairedEpisodes, IEnumerable<Episode> additionalEpisodes)
-        {
-            var episodes = GetRecursiveChildren(user, i => i is Episode)
-                .Cast<Episode>();
+            IEnumerable<Episode> episodes;
 
-            episodes = FilterEpisodesBySeason(episodes, seasonNumber, DisplaySpecialsWithSeasons);
+            if (seriesIds.Count > 1)
+            {
+                episodes = LibraryManager.GetItemList(new InternalItemsQuery(user)
+                {
+                    AncestorIds = seriesIds.Select(i => i.ToString("N")).ToArray(),
+                    IncludeItemTypes = new[] { typeof(Episode).Name },
+                    SortBy = new[] { ItemSortBy.SortName }
 
-            episodes = episodes.Concat(additionalEpisodes).Distinct();
+                }).OfType<Episode>();
+            }
+            else
+            {
+                episodes = GetRecursiveChildren(user, i => i is Episode)
+                    .Cast<Episode>();
+            }
+
+            episodes = FilterEpisodesBySeason(episodes, seasonNumber, DisplaySpecialsWithSeasons);
 
             if (!includeMissingEpisodes)
             {
@@ -360,7 +391,7 @@ namespace MediaBrowser.Controller.Entities.TV
         {
             if (!includeSpecials || seasonNumber < 1)
             {
-                return episodes.Where(i => (i.PhysicalSeasonNumber ?? -1) == seasonNumber);
+                return episodes.Where(i => (i.ParentIndexNumber ?? -1) == seasonNumber);
             }
 
             return episodes.Where(i =>
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 87b3bffe4..6959de8e6 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -82,7 +82,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
         private IDbCommand _updateInheritedRatingCommand;
         private IDbCommand _updateInheritedTagsCommand;
 
-        public const int LatestSchemaVersion = 66;
+        public const int LatestSchemaVersion = 68;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SqliteItemRepository"/> class.
@@ -1936,6 +1936,12 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 cmd.Parameters.Add(cmd, "@Path", DbType.String).Value = query.Path;
             }
 
+            if (!string.IsNullOrWhiteSpace(query.PresentationUniqueKey))
+            {
+                whereClauses.Add("PresentationUniqueKey=@PresentationUniqueKey");
+                cmd.Parameters.Add(cmd, "@PresentationUniqueKey", DbType.String).Value = query.PresentationUniqueKey;
+            }
+
             if (query.MinCommunityRating.HasValue)
             {
                 whereClauses.Add("CommunityRating>=@MinCommunityRating");
@@ -2323,6 +2329,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
         private bool EnableGroupByPresentationUniqueKey(InternalItemsQuery query)
         {
+            if (!string.IsNullOrWhiteSpace(query.PresentationUniqueKey))
+            {
+                return false;
+            }
+
             if (query.IncludeItemTypes.Length == 0)
             {
                 return true;
@@ -2333,7 +2344,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 typeof(Video).Name ,
                 typeof(Movie).Name ,
                 typeof(MusicVideo).Name ,
-                typeof(Series).Name };
+                typeof(Series).Name ,
+                typeof(Season).Name };
 
             if (types.Any(i => query.IncludeItemTypes.Contains(i, StringComparer.OrdinalIgnoreCase)))
             {
diff --git a/MediaBrowser.Server.Implementations/Sorting/AiredEpisodeOrderComparer.cs b/MediaBrowser.Server.Implementations/Sorting/AiredEpisodeOrderComparer.cs
index 70cf805cf..91abbe34c 100644
--- a/MediaBrowser.Server.Implementations/Sorting/AiredEpisodeOrderComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/AiredEpisodeOrderComparer.cs
@@ -49,8 +49,8 @@ namespace MediaBrowser.Server.Implementations.Sorting
 
         private int Compare(Episode x, Episode y)
         {
-            var isXSpecial = (x.PhysicalSeasonNumber ?? -1) == 0;
-            var isYSpecial = (y.PhysicalSeasonNumber ?? -1) == 0;
+            var isXSpecial = (x.ParentIndexNumber ?? -1) == 0;
+            var isYSpecial = (y.ParentIndexNumber ?? -1) == 0;
 
             if (isXSpecial && isYSpecial)
             {
@@ -74,7 +74,7 @@ namespace MediaBrowser.Server.Implementations.Sorting
         {
             // http://thetvdb.com/wiki/index.php?title=Special_Episodes
 
-            var xSeason = x.PhysicalSeasonNumber ?? -1;
+            var xSeason = x.ParentIndexNumber ?? -1;
             var ySeason = y.AirsAfterSeasonNumber ?? y.AirsBeforeSeasonNumber ?? -1;
 
             if (xSeason != ySeason)
@@ -142,8 +142,8 @@ namespace MediaBrowser.Server.Implementations.Sorting
 
         private int CompareEpisodes(Episode x, Episode y)
         {
-            var xValue = (x.PhysicalSeasonNumber ?? -1) * 1000 + (x.IndexNumber ?? -1);
-            var yValue = (y.PhysicalSeasonNumber ?? -1) * 1000 + (y.IndexNumber ?? -1);
+            var xValue = (x.ParentIndexNumber ?? -1) * 1000 + (x.IndexNumber ?? -1);
+            var yValue = (y.ParentIndexNumber ?? -1) * 1000 + (y.IndexNumber ?? -1);
 
             return xValue.CompareTo(yValue);
         }
diff --git a/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs b/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs
index dc880d84b..ec91dc1b7 100644
--- a/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs
+++ b/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs
@@ -36,10 +36,25 @@ namespace MediaBrowser.Server.Implementations.TV
                 ? new string[] { }
                 : new[] { request.ParentId };
 
+            string presentationUniqueKey = null;
+            int? limit = null;
+            if (!string.IsNullOrWhiteSpace(request.SeriesId))
+            {
+                var series = _libraryManager.GetItemById(request.SeriesId);
+
+                if (series != null)
+                {
+                    presentationUniqueKey = series.PresentationUniqueKey;
+                    limit = 1;
+                }
+            }
+
             var items = _libraryManager.GetItemList(new InternalItemsQuery(user)
             {
                 IncludeItemTypes = new[] { typeof(Series).Name },
-                SortOrder = SortOrder.Ascending
+                SortOrder = SortOrder.Ascending,
+                PresentationUniqueKey = presentationUniqueKey,
+                Limit = limit
 
             }, parentIds).Cast<Series>();
 
@@ -58,10 +73,25 @@ namespace MediaBrowser.Server.Implementations.TV
                 throw new ArgumentException("User not found");
             }
 
+            string presentationUniqueKey = null;
+            int? limit = null;
+            if (!string.IsNullOrWhiteSpace(request.SeriesId))
+            {
+                var series = _libraryManager.GetItemById(request.SeriesId);
+
+                if (series != null)
+                {
+                    presentationUniqueKey = series.PresentationUniqueKey;
+                    limit = 1;
+                }
+            }
+
             var items = _libraryManager.GetItemList(new InternalItemsQuery(user)
             {
                 IncludeItemTypes = new[] { typeof(Series).Name },
-                SortOrder = SortOrder.Ascending
+                SortOrder = SortOrder.Ascending,
+                PresentationUniqueKey = presentationUniqueKey,
+                Limit = limit
 
             }, parentsFolders.Select(i => i.Id.ToString("N"))).Cast<Series>();
 
@@ -76,30 +106,30 @@ namespace MediaBrowser.Server.Implementations.TV
             // Avoid implicitly captured closure
             var currentUser = user;
 
-            return FilterSeries(request, series)
+            return series
                 .AsParallel()
                 .Select(i => GetNextUp(i, currentUser))
                 // Include if an episode was found, and either the series is not unwatched or the specific series was requested
                 .Where(i => i.Item1 != null && (!i.Item3 || !string.IsNullOrWhiteSpace(request.SeriesId)))
-                .OrderByDescending(i =>
-                {
-                    var episode = i.Item1;
+                //.OrderByDescending(i =>
+                //{
+                //    var episode = i.Item1;
 
-                    var seriesUserData = _userDataManager.GetUserData(user, episode.Series);
+                //    var seriesUserData = _userDataManager.GetUserData(user, episode.Series);
 
-                    if (seriesUserData.IsFavorite)
-                    {
-                        return 2;
-                    }
+                //    if (seriesUserData.IsFavorite)
+                //    {
+                //        return 2;
+                //    }
 
-                    if (seriesUserData.Likes.HasValue)
-                    {
-                        return seriesUserData.Likes.Value ? 1 : -1;
-                    }
+                //    if (seriesUserData.Likes.HasValue)
+                //    {
+                //        return seriesUserData.Likes.Value ? 1 : -1;
+                //    }
 
-                    return 0;
-                })
-                .ThenByDescending(i => i.Item2)
+                //    return 0;
+                //})
+                .OrderByDescending(i => i.Item2)
                 .ThenByDescending(i => i.Item1.PremiereDate ?? DateTime.MinValue)
                 .Select(i => i.Item1);
         }
@@ -142,7 +172,7 @@ namespace MediaBrowser.Server.Implementations.TV
                 }
                 else
                 {
-                    if (!episode.IsVirtualUnaired && (!episode.IsMissingEpisode || includeMissing))
+                    if (!episode.IsVirtualUnaired && (includeMissing || !episode.IsMissingEpisode))
                     {
                         nextUp = episode;
                     }
@@ -154,24 +184,12 @@ namespace MediaBrowser.Server.Implementations.TV
                 return new Tuple<Episode, DateTime, bool>(nextUp, lastWatchedDate, false);
             }
 
-            var firstEpisode = allEpisodes.LastOrDefault(i => !i.IsVirtualUnaired && (!i.IsMissingEpisode || includeMissing) && !i.IsPlayed(user));
+            var firstEpisode = allEpisodes.LastOrDefault(i => !i.IsVirtualUnaired && (includeMissing || !i.IsMissingEpisode) && !i.IsPlayed(user));
 
             // Return the first episode
             return new Tuple<Episode, DateTime, bool>(firstEpisode, DateTime.MinValue, true);
         }
 
-        private IEnumerable<Series> FilterSeries(NextUpQuery request, IEnumerable<Series> items)
-        {
-            if (!string.IsNullOrWhiteSpace(request.SeriesId))
-            {
-                var id = new Guid(request.SeriesId);
-
-                items = items.Where(i => i.Id == id);
-            }
-
-            return items;
-        }
-
         private QueryResult<BaseItem> GetResult(IEnumerable<BaseItem> items, int? totalRecordLimit, NextUpQuery query)
         {
             var itemsArray = totalRecordLimit.HasValue ? items.Take(totalRecordLimit.Value).ToArray() : items.ToArray();
-- 
cgit v1.2.3