alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-18 13:40:45 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #7029 from cvium/allocations_maybe

Browse Source
This commit is contained in:
Cody Robibero
2021-12-24 01:59:25 +00:00
committed by GitHub
parent 259bc231d6 b880dc8a4a
commit 076a13abeb
88 changed files with 169 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@@ -1283,11 +1283,11 @@ namespace MediaBrowser.Controller.Entities
{
try
{
var files = IsFileProtocol ?
GetFileSystemChildren(options.DirectoryService).ToList() :
new List<FileSystemMetadata>();
if (IsFileProtocol)
{
requiresSave = await RefreshedOwnedItems(options, GetFileSystemChildren(options.DirectoryService).ToList(), cancellationToken).ConfigureAwait(false);
}
requiresSave = await RefreshedOwnedItems(options, files, cancellationToken).ConfigureAwait(false);
await LibraryManager.UpdateImagesAsync(this).ConfigureAwait(false); // ensure all image properties in DB are fresh
}
catch (Exception ex)
@@ -1642,7 +1642,7 @@ namespace MediaBrowser.Controller.Entities
private bool IsVisibleViaTags(User user)
{
if (user.GetPreference(PreferenceKind.BlockedTags).Any(i => Tags.Contains(i, StringComparer.OrdinalIgnoreCase)))
if (user.GetPreference(PreferenceKind.BlockedTags).Any(i => Tags.Contains(i, StringComparison.OrdinalIgnoreCase)))
{
return false;
}
@@ -1811,7 +1811,7 @@ namespace MediaBrowser.Controller.Entities
var current = Studios;
if (!current.Contains(name, StringComparer.OrdinalIgnoreCase))
if (!current.Contains(name, StringComparison.OrdinalIgnoreCase))
{
int curLen = current.Length;
if (curLen == 0)
@@ -1846,7 +1846,7 @@ namespace MediaBrowser.Controller.Entities
}
var genres = Genres;
if (!genres.Contains(name, StringComparer.OrdinalIgnoreCase))
if (!genres.Contains(name, StringComparison.OrdinalIgnoreCase))
{
var list = genres.ToList();
list.Add(name);
@@ -2052,7 +2052,7 @@ namespace MediaBrowser.Controller.Entities
.ToList();
var deletedImages = ImageInfos
.Where(image => image.IsLocalFile && !allFiles.Contains(image.Path, StringComparer.OrdinalIgnoreCase))
.Where(image => image.IsLocalFile && !allFiles.Contains(image.Path, StringComparison.OrdinalIgnoreCase))
.ToList();
if (deletedImages.Count > 0)