mirror of https://github.com/jellyfin/jellyfin.git
Merge pull request #6281 from crobibero/controller-warn-04
This commit is contained in:
commit
c22582b5aa
|
@ -164,7 +164,7 @@ namespace Emby.Server.Implementations.Collections
|
||||||
DateCreated = DateTime.UtcNow
|
DateCreated = DateTime.UtcNow
|
||||||
};
|
};
|
||||||
|
|
||||||
parentFolder.AddChild(collection, CancellationToken.None);
|
parentFolder.AddChild(collection);
|
||||||
|
|
||||||
if (options.ItemIdList.Count > 0)
|
if (options.ItemIdList.Count > 0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -147,7 +147,7 @@ namespace Emby.Server.Implementations.Playlists
|
||||||
|
|
||||||
playlist.SetMediaType(options.MediaType);
|
playlist.SetMediaType(options.MediaType);
|
||||||
|
|
||||||
parentFolder.AddChild(playlist, CancellationToken.None);
|
parentFolder.AddChild(playlist);
|
||||||
|
|
||||||
await playlist.RefreshMetadata(new MetadataRefreshOptions(new DirectoryService(_fileSystem)) { ForceSave = true }, CancellationToken.None)
|
await playlist.RefreshMetadata(new MetadataRefreshOptions(new DirectoryService(_fileSystem)) { ForceSave = true }, CancellationToken.None)
|
||||||
.ConfigureAwait(false);
|
.ConfigureAwait(false);
|
||||||
|
|
|
@ -1496,7 +1496,7 @@ namespace Jellyfin.Api.Controllers
|
||||||
args += " -ar " + state.OutputAudioSampleRate.Value.ToString(CultureInfo.InvariantCulture);
|
args += " -ar " + state.OutputAudioSampleRate.Value.ToString(CultureInfo.InvariantCulture);
|
||||||
}
|
}
|
||||||
|
|
||||||
args += _encodingHelper.GetAudioFilterParam(state, _encodingOptions, true);
|
args += _encodingHelper.GetAudioFilterParam(state, _encodingOptions);
|
||||||
|
|
||||||
return args;
|
return args;
|
||||||
}
|
}
|
||||||
|
|
|
@ -485,7 +485,7 @@ namespace Jellyfin.Api.Controllers
|
||||||
args += " -ar " + state.OutputAudioSampleRate.Value.ToString(CultureInfo.InvariantCulture);
|
args += " -ar " + state.OutputAudioSampleRate.Value.ToString(CultureInfo.InvariantCulture);
|
||||||
}
|
}
|
||||||
|
|
||||||
args += _encodingHelper.GetAudioFilterParam(state, _encodingOptions, true);
|
args += _encodingHelper.GetAudioFilterParam(state, _encodingOptions);
|
||||||
|
|
||||||
return args;
|
return args;
|
||||||
}
|
}
|
||||||
|
|
|
@ -206,9 +206,8 @@ namespace MediaBrowser.Controller.Entities
|
||||||
/// Adds the child.
|
/// Adds the child.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="item">The item.</param>
|
/// <param name="item">The item.</param>
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
|
||||||
/// <exception cref="InvalidOperationException">Unable to add + item.Name.</exception>
|
/// <exception cref="InvalidOperationException">Unable to add + item.Name.</exception>
|
||||||
public void AddChild(BaseItem item, CancellationToken cancellationToken)
|
public void AddChild(BaseItem item)
|
||||||
{
|
{
|
||||||
item.SetParent(this);
|
item.SetParent(this);
|
||||||
|
|
||||||
|
@ -1385,18 +1384,6 @@ namespace MediaBrowser.Controller.Entities
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets allowed recursive children of an item.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="user">The user.</param>
|
|
||||||
/// <param name="includeLinkedChildren">if set to <c>true</c> [include linked children].</param>
|
|
||||||
/// <returns>IEnumerable{BaseItem}.</returns>
|
|
||||||
/// <exception cref="ArgumentNullException"></exception>
|
|
||||||
public IEnumerable<BaseItem> GetRecursiveChildren(User user, bool includeLinkedChildren = true)
|
|
||||||
{
|
|
||||||
return GetRecursiveChildren(user, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual IEnumerable<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
|
public virtual IEnumerable<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
|
||||||
{
|
{
|
||||||
if (user == null)
|
if (user == null)
|
||||||
|
|
|
@ -65,7 +65,7 @@ namespace MediaBrowser.Controller.Entities
|
||||||
switch (viewType)
|
switch (viewType)
|
||||||
{
|
{
|
||||||
case CollectionType.Folders:
|
case CollectionType.Folders:
|
||||||
return GetResult(_libraryManager.GetUserRootFolder().GetChildren(user, true), queryParent, query);
|
return GetResult(_libraryManager.GetUserRootFolder().GetChildren(user, true), query);
|
||||||
|
|
||||||
case CollectionType.TvShows:
|
case CollectionType.TvShows:
|
||||||
return GetTvView(queryParent, user, query);
|
return GetTvView(queryParent, user, query);
|
||||||
|
@ -110,7 +110,7 @@ namespace MediaBrowser.Controller.Entities
|
||||||
return GetMovieMovies(queryParent, user, query);
|
return GetMovieMovies(queryParent, user, query);
|
||||||
|
|
||||||
case SpecialFolder.MovieCollections:
|
case SpecialFolder.MovieCollections:
|
||||||
return GetMovieCollections(queryParent, user, query);
|
return GetMovieCollections(user, query);
|
||||||
|
|
||||||
case SpecialFolder.TvFavoriteEpisodes:
|
case SpecialFolder.TvFavoriteEpisodes:
|
||||||
return GetFavoriteEpisodes(queryParent, user, query);
|
return GetFavoriteEpisodes(queryParent, user, query);
|
||||||
|
@ -122,7 +122,7 @@ namespace MediaBrowser.Controller.Entities
|
||||||
{
|
{
|
||||||
if (queryParent is UserView)
|
if (queryParent is UserView)
|
||||||
{
|
{
|
||||||
return GetResult(GetMediaFolders(user).OfType<Folder>().SelectMany(i => i.GetChildren(user, true)), queryParent, query);
|
return GetResult(GetMediaFolders(user).OfType<Folder>().SelectMany(i => i.GetChildren(user, true)), query);
|
||||||
}
|
}
|
||||||
|
|
||||||
return queryParent.GetItems(query);
|
return queryParent.GetItems(query);
|
||||||
|
@ -160,7 +160,7 @@ namespace MediaBrowser.Controller.Entities
|
||||||
GetUserView(SpecialFolder.MovieGenres, "Genres", "5", parent)
|
GetUserView(SpecialFolder.MovieGenres, "Genres", "5", parent)
|
||||||
};
|
};
|
||||||
|
|
||||||
return GetResult(list, parent, query);
|
return GetResult(list, query);
|
||||||
}
|
}
|
||||||
|
|
||||||
private QueryResult<BaseItem> GetFavoriteMovies(Folder parent, User user, InternalItemsQuery query)
|
private QueryResult<BaseItem> GetFavoriteMovies(Folder parent, User user, InternalItemsQuery query)
|
||||||
|
@ -207,7 +207,7 @@ namespace MediaBrowser.Controller.Entities
|
||||||
return _libraryManager.GetItemsResult(query);
|
return _libraryManager.GetItemsResult(query);
|
||||||
}
|
}
|
||||||
|
|
||||||
private QueryResult<BaseItem> GetMovieCollections(Folder parent, User user, InternalItemsQuery query)
|
private QueryResult<BaseItem> GetMovieCollections(User user, InternalItemsQuery query)
|
||||||
{
|
{
|
||||||
query.Parent = null;
|
query.Parent = null;
|
||||||
query.IncludeItemTypes = new[] { nameof(BoxSet) };
|
query.IncludeItemTypes = new[] { nameof(BoxSet) };
|
||||||
|
@ -275,9 +275,9 @@ namespace MediaBrowser.Controller.Entities
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.Where(i => i != null)
|
.Where(i => i != null)
|
||||||
.Select(i => GetUserViewWithName(i.Name, SpecialFolder.MovieGenre, i.SortName, parent));
|
.Select(i => GetUserViewWithName(SpecialFolder.MovieGenre, i.SortName, parent));
|
||||||
|
|
||||||
return GetResult(genres, parent, query);
|
return GetResult(genres, query);
|
||||||
}
|
}
|
||||||
|
|
||||||
private QueryResult<BaseItem> GetMovieGenreItems(Folder queryParent, Folder displayParent, User user, InternalItemsQuery query)
|
private QueryResult<BaseItem> GetMovieGenreItems(Folder queryParent, Folder displayParent, User user, InternalItemsQuery query)
|
||||||
|
@ -323,7 +323,7 @@ namespace MediaBrowser.Controller.Entities
|
||||||
GetUserView(SpecialFolder.TvGenres, "Genres", "6", parent)
|
GetUserView(SpecialFolder.TvGenres, "Genres", "6", parent)
|
||||||
};
|
};
|
||||||
|
|
||||||
return GetResult(list, parent, query);
|
return GetResult(list, query);
|
||||||
}
|
}
|
||||||
|
|
||||||
private QueryResult<BaseItem> GetTvLatest(Folder parent, User user, InternalItemsQuery query)
|
private QueryResult<BaseItem> GetTvLatest(Folder parent, User user, InternalItemsQuery query)
|
||||||
|
@ -403,9 +403,9 @@ namespace MediaBrowser.Controller.Entities
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.Where(i => i != null)
|
.Where(i => i != null)
|
||||||
.Select(i => GetUserViewWithName(i.Name, SpecialFolder.TvGenre, i.SortName, parent));
|
.Select(i => GetUserViewWithName(SpecialFolder.TvGenre, i.SortName, parent));
|
||||||
|
|
||||||
return GetResult(genres, parent, query);
|
return GetResult(genres, query);
|
||||||
}
|
}
|
||||||
|
|
||||||
private QueryResult<BaseItem> GetTvGenreItems(Folder queryParent, Folder displayParent, User user, InternalItemsQuery query)
|
private QueryResult<BaseItem> GetTvGenreItems(Folder queryParent, Folder displayParent, User user, InternalItemsQuery query)
|
||||||
|
@ -432,13 +432,12 @@ namespace MediaBrowser.Controller.Entities
|
||||||
|
|
||||||
private QueryResult<BaseItem> GetResult<T>(
|
private QueryResult<BaseItem> GetResult<T>(
|
||||||
IEnumerable<T> items,
|
IEnumerable<T> items,
|
||||||
BaseItem queryParent,
|
|
||||||
InternalItemsQuery query)
|
InternalItemsQuery query)
|
||||||
where T : BaseItem
|
where T : BaseItem
|
||||||
{
|
{
|
||||||
items = items.Where(i => Filter(i, query.User, query, _userDataManager, _libraryManager));
|
items = items.Where(i => Filter(i, query.User, query, _userDataManager, _libraryManager));
|
||||||
|
|
||||||
return PostFilterAndSort(items, queryParent, null, query, _libraryManager, _config);
|
return PostFilterAndSort(items, null, query, _libraryManager);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool FilterItem(BaseItem item, InternalItemsQuery query)
|
public static bool FilterItem(BaseItem item, InternalItemsQuery query)
|
||||||
|
@ -448,11 +447,9 @@ namespace MediaBrowser.Controller.Entities
|
||||||
|
|
||||||
public static QueryResult<BaseItem> PostFilterAndSort(
|
public static QueryResult<BaseItem> PostFilterAndSort(
|
||||||
IEnumerable<BaseItem> items,
|
IEnumerable<BaseItem> items,
|
||||||
BaseItem queryParent,
|
|
||||||
int? totalRecordLimit,
|
int? totalRecordLimit,
|
||||||
InternalItemsQuery query,
|
InternalItemsQuery query,
|
||||||
ILibraryManager libraryManager,
|
ILibraryManager libraryManager)
|
||||||
IServerConfigurationManager configurationManager)
|
|
||||||
{
|
{
|
||||||
var user = query.User;
|
var user = query.User;
|
||||||
|
|
||||||
|
@ -1001,7 +998,7 @@ namespace MediaBrowser.Controller.Entities
|
||||||
return new BaseItem[] { parent };
|
return new BaseItem[] { parent };
|
||||||
}
|
}
|
||||||
|
|
||||||
private UserView GetUserViewWithName(string name, string type, string sortName, BaseItem parent)
|
private UserView GetUserViewWithName(string type, string sortName, BaseItem parent)
|
||||||
{
|
{
|
||||||
return _userViewManager.GetUserSubView(parent.Id, parent.Id.ToString("N", CultureInfo.InvariantCulture), type, sortName);
|
return _userViewManager.GetUserSubView(parent.Id, parent.Id.ToString("N", CultureInfo.InvariantCulture), type, sortName);
|
||||||
}
|
}
|
||||||
|
|
|
@ -82,7 +82,7 @@ namespace MediaBrowser.Controller.LiveTv
|
||||||
return "TvChannel";
|
return "TvChannel";
|
||||||
}
|
}
|
||||||
|
|
||||||
public IEnumerable<BaseItem> GetTaggedItems(IEnumerable<BaseItem> inputItems)
|
public IEnumerable<BaseItem> GetTaggedItems()
|
||||||
{
|
{
|
||||||
return new List<BaseItem>();
|
return new List<BaseItem>();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1692,7 +1692,7 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
return 128000;
|
return 128000;
|
||||||
}
|
}
|
||||||
|
|
||||||
public string GetAudioFilterParam(EncodingJobInfo state, EncodingOptions encodingOptions, bool isHls)
|
public string GetAudioFilterParam(EncodingJobInfo state, EncodingOptions encodingOptions)
|
||||||
{
|
{
|
||||||
var channels = state.OutputAudioChannels;
|
var channels = state.OutputAudioChannels;
|
||||||
|
|
||||||
|
@ -3836,7 +3836,7 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
args += " -ar " + state.OutputAudioSampleRate.Value.ToString(_usCulture);
|
args += " -ar " + state.OutputAudioSampleRate.Value.ToString(_usCulture);
|
||||||
}
|
}
|
||||||
|
|
||||||
args += GetAudioFilterParam(state, encodingOptions, false);
|
args += GetAudioFilterParam(state, encodingOptions);
|
||||||
|
|
||||||
return args;
|
return args;
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,7 @@ namespace MediaBrowser.Controller.Providers
|
||||||
public string Name { get; set; }
|
public string Name { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the original title
|
/// Gets or sets the original title.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value>The original title of the item.</value>
|
/// <value>The original title of the item.</value>
|
||||||
public string OriginalTitle { get; set; }
|
public string OriginalTitle { get; set; }
|
||||||
|
|
|
@ -187,7 +187,7 @@ namespace MediaBrowser.Providers.TV
|
||||||
SeriesName = series.Name
|
SeriesName = series.Name
|
||||||
};
|
};
|
||||||
|
|
||||||
series.AddChild(season, cancellationToken);
|
series.AddChild(season);
|
||||||
|
|
||||||
await season.RefreshMetadata(new MetadataRefreshOptions(new DirectoryService(FileSystem)), cancellationToken).ConfigureAwait(false);
|
await season.RefreshMetadata(new MetadataRefreshOptions(new DirectoryService(FileSystem)), cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue