reduce recursive querying

MediaBrowser.Api/BaseApiService.cs

@@ -79,7 +79,7 @@ namespace MediaBrowser.Api
                 }
             }
         }
-        
+
         /// <summary>
         /// To the optimized serialized result using cache.
         /// </summary>
@@ -118,9 +118,6 @@ namespace MediaBrowser.Api
             return ResultFactory.GetStaticFileResult(Request, path);
         }
 
-        private readonly char[] _dashReplaceChars = { '?', '/', '&' };
-        private const char SlugChar = '-';
-
         protected DtoOptions GetDtoOptions(object request)
         {
             var options = new DtoOptions();
@@ -154,152 +151,122 @@ namespace MediaBrowser.Api
 
         protected MusicArtist GetArtist(string name, ILibraryManager libraryManager)
         {
-            return libraryManager.GetArtist(DeSlugArtistName(name, libraryManager));
+            if (name.IndexOf(BaseItem.SlugChar) != -1)
-        }
+            {
-
+                var result = libraryManager.GetItemList(new InternalItemsQuery
-        protected Studio GetStudio(string name, ILibraryManager libraryManager)
+                {
-        {
+                    SlugName = name,
-            return libraryManager.GetStudio(DeSlugStudioName(name, libraryManager));
+                    IncludeItemTypes = new[] { typeof(MusicArtist).Name }
-        }
-
-        protected Genre GetGenre(string name, ILibraryManager libraryManager)
-        {
-            return libraryManager.GetGenre(DeSlugGenreName(name, libraryManager));
-        }
 
-        protected MusicGenre GetMusicGenre(string name, ILibraryManager libraryManager)
+                }).OfType<MusicArtist>().FirstOrDefault();
-        {
-            return libraryManager.GetMusicGenre(DeSlugGenreName(name, libraryManager));
-        }
 
-        protected GameGenre GetGameGenre(string name, ILibraryManager libraryManager)
+                if (result != null)
-        {
+                {
-            return libraryManager.GetGameGenre(DeSlugGameGenreName(name, libraryManager));
+                    return result;
-        }
+                }
+            }
 
-        protected Person GetPerson(string name, ILibraryManager libraryManager)
+            return libraryManager.GetArtist(name);
-        {
-            return libraryManager.GetPerson(DeSlugPersonName(name, libraryManager));
         }
 
-        /// <summary>
+        protected Studio GetStudio(string name, ILibraryManager libraryManager)
-        /// Deslugs an artist name by finding the correct entry in the library
-        /// </summary>
-        /// <param name="name"></param>
-        /// <param name="libraryManager"></param>
-        /// <returns></returns>
-        protected string DeSlugArtistName(string name, ILibraryManager libraryManager)
         {
-            if (name.IndexOf(SlugChar) == -1)
+            if (name.IndexOf(BaseItem.SlugChar) != -1)
-            {
-                return name;
-            }
-
-            var items = libraryManager.GetItemList(new InternalItemsQuery
             {
-                IncludeItemTypes = new[] { typeof(Audio).Name, typeof(MusicVideo).Name, typeof(MusicAlbum).Name }
+                var result = libraryManager.GetItemList(new InternalItemsQuery
-            });
-
-            return items
-                .OfType<IHasArtist>()
-                .SelectMany(i => i.AllArtists)
-                .DistinctNames()
-                .FirstOrDefault(i =>
                 {
-                    i = _dashReplaceChars.Aggregate(i, (current, c) => current.Replace(c, SlugChar));
+                    SlugName = name,
+                    IncludeItemTypes = new[] { typeof(Studio).Name }
 
-                    return string.Equals(i, name, StringComparison.OrdinalIgnoreCase);
+                }).OfType<Studio>().FirstOrDefault();
+
+                if (result != null)
+                {
+                    return result;
+                }
+            }
 
-                }) ?? name;
+            return libraryManager.GetStudio(name);
         }
 
-        /// <summary>
+        protected Genre GetGenre(string name, ILibraryManager libraryManager)
-        /// Deslugs a genre name by finding the correct entry in the library
-        /// </summary>
-        protected string DeSlugGenreName(string name, ILibraryManager libraryManager)
         {
-            if (name.IndexOf(SlugChar) == -1)
+            if (name.IndexOf(BaseItem.SlugChar) != -1)
             {
-                return name;
+                var result = libraryManager.GetItemList(new InternalItemsQuery
-            }
-
-            return libraryManager.RootFolder.GetRecursiveChildren()
-                .SelectMany(i => i.Genres)
-                .DistinctNames()
-                .FirstOrDefault(i =>
                 {
-                    i = _dashReplaceChars.Aggregate(i, (current, c) => current.Replace(c, SlugChar));
+                    SlugName = name,
+                    IncludeItemTypes = new[] { typeof(Genre).Name }
 
-                    return string.Equals(i, name, StringComparison.OrdinalIgnoreCase);
+                }).OfType<Genre>().FirstOrDefault();
+
+                if (result != null)
+                {
+                    return result;
+                }
+            }
 
-                }) ?? name;
+            return libraryManager.GetGenre(name);
         }
 
-        protected string DeSlugGameGenreName(string name, ILibraryManager libraryManager)
+        protected MusicGenre GetMusicGenre(string name, ILibraryManager libraryManager)
         {
-            if (name.IndexOf(SlugChar) == -1)
+            if (name.IndexOf(BaseItem.SlugChar) != -1)
             {
-                return name;
+                var result = libraryManager.GetItemList(new InternalItemsQuery
-            }
+                {
+                    SlugName = name,
+                    IncludeItemTypes = new[] { typeof(MusicGenre).Name }
 
-            var items = libraryManager.GetItemList(new InternalItemsQuery
+                }).OfType<MusicGenre>().FirstOrDefault();
-            {
-                IncludeItemTypes = new[] { typeof(Game).Name }
-            });
 
-            return items
+                if (result != null)
-                .SelectMany(i => i.Genres)
-                .DistinctNames()
-                .FirstOrDefault(i =>
                 {
-                    i = _dashReplaceChars.Aggregate(i, (current, c) => current.Replace(c, SlugChar));
+                    return result;
-
+                }
-                    return string.Equals(i, name, StringComparison.OrdinalIgnoreCase);
+            }
 
-                }) ?? name;
+            return libraryManager.GetMusicGenre(name);
         }
 
-        /// <summary>
+        protected GameGenre GetGameGenre(string name, ILibraryManager libraryManager)
-        /// Deslugs a studio name by finding the correct entry in the library
-        /// </summary>
-        protected string DeSlugStudioName(string name, ILibraryManager libraryManager)
         {
-            if (name.IndexOf(SlugChar) == -1)
+            if (name.IndexOf(BaseItem.SlugChar) != -1)
             {
-                return name;
+                var result = libraryManager.GetItemList(new InternalItemsQuery
-            }
-
-            return libraryManager.RootFolder
-                .GetRecursiveChildren()
-                .SelectMany(i => i.Studios)
-                .DistinctNames()
-                .FirstOrDefault(i =>
                 {
-                    i = _dashReplaceChars.Aggregate(i, (current, c) => current.Replace(c, SlugChar));
+                    SlugName = name,
+                    IncludeItemTypes = new[] { typeof(GameGenre).Name }
 
-                    return string.Equals(i, name, StringComparison.OrdinalIgnoreCase);
+                }).OfType<GameGenre>().FirstOrDefault();
 
-                }) ?? name;
+                if (result != null)
+                {
+                    return result;
+                }
+            }
+
+            return libraryManager.GetGameGenre(name);
         }
 
-        /// <summary>
+        protected Person GetPerson(string name, ILibraryManager libraryManager)
-        /// Deslugs a person name by finding the correct entry in the library
-        /// </summary>
-        protected string DeSlugPersonName(string name, ILibraryManager libraryManager)
         {
-            if (name.IndexOf(SlugChar) == -1)
+            if (name.IndexOf(BaseItem.SlugChar) != -1)
             {
-                return name;
+                var result = libraryManager.GetItemList(new InternalItemsQuery
-            }
-
-            return libraryManager.GetPeopleNames(new InternalPeopleQuery())
-                .FirstOrDefault(i =>
                 {
-                    i = _dashReplaceChars.Aggregate(i, (current, c) => current.Replace(c, SlugChar));
+                    SlugName = name,
+                    IncludeItemTypes = new[] { typeof(Person).Name }
 
-                    return string.Equals(i, name, StringComparison.OrdinalIgnoreCase);
+                }).OfType<Person>().FirstOrDefault();
+
+                if (result != null)
+                {
+                    return result;
+                }
+            }
 
-                }) ?? name;
+            return libraryManager.GetPerson(name);
         }
 
         protected string GetPathValue(int index)

MediaBrowser.Api/VideosService.cs

@@ -175,7 +175,7 @@ namespace MediaBrowser.Api
 
             foreach (var item in items.Where(i => i.Id != primaryVersion.Id))
             {
-                item.PrimaryVersionId = primaryVersion.Id;
+                item.PrimaryVersionId = primaryVersion.Id.ToString("N");
 
                 await item.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
 

MediaBrowser.Controller/Entities/BaseItem.cs

@@ -44,6 +44,9 @@ namespace MediaBrowser.Controller.Entities
             ImageInfos = new List<ItemImageInfo>();
         }
 
+        public static readonly char[] SlugReplaceChars = { '?', '/', '&' };
+        public static char SlugChar = '-';
+
         /// <summary>
         /// The supported image extensions
         /// </summary>
@@ -125,6 +128,21 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
+        [IgnoreDataMember]
+        public string SlugName
+        {
+            get
+            {
+                var name = Name;
+                if (string.IsNullOrWhiteSpace(name))
+                {
+                    return string.Empty;
+                }
+
+                return SlugReplaceChars.Aggregate(name, (current, c) => current.Replace(c, SlugChar));
+            }
+        }
+
         public string OriginalTitle { get; set; }
 
         /// <summary>
@@ -728,12 +746,14 @@ namespace MediaBrowser.Controller.Entities
         /// Gets or sets the critic rating.
         /// </summary>
         /// <value>The critic rating.</value>
+        [IgnoreDataMember]
         public float? CriticRating { get; set; }
 
         /// <summary>
         /// Gets or sets the critic rating summary.
         /// </summary>
         /// <value>The critic rating summary.</value>
+        [IgnoreDataMember]
         public string CriticRatingSummary { get; set; }
 
         /// <summary>

MediaBrowser.Controller/Entities/Folder.cs

@@ -707,8 +707,8 @@ namespace MediaBrowser.Controller.Entities
         {
             return ItemRepository.GetItemIdsList(new InternalItemsQuery
             {
-                ParentId = Id
+                ParentId = Id,
-
+                GroupByPresentationUniqueKey = false
             });
         }
 

MediaBrowser.Controller/Entities/InternalItemsQuery.cs

@@ -49,6 +49,7 @@ namespace MediaBrowser.Controller.Entities
         public string PresentationUniqueKey { get; set; }
         public string Path { get; set; }
         public string Name { get; set; }
+        public string SlugName { get; set; }
 
         public string Person { get; set; }
         public string[] PersonIds { get; set; }
@@ -133,9 +134,13 @@ namespace MediaBrowser.Controller.Entities
 
         public string[] AlbumNames { get; set; }
         public string[] ArtistNames { get; set; }
-        
+
+        public bool GroupByPresentationUniqueKey { get; set; }
+
         public InternalItemsQuery()
         {
+            GroupByPresentationUniqueKey = true;
+
             AlbumNames = new string[] { };
             ArtistNames = new string[] { };
             

MediaBrowser.Controller/Entities/Movies/BoxSet.cs

@@ -8,6 +8,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
+using MediaBrowser.Controller.Entities.Audio;
 
 namespace MediaBrowser.Controller.Entities.Movies
 {
@@ -118,7 +119,7 @@ namespace MediaBrowser.Controller.Entities.Movies
             // Gather all possible ratings
             var ratings = GetRecursiveChildren()
                 .Concat(GetLinkedChildren())
-                .Where(i => i is Movie || i is Series)
+                .Where(i => i is Movie || i is Series || i is MusicAlbum || i is Game)
                 .Select(i => i.OfficialRating)
                 .Where(i => !string.IsNullOrEmpty(i))
                 .Distinct(StringComparer.OrdinalIgnoreCase)

MediaBrowser.Controller/Entities/Video.cs

@@ -28,7 +28,8 @@ namespace MediaBrowser.Controller.Entities
         IThemeMedia,
         IArchivable
     {
-        public Guid? PrimaryVersionId { get; set; }
+        [IgnoreDataMember]
+        public string PrimaryVersionId { get; set; }
 
         public List<string> AdditionalParts { get; set; }
         public List<string> LocalAlternateVersions { get; set; }
@@ -49,9 +50,9 @@ namespace MediaBrowser.Controller.Entities
         {
             get
             {
-                if (PrimaryVersionId.HasValue)
+                if (!string.IsNullOrWhiteSpace(PrimaryVersionId))
                 {
-                    return PrimaryVersionId.Value.ToString("N");
+                    return PrimaryVersionId;
                 }
 
                 return base.PresentationUniqueKey;
@@ -70,6 +71,72 @@ namespace MediaBrowser.Controller.Entities
         /// <value>The timestamp.</value>
         public TransportStreamTimestamp? Timestamp { get; set; }
 
+        /// <summary>
+        /// Gets or sets the subtitle paths.
+        /// </summary>
+        /// <value>The subtitle paths.</value>
+        public List<string> SubtitleFiles { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance has subtitles.
+        /// </summary>
+        /// <value><c>true</c> if this instance has subtitles; otherwise, <c>false</c>.</value>
+        public bool HasSubtitles { get; set; }
+
+        public bool IsPlaceHolder { get; set; }
+        public bool IsShortcut { get; set; }
+        public string ShortcutPath { get; set; }
+
+        /// <summary>
+        /// Gets or sets the video bit rate.
+        /// </summary>
+        /// <value>The video bit rate.</value>
+        public int? VideoBitRate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the default index of the video stream.
+        /// </summary>
+        /// <value>The default index of the video stream.</value>
+        public int? DefaultVideoStreamIndex { get; set; }
+
+        /// <summary>
+        /// Gets or sets the type of the video.
+        /// </summary>
+        /// <value>The type of the video.</value>
+        public VideoType VideoType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the type of the iso.
+        /// </summary>
+        /// <value>The type of the iso.</value>
+        public IsoType? IsoType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the video3 D format.
+        /// </summary>
+        /// <value>The video3 D format.</value>
+        public Video3DFormat? Video3DFormat { get; set; }
+
+        /// <summary>
+        /// If the video is a folder-rip, this will hold the file list for the largest playlist
+        /// </summary>
+        public List<string> PlayableStreamFileNames { get; set; }
+
+        /// <summary>
+        /// Gets the playable stream files.
+        /// </summary>
+        /// <returns>List{System.String}.</returns>
+        public List<string> GetPlayableStreamFiles()
+        {
+            return GetPlayableStreamFiles(Path);
+        }
+
+        /// <summary>
+        /// Gets or sets the aspect ratio.
+        /// </summary>
+        /// <value>The aspect ratio.</value>
+        public string AspectRatio { get; set; }
+
         public Video()
         {
             PlayableStreamFileNames = new List<string>();
@@ -104,9 +171,9 @@ namespace MediaBrowser.Controller.Entities
         {
             get
             {
-                if (PrimaryVersionId.HasValue)
+                if (!string.IsNullOrWhiteSpace(PrimaryVersionId))
                 {
-                    var item = LibraryManager.GetItemById(PrimaryVersionId.Value) as Video;
+                    var item = LibraryManager.GetItemById(PrimaryVersionId) as Video;
                     if (item != null)
                     {
                         return item.MediaSourceCount;
@@ -238,72 +305,6 @@ namespace MediaBrowser.Controller.Entities
                 .OrderBy(i => i.SortName);
         }
 
-        /// <summary>
-        /// Gets or sets the subtitle paths.
-        /// </summary>
-        /// <value>The subtitle paths.</value>
-        public List<string> SubtitleFiles { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance has subtitles.
-        /// </summary>
-        /// <value><c>true</c> if this instance has subtitles; otherwise, <c>false</c>.</value>
-        public bool HasSubtitles { get; set; }
-
-        public bool IsPlaceHolder { get; set; }
-        public bool IsShortcut { get; set; }
-        public string ShortcutPath { get; set; }
-
-        /// <summary>
-        /// Gets or sets the video bit rate.
-        /// </summary>
-        /// <value>The video bit rate.</value>
-        public int? VideoBitRate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the default index of the video stream.
-        /// </summary>
-        /// <value>The default index of the video stream.</value>
-        public int? DefaultVideoStreamIndex { get; set; }
-
-        /// <summary>
-        /// Gets or sets the type of the video.
-        /// </summary>
-        /// <value>The type of the video.</value>
-        public VideoType VideoType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the type of the iso.
-        /// </summary>
-        /// <value>The type of the iso.</value>
-        public IsoType? IsoType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the video3 D format.
-        /// </summary>
-        /// <value>The video3 D format.</value>
-        public Video3DFormat? Video3DFormat { get; set; }
-
-        /// <summary>
-        /// If the video is a folder-rip, this will hold the file list for the largest playlist
-        /// </summary>
-        public List<string> PlayableStreamFileNames { get; set; }
-
-        /// <summary>
-        /// Gets the playable stream files.
-        /// </summary>
-        /// <returns>List{System.String}.</returns>
-        public List<string> GetPlayableStreamFiles()
-        {
-            return GetPlayableStreamFiles(Path);
-        }
-
-        /// <summary>
-        /// Gets or sets the aspect ratio.
-        /// </summary>
-        /// <value>The aspect ratio.</value>
-        public string AspectRatio { get; set; }
-
         [IgnoreDataMember]
         public override string ContainingFolderPath
         {
@@ -520,9 +521,9 @@ namespace MediaBrowser.Controller.Entities
             list.Add(new Tuple<Video, MediaSourceType>(this, MediaSourceType.Default));
             list.AddRange(GetLinkedAlternateVersions().Select(i => new Tuple<Video, MediaSourceType>(i, MediaSourceType.Grouping)));
 
-            if (PrimaryVersionId.HasValue)
+            if (!string.IsNullOrWhiteSpace(PrimaryVersionId))
             {
-                var primary = LibraryManager.GetItemById(PrimaryVersionId.Value) as Video;
+                var primary = LibraryManager.GetItemById(PrimaryVersionId) as Video;
                 if (primary != null)
                 {
                     var existingIds = list.Select(i => i.Item1.Id).ToList();

MediaBrowser.Server.Implementations/Dto/DtoService.cs

@@ -397,12 +397,6 @@ namespace MediaBrowser.Server.Implementations.Dto
                     collectionFolder.GetViewType(user);
             }
 
-            var playlist = item as Playlist;
-            if (playlist != null)
-            {
-                AttachLinkedChildImages(dto, playlist, user, options);
-            }
-
             if (fields.Contains(ItemFields.CanDelete))
             {
                 dto.CanDelete = user == null
@@ -1564,45 +1558,6 @@ namespace MediaBrowser.Server.Implementations.Dto
             }
         }
 
-        private void AttachLinkedChildImages(BaseItemDto dto, Folder folder, User user, DtoOptions options)
-        {
-            List<BaseItem> linkedChildren = null;
-
-            var backdropLimit = options.GetImageLimit(ImageType.Backdrop);
-
-            if (backdropLimit > 0 && dto.BackdropImageTags.Count == 0)
-            {
-                linkedChildren = user == null
-                    ? folder.GetRecursiveChildren().ToList()
-                    : folder.GetRecursiveChildren(user).ToList();
-
-                var parentWithBackdrop = linkedChildren.FirstOrDefault(i => i.GetImages(ImageType.Backdrop).Any());
-
-                if (parentWithBackdrop != null)
-                {
-                    dto.ParentBackdropItemId = GetDtoId(parentWithBackdrop);
-                    dto.ParentBackdropImageTags = GetBackdropImageTags(parentWithBackdrop, backdropLimit);
-                }
-            }
-
-            if (!dto.ImageTags.ContainsKey(ImageType.Primary) && options.GetImageLimit(ImageType.Primary) > 0)
-            {
-                if (linkedChildren == null)
-                {
-                    linkedChildren = user == null
-                        ? folder.GetRecursiveChildren().ToList()
-                        : folder.GetRecursiveChildren(user).ToList();
-                }
-                var parentWithImage = linkedChildren.FirstOrDefault(i => i.GetImages(ImageType.Primary).Any());
-
-                if (parentWithImage != null)
-                {
-                    dto.ParentPrimaryImageItemId = GetDtoId(parentWithImage);
-                    dto.ParentPrimaryImageTag = GetImageCacheTag(parentWithImage, ImageType.Primary);
-                }
-            }
-        }
-
         private string GetMappedPath(IHasMetadata item)
         {
             var path = item.Path;

MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs

@@ -2,7 +2,6 @@
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Logging;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -35,25 +34,20 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
         /// <returns>Task.</returns>
         public async Task Run(IProgress<double> progress, CancellationToken cancellationToken)
         {
-            var items = _libraryManager.RootFolder.GetRecursiveChildren()
+            var items = _libraryManager.GetItemList(new InternalItemsQuery
-                .SelectMany(i => i.Studios)
+            {
-                .DistinctNames()
+                IncludeItemTypes = new[] { typeof(Studio).Name }
-                .ToList();
+
+            }).ToList();
 
             var numComplete = 0;
             var count = items.Count;
 
-            var validIds = new List<Guid>();
+            foreach (var item in items)
-
-            foreach (var name in items)
             {
                 try
                 {
-                    var itemByName = _libraryManager.GetStudio(name);
+                    await item.RefreshMetadata(cancellationToken).ConfigureAwait(false);
-
-                    validIds.Add(itemByName.Id);
-
-                    await itemByName.RefreshMetadata(cancellationToken).ConfigureAwait(false);
                 }
                 catch (OperationCanceledException)
                 {
@@ -62,7 +56,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error refreshing {0}", ex, name);
+                    _logger.ErrorException("Error refreshing {0}", ex, item.Name);
                 }
 
                 numComplete++;
@@ -73,28 +67,6 @@ 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)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                
-                var item = _libraryManager.GetItemById(id);
-
-                await _libraryManager.DeleteItem(item, new DeleteOptions
-                {
-                    DeleteFileLocation = false
-
-                }).ConfigureAwait(false);
-            }
-
             progress.Report(100);
         }
     }

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 = 69;
+        public const int LatestSchemaVersion = 71;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SqliteItemRepository"/> class.
@@ -226,6 +226,9 @@ namespace MediaBrowser.Server.Implementations.Persistence
             _connection.AddColumn(Logger, "TypedBaseItems", "InheritedTags", "Text");
             _connection.AddColumn(Logger, "TypedBaseItems", "CleanName", "Text");
             _connection.AddColumn(Logger, "TypedBaseItems", "PresentationUniqueKey", "Text");
+            _connection.AddColumn(Logger, "TypedBaseItems", "SlugName", "Text");
+            _connection.AddColumn(Logger, "TypedBaseItems", "OriginalTitle", "Text");
+            _connection.AddColumn(Logger, "TypedBaseItems", "PrimaryVersionId", "Text");
 
             string[] postQueries =
                 {
@@ -367,7 +370,9 @@ namespace MediaBrowser.Server.Implementations.Persistence
             "Tags",
             "SourceType",
             "TrailerTypes",
-            "DateModifiedDuringLastRefresh"
+            "DateModifiedDuringLastRefresh",
+            "OriginalTitle",
+            "PrimaryVersionId"
         };
 
         private readonly string[] _mediaStreamSaveColumns =
@@ -476,7 +481,10 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 "DateModifiedDuringLastRefresh",
                 "InheritedTags",
                 "CleanName",
-                "PresentationUniqueKey"
+                "PresentationUniqueKey",
+                "SlugName",
+                "OriginalTitle",
+                "PrimaryVersionId"
             };
             _saveItemCommand = _connection.CreateCommand();
             _saveItemCommand.CommandText = "replace into TypedBaseItems (" + string.Join(",", saveColumns.ToArray()) + ") values (";
@@ -810,7 +818,20 @@ namespace MediaBrowser.Server.Implementations.Persistence
                     {
                         _saveItemCommand.GetParameter(index++).Value = item.Name.RemoveDiacritics();
                     }
+
                     _saveItemCommand.GetParameter(index++).Value = item.PresentationUniqueKey;
+                    _saveItemCommand.GetParameter(index++).Value = item.SlugName;
+                    _saveItemCommand.GetParameter(index++).Value = item.OriginalTitle;
+
+                    var video = item as Video;
+                    if (video != null)
+                    {
+                        _saveItemCommand.GetParameter(index++).Value = video.PrimaryVersionId;
+                    }
+                    else
+                    {
+                        _saveItemCommand.GetParameter(index++).Value = null;
+                    }
 
                     _saveItemCommand.Transaction = transaction;
 
@@ -1189,6 +1210,20 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 item.DateModifiedDuringLastRefresh = reader.GetDateTime(51).ToUniversalTime();
             }
 
+            if (!reader.IsDBNull(52))
+            {
+                item.OriginalTitle = reader.GetString(52);
+            }
+
+            var video = item as Video;
+            if (video != null)
+            {
+                if (!reader.IsDBNull(53))
+                {
+                    video.PrimaryVersionId = reader.GetString(53);
+                }
+            }
+
             return item;
         }
 
@@ -2070,6 +2105,19 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 cmd.Parameters.Add(cmd, "@PersonName", DbType.String).Value = query.Person;
             }
 
+            if (!string.IsNullOrWhiteSpace(query.SlugName))
+            {
+                if (_config.Configuration.SchemaVersion >= 70)
+                {
+                    whereClauses.Add("SlugName=@SlugName");
+                }
+                else
+                {
+                    whereClauses.Add("Name=@SlugName");
+                }
+                cmd.Parameters.Add(cmd, "@SlugName", DbType.String).Value = query.SlugName;
+            }
+
             if (!string.IsNullOrWhiteSpace(query.Name))
             {
                 if (_config.Configuration.SchemaVersion >= 66)
@@ -2340,6 +2388,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
         private bool EnableGroupByPresentationUniqueKey(InternalItemsQuery query)
         {
+            if (!query.GroupByPresentationUniqueKey)
+            {
+                return false;
+            }
+
             if (!string.IsNullOrWhiteSpace(query.PresentationUniqueKey))
             {
                 return false;