diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-01-09 15:28:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-09 15:28:12 -0500 |
| commit | 488e36811df4de3a9d75333bc7b73d6ec2eb6ed9 (patch) | |
| tree | 123cfd54e289f98c75c7b722f2bda548c00ae6a2 /Emby.Server.Implementations/Library | |
| parent | d9dda3b56e4269e074379dee134130feab76ad04 (diff) | |
| parent | 85cd90d6e6bb022469cbb34248300f3164cf1775 (diff) | |
Merge pull request #2390 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/Library')
| -rw-r--r-- | Emby.Server.Implementations/Library/LibraryManager.cs | 2 | ||||
| -rw-r--r-- | Emby.Server.Implementations/Library/SearchEngine.cs | 4 | ||||
| -rw-r--r-- | Emby.Server.Implementations/Library/UserViewManager.cs | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs index 4dd6cd303..db514af76 100644 --- a/Emby.Server.Implementations/Library/LibraryManager.cs +++ b/Emby.Server.Implementations/Library/LibraryManager.cs @@ -2481,6 +2481,8 @@ namespace Emby.Server.Implementations.Library options.VideoFileExtensions.Remove(".zip"); } + options.VideoFileExtensions.Add(".tp"); + return options; } diff --git a/Emby.Server.Implementations/Library/SearchEngine.cs b/Emby.Server.Implementations/Library/SearchEngine.cs index afdf65c06..e6c88aa1a 100644 --- a/Emby.Server.Implementations/Library/SearchEngine.cs +++ b/Emby.Server.Implementations/Library/SearchEngine.cs @@ -157,6 +157,7 @@ namespace Emby.Server.Implementations.Library } AddIfMissing(excludeItemTypes, typeof(CollectionFolder).Name); + AddIfMissing(excludeItemTypes, typeof(Folder).Name); var mediaItems = _libraryManager.GetItemList(new InternalItemsQuery(user) { @@ -164,8 +165,7 @@ namespace Emby.Server.Implementations.Library ExcludeItemTypes = excludeItemTypes.ToArray(), IncludeItemTypes = includeItemTypes.ToArray(), Limit = query.Limit, - IncludeItemsByName = true, - IsVirtualItem = false + IncludeItemsByName = true }); // Add search hints based on item name diff --git a/Emby.Server.Implementations/Library/UserViewManager.cs b/Emby.Server.Implementations/Library/UserViewManager.cs index f7cc8bb73..0a8b1c681 100644 --- a/Emby.Server.Implementations/Library/UserViewManager.cs +++ b/Emby.Server.Implementations/Library/UserViewManager.cs @@ -287,7 +287,7 @@ namespace Emby.Server.Implementations.Library SortBy = new[] { ItemSortBy.DateCreated }, IsFolder = includeItemTypes.Length == 0 ? false : (bool?)null, ExcludeItemTypes = excludeItemTypes, - ExcludeLocationTypes = new[] { LocationType.Virtual }, + IsVirtualItem = false, Limit = limit * 5, SourceTypes = parents.Count == 0 ? new[] { SourceType.Library } : new SourceType[] { }, IsPlayed = request.IsPlayed |