Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-03 13:44:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Genre cleanup (#13916)

Browse Source
This commit is contained in:
Tim Eisele 2025-04-15 04:43:38 +02:00 committed by GitHub
parent 8be8ea60f1
commit 6e9e2f500f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/Library/Validators/GenresValidator.cs
View File

@ -80,7 +80,7 @@ namespace Emby.Server.Implementations.Library.Validators
var deadEntities = _libraryManager.GetItemList(new InternalItemsQuery var deadEntities = _libraryManager.GetItemList(new InternalItemsQuery
{ {
IncludeItemTypes = [BaseItemKind.Genre], IncludeItemTypes = [BaseItemKind.Genre, BaseItemKind.MusicGenre],
IsDeadGenre = true, IsDeadGenre = true,
IsLocked = false IsLocked = false
}); });

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

@ -52,7 +52,7 @@ namespace MediaBrowser.Controller.Entities
/// The supported image extensions. /// The supported image extensions.
/// </summary> /// </summary>
public static readonly string[] SupportedImageExtensions public static readonly string[] SupportedImageExtensions
= new[] { ".png", ".jpg", ".jpeg", ".webp", ".tbn", ".gif", ".svg" }; = [".png", ".jpg", ".jpeg", ".webp", ".tbn", ".gif", ".svg"];
private static readonly List<string> _supportedExtensions = new List<string>(SupportedImageExtensions) private static readonly List<string> _supportedExtensions = new List<string>(SupportedImageExtensions)
{ {
@ -448,7 +448,7 @@ namespace MediaBrowser.Controller.Entities
return Array.Empty<string>(); return Array.Empty<string>();
} }
return new[] { Path }; return [Path];
} }
} }
@ -1984,7 +1984,7 @@ namespace MediaBrowser.Controller.Entities
public void RemoveImage(ItemImageInfo image) public void RemoveImage(ItemImageInfo image)
{ {
RemoveImages(new[] { image }); RemoveImages([image]);
} }
public void RemoveImages(IEnumerable<ItemImageInfo> deletedImages) public void RemoveImages(IEnumerable<ItemImageInfo> deletedImages)
@ -2019,7 +2019,7 @@ namespace MediaBrowser.Controller.Entities
continue; continue;
} }
(deletedImages ??= new List<ItemImageInfo>()).Add(imageInfo); (deletedImages ??= []).Add(imageInfo);
} }
var anyImagesRemoved = deletedImages?.Count > 0; var anyImagesRemoved = deletedImages?.Count > 0;
@ -2222,11 +2222,7 @@ namespace MediaBrowser.Controller.Entities
{ {
return new[] return new[]
{ {
new FileSystemMetadata FileSystem.GetFileSystemInfo(Path)
{
FullName = Path,
IsDirectory = IsFolder
}
}.Concat(GetLocalMetadataFilesToDelete()); }.Concat(GetLocalMetadataFilesToDelete());
} }
@ -2234,7 +2230,7 @@ namespace MediaBrowser.Controller.Entities
{ {
if (IsFolder || !IsInMixedFolder) if (IsFolder || !IsInMixedFolder)
{ {
return new List<FileSystemMetadata>(); return [];
} }
var filename = System.IO.Path.GetFileNameWithoutExtension(Path); var filename = System.IO.Path.GetFileNameWithoutExtension(Path);
@ -2490,10 +2486,10 @@ namespace MediaBrowser.Controller.Entities
protected virtual List<string> GetEtagValues(User user) protected virtual List<string> GetEtagValues(User user)
{ {
return new List<string> return
{ [
DateLastSaved.Ticks.ToString(CultureInfo.InvariantCulture) DateLastSaved.Ticks.ToString(CultureInfo.InvariantCulture)
}; ];
} }
public virtual IEnumerable<Guid> GetAncestorIds() public virtual IEnumerable<Guid> GetAncestorIds()
@ -2513,7 +2509,7 @@ namespace MediaBrowser.Controller.Entities
public virtual IEnumerable<Guid> GetIdsForAncestorQuery() public virtual IEnumerable<Guid> GetIdsForAncestorQuery()
{ {
return new[] { Id }; return [Id];
} }
public virtual double? GetRefreshProgress() public virtual double? GetRefreshProgress()