alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-10 16:23:06 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ensure custom css is loaded last

Browse Source
This commit is contained in:
Luke Pulverenti
2017-07-23 18:29:53 -04:00
parent e6b22f35e5
commit dc7a59c73a
20 changed files with 39 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@@ -45,7 +45,6 @@ namespace MediaBrowser.Controller.Entities
{
ThemeSongIds = new List<Guid>();
ThemeVideoIds = new List<Guid>();
Keywords = new List<string>();
Tags = new List<string>();
Genres = new List<string>();
Studios = new List<string>();
@@ -881,7 +880,6 @@ namespace MediaBrowser.Controller.Entities
[IgnoreDataMember]
public List<string> Tags { get; set; }
public List<string> Keywords { get; set; }
public List<string> ProductionLocations { get; set; }
/// <summary>
@@ -2279,11 +2277,6 @@ namespace MediaBrowser.Controller.Entities
newOptions.ForceSave = true;
ownedItem.ProductionLocations = item.ProductionLocations.ToList();
}
if (!item.Keywords.SequenceEqual(ownedItem.Keywords, StringComparer.Ordinal))
{
newOptions.ForceSave = true;
ownedItem.Keywords = item.Keywords.ToList();
}
if (item.CommunityRating != ownedItem.CommunityRating)
{
ownedItem.CommunityRating = item.CommunityRating;

2
MediaBrowser.Controller/Entities/InternalItemsQuery.cs
View File

@@ -38,7 +38,6 @@ namespace MediaBrowser.Controller.Entities
public string[] ExcludeTags { get; set; }
public string[] ExcludeInheritedTags { get; set; }
public string[] Genres { get; set; }
public string[] Keywords { get; set; }
public bool? IsSpecialSeason { get; set; }
public bool? IsMissing { get; set; }
@@ -194,7 +193,6 @@ namespace MediaBrowser.Controller.Entities
OfficialRatings = new string[] { };
SortBy = new string[] { };
MediaTypes = new string[] { };
Keywords = new string[] { };
IncludeItemTypes = new string[] { };
ExcludeItemTypes = new string[] { };
Genres = new string[] { };

21
MediaBrowser.Controller/Entities/KeywordExtensions.cs
View File

@@ -1,21 +0,0 @@
using System;
using System.Linq;
namespace MediaBrowser.Controller.Entities
{
public static class KeywordExtensions
{
public static void AddKeyword(this BaseItem item, string name)
{
if (string.IsNullOrWhiteSpace(name))
{
throw new ArgumentNullException("name");
}
if (!item.Keywords.Contains(name, StringComparer.OrdinalIgnoreCase))
{
item.Keywords.Add(name);
}
}
}
}

1
MediaBrowser.Controller/Entities/Trailer.cs
View File

@@ -15,7 +15,6 @@ namespace MediaBrowser.Controller.Entities
public Trailer()
{
RemoteTrailers = new List<MediaUrl>();
Keywords = new List<string>();
TrailerTypes = new List<TrailerType> { TrailerType.LocalTrailer };
}

1
MediaBrowser.Controller/MediaBrowser.Controller.csproj
View File

@@ -101,7 +101,6 @@
<Compile Include="Entities\IHasDisplayOrder.cs" />
<Compile Include="Entities\IHasId.cs" />
<Compile Include="Entities\IHasImages.cs" />
<Compile Include="Entities\KeywordExtensions.cs" />
<Compile Include="Entities\IHasMediaSources.cs" />
<Compile Include="Entities\IHasProgramAttributes.cs" />
<Compile Include="Entities\IHasScreenshots.cs" />