mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-05-24 02:02:29 -04:00
Applied coding style
This commit is contained in:
parent
17e4485b94
commit
b39553611d
@ -28,9 +28,9 @@ namespace Emby.Server.Implementations.Data
|
|||||||
_dbProvider = dbProvider;
|
_dbProvider = dbProvider;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task Run(IProgress<double> progress, CancellationToken cancellationToken)
|
public async Task Run(IProgress<double> progress, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
return CleanDeadItems(cancellationToken, progress);
|
await CleanDeadItems(cancellationToken, progress).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task CleanDeadItems(CancellationToken cancellationToken, IProgress<double> progress)
|
private async Task CleanDeadItems(CancellationToken cancellationToken, IProgress<double> progress)
|
||||||
|
@ -1,12 +1,8 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Frozen;
|
using System.Collections.Frozen;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Collections.Immutable;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Threading.Channels;
|
using System.Threading.Channels;
|
||||||
using Emby.Server.Implementations.Playlists;
|
using Emby.Server.Implementations.Playlists;
|
||||||
using Jellyfin.Data.Enums;
|
using Jellyfin.Data.Enums;
|
||||||
using Jellyfin.Server.Implementations;
|
|
||||||
using MediaBrowser.Controller.Entities;
|
using MediaBrowser.Controller.Entities;
|
||||||
using MediaBrowser.Controller.Entities.Audio;
|
using MediaBrowser.Controller.Entities.Audio;
|
||||||
using MediaBrowser.Controller.Entities.Movies;
|
using MediaBrowser.Controller.Entities.Movies;
|
||||||
@ -14,7 +10,6 @@ using MediaBrowser.Controller.Entities.TV;
|
|||||||
using MediaBrowser.Controller.LiveTv;
|
using MediaBrowser.Controller.LiveTv;
|
||||||
using MediaBrowser.Controller.Persistence;
|
using MediaBrowser.Controller.Persistence;
|
||||||
using MediaBrowser.Controller.Playlists;
|
using MediaBrowser.Controller.Playlists;
|
||||||
using MediaBrowser.Model.Querying;
|
|
||||||
|
|
||||||
namespace Emby.Server.Implementations.Data;
|
namespace Emby.Server.Implementations.Data;
|
||||||
|
|
||||||
@ -23,7 +18,6 @@ public class ItemTypeLookup : IItemTypeLookup
|
|||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public IReadOnlyList<string> MusicGenreTypes { get; } = [
|
public IReadOnlyList<string> MusicGenreTypes { get; } = [
|
||||||
|
|
||||||
typeof(Audio).FullName!,
|
typeof(Audio).FullName!,
|
||||||
typeof(MusicVideo).FullName!,
|
typeof(MusicVideo).FullName!,
|
||||||
typeof(MusicAlbum).FullName!,
|
typeof(MusicAlbum).FullName!,
|
||||||
|
@ -1810,11 +1810,11 @@ namespace Emby.Server.Implementations.Library
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public void CreateItem(BaseItem item, BaseItem? parent)
|
public void CreateItem(BaseItem item, BaseItem? parent)
|
||||||
{
|
{
|
||||||
CreateItems(new[] { item }, parent, CancellationToken.None);
|
CreateOrUpdateItems(new[] { item }, parent, CancellationToken.None);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public void CreateItems(IReadOnlyList<BaseItem> items, BaseItem? parent, CancellationToken cancellationToken)
|
public void CreateOrUpdateItems(IReadOnlyList<BaseItem> items, BaseItem? parent, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
_itemRepository.SaveItems(items, cancellationToken);
|
_itemRepository.SaveItems(items, cancellationToken);
|
||||||
|
|
||||||
@ -2971,10 +2971,11 @@ namespace Emby.Server.Implementations.Library
|
|||||||
{
|
{
|
||||||
if (createEntity)
|
if (createEntity)
|
||||||
{
|
{
|
||||||
CreateItems([personEntity], null, CancellationToken.None);
|
CreateOrUpdateItems([personEntity], null, CancellationToken.None);
|
||||||
}
|
}
|
||||||
|
|
||||||
await RunMetadataSavers(personEntity, itemUpdateType).ConfigureAwait(false);
|
await RunMetadataSavers(personEntity, itemUpdateType).ConfigureAwait(false);
|
||||||
|
CreateOrUpdateItems([personEntity], null, CancellationToken.None);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -218,7 +218,7 @@ namespace Emby.Server.Implementations.Library
|
|||||||
list.Add(source);
|
list.Add(source);
|
||||||
}
|
}
|
||||||
|
|
||||||
return SortMediaSources(list).ToImmutableArray();
|
return SortMediaSources(list).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />>
|
/// <inheritdoc />>
|
||||||
|
@ -397,7 +397,7 @@ public class InstantMixController : BaseJellyfinApiController
|
|||||||
|
|
||||||
if (limit.HasValue && limit < items.Count)
|
if (limit.HasValue && limit < items.Count)
|
||||||
{
|
{
|
||||||
items = items.Take(limit.Value).ToImmutableArray();
|
items = items.Take(limit.Value).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
var result = new QueryResult<BaseItemDto>(
|
var result = new QueryResult<BaseItemDto>(
|
||||||
|
@ -113,11 +113,11 @@ public class YearsController : BaseJellyfinApiController
|
|||||||
|
|
||||||
if (userId.IsNullOrEmpty())
|
if (userId.IsNullOrEmpty())
|
||||||
{
|
{
|
||||||
items = recursive ? folder.GetRecursiveChildren(Filter) : folder.Children.Where(Filter).ToImmutableArray();
|
items = recursive ? folder.GetRecursiveChildren(Filter) : folder.Children.Where(Filter).ToArray();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
items = recursive ? folder.GetRecursiveChildren(user, query) : folder.GetChildren(user, true).Where(Filter).ToImmutableArray();
|
items = recursive ? folder.GetRecursiveChildren(user, query) : folder.GetChildren(user, true).Where(Filter).ToArray();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -117,7 +117,7 @@ public sealed class BaseItemRepository(
|
|||||||
PrepareFilterQuery(filter);
|
PrepareFilterQuery(filter);
|
||||||
|
|
||||||
using var context = dbProvider.CreateDbContext();
|
using var context = dbProvider.CreateDbContext();
|
||||||
return ApplyQueryFilter(context.BaseItems.AsNoTracking(), context, filter).Select(e => e.Id).ToImmutableArray();
|
return ApplyQueryFilter(context.BaseItems.AsNoTracking(), context, filter).Select(e => e.Id).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
@ -216,7 +216,7 @@ public sealed class BaseItemRepository(
|
|||||||
dbQuery = ApplyGroupingFilter(dbQuery, filter);
|
dbQuery = ApplyGroupingFilter(dbQuery, filter);
|
||||||
dbQuery = ApplyQueryPageing(dbQuery, filter);
|
dbQuery = ApplyQueryPageing(dbQuery, filter);
|
||||||
|
|
||||||
result.Items = dbQuery.AsEnumerable().Where(e => e is not null).Select(w => DeserialiseBaseItem(w, filter.SkipDeserialization)).ToImmutableArray();
|
result.Items = dbQuery.AsEnumerable().Where(e => e is not null).Select(w => DeserialiseBaseItem(w, filter.SkipDeserialization)).ToArray();
|
||||||
result.StartIndex = filter.StartIndex ?? 0;
|
result.StartIndex = filter.StartIndex ?? 0;
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@ -235,7 +235,7 @@ public sealed class BaseItemRepository(
|
|||||||
dbQuery = ApplyGroupingFilter(dbQuery, filter);
|
dbQuery = ApplyGroupingFilter(dbQuery, filter);
|
||||||
dbQuery = ApplyQueryPageing(dbQuery, filter);
|
dbQuery = ApplyQueryPageing(dbQuery, filter);
|
||||||
|
|
||||||
return dbQuery.AsEnumerable().Where(e => e is not null).Select(w => DeserialiseBaseItem(w, filter.SkipDeserialization)).ToImmutableArray();
|
return dbQuery.AsEnumerable().Where(e => e is not null).Select(w => DeserialiseBaseItem(w, filter.SkipDeserialization)).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
private IQueryable<BaseItemEntity> ApplyGroupingFilter(IQueryable<BaseItemEntity> dbQuery, InternalItemsQuery filter)
|
private IQueryable<BaseItemEntity> ApplyGroupingFilter(IQueryable<BaseItemEntity> dbQuery, InternalItemsQuery filter)
|
||||||
@ -831,7 +831,7 @@ public sealed class BaseItemRepository(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// query = query.DistinctBy(e => e.CleanValue);
|
// query = query.DistinctBy(e => e.CleanValue);
|
||||||
return query.Select(e => e.ItemValue.CleanValue).ToImmutableArray();
|
return query.Select(e => e.ItemValue.CleanValue).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static bool TypeRequiresDeserialization(Type type)
|
private static bool TypeRequiresDeserialization(Type type)
|
||||||
@ -976,10 +976,10 @@ public sealed class BaseItemRepository(
|
|||||||
});
|
});
|
||||||
|
|
||||||
result.StartIndex = filter.StartIndex ?? 0;
|
result.StartIndex = filter.StartIndex ?? 0;
|
||||||
result.Items = resultQuery.ToImmutableArray().Where(e => e is not null).Select(e =>
|
result.Items = resultQuery.ToArray().Where(e => e is not null).Select(e =>
|
||||||
{
|
{
|
||||||
return (DeserialiseBaseItem(e.item, filter.SkipDeserialization), e.itemCount);
|
return (DeserialiseBaseItem(e.item, filter.SkipDeserialization), e.itemCount);
|
||||||
}).ToImmutableArray();
|
}).ToArray();
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
@ -73,7 +73,7 @@ public class ChapterRepository : IChapterRepository
|
|||||||
})
|
})
|
||||||
.ToList()
|
.ToList()
|
||||||
.Select(e => Map(e.chapter, e.baseItemPath!))
|
.Select(e => Map(e.chapter, e.baseItemPath!))
|
||||||
.ToImmutableArray();
|
.ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc cref="IChapterRepository"/>
|
/// <inheritdoc cref="IChapterRepository"/>
|
||||||
|
@ -40,7 +40,7 @@ public class MediaAttachmentRepository(IDbContextFactory<JellyfinDbContext> dbPr
|
|||||||
query = query.Where(e => e.Index == filter.Index);
|
query = query.Where(e => e.Index == filter.Index);
|
||||||
}
|
}
|
||||||
|
|
||||||
return query.AsEnumerable().Select(Map).ToImmutableArray();
|
return query.AsEnumerable().Select(Map).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
private MediaAttachment Map(AttachmentStreamInfo attachment)
|
private MediaAttachment Map(AttachmentStreamInfo attachment)
|
||||||
|
@ -51,7 +51,7 @@ public class MediaStreamRepository : IMediaStreamRepository
|
|||||||
public IReadOnlyList<MediaStream> GetMediaStreams(MediaStreamQuery filter)
|
public IReadOnlyList<MediaStream> GetMediaStreams(MediaStreamQuery filter)
|
||||||
{
|
{
|
||||||
using var context = _dbProvider.CreateDbContext();
|
using var context = _dbProvider.CreateDbContext();
|
||||||
return TranslateQuery(context.MediaStreamInfos.AsNoTracking(), filter).AsEnumerable().Select(Map).ToImmutableArray();
|
return TranslateQuery(context.MediaStreamInfos.AsNoTracking(), filter).AsEnumerable().Select(Map).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
private string? GetPathToSave(string? path)
|
private string? GetPathToSave(string? path)
|
||||||
|
@ -36,7 +36,7 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
|
|||||||
dbQuery = dbQuery.Take(filter.Limit);
|
dbQuery = dbQuery.Take(filter.Limit);
|
||||||
}
|
}
|
||||||
|
|
||||||
return dbQuery.AsEnumerable().Select(Map).ToImmutableArray();
|
return dbQuery.AsEnumerable().Select(Map).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
@ -51,7 +51,7 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
|
|||||||
dbQuery = dbQuery.Take(filter.Limit);
|
dbQuery = dbQuery.Take(filter.Limit);
|
||||||
}
|
}
|
||||||
|
|
||||||
return dbQuery.Select(e => e.Name).ToImmutableArray();
|
return dbQuery.Select(e => e.Name).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
|
@ -154,7 +154,7 @@ public class MediaSegmentManager : IMediaSegmentManager
|
|||||||
return query
|
return query
|
||||||
.OrderBy(e => e.StartTicks)
|
.OrderBy(e => e.StartTicks)
|
||||||
.AsNoTracking()
|
.AsNoTracking()
|
||||||
.ToImmutableArray()
|
.ToArray()
|
||||||
.Select(Map);
|
.Select(Map);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1092,7 +1092,7 @@ namespace MediaBrowser.Controller.Entities
|
|||||||
return 1;
|
return 1;
|
||||||
}).ThenBy(i => i.Video3DFormat.HasValue ? 1 : 0)
|
}).ThenBy(i => i.Video3DFormat.HasValue ? 1 : 0)
|
||||||
.ThenByDescending(i => i, new MediaSourceWidthComparator())
|
.ThenByDescending(i => i, new MediaSourceWidthComparator())
|
||||||
.ToImmutableArray();
|
.ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected virtual IEnumerable<(BaseItem Item, MediaSourceType MediaSourceType)> GetAllItemsForMediaSources()
|
protected virtual IEnumerable<(BaseItem Item, MediaSourceType MediaSourceType)> GetAllItemsForMediaSources()
|
||||||
|
@ -452,7 +452,7 @@ namespace MediaBrowser.Controller.Entities
|
|||||||
|
|
||||||
if (newItems.Count > 0)
|
if (newItems.Count > 0)
|
||||||
{
|
{
|
||||||
LibraryManager.CreateItems(newItems, this, cancellationToken);
|
LibraryManager.CreateOrUpdateItems(newItems, this, cancellationToken);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -1306,7 +1306,7 @@ namespace MediaBrowser.Controller.Entities
|
|||||||
|
|
||||||
AddChildren(user, includeLinkedChildren, result, false, query);
|
AddChildren(user, includeLinkedChildren, result, false, query);
|
||||||
|
|
||||||
return result.Values.ToImmutableArray();
|
return result.Values.ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected virtual IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
|
protected virtual IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
|
||||||
@ -1379,7 +1379,7 @@ namespace MediaBrowser.Controller.Entities
|
|||||||
|
|
||||||
AddChildren(user, true, result, true, query);
|
AddChildren(user, true, result, true, query);
|
||||||
|
|
||||||
return result.Values.ToImmutableArray();
|
return result.Values.ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -1407,7 +1407,7 @@ namespace MediaBrowser.Controller.Entities
|
|||||||
|
|
||||||
AddChildrenToList(result, includeLinkedChildren, true, filter);
|
AddChildrenToList(result, includeLinkedChildren, true, filter);
|
||||||
|
|
||||||
return result.Values.ToImmutableArray();
|
return result.Values.ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -1563,7 +1563,7 @@ namespace MediaBrowser.Controller.Entities
|
|||||||
return LinkedChildren
|
return LinkedChildren
|
||||||
.Select(i => new Tuple<LinkedChild, BaseItem>(i, GetLinkedChild(i)))
|
.Select(i => new Tuple<LinkedChild, BaseItem>(i, GetLinkedChild(i)))
|
||||||
.Where(i => i.Item2 is not null)
|
.Where(i => i.Item2 is not null)
|
||||||
.ToImmutableArray();
|
.ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override async Task<bool> RefreshedOwnedItems(MetadataRefreshOptions options, IReadOnlyList<FileSystemMetadata> fileSystemChildren, CancellationToken cancellationToken)
|
protected override async Task<bool> RefreshedOwnedItems(MetadataRefreshOptions options, IReadOnlyList<FileSystemMetadata> fileSystemChildren, CancellationToken cancellationToken)
|
||||||
|
@ -131,13 +131,13 @@ namespace MediaBrowser.Controller.Entities.Movies
|
|||||||
public override IReadOnlyList<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)
|
public override IReadOnlyList<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)
|
||||||
{
|
{
|
||||||
var children = base.GetChildren(user, includeLinkedChildren, query);
|
var children = base.GetChildren(user, includeLinkedChildren, query);
|
||||||
return Sort(children, user).ToImmutableArray();
|
return Sort(children, user).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override IReadOnlyList<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
|
public override IReadOnlyList<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
|
||||||
{
|
{
|
||||||
var children = base.GetRecursiveChildren(user, query);
|
var children = base.GetRecursiveChildren(user, query);
|
||||||
return Sort(children, user).ToImmutableArray();
|
return Sort(children, user).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
public BoxSetInfo GetLookupInfo()
|
public BoxSetInfo GetLookupInfo()
|
||||||
|
@ -258,7 +258,7 @@ namespace MediaBrowser.Controller.Library
|
|||||||
/// <param name="items">Items to create.</param>
|
/// <param name="items">Items to create.</param>
|
||||||
/// <param name="parent">Parent of new items.</param>
|
/// <param name="parent">Parent of new items.</param>
|
||||||
/// <param name="cancellationToken">CancellationToken to use for operation.</param>
|
/// <param name="cancellationToken">CancellationToken to use for operation.</param>
|
||||||
void CreateItems(IReadOnlyList<BaseItem> items, BaseItem? parent, CancellationToken cancellationToken);
|
void CreateOrUpdateItems(IReadOnlyList<BaseItem> items, BaseItem? parent, CancellationToken cancellationToken);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Updates the item.
|
/// Updates the item.
|
||||||
|
@ -37,7 +37,7 @@ namespace MediaBrowser.Providers.Music
|
|||||||
Recursive = true,
|
Recursive = true,
|
||||||
IsFolder = false
|
IsFolder = false
|
||||||
})
|
})
|
||||||
: item.GetRecursiveChildren(i => i is IHasArtist && !i.IsFolder).ToImmutableArray();
|
: item.GetRecursiveChildren(i => i is IHasArtist && !i.IsFolder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -265,7 +265,7 @@ public class GuideManager : IGuideManager
|
|||||||
|
|
||||||
if (newPrograms.Count > 0)
|
if (newPrograms.Count > 0)
|
||||||
{
|
{
|
||||||
_libraryManager.CreateItems(newPrograms, null, cancellationToken);
|
_libraryManager.CreateOrUpdateItems(newPrograms, null, cancellationToken);
|
||||||
await PrecacheImages(newPrograms, maxCacheDate).ConfigureAwait(false);
|
await PrecacheImages(newPrograms, maxCacheDate).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user