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

Add non-standard multi-value audio tag support (#12385)

Browse Source
This commit is contained in:
gnattu 2024-09-08 11:10:59 +08:00 committed by GitHub
parent b4f71859d9
commit c6de7225b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 77 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
MediaBrowser.Model/Configuration/LibraryOptions.cs
View File

@ -7,6 +7,8 @@ namespace MediaBrowser.Model.Configuration
{ {
public class LibraryOptions public class LibraryOptions
{ {
private static readonly char[] _defaultTagDelimiters = ['/', '|', ';', '\\'];
public LibraryOptions() public LibraryOptions()
{ {
TypeOptions = Array.Empty<TypeOptions>(); TypeOptions = Array.Empty<TypeOptions>();
@ -30,6 +32,11 @@ namespace MediaBrowser.Model.Configuration
PathInfos = Array.Empty<MediaPathInfo>(); PathInfos = Array.Empty<MediaPathInfo>();
EnableAutomaticSeriesGrouping = true; EnableAutomaticSeriesGrouping = true;
SeasonZeroDisplayName = "Specials"; SeasonZeroDisplayName = "Specials";
PreferNonstandardArtistsTag = false;
UseCustomTagDelimiters = false;
CustomTagDelimiters = _defaultTagDelimiters;
DelimiterWhitelist = Array.Empty<string>();
} }
public bool Enabled { get; set; } = true; public bool Enabled { get; set; } = true;
@ -113,6 +120,17 @@ namespace MediaBrowser.Model.Configuration
public string[] LyricFetcherOrder { get; set; } public string[] LyricFetcherOrder { get; set; }
[DefaultValue(false)]
public bool PreferNonstandardArtistsTag { get; set; }
[DefaultValue(false)]
public bool UseCustomTagDelimiters { get; set; }
[DefaultValue(typeof(LibraryOptions), nameof(_defaultTagDelimiters))]
public char[] CustomTagDelimiters { get; set; }
public string[] DelimiterWhitelist { get; set; }
public bool AutomaticallyAddToCollection { get; set; } public bool AutomaticallyAddToCollection { get; set; }
public EmbeddedSubtitleOptions AllowEmbeddedSubtitles { get; set; } public EmbeddedSubtitleOptions AllowEmbeddedSubtitles { get; set; }

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

@ -6,7 +6,6 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using ATL; using ATL;
using Jellyfin.Data.Enums; using Jellyfin.Data.Enums;
using Jellyfin.Extensions;
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
@ -158,6 +157,7 @@ namespace MediaBrowser.Providers.MediaInfo
/// <param name="tryExtractEmbeddedLyrics">Whether to extract embedded lyrics to lrc file. </param> /// <param name="tryExtractEmbeddedLyrics">Whether to extract embedded lyrics to lrc file. </param>
private async Task FetchDataFromTags(Audio audio, Model.MediaInfo.MediaInfo mediaInfo, MetadataRefreshOptions options, bool tryExtractEmbeddedLyrics) private async Task FetchDataFromTags(Audio audio, Model.MediaInfo.MediaInfo mediaInfo, MetadataRefreshOptions options, bool tryExtractEmbeddedLyrics)
{ {
var libraryOptions = _libraryManager.GetLibraryOptions(audio);
Track track = new Track(audio.Path); Track track = new Track(audio.Path);
// ATL will fall back to filename as title when it does not understand the metadata // ATL will fall back to filename as title when it does not understand the metadata
@ -175,6 +175,12 @@ namespace MediaBrowser.Providers.MediaInfo
{ {
var people = new List<PersonInfo>(); var people = new List<PersonInfo>();
var albumArtists = string.IsNullOrEmpty(track.AlbumArtist) ? mediaInfo.AlbumArtists : track.AlbumArtist.Split(InternalValueSeparator); var albumArtists = string.IsNullOrEmpty(track.AlbumArtist) ? mediaInfo.AlbumArtists : track.AlbumArtist.Split(InternalValueSeparator);
if (libraryOptions.UseCustomTagDelimiters)
{
albumArtists = albumArtists.SelectMany(a => SplitWithCustomDelimiter(a, libraryOptions.CustomTagDelimiters, libraryOptions.DelimiterWhitelist)).ToArray();
}
foreach (var albumArtist in albumArtists) foreach (var albumArtist in albumArtists)
{ {
if (!string.IsNullOrEmpty(albumArtist)) if (!string.IsNullOrEmpty(albumArtist))
@ -187,7 +193,26 @@ namespace MediaBrowser.Providers.MediaInfo
} }
} }
var performers = string.IsNullOrEmpty(track.Artist) ? mediaInfo.Artists : track.Artist.Split(InternalValueSeparator); string[]? performers = null;
if (libraryOptions.PreferNonstandardArtistsTag)
{
track.AdditionalFields.TryGetValue("ARTISTS", out var artistsTagString);
if (artistsTagString is not null)
{
performers = artistsTagString.Split(InternalValueSeparator);
}
}
if (performers is null || performers.Length == 0)
{
performers = string.IsNullOrEmpty(track.Artist) ? mediaInfo.Artists : track.Artist.Split(InternalValueSeparator);
}
if (libraryOptions.UseCustomTagDelimiters)
{
performers = performers.SelectMany(p => SplitWithCustomDelimiter(p, libraryOptions.CustomTagDelimiters, libraryOptions.DelimiterWhitelist)).ToArray();
}
foreach (var performer in performers) foreach (var performer in performers)
{ {
if (!string.IsNullOrEmpty(performer)) if (!string.IsNullOrEmpty(performer))
@ -285,6 +310,12 @@ namespace MediaBrowser.Providers.MediaInfo
if (!audio.LockedFields.Contains(MetadataField.Genres)) if (!audio.LockedFields.Contains(MetadataField.Genres))
{ {
var genres = string.IsNullOrEmpty(track.Genre) ? mediaInfo.Genres : track.Genre.Split(InternalValueSeparator).Distinct(StringComparer.OrdinalIgnoreCase).ToArray(); var genres = string.IsNullOrEmpty(track.Genre) ? mediaInfo.Genres : track.Genre.Split(InternalValueSeparator).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
if (libraryOptions.UseCustomTagDelimiters)
{
genres = genres.SelectMany(g => SplitWithCustomDelimiter(g, libraryOptions.CustomTagDelimiters, libraryOptions.DelimiterWhitelist)).ToArray();
}
audio.Genres = options.ReplaceAllMetadata || audio.Genres == null || audio.Genres.Length == 0 audio.Genres = options.ReplaceAllMetadata || audio.Genres == null || audio.Genres.Length == 0
? genres ? genres
: audio.Genres; : audio.Genres;
@ -379,5 +410,31 @@ namespace MediaBrowser.Providers.MediaInfo
currentStreams.Add(externalLyricFiles[0]); currentStreams.Add(externalLyricFiles[0]);
} }
} }
private List<string> SplitWithCustomDelimiter(string val, char[] tagDelimiters, string[] whitelist)
{
var items = new List<string>();
var temp = val;
foreach (var whitelistItem in whitelist)
{
if (string.IsNullOrWhiteSpace(whitelistItem))
{
continue;
}
var originalTemp = temp;
temp = temp.Replace(whitelistItem, string.Empty, StringComparison.OrdinalIgnoreCase);
if (!string.Equals(temp, originalTemp, StringComparison.OrdinalIgnoreCase))
{
items.Add(whitelistItem);
}
}
var items2 = temp.Split(tagDelimiters, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries).DistinctNames();
items.AddRange(items2);
return items;
}
} }
} }