From d48496b84341b4f04500d844cc2c6b6c6557b272 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 6 May 2017 15:45:23 -0400
Subject: [PATCH] add new search filters
---
.../Data/SqliteItemRepository.cs | 70 ++++++++-----------
.../Library/SearchEngine.cs | 8 ++-
.../LiveTv/EmbyTV/EmbyTV.cs | 5 --
.../Security/PluginSecurityManager.cs | 6 --
MediaBrowser.Api/SearchService.cs | 23 +++++-
MediaBrowser.Api/StartupWizardService.cs | 1 -
MediaBrowser.Controller/Entities/BaseItem.cs | 13 +---
.../Entities/InternalItemsQuery.cs | 1 -
.../Parsers/BaseItemXmlParser.cs | 11 ---
.../Savers/BaseXmlSaver.cs | 7 --
.../Configuration/ServerConfiguration.cs | 1 -
MediaBrowser.Model/Querying/ItemFields.cs | 2 -
MediaBrowser.Model/Search/SearchQuery.cs | 10 +++
.../Manager/ProviderUtils.cs | 5 --
.../MediaInfo/FFProbeVideoInfo.cs | 5 --
.../Parsers/BaseNfoParser.cs | 11 ---
.../Savers/BaseNfoSaver.cs | 7 --
SharedVersion.cs | 2 +-
18 files changed, 69 insertions(+), 119 deletions(-)
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index c0f473a9db..61dce9bba3 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -201,7 +201,6 @@ namespace Emby.Server.Implementations.Data
AddColumn(db, "TypedBaseItems", "SortName", "Text", existingColumnNames);
AddColumn(db, "TypedBaseItems", "RunTimeTicks", "BIGINT", existingColumnNames);
- AddColumn(db, "TypedBaseItems", "OfficialRatingDescription", "Text", existingColumnNames);
AddColumn(db, "TypedBaseItems", "HomePageUrl", "Text", existingColumnNames);
AddColumn(db, "TypedBaseItems", "VoteCount", "INT", existingColumnNames);
AddColumn(db, "TypedBaseItems", "DisplayMediaType", "Text", existingColumnNames);
@@ -426,7 +425,6 @@ namespace Emby.Server.Implementations.Data
"ParentIndexNumber",
"ProductionYear",
"OfficialRating",
- "OfficialRatingDescription",
"HomePageUrl",
"DisplayMediaType",
"ForcedSortName",
@@ -547,7 +545,6 @@ namespace Emby.Server.Implementations.Data
"InheritedParentalRatingValue",
"SortName",
"RunTimeTicks",
- "OfficialRatingDescription",
"HomePageUrl",
"VoteCount",
"DisplayMediaType",
@@ -825,7 +822,6 @@ namespace Emby.Server.Implementations.Data
saveItemStatement.TryBind("@SortName", item.SortName);
saveItemStatement.TryBind("@RunTimeTicks", item.RunTimeTicks);
- saveItemStatement.TryBind("@OfficialRatingDescription", item.OfficialRatingDescription);
saveItemStatement.TryBind("@HomePageUrl", item.HomePageUrl);
saveItemStatement.TryBind("@VoteCount", item.VoteCount);
saveItemStatement.TryBind("@DisplayMediaType", item.DisplayMediaType);
@@ -1278,22 +1274,10 @@ namespace Emby.Server.Implementations.Data
{
return false;
}
- if (type == typeof(Year))
- {
- return false;
- }
- if (type == typeof(Book))
- {
- return false;
- }
if (type == typeof(Person))
{
return false;
}
- if (type == typeof(RecordingGroup))
- {
- return false;
- }
if (type == typeof(Channel))
{
return false;
@@ -1327,31 +1311,42 @@ namespace Emby.Server.Implementations.Data
return false;
}
}
- if (_config.Configuration.SkipDeserializationForPrograms)
+
+ if (type == typeof(Year))
{
- if (type == typeof(LiveTvProgram))
- {
- return false;
- }
+ return false;
+ }
+ if (type == typeof(Book))
+ {
+ return false;
+ }
+ if (type == typeof(RecordingGroup))
+ {
+ return false;
+ }
+ if (type == typeof(LiveTvProgram))
+ {
+ return false;
}
+ if (type == typeof(LiveTvAudioRecording))
+ {
+ return false;
+ }
+ if (type == typeof(AudioPodcast))
+ {
+ return false;
+ }
+ if (type == typeof(AudioBook))
+ {
+ return false;
+ }
+
if (_config.Configuration.SkipDeserializationForAudio)
{
if (type == typeof(Audio))
{
return false;
}
- if (type == typeof(LiveTvAudioRecording))
- {
- return false;
- }
- if (type == typeof(AudioPodcast))
- {
- return false;
- }
- if (type == typeof(AudioBook))
- {
- return false;
- }
if (type == typeof(MusicAlbum))
{
return false;
@@ -1597,15 +1592,6 @@ namespace Emby.Server.Implementations.Data
}
index++;
- if (query.HasField(ItemFields.OfficialRatingDescription))
- {
- if (!reader.IsDBNull(index))
- {
- item.OfficialRatingDescription = reader.GetString(index);
- }
- index++;
- }
-
if (query.HasField(ItemFields.HomePageUrl))
{
if (!reader.IsDBNull(index))
diff --git a/Emby.Server.Implementations/Library/SearchEngine.cs b/Emby.Server.Implementations/Library/SearchEngine.cs
index 51c9504c20..f640ae2b15 100644
--- a/Emby.Server.Implementations/Library/SearchEngine.cs
+++ b/Emby.Server.Implementations/Library/SearchEngine.cs
@@ -168,7 +168,13 @@ namespace Emby.Server.Implementations.Library
IncludeItemsByName = string.IsNullOrWhiteSpace(query.ParentId),
ParentId = string.IsNullOrWhiteSpace(query.ParentId) ? (Guid?)null : new Guid(query.ParentId),
SortBy = new[] { ItemSortBy.SortName },
- Recursive = true
+ Recursive = true,
+
+ IsKids = query.IsKids,
+ IsMovie = query.IsMovie,
+ IsNews = query.IsNews,
+ IsSeries = query.IsSeries,
+ IsSports = query.IsSports
});
// Add search hints based on item name
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 9ce4822730..f1b3f41b42 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -2155,11 +2155,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
writer.WriteElementString("mpaa", item.OfficialRating);
}
- if (!string.IsNullOrEmpty(item.OfficialRatingDescription))
- {
- writer.WriteElementString("mpaadescription", item.OfficialRatingDescription);
- }
-
var overview = (item.Overview ?? string.Empty)
.StripHtml()
.Replace(""", "'");
diff --git a/Emby.Server.Implementations/Security/PluginSecurityManager.cs b/Emby.Server.Implementations/Security/PluginSecurityManager.cs
index 7cd0a8d5f3..d42fae3ad0 100644
--- a/Emby.Server.Implementations/Security/PluginSecurityManager.cs
+++ b/Emby.Server.Implementations/Security/PluginSecurityManager.cs
@@ -101,12 +101,6 @@ namespace Emby.Server.Implementations.Security
/// <returns></returns>
public async Task LoadAllRegistrationInfo()
{
- var response = await _httpClient.GetResponse(new HttpRequestOptions
- {
- Url = "http://192.168.1.2:8096/emby/Videos/663c8a38ccfe91af6566852f78e62c26/stream.mkv?Static=true&mediaSourceId=663c8a38ccfe91af6566852f78e62c26&deviceId=hyJA92oXn4RExFTGismCnY6da91kwnTvv8YvsYf0E&Tag=bcdc02b1cdd6f1eb4a57a6812831617b"
-
- }).ConfigureAwait(false);
-
var tasks = new List<Task>();
ResetSupporterInfo();
diff --git a/MediaBrowser.Api/SearchService.cs b/MediaBrowser.Api/SearchService.cs
index 5c0f918d93..3df815cda1 100644
--- a/MediaBrowser.Api/SearchService.cs
+++ b/MediaBrowser.Api/SearchService.cs
@@ -69,6 +69,21 @@ namespace MediaBrowser.Api
public string ParentId { get; set; }
+ [ApiMember(Name = "IsMovie", Description = "Optional filter for movies.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET,POST")]
+ public bool? IsMovie { get; set; }
+
+ [ApiMember(Name = "IsSeries", Description = "Optional filter for movies.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET,POST")]
+ public bool? IsSeries { get; set; }
+
+ [ApiMember(Name = "IsNews", Description = "Optional filter for news.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET,POST")]
+ public bool? IsNews { get; set; }
+
+ [ApiMember(Name = "IsKids", Description = "Optional filter for kids.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET,POST")]
+ public bool? IsKids { get; set; }
+
+ [ApiMember(Name = "IsSports", Description = "Optional filter for sports.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET,POST")]
+ public bool? IsSports { get; set; }
+
public GetSearchHints()
{
IncludeArtists = true;
@@ -139,7 +154,13 @@ namespace MediaBrowser.Api
StartIndex = request.StartIndex,
UserId = request.UserId,
IncludeItemTypes = (request.IncludeItemTypes ?? string.Empty).Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToArray(),
- ParentId = request.ParentId
+ ParentId = request.ParentId,
+
+ IsKids = request.IsKids,
+ IsMovie = request.IsMovie,
+ IsNews = request.IsNews,
+ IsSeries = request.IsSeries,
+ IsSports = request.IsSports
}).ConfigureAwait(false);
diff --git a/MediaBrowser.Api/StartupWizardService.cs b/MediaBrowser.Api/StartupWizardService.cs
index 111e552f25..7e13512aa1 100644
--- a/MediaBrowser.Api/StartupWizardService.cs
+++ b/MediaBrowser.Api/StartupWizardService.cs
@@ -95,7 +95,6 @@ namespace MediaBrowser.Api
config.EnableStandaloneMusicKeys = true;
config.EnableCaseSensitiveItemIds = true;
config.SkipDeserializationForBasicTypes = true;
- config.SkipDeserializationForPrograms = true;
config.SkipDeserializationForAudio = true;
config.EnableSeriesPresentationUniqueKey = true;
config.EnableLocalizedGuids = true;
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 70512ef650..999f6db3fc 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -84,6 +84,7 @@ namespace MediaBrowser.Controller.Entities
public long? Size { get; set; }
public string Container { get; set; }
+
[IgnoreDataMember]
public string Tagline { get; set; }
@@ -834,13 +835,6 @@ namespace MediaBrowser.Controller.Entities
[IgnoreDataMember]
public float? CriticRating { get; set; }
- /// <summary>
- /// Gets or sets the official rating description.
- /// </summary>
- /// <value>The official rating description.</value>
- [IgnoreDataMember]
- public string OfficialRatingDescription { get; set; }
-
/// <summary>
/// Gets or sets the custom rating.
/// </summary>
@@ -2291,11 +2285,6 @@ namespace MediaBrowser.Controller.Entities
ownedItem.CustomRating = item.CustomRating;
newOptions.ForceSave = true;
}
- if (!string.Equals(item.OfficialRatingDescription, ownedItem.OfficialRatingDescription, StringComparison.Ordinal))
- {
- ownedItem.OfficialRatingDescription = item.OfficialRatingDescription;
- newOptions.ForceSave = true;
- }
}
return ownedItem.RefreshMetadata(newOptions, cancellationToken);
diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
index 6fffbf09e4..092461c842 100644
--- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
+++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
@@ -175,7 +175,6 @@ namespace MediaBrowser.Controller.Entities
case ItemFields.DateCreated:
case ItemFields.SortName:
case ItemFields.Overview:
- case ItemFields.OfficialRatingDescription:
case ItemFields.HomePageUrl:
case ItemFields.VoteCount:
case ItemFields.DisplayMediaType:
diff --git a/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs b/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
index 76507ac4d7..2500ee4820 100644
--- a/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
+++ b/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
@@ -365,17 +365,6 @@ namespace MediaBrowser.LocalMetadata.Parsers
break;
}
- case "MPAADescription":
- {
- var rating = reader.ReadElementContentAsString();
-
- if (!string.IsNullOrWhiteSpace(rating))
- {
- item.OfficialRatingDescription = rating;
- }
- break;
- }
-
case "CustomRating":
{
var val = reader.ReadElementContentAsString();
diff --git a/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
index 01918a80cc..a3a55176cd 100644
--- a/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
@@ -71,8 +71,6 @@ namespace MediaBrowser.LocalMetadata.Savers
// Deprecated. No longer saving in this field.
"MPAARating",
- "MPAADescription",
-
"MusicBrainzArtistId",
"MusicBrainzAlbumArtistId",
"MusicBrainzAlbumId",
@@ -308,11 +306,6 @@ namespace MediaBrowser.LocalMetadata.Savers
writer.WriteElementString("ContentRating", item.OfficialRating);
}
- if (!string.IsNullOrEmpty(item.OfficialRatingDescription))
- {
- writer.WriteElementString("MPAADescription", item.OfficialRatingDescription);
- }
-
writer.WriteElementString("Added", item.DateCreated.ToLocalTime().ToString("G"));
writer.WriteElementString("LockData", item.IsLocked.ToString().ToLower());
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index a924ad76e5..838111a383 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -164,7 +164,6 @@ namespace MediaBrowser.Model.Configuration
public bool EnableAutomaticRestart { get; set; }
public bool SkipDeserializationForBasicTypes { get; set; }
- public bool SkipDeserializationForPrograms { get; set; }
public bool SkipDeserializationForAudio { get; set; }
public string ServerName { get; set; }
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index def47f645a..75ba09b609 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -117,8 +117,6 @@
/// </summary>
MediaSources,
- OfficialRatingDescription,
-
OriginalTitle,
/// <summary>
diff --git a/MediaBrowser.Model/Search/SearchQuery.cs b/MediaBrowser.Model/Search/SearchQuery.cs
index 11d2d97f7a..897a9db523 100644
--- a/MediaBrowser.Model/Search/SearchQuery.cs
+++ b/MediaBrowser.Model/Search/SearchQuery.cs
@@ -36,6 +36,16 @@ namespace MediaBrowser.Model.Search
public string[] IncludeItemTypes { get; set; }
public string ParentId { get; set; }
+ public bool? IsMovie { get; set; }
+
+ public bool? IsSeries { get; set; }
+
+ public bool? IsNews { get; set; }
+
+ public bool? IsKids { get; set; }
+
+ public bool? IsSports { get; set; }
+
public SearchQuery()
{
IncludeArtists = true;
diff --git a/MediaBrowser.Providers/Manager/ProviderUtils.cs b/MediaBrowser.Providers/Manager/ProviderUtils.cs
index dfa80a1807..f544c09dc1 100644
--- a/MediaBrowser.Providers/Manager/ProviderUtils.cs
+++ b/MediaBrowser.Providers/Manager/ProviderUtils.cs
@@ -91,11 +91,6 @@ namespace MediaBrowser.Providers.Manager
}
}
- if (replaceData || string.IsNullOrEmpty(target.OfficialRatingDescription))
- {
- target.OfficialRatingDescription = source.OfficialRatingDescription;
- }
-
if (replaceData || string.IsNullOrEmpty(target.CustomRating))
{
target.CustomRating = source.CustomRating;
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
index e84617fd34..c686e1d2e1 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
@@ -356,11 +356,6 @@ namespace MediaBrowser.Providers.MediaInfo
}
}
- if (!string.IsNullOrWhiteSpace(data.OfficialRatingDescription) || isFullRefresh)
- {
- video.OfficialRatingDescription = data.OfficialRatingDescription;
- }
-
if (!video.IsLocked && !video.LockedFields.Contains(MetadataFields.Genres))
{
if (video.Genres.Count == 0 || isFullRefresh)
diff --git a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
index 641ea4034c..dfd4694c36 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
@@ -452,17 +452,6 @@ namespace MediaBrowser.XbmcMetadata.Parsers
break;
}
- case "mpaadescription":
- {
- var rating = reader.ReadElementContentAsString();
-
- if (!string.IsNullOrWhiteSpace(rating))
- {
- item.OfficialRatingDescription = rating;
- }
- break;
- }
-
case "customrating":
{
var val = reader.ReadElementContentAsString();
diff --git a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
index ca7d8a43f7..623b109f76 100644
--- a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
@@ -19,7 +19,6 @@ using System.Text;
using System.Threading;
using System.Xml;
using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.IO;
using MediaBrowser.Model.Extensions;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Xml;
@@ -42,7 +41,6 @@ namespace MediaBrowser.XbmcMetadata.Savers
"year",
"sorttitle",
"mpaa",
- "mpaadescription",
"aspectratio",
"website",
"collectionnumber",
@@ -556,11 +554,6 @@ namespace MediaBrowser.XbmcMetadata.Savers
writer.WriteElementString("mpaa", item.OfficialRating);
}
- if (!string.IsNullOrEmpty(item.OfficialRatingDescription))
- {
- writer.WriteElementString("mpaadescription", item.OfficialRatingDescription);
- }
-
var hasAspectRatio = item as IHasAspectRatio;
if (hasAspectRatio != null)
{
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 0cf34eeacc..caf7c1e63a 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
using System.Reflection;
-[assembly: AssemblyVersion("3.2.13.14")]
+[assembly: AssemblyVersion("3.2.14.1")]