Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-05-24 02:02:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up usings and honor SortName

Browse Source
This commit is contained in:
Marc Brooks 2025-02-25 01:51:38 -06:00
parent 4e64b261a8
commit 114591c1aa
8 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,6 @@ using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Persistence;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Globalization;

1
MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
View File

@ -12,7 +12,6 @@ using Jellyfin.Data.Enums;
using Jellyfin.Extensions;
using MediaBrowser.Controller.Extensions;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Globalization;

1
MediaBrowser.Providers/MediaInfo/AudioFileProber.cs
View File

@ -14,7 +14,6 @@ using MediaBrowser.Controller.Lyrics;
using MediaBrowser.Controller.MediaEncoding;
using MediaBrowser.Controller.Persistence;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Dlna;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;

1
MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
View File

@ -12,7 +12,6 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Providers;
using TMDbLib.Objects.Find;

1
MediaBrowser.XbmcMetadata/Savers/AlbumNfoSaver.cs
View File

@ -74,6 +74,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
foreach (var track in tracks
.OrderBy(i => i.ParentIndexNumber ?? 0)
.ThenBy(i => i.IndexNumber ?? 0)
.ThenBy(i => SortNameOrName(i))
.ThenBy(i => i.Name?.Trim()))
{
writer.WriteStartElement("track");

3
MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs
View File

@ -7,7 +7,6 @@ using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.IO;
using MediaBrowser.XbmcMetadata.Configuration;
using Microsoft.Extensions.Logging;
@ -73,7 +72,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
{
foreach (var album in albums
.OrderBy(album => album.ProductionYear ?? 0)
.ThenBy(album => album.SortName?.Trim())
.ThenBy(album => SortNameOrName(album))
.ThenBy(album => album.Name?.Trim()))
{
writer.WriteStartElement("album");

20
MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
View File

@ -19,7 +19,6 @@ using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.IO;
@ -1038,5 +1037,24 @@ namespace MediaBrowser.XbmcMetadata.Savers
private string GetTagForProviderKey(string providerKey)
=> providerKey.ToLowerInvariant() + "id";
protected static string SortNameOrName(BaseItem item)
{
if (item == null)
{
return string.Empty;
}
if (item.SortName != null)
{
string trimmed = item.SortName.Trim();
if (trimmed.Length > 0)
{
return trimmed;
}
}
return (item.Name ?? string.Empty).Trim();
}
}
}

1
MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
View File

@ -9,7 +9,6 @@ using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.IO;
using Microsoft.Extensions.Logging;