Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-09 07:10:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

update intro queries

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-07 03:04:54 -05:00
parent b253b86338
commit ba9222898b
4 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Emby.Server.Implementations/Data/SqliteItemRepository.cs
View file

@ -3368,9 +3368,9 @@ namespace Emby.Server.Implementations.Data
} }
} }
if (query.SimilarTo != null) if (query.SimilarTo != null && query.MinSimilarityScore > 0)
{ {
whereClauses.Add("SimilarityScore > 0"); whereClauses.Add("SimilarityScore > " + (query.MinSimilarityScore - 1).ToString(CultureInfo.InvariantCulture));
} }
if (query.IsFolder.HasValue) if (query.IsFolder.HasValue)

10
Emby.Server.Implementations/Intros/DefaultIntroProvider.cs
View file

@ -100,7 +100,12 @@ namespace Emby.Server.Implementations.Intros
if (trailerTypes.Count > 0) if (trailerTypes.Count > 0)
{ {
var trailerResult = _libraryManager.GetItemList(new InternalItemsQuery if (trailerTypes.Count >= 5)
{
trailerTypes.Clear();
}
var trailerResult = _libraryManager.GetItemList(new InternalItemsQuery(user)
{ {
IncludeItemTypes = new[] { typeof(Trailer).Name }, IncludeItemTypes = new[] { typeof(Trailer).Name },
TrailerTypes = trailerTypes.ToArray(), TrailerTypes = trailerTypes.ToArray(),
@ -111,7 +116,8 @@ namespace Emby.Server.Implementations.Intros
// Account for duplicates by imdb id, since the database doesn't support this yet // Account for duplicates by imdb id, since the database doesn't support this yet
Limit = config.TrailerLimit * 2, Limit = config.TrailerLimit * 2,
SourceTypes = sourceTypes.ToArray() SourceTypes = sourceTypes.ToArray(),
MinSimilarityScore = 0
}).Where(i => string.IsNullOrWhiteSpace(i.GetProviderId(MetadataProviders.Imdb)) || !string.Equals(i.GetProviderId(MetadataProviders.Imdb), item.GetProviderId(MetadataProviders.Imdb), StringComparison.OrdinalIgnoreCase)).Take(config.TrailerLimit); }).Where(i => string.IsNullOrWhiteSpace(i.GetProviderId(MetadataProviders.Imdb)) || !string.Equals(i.GetProviderId(MetadataProviders.Imdb), item.GetProviderId(MetadataProviders.Imdb), StringComparison.OrdinalIgnoreCase)).Take(config.TrailerLimit);

1
MediaBrowser.Controller/Entities/BaseItem.cs
View file

@ -53,6 +53,7 @@ namespace MediaBrowser.Controller.Entities
ImageInfos = new List<ItemImageInfo>(); ImageInfos = new List<ItemImageInfo>();
InheritedTags = new List<string>(); InheritedTags = new List<string>();
ProductionLocations = new List<string>(); ProductionLocations = new List<string>();
SourceType = SourceType.Library;
} }
public static readonly char[] SlugReplaceChars = { '?', '/', '&' }; public static readonly char[] SlugReplaceChars = { '?', '/', '&' };

3
MediaBrowser.Controller/Entities/InternalItemsQuery.cs
View file

@ -160,6 +160,7 @@ namespace MediaBrowser.Controller.Entities
public DateTime? MinDateLastSaved { get; set; } public DateTime? MinDateLastSaved { get; set; }
public DtoOptions DtoOptions { get; set; } public DtoOptions DtoOptions { get; set; }
public int MinSimilarityScore { get; set; }
public bool HasField(ItemFields name) public bool HasField(ItemFields name)
{ {
@ -197,6 +198,8 @@ namespace MediaBrowser.Controller.Entities
public InternalItemsQuery() public InternalItemsQuery()
{ {
MinSimilarityScore = 1;
GroupByPresentationUniqueKey = true; GroupByPresentationUniqueKey = true;
EnableTotalRecordCount = true; EnableTotalRecordCount = true;