alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 09:04:42 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

add new search filters

Browse Source
This commit is contained in:
Luke Pulverenti
2017-05-06 15:45:23 -04:00
parent 59f2463efd
commit d48496b843
18 changed files with 69 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
Emby.Server.Implementations/Data/SqliteItemRepository.cs
View File

@@ -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))

8
Emby.Server.Implementations/Library/SearchEngine.cs
View File

@@ -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

5
Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
View File

@@ -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(""", "'");

6
Emby.Server.Implementations/Security/PluginSecurityManager.cs
View File

@@ -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();