aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Drawing/IImageProcessor.cs5
-rw-r--r--MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs39
-rw-r--r--MediaBrowser.Controller/Entities/BaseItem.cs13
-rw-r--r--MediaBrowser.Controller/Entities/UserViewBuilder.cs321
4 files changed, 50 insertions, 328 deletions
diff --git a/MediaBrowser.Controller/Drawing/IImageProcessor.cs b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
index e1e98857f..058bf70cd 100644
--- a/MediaBrowser.Controller/Drawing/IImageProcessor.cs
+++ b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.Entities;
+using System;
+using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Drawing;
using MediaBrowser.Model.Entities;
@@ -83,7 +84,7 @@ namespace MediaBrowser.Controller.Drawing
/// </summary>
/// <param name="options">The options.</param>
/// <returns>Task.</returns>
- Task<string> ProcessImage(ImageProcessingOptions options);
+ Task<Tuple<string,string>> ProcessImage(ImageProcessingOptions options);
/// <summary>
/// Gets the enhanced image.
diff --git a/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs b/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs
index e6bf86853..2b80b701e 100644
--- a/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs
+++ b/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs
@@ -4,6 +4,7 @@ using MediaBrowser.Model.Drawing;
using System;
using System.Collections.Generic;
using System.IO;
+using System.Linq;
namespace MediaBrowser.Controller.Drawing
{
@@ -29,7 +30,7 @@ namespace MediaBrowser.Controller.Drawing
public List<IImageEnhancer> Enhancers { get; set; }
- public ImageFormat OutputFormat { get; set; }
+ public List<ImageFormat> SupportedOutputFormats { get; set; }
public bool AddPlayedIndicator { get; set; }
@@ -48,19 +49,47 @@ namespace MediaBrowser.Controller.Drawing
!MaxHeight.HasValue;
}
+ public bool HasDefaultOptions(string originalImagePath, ImageSize size)
+ {
+ if (!HasDefaultOptionsWithoutSize(originalImagePath))
+ {
+ return false;
+ }
+
+ if (Width.HasValue && !size.Width.Equals(Width.Value))
+ {
+ return false;
+ }
+ if (Height.HasValue && !size.Height.Equals(Height.Value))
+ {
+ return false;
+ }
+ if (MaxWidth.HasValue && size.Width > MaxWidth.Value)
+ {
+ return false;
+ }
+ if (MaxHeight.HasValue && size.Height > MaxHeight.Value)
+ {
+ return false;
+ }
+
+ return true;
+ }
+
public bool HasDefaultOptionsWithoutSize(string originalImagePath)
{
- return (Quality == 100) &&
- IsOutputFormatDefault(originalImagePath) &&
+ return (Quality >= 90) &&
+ IsFormatSupported(originalImagePath) &&
!AddPlayedIndicator &&
PercentPlayed.Equals(0) &&
!UnplayedCount.HasValue &&
string.IsNullOrEmpty(BackgroundColor);
}
- private bool IsOutputFormatDefault(string originalImagePath)
+ private bool IsFormatSupported(string originalImagePath)
{
- return string.Equals(Path.GetExtension(originalImagePath), "." + OutputFormat, StringComparison.OrdinalIgnoreCase);
+ var ext = Path.GetExtension(originalImagePath);
+ return SupportedOutputFormats.Any(outputFormat => string.Equals(ext, "." + outputFormat, StringComparison.OrdinalIgnoreCase));
}
}
}
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 5b0af42e8..d9b7b1ae7 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -690,9 +690,10 @@ namespace MediaBrowser.Controller.Entities
[IgnoreDataMember]
public int? ParentIndexNumber { get; set; }
- public virtual string GetOfficialRatingForComparison(bool inherit)
+ [IgnoreDataMember]
+ public string OfficialRatingForComparison
{
- if (inherit)
+ get
{
if (!string.IsNullOrWhiteSpace(OfficialRating))
{
@@ -702,13 +703,11 @@ namespace MediaBrowser.Controller.Entities
var parent = DisplayParent;
if (parent != null)
{
- return parent.GetOfficialRatingForComparison(inherit);
+ return parent.OfficialRatingForComparison;
}
return null;
}
-
- return OfficialRating;
}
[IgnoreDataMember]
@@ -1141,7 +1140,7 @@ namespace MediaBrowser.Controller.Entities
if (string.IsNullOrWhiteSpace(rating))
{
- rating = GetOfficialRatingForComparison(true);
+ rating = OfficialRatingForComparison;
}
if (string.IsNullOrWhiteSpace(rating))
@@ -1190,7 +1189,7 @@ namespace MediaBrowser.Controller.Entities
if (string.IsNullOrWhiteSpace(rating))
{
- rating = GetOfficialRatingForComparison(true);
+ rating = OfficialRatingForComparison;
}
if (string.IsNullOrWhiteSpace(rating))
diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
index 4d5f14f8c..87f45ec8e 100644
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -125,7 +125,14 @@ namespace MediaBrowser.Controller.Entities
case CollectionType.HomeVideos:
case CollectionType.Games:
case CollectionType.MusicVideos:
+ case CollectionType.Music:
+ {
+ if (query.Recursive)
+ {
+ return GetResult(queryParent.GetRecursiveChildren(user, true), queryParent, query);
+ }
return GetResult(queryParent.GetChildren(user, true), queryParent, query);
+ }
case CollectionType.Folders:
return GetResult(user.RootFolder.GetChildren(user, true), queryParent, query);
@@ -139,36 +146,9 @@ namespace MediaBrowser.Controller.Entities
case CollectionType.TvShows:
return await GetTvView(queryParent, user, query).ConfigureAwait(false);
- case CollectionType.Music:
- return await GetMusicFolders(queryParent, user, query).ConfigureAwait(false);
-
case CollectionType.Movies:
return await GetMovieFolders(queryParent, user, query).ConfigureAwait(false);
- case SpecialFolder.MusicGenres:
- return await GetMusicGenres(queryParent, user, query).ConfigureAwait(false);
-
- case SpecialFolder.MusicGenre:
- return await GetMusicGenreItems(queryParent, displayParent, user, query).ConfigureAwait(false);
-
- case SpecialFolder.GameGenres:
- return await GetGameGenres(queryParent, user, query).ConfigureAwait(false);
-
- case SpecialFolder.GameGenre:
- return await GetGameGenreItems(queryParent, displayParent, user, query).ConfigureAwait(false);
-
- case SpecialFolder.GameSystems:
- return GetGameSystems(queryParent, user, query);
-
- case SpecialFolder.LatestGames:
- return GetLatestGames(queryParent, user, query);
-
- case SpecialFolder.RecentlyPlayedGames:
- return GetRecentlyPlayedGames(queryParent, user, query);
-
- case SpecialFolder.GameFavorites:
- return GetFavoriteGames(queryParent, user, query);
-
case SpecialFolder.TvShowSeries:
return GetTvSeries(queryParent, user, query);
@@ -208,42 +188,12 @@ namespace MediaBrowser.Controller.Entities
case SpecialFolder.MovieCollections:
return GetMovieCollections(queryParent, user, query);
- case SpecialFolder.MusicLatest:
- return GetMusicLatest(queryParent, user, query);
-
- case SpecialFolder.MusicPlaylists:
- return await GetMusicPlaylists(queryParent, user, query).ConfigureAwait(false);
-
- case SpecialFolder.MusicAlbums:
- return GetMusicAlbums(queryParent, user, query);
-
- case SpecialFolder.MusicAlbumArtists:
- return GetMusicAlbumArtists(queryParent, user, query);
-
- case SpecialFolder.MusicArtists:
- return GetMusicArtists(queryParent, user, query);
-
- case SpecialFolder.MusicSongs:
- return GetMusicSongs(queryParent, user, query);
-
case SpecialFolder.TvFavoriteEpisodes:
return GetFavoriteEpisodes(queryParent, user, query);
case SpecialFolder.TvFavoriteSeries:
return GetFavoriteSeries(queryParent, user, query);
- case SpecialFolder.MusicFavorites:
- return await GetMusicFavorites(queryParent, user, query).ConfigureAwait(false);
-
- case SpecialFolder.MusicFavoriteAlbums:
- return GetFavoriteAlbums(queryParent, user, query);
-
- case SpecialFolder.MusicFavoriteArtists:
- return GetFavoriteArtists(queryParent, user, query);
-
- case SpecialFolder.MusicFavoriteSongs:
- return GetFavoriteSongs(queryParent, user, query);
-
default:
{
if (queryParent is UserView)
@@ -270,154 +220,6 @@ namespace MediaBrowser.Controller.Entities
return 50;
}
- private async Task<QueryResult<BaseItem>> GetMusicFolders(Folder parent, User user, InternalItemsQuery query)
- {
- if (query.Recursive)
- {
- var items = GetRecursiveChildren(parent, user, new[] { CollectionType.Music, CollectionType.MusicVideos }, i => FilterItem(i, query));
-
- return PostFilterAndSort(items, parent, null, query);
- }
-
- var list = new List<BaseItem>();
-
- list.Add(await GetUserView(SpecialFolder.MusicLatest, "0", parent).ConfigureAwait(false));
- list.Add(await GetUserView(SpecialFolder.MusicPlaylists, "1", parent).ConfigureAwait(false));
- list.Add(await GetUserView(SpecialFolder.MusicAlbums, "2", parent).ConfigureAwait(false));
- list.Add(await GetUserView(SpecialFolder.MusicAlbumArtists, "3", parent).ConfigureAwait(false));
- //list.Add(await GetUserView(SpecialFolder.MusicArtists, user, "4", parent).ConfigureAwait(false));
- list.Add(await GetUserView(SpecialFolder.MusicSongs, "5", parent).ConfigureAwait(false));
- list.Add(await GetUserView(SpecialFolder.MusicGenres, "6", parent).ConfigureAwait(false));
- list.Add(await GetUserView(SpecialFolder.MusicFavorites, "7", parent).ConfigureAwait(false));
-
- return GetResult(list, parent, query);
- }
-
- private async Task<QueryResult<BaseItem>> GetMusicFavorites(Folder parent, User user, InternalItemsQuery query)
- {
- var list = new List<BaseItem>();
-
- list.Add(await GetUserView(SpecialFolder.MusicFavoriteAlbums, "0", parent).ConfigureAwait(false));
- list.Add(await GetUserView(SpecialFolder.MusicFavoriteArtists, "1", parent).ConfigureAwait(false));
- list.Add(await GetUserView(SpecialFolder.MusicFavoriteSongs, "2", parent).ConfigureAwait(false));
-
- return GetResult(list, parent, query);
- }
-
- private async Task<QueryResult<BaseItem>> GetMusicGenres(Folder parent, User user, InternalItemsQuery query)
- {
- var tasks = GetRecursiveChildren(parent, user, new[] { CollectionType.Music, CollectionType.MusicVideos })
- .Where(i => !i.IsFolder)
- .SelectMany(i => i.Genres)
- .DistinctNames()
- .Select(i =>
- {
- try
- {
- return _libraryManager.GetMusicGenre(i);
- }
- catch
- {
- // Full exception logged at lower levels
- _logger.Error("Error getting genre");
- return null;
- }
-
- })
- .Where(i => i != null)
- .Select(i => GetUserView(i.Name, SpecialFolder.MusicGenre, i.SortName, parent));
-
- var genres = await Task.WhenAll(tasks).ConfigureAwait(false);
-
- return GetResult(genres, parent, query);
- }
-
- private async Task<QueryResult<BaseItem>> GetMusicGenreItems(Folder queryParent, Folder displayParent, User user, InternalItemsQuery query)
- {
- var items = GetRecursiveChildren(queryParent, user, new[] { CollectionType.Music, CollectionType.MusicVideos })
- .Where(i => !i.IsFolder)
- .Where(i => i.Genres.Contains(displayParent.Name, StringComparer.OrdinalIgnoreCase))
- .OfType<IHasAlbumArtist>();
-
- var artists = _libraryManager.GetAlbumArtists(items);
-
- return GetResult(artists, queryParent, query);
- }
-
- private QueryResult<BaseItem> GetMusicAlbumArtists(Folder parent, User user, InternalItemsQuery query)
- {
- var items = GetRecursiveChildren(parent, user, new[] { CollectionType.Music, CollectionType.MusicVideos })
- .Where(i => !i.IsFolder)
- .OfType<IHasAlbumArtist>();
-
- var artists = _libraryManager.GetAlbumArtists(items);
-
- return GetResult(artists, parent, query);
- }
-
- private QueryResult<BaseItem> GetMusicArtists(Folder parent, User user, InternalItemsQuery query)
- {
- var items = GetRecursiveChildren(parent, user, new[] { CollectionType.Music, CollectionType.MusicVideos })
- .Where(i => !i.IsFolder)
- .OfType<IHasArtist>();
-
- var artists = _libraryManager.GetArtists(items);
-
- return GetResult(artists, parent, query);
- }
-
- private QueryResult<BaseItem> GetFavoriteArtists(Folder parent, User user, InternalItemsQuery query)
- {
- var items = GetRecursiveChildren(parent, user, new[] { CollectionType.Music, CollectionType.MusicVideos })
- .Where(i => !i.IsFolder)
- .OfType<IHasAlbumArtist>();
-
- var artists = _libraryManager.GetAlbumArtists(items).Where(i => _userDataManager.GetUserData(user.Id, i.GetUserDataKey()).IsFavorite);
-
- return GetResult(artists, parent, query);
- }
-
- private Task<QueryResult<BaseItem>> GetMusicPlaylists(Folder parent, User user, InternalItemsQuery query)
- {
- query.IncludeItemTypes = new[] { "Playlist" };
- query.Recursive = true;
-
- return parent.GetItems(query);
- }
-
- private QueryResult<BaseItem> GetMusicAlbums(Folder parent, User user, InternalItemsQuery query)
- {
- var items = GetRecursiveChildren(parent, user, new[] { CollectionType.Music, CollectionType.MusicVideos }, i => (i is MusicAlbum) && FilterItem(i, query));
-
- return PostFilterAndSort(items, parent, null, query);
- }
-
- private QueryResult<BaseItem> GetMusicSongs(Folder parent, User user, InternalItemsQuery query)
- {
- var items = GetRecursiveChildren(parent, user, new[] { CollectionType.Music, CollectionType.MusicVideos }, i => (i is Audio.Audio) && FilterItem(i, query));
-
- return PostFilterAndSort(items, parent, null, query);
- }
-
- private QueryResult<BaseItem> GetMusicLatest(Folder parent, User user, InternalItemsQuery query)
- {
- var items = _userViewManager.GetLatestItems(new LatestItemsQuery
- {
- UserId = user.Id.ToString("N"),
- Limit = GetSpecialItemsLimit(),
- IncludeItemTypes = new[] { typeof(Audio.Audio).Name },
- ParentId = (parent == null ? null : parent.Id.ToString("N")),
- GroupItems = true
-
- }).Select(i => i.Item1 ?? i.Item2.FirstOrDefault()).Where(i => i != null);
-
- query.SortBy = new string[] { };
-
- //var items = GetRecursiveChildren(parent, user, new[] { CollectionType.Music, CollectionType.MusicVideos }, i => i is MusicVideo || i is Audio.Audio && FilterItem(i, query));
-
- return PostFilterAndSort(items, parent, null, query);
- }
-
private async Task<QueryResult<BaseItem>> GetMovieFolders(Folder parent, User user, InternalItemsQuery query)
{
if (query.Recursive)
@@ -476,24 +278,6 @@ namespace MediaBrowser.Controller.Entities
return PostFilterAndSort(items, parent, null, query);
}
- private QueryResult<BaseItem> GetFavoriteSongs(Folder parent, User user, InternalItemsQuery query)
- {
- query.IsFavorite = true;
-
- var items = GetRecursiveChildren(parent, user, new[] { CollectionType.Music }, i => (i is Audio.Audio) && FilterItem(i, query));
-
- return PostFilterAndSort(items, parent, null, query);
- }
-
- private QueryResult<BaseItem> GetFavoriteAlbums(Folder parent, User user, InternalItemsQuery query)
- {
- query.IsFavorite = true;
-
- var items = GetRecursiveChildren(parent, user, new[] { CollectionType.Music }, i => (i is MusicAlbum) && FilterItem(i, query));
-
- return PostFilterAndSort(items, parent, null, query);
- }
-
private QueryResult<BaseItem> GetMovieMovies(Folder parent, User user, InternalItemsQuery query)
{
var items = GetRecursiveChildren(parent, user, new[] { CollectionType.Movies, CollectionType.BoxSets, string.Empty }, i => (i is Movie) && FilterItem(i, query));
@@ -613,54 +397,6 @@ namespace MediaBrowser.Controller.Entities
return GetResult(list, parent, query);
}
- private async Task<QueryResult<BaseItem>> GetGameView(User user, Folder parent, InternalItemsQuery query)
- {
- if (query.Recursive)
- {
- var items = GetRecursiveChildren(parent, user, new[] { CollectionType.Games }, i => FilterItem(i, query));
- return PostFilterAndSort(items, parent, null, query);
- }
-
- var list = new List<BaseItem>();
-
- list.Add(await GetUserView(SpecialFolder.LatestGames, "0", parent).ConfigureAwait(false));
- list.Add(await GetUserView(SpecialFolder.RecentlyPlayedGames, "1", parent).ConfigureAwait(false));
- list.Add(await GetUserView(SpecialFolder.GameFavorites, "2", parent).ConfigureAwait(false));
- list.Add(await GetUserView(SpecialFolder.GameSystems, "3", parent).ConfigureAwait(false));
- list.Add(await GetUserView(SpecialFolder.GameGenres, "4", parent).ConfigureAwait(false));
-
- return GetResult(list, parent, query);
- }
-
- private QueryResult<BaseItem> GetLatestGames(Folder parent, User user, InternalItemsQuery query)
- {
- query.SortBy = new[] { ItemSortBy.DateCreated, ItemSortBy.SortName };
- query.SortOrder = SortOrder.Descending;
-
- var items = GetRecursiveChildren(parent, user, new[] { CollectionType.Games }, i => i is Game && FilterItem(i, query));
-
- return PostFilterAndSort(items, parent, GetSpecialItemsLimit(), query);
- }
-
- private QueryResult<BaseItem> GetRecentlyPlayedGames(Folder parent, User user, InternalItemsQuery query)
- {
- query.IsPlayed = true;
- query.SortBy = new[] { ItemSortBy.DatePlayed, ItemSortBy.SortName };
- query.SortOrder = SortOrder.Descending;
-
- var items = GetRecursiveChildren(parent, user, new[] { CollectionType.Games }, i => i is Game && FilterItem(i, query));
-
- return PostFilterAndSort(items, parent, GetSpecialItemsLimit(), query);
- }
-
- private QueryResult<BaseItem> GetFavoriteGames(Folder parent, User user, InternalItemsQuery query)
- {
- query.IsFavorite = true;
-
- var items = GetRecursiveChildren(parent, user, new[] { CollectionType.Games }, i => i is Game && FilterItem(i, query));
- return PostFilterAndSort(items, parent, null, query);
- }
-
private QueryResult<BaseItem> GetTvLatest(Folder parent, User user, InternalItemsQuery query)
{
query.SortBy = new[] { ItemSortBy.DateCreated, ItemSortBy.SortName };
@@ -741,49 +477,6 @@ namespace MediaBrowser.Controller.Entities
return GetResult(items, queryParent, query);
}
- private QueryResult<BaseItem> GetGameSystems(Folder parent, User user, InternalItemsQuery query)
- {
- var items = GetRecursiveChildren(parent, user, new[] { CollectionType.Games }, i => i is GameSystem && FilterItem(i, query));
-
- return PostFilterAndSort(items, parent, null, query);
- }
-
- private async Task<QueryResult<BaseItem>> GetGameGenreItems(Folder queryParent, Folder displayParent, User user, InternalItemsQuery query)
- {
- var items = GetRecursiveChildren(queryParent, user, new[] { CollectionType.Games },
- i => i is Game && i.Genres.Contains(displayParent.Name, StringComparer.OrdinalIgnoreCase));
-
- return GetResult(items, queryParent, query);
- }
-
- private async Task<QueryResult<BaseItem>> GetGameGenres(Folder parent, User user, InternalItemsQuery query)
- {
- var tasks = GetRecursiveChildren(parent, user, new[] { CollectionType.Games })
- .OfType<Game>()
- .SelectMany(i => i.Genres)
- .DistinctNames()
- .Select(i =>
- {
- try
- {
- return _libraryManager.GetGameGenre(i);
- }
- catch
- {
- // Full exception logged at lower levels
- _logger.Error("Error getting game genre");
- return null;
- }
-
- })
- .Where(i => i != null)
- .Select(i => GetUserView(i.Name, SpecialFolder.GameGenre, i.SortName, parent));
-
- var genres = await Task.WhenAll(tasks).ConfigureAwait(false);
-
- return GetResult(genres, parent, query);
- }
-
private QueryResult<BaseItem> GetResult<T>(QueryResult<T> result)
where T : BaseItem
{
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-04 06:44:29 +0000