open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge d04f255e71 into f20a9c9b2b

Browse Source
Marc Brooks 1 month ago committed by GitHub
parent f20a9c9b2b d04f255e71
commit 52750fb722
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 108 additions and 61 deletions
Show Stats Download Patch File Download Diff File

8
MediaBrowser.Controller/Entities/BaseItem.cs
Unescape View File

@ -22,6 +22,7 @@ using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Persistence; using MediaBrowser.Controller.Persistence;
using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Providers;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Dto; using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Globalization; using MediaBrowser.Model.Globalization;
@ -916,7 +917,7 @@ namespace MediaBrowser.Controller.Entities
// Remove from middle if surrounded by spaces // Remove from middle if surrounded by spaces
sortable = sortable.Replace(" " + search + " ", " ", StringComparison.Ordinal); sortable = sortable.Replace(" " + search + " ", " ", StringComparison.Ordinal);
// Remove from end if followed by a space // Remove from end if preceeded by a space
if (sortable.EndsWith(" " + search, StringComparison.Ordinal)) if (sortable.EndsWith(" " + search, StringComparison.Ordinal))
{ {
sortable = sortable.Remove(sortable.Length - (search.Length + 1)); sortable = sortable.Remove(sortable.Length - (search.Length + 1));
@ -1771,7 +1772,7 @@ namespace MediaBrowser.Controller.Entities
public void AddStudio(string name) public void AddStudio(string name)
{ {
ArgumentException.ThrowIfNullOrEmpty(name); ArgumentException.ThrowIfNullOrEmpty(name);
name = name.Trim();
var current = Studios; var current = Studios;
if (!current.Contains(name, StringComparison.OrdinalIgnoreCase)) if (!current.Contains(name, StringComparison.OrdinalIgnoreCase))
@ -1790,7 +1791,7 @@ namespace MediaBrowser.Controller.Entities
public void SetStudios(IEnumerable<string> names) public void SetStudios(IEnumerable<string> names)
{ {
Studios = names.Distinct().ToArray(); Studios = names.Trimmed().Distinct().ToArray();
} }
/// <summary> /// <summary>
@ -1801,6 +1802,7 @@ namespace MediaBrowser.Controller.Entities
public void AddGenre(string name) public void AddGenre(string name)
{ {
ArgumentException.ThrowIfNullOrEmpty(name); ArgumentException.ThrowIfNullOrEmpty(name);
name = name.Trim();
var genres = Genres; var genres = Genres;
if (!genres.Contains(name, StringComparison.OrdinalIgnoreCase)) if (!genres.Contains(name, StringComparison.OrdinalIgnoreCase))

2
MediaBrowser.Controller/Entities/PeopleHelper.cs
Unescape View File

@ -15,6 +15,8 @@ namespace MediaBrowser.Controller.Entities
ArgumentNullException.ThrowIfNull(person); ArgumentNullException.ThrowIfNull(person);
ArgumentException.ThrowIfNullOrEmpty(person.Name); ArgumentException.ThrowIfNullOrEmpty(person.Name);
person.Name = person.Name.Trim();
// Normalize // Normalize
if (string.Equals(person.Role, PersonType.GuestStar, StringComparison.OrdinalIgnoreCase)) if (string.Equals(person.Role, PersonType.GuestStar, StringComparison.OrdinalIgnoreCase))
{ {

5
MediaBrowser.Controller/Sorting/SortExtensions.cs
Unescape View File

@ -30,5 +30,10 @@ namespace MediaBrowser.Controller.Sorting
{ {
return list.ThenByDescending(getName, _comparer); return list.ThenByDescending(getName, _comparer);
} }
public static IEnumerable<string> Trimmed(this IEnumerable<string> values)
{
return values.Select(i => (i ?? string.Empty).Trim());
}
} }
} }

18
MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
Unescape View File

@ -258,7 +258,12 @@ namespace MediaBrowser.LocalMetadata.Parsers
case "Network": case "Network":
foreach (var name in reader.GetStringArray()) foreach (var name in reader.GetStringArray())
{ {
item.AddStudio(name); if (string.IsNullOrWhiteSpace(name))
{
continue;
}
item.AddStudio(name.Trim());
} }
break; break;
@ -294,7 +299,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
var trailer = reader.ReadNormalizedString(); var trailer = reader.ReadNormalizedString();
if (!string.IsNullOrEmpty(trailer)) if (!string.IsNullOrEmpty(trailer))
{ {
item.AddTrailerUrl(trailer); item.AddTrailerUrl(trailer.Trim());
} }
break; break;
@ -302,7 +307,10 @@ namespace MediaBrowser.LocalMetadata.Parsers
var displayOrder = reader.ReadNormalizedString(); var displayOrder = reader.ReadNormalizedString();
if (!string.IsNullOrEmpty(displayOrder) && item is IHasDisplayOrder hasDisplayOrder) if (!string.IsNullOrEmpty(displayOrder) && item is IHasDisplayOrder hasDisplayOrder)
{ {
hasDisplayOrder.DisplayOrder = displayOrder; if (!string.IsNullOrWhiteSpace(displayOrder))
{
hasDisplayOrder.DisplayOrder = displayOrder.Trim();
}
} }
break; break;
@ -655,7 +663,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
var tag = reader.ReadNormalizedString(); var tag = reader.ReadNormalizedString();
if (!string.IsNullOrEmpty(tag)) if (!string.IsNullOrEmpty(tag))
{ {
tags.Add(tag); tags.Add(tag.Trim());
} }
break; break;
@ -727,7 +735,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
var trailer = reader.ReadNormalizedString(); var trailer = reader.ReadNormalizedString();
if (!string.IsNullOrEmpty(trailer)) if (!string.IsNullOrEmpty(trailer))
{ {
item.AddTrailerUrl(trailer); item.AddTrailerUrl(trailer.Trim());
} }
break; break;

27
MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
Unescape View File

@ -11,6 +11,7 @@ using System.Xml;
using Jellyfin.Data.Enums; using Jellyfin.Data.Enums;
using Jellyfin.Extensions; using Jellyfin.Extensions;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Dto; using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Globalization; using MediaBrowser.Model.Globalization;
@ -531,42 +532,44 @@ namespace MediaBrowser.MediaEncoding.Probing
private void ProcessPairs(string key, List<NameValuePair> pairs, MediaInfo info) private void ProcessPairs(string key, List<NameValuePair> pairs, MediaInfo info)
{ {
List<BaseItemPerson> peoples = new List<BaseItemPerson>(); List<BaseItemPerson> peoples = new List<BaseItemPerson>();
var distinctPairs = pairs.Select(p => p.Value)
.Where(i => !string.IsNullOrWhiteSpace(i))
.Trimmed()
.Distinct(StringComparer.OrdinalIgnoreCase);
if (string.Equals(key, "studio", StringComparison.OrdinalIgnoreCase)) if (string.Equals(key, "studio", StringComparison.OrdinalIgnoreCase))
{ {
info.Studios = pairs.Select(p => p.Value) info.Studios = distinctPairs.ToArray();
.Where(i => !string.IsNullOrWhiteSpace(i))
.Distinct(StringComparer.OrdinalIgnoreCase)
.ToArray();
} }
else if (string.Equals(key, "screenwriters", StringComparison.OrdinalIgnoreCase)) else if (string.Equals(key, "screenwriters", StringComparison.OrdinalIgnoreCase))
{ {
foreach (var pair in pairs) foreach (var pair in distinctPairs)
{ {
peoples.Add(new BaseItemPerson peoples.Add(new BaseItemPerson
{ {
Name = pair.Value, Name = pair,
Type = PersonKind.Writer Type = PersonKind.Writer
}); });
} }
} }
else if (string.Equals(key, "producers", StringComparison.OrdinalIgnoreCase)) else if (string.Equals(key, "producers", StringComparison.OrdinalIgnoreCase))
{ {
foreach (var pair in pairs) foreach (var pair in distinctPairs)
{ {
peoples.Add(new BaseItemPerson peoples.Add(new BaseItemPerson
{ {
Name = pair.Value, Name = pair,
Type = PersonKind.Producer Type = PersonKind.Producer
}); });
} }
} }
else if (string.Equals(key, "directors", StringComparison.OrdinalIgnoreCase)) else if (string.Equals(key, "directors", StringComparison.OrdinalIgnoreCase))
{ {
foreach (var pair in pairs) foreach (var pair in distinctPairs)
{ {
peoples.Add(new BaseItemPerson peoples.Add(new BaseItemPerson
{ {
Name = pair.Value, Name = pair,
Type = PersonKind.Director Type = PersonKind.Director
}); });
} }
@ -616,7 +619,7 @@ namespace MediaBrowser.MediaEncoding.Probing
return new NameValuePair return new NameValuePair
{ {
Name = name, Name = name,
Value = value Value = value?.Trim()
}; };
} }
@ -1449,7 +1452,7 @@ namespace MediaBrowser.MediaEncoding.Probing
continue; continue;
} }
genres.Add(genre); genres.Add(genre.Trim());
} }
info.Genres = genres info.Genres = genres

15
MediaBrowser.Providers/MediaInfo/AudioFileProber.cs
Unescape View File

@ -11,6 +11,7 @@ using MediaBrowser.Controller.Lyrics;
using MediaBrowser.Controller.MediaEncoding; using MediaBrowser.Controller.MediaEncoding;
using MediaBrowser.Controller.Persistence; using MediaBrowser.Controller.Persistence;
using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Providers;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Dlna; using MediaBrowser.Model.Dlna;
using MediaBrowser.Model.Dto; using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
@ -188,7 +189,7 @@ namespace MediaBrowser.Providers.MediaInfo
{ {
PeopleHelper.AddPerson(people, new PersonInfo PeopleHelper.AddPerson(people, new PersonInfo
{ {
Name = albumArtist, Name = albumArtist.Trim(),
Type = PersonKind.AlbumArtist Type = PersonKind.AlbumArtist
}); });
} }
@ -201,7 +202,7 @@ namespace MediaBrowser.Providers.MediaInfo
{ {
PeopleHelper.AddPerson(people, new PersonInfo PeopleHelper.AddPerson(people, new PersonInfo
{ {
Name = performer, Name = performer.Trim(),
Type = PersonKind.Artist Type = PersonKind.Artist
}); });
} }
@ -213,7 +214,7 @@ namespace MediaBrowser.Providers.MediaInfo
{ {
PeopleHelper.AddPerson(people, new PersonInfo PeopleHelper.AddPerson(people, new PersonInfo
{ {
Name = composer, Name = composer.Trim(),
Type = PersonKind.Composer Type = PersonKind.Composer
}); });
} }
@ -250,18 +251,18 @@ namespace MediaBrowser.Providers.MediaInfo
if (!audio.LockedFields.Contains(MetadataField.Name) && !string.IsNullOrEmpty(tags.Title)) if (!audio.LockedFields.Contains(MetadataField.Name) && !string.IsNullOrEmpty(tags.Title))
{ {
audio.Name = tags.Title; audio.Name = options.ReplaceAllMetadata || string.IsNullOrEmpty(audio.Name) ? tags.Title.Trim() : audio.Name;
} }
if (options.ReplaceAllMetadata) if (options.ReplaceAllMetadata)
{ {
audio.Album = tags.Album; audio.Album = tags.Album.Trim();
audio.IndexNumber = Convert.ToInt32(tags.Track); audio.IndexNumber = Convert.ToInt32(tags.Track);
audio.ParentIndexNumber = Convert.ToInt32(tags.Disc); audio.ParentIndexNumber = Convert.ToInt32(tags.Disc);
} }
else else
{ {
audio.Album ??= tags.Album; audio.Album ??= tags.Album.Trim();
audio.IndexNumber ??= Convert.ToInt32(tags.Track); audio.IndexNumber ??= Convert.ToInt32(tags.Track);
audio.ParentIndexNumber ??= Convert.ToInt32(tags.Disc); audio.ParentIndexNumber ??= Convert.ToInt32(tags.Disc);
} }
@ -280,7 +281,7 @@ namespace MediaBrowser.Providers.MediaInfo
if (!audio.LockedFields.Contains(MetadataField.Genres)) if (!audio.LockedFields.Contains(MetadataField.Genres))
{ {
audio.Genres = options.ReplaceAllMetadata || audio.Genres == null || audio.Genres.Length == 0 audio.Genres = options.ReplaceAllMetadata || audio.Genres == null || audio.Genres.Length == 0
? tags.Genres.Distinct(StringComparer.OrdinalIgnoreCase).ToArray() ? tags.Genres.Trimmed().Distinct(StringComparer.OrdinalIgnoreCase).ToArray()
: audio.Genres; : audio.Genres;
} }

4
MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
Unescape View File

@ -508,9 +508,9 @@ namespace MediaBrowser.Providers.MediaInfo
{ {
PeopleHelper.AddPerson(people, new PersonInfo PeopleHelper.AddPerson(people, new PersonInfo
{ {
Name = person.Name, Name = person.Name.Trim(),
Type = person.Type, Type = person.Type,
Role = person.Role Role = person.Role.Trim()
}); });
} }

4
MediaBrowser.Providers/Music/AlbumMetadataService.cs
Unescape View File

@ -187,7 +187,7 @@ namespace MediaBrowser.Providers.Music
{ {
PeopleHelper.AddPerson(people, new PersonInfo PeopleHelper.AddPerson(people, new PersonInfo
{ {
Name = albumArtist, Name = albumArtist.Trim(),
Type = PersonKind.AlbumArtist Type = PersonKind.AlbumArtist
}); });
} }
@ -196,7 +196,7 @@ namespace MediaBrowser.Providers.Music
{ {
PeopleHelper.AddPerson(people, new PersonInfo PeopleHelper.AddPerson(people, new PersonInfo
{ {
Name = artist, Name = artist.Trim(),
Type = PersonKind.Artist Type = PersonKind.Artist
}); });
} }

6
MediaBrowser.Providers/Plugins/Omdb/OmdbProvider.cs
Unescape View File

@ -424,7 +424,7 @@ namespace MediaBrowser.Providers.Plugins.Omdb
{ {
var person = new PersonInfo var person = new PersonInfo
{ {
Name = result.Director, Name = result.Director.Trim(),
Type = PersonKind.Director Type = PersonKind.Director
}; };
@ -435,7 +435,7 @@ namespace MediaBrowser.Providers.Plugins.Omdb
{ {
var person = new PersonInfo var person = new PersonInfo
{ {
Name = result.Writer, Name = result.Writer.Trim(),
Type = PersonKind.Writer Type = PersonKind.Writer
}; };
@ -449,7 +449,7 @@ namespace MediaBrowser.Providers.Plugins.Omdb
{ {
var person = new PersonInfo var person = new PersonInfo
{ {
Name = actor, Name = actor.Trim(),
Type = PersonKind.Actor Type = PersonKind.Actor
}; };

4
MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
Unescape View File

@ -258,7 +258,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
var personInfo = new PersonInfo var personInfo = new PersonInfo
{ {
Name = actor.Name.Trim(), Name = actor.Name.Trim(),
Role = actor.Character, Role = actor.Character.Trim(),
Type = PersonKind.Actor, Type = PersonKind.Actor,
SortOrder = actor.Order SortOrder = actor.Order
}; };
@ -293,7 +293,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
var personInfo = new PersonInfo var personInfo = new PersonInfo
{ {
Name = person.Name.Trim(), Name = person.Name.Trim(),
Role = person.Job, Role = person.Job?.Trim(),
Type = type Type = type
}; };

6
MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.cs
Unescape View File

@ -222,7 +222,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
metadataResult.AddPerson(new PersonInfo metadataResult.AddPerson(new PersonInfo
{ {
Name = actor.Name.Trim(), Name = actor.Name.Trim(),
Role = actor.Character, Role = actor.Character.Trim(),
Type = PersonKind.Actor, Type = PersonKind.Actor,
SortOrder = actor.Order SortOrder = actor.Order
}); });
@ -236,7 +236,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
metadataResult.AddPerson(new PersonInfo metadataResult.AddPerson(new PersonInfo
{ {
Name = guest.Name.Trim(), Name = guest.Name.Trim(),
Role = guest.Character, Role = guest.Character.Trim(),
Type = PersonKind.GuestStar, Type = PersonKind.GuestStar,
SortOrder = guest.Order SortOrder = guest.Order
}); });
@ -260,7 +260,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
metadataResult.AddPerson(new PersonInfo metadataResult.AddPerson(new PersonInfo
{ {
Name = person.Name.Trim(), Name = person.Name.Trim(),
Role = person.Job, Role = person.Job?.Trim(),
Type = type Type = type
}); });
} }

4
MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonProvider.cs
Unescape View File

@ -88,7 +88,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
result.AddPerson(new PersonInfo result.AddPerson(new PersonInfo
{ {
Name = cast[i].Name.Trim(), Name = cast[i].Name.Trim(),
Role = cast[i].Character, Role = cast[i].Character.Trim(),
Type = PersonKind.Actor, Type = PersonKind.Actor,
SortOrder = cast[i].Order SortOrder = cast[i].Order
}); });
@ -111,7 +111,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
result.AddPerson(new PersonInfo result.AddPerson(new PersonInfo
{ {
Name = person.Name.Trim(), Name = person.Name.Trim(),
Role = person.Job, Role = person.Job?.Trim(),
Type = type Type = type
}); });
} }

4
MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs
Unescape View File

@ -352,7 +352,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
var personInfo = new PersonInfo var personInfo = new PersonInfo
{ {
Name = actor.Name.Trim(), Name = actor.Name.Trim(),
Role = actor.Character, Role = actor.Character.Trim(),
Type = PersonKind.Actor, Type = PersonKind.Actor,
SortOrder = actor.Order, SortOrder = actor.Order,
ImageUrl = _tmdbClientManager.GetPosterUrl(actor.ProfilePath) ImageUrl = _tmdbClientManager.GetPosterUrl(actor.ProfilePath)
@ -390,7 +390,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
yield return new PersonInfo yield return new PersonInfo
{ {
Name = person.Name.Trim(), Name = person.Name.Trim(),
Role = person.Job, Role = person.Job?.Trim(),
Type = type Type = type
}; };
} }

17
MediaBrowser.XbmcMetadata/Savers/AlbumNfoSaver.cs
Unescape View File

@ -8,6 +8,7 @@ using MediaBrowser.Controller.Configuration;
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;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.IO; using MediaBrowser.Model.IO;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -55,12 +56,12 @@ namespace MediaBrowser.XbmcMetadata.Savers
{ {
var album = (MusicAlbum)item; var album = (MusicAlbum)item;
foreach (var artist in album.Artists) foreach (var artist in album.Artists.Trimmed().OrderBy(artist => artist))
{ {
writer.WriteElementString("artist", artist); writer.WriteElementString("artist", artist);
} }
foreach (var artist in album.AlbumArtists) foreach (var artist in album.AlbumArtists.Trimmed().OrderBy(artist => artist))
{ {
writer.WriteElementString("albumartist", artist); writer.WriteElementString("albumartist", artist);
} }
@ -70,11 +71,19 @@ namespace MediaBrowser.XbmcMetadata.Savers
private void AddTracks(IEnumerable<BaseItem> tracks, XmlWriter writer) private void AddTracks(IEnumerable<BaseItem> tracks, XmlWriter writer)
{ {
foreach (var track in tracks.OrderBy(i => i.ParentIndexNumber ?? 0).ThenBy(i => i.IndexNumber ?? 0)) foreach (var track in tracks
.OrderBy(i => i.ParentIndexNumber ?? 0)
.ThenBy(i => i.IndexNumber ?? 0)
.ThenBy(i => i.Name?.Trim()))
{ {
writer.WriteStartElement("track"); writer.WriteStartElement("track");
if (track.IndexNumber.HasValue) if (track.ParentIndexNumber.HasValue && track.ParentIndexNumber.Value != 0)
{
writer.WriteElementString("disc", track.ParentIndexNumber.Value.ToString(CultureInfo.InvariantCulture));
}
if (track.IndexNumber.HasValue && track.IndexNumber.Value != 0)
{ {
writer.WriteElementString("position", track.IndexNumber.Value.ToString(CultureInfo.InvariantCulture)); writer.WriteElementString("position", track.IndexNumber.Value.ToString(CultureInfo.InvariantCulture));
} }

7
MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs
Unescape View File

@ -1,11 +1,13 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Linq;
using System.Xml; using System.Xml;
using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Configuration;
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;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.IO; using MediaBrowser.Model.IO;
using MediaBrowser.XbmcMetadata.Configuration; using MediaBrowser.XbmcMetadata.Configuration;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -69,7 +71,10 @@ namespace MediaBrowser.XbmcMetadata.Savers
private void AddAlbums(IList<BaseItem> albums, XmlWriter writer) private void AddAlbums(IList<BaseItem> albums, XmlWriter writer)
{ {
foreach (var album in albums) foreach (var album in albums
.OrderBy(album => album.ProductionYear ?? 0)
.ThenBy(album => album.SortName?.Trim())
.ThenBy(album => album.Name?.Trim()))
{ {
writer.WriteStartElement("album"); writer.WriteStartElement("album");

35
MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
Unescape View File

@ -19,6 +19,7 @@ using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
using MediaBrowser.Model.IO; using MediaBrowser.Model.IO;
@ -488,7 +489,9 @@ namespace MediaBrowser.XbmcMetadata.Savers
var directors = people var directors = people
.Where(i => i.IsType(PersonKind.Director)) .Where(i => i.IsType(PersonKind.Director))
.Select(i => i.Name) .Select(i => i.Name?.Trim())
.Distinct(StringComparer.OrdinalIgnoreCase)
.OrderBy(i => i)
.ToList(); .ToList();
foreach (var person in directors) foreach (var person in directors)
@ -498,8 +501,9 @@ namespace MediaBrowser.XbmcMetadata.Savers
var writers = people var writers = people
.Where(i => i.IsType(PersonKind.Writer)) .Where(i => i.IsType(PersonKind.Writer))
.Select(i => i.Name) .Select(i => i.Name?.Trim())
.Distinct(StringComparer.OrdinalIgnoreCase) .Distinct(StringComparer.OrdinalIgnoreCase)
.OrderBy(i => i)
.ToList(); .ToList();
foreach (var person in writers) foreach (var person in writers)
@ -512,7 +516,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
writer.WriteElementString("credits", person); writer.WriteElementString("credits", person);
} }
foreach (var trailer in item.RemoteTrailers) foreach (var trailer in item.RemoteTrailers.OrderBy(t => t.Url?.Trim()))
{ {
writer.WriteElementString("trailer", GetOutputTrailerUrl(trailer.Url)); writer.WriteElementString("trailer", GetOutputTrailerUrl(trailer.Url));
} }
@ -660,22 +664,22 @@ namespace MediaBrowser.XbmcMetadata.Savers
writer.WriteElementString("tagline", item.Tagline); writer.WriteElementString("tagline", item.Tagline);
} }
foreach (var country in item.ProductionLocations) foreach (var country in item.ProductionLocations.Trimmed().OrderBy(country => country))
{ {
writer.WriteElementString("country", country); writer.WriteElementString("country", country);
} }
foreach (var genre in item.Genres) foreach (var genre in item.Genres.Trimmed().OrderBy(genre => genre))
{ {
writer.WriteElementString("genre", genre); writer.WriteElementString("genre", genre);
} }
foreach (var studio in item.Studios) foreach (var studio in item.Studios.Trimmed().OrderBy(studio => studio))
{ {
writer.WriteElementString("studio", studio); writer.WriteElementString("studio", studio);
} }
foreach (var tag in item.Tags) foreach (var tag in item.Tags.Trimmed().OrderBy(tag => tag))
{ {
if (item is MusicAlbum || item is MusicArtist) if (item is MusicAlbum || item is MusicArtist)
{ {
@ -752,7 +756,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
if (item.ProviderIds is not null) if (item.ProviderIds is not null)
{ {
foreach (var providerKey in item.ProviderIds.Keys) foreach (var providerKey in item.ProviderIds.Keys.OrderBy(providerKey => providerKey))
{ {
var providerId = item.ProviderIds[providerKey]; var providerId = item.ProviderIds[providerKey];
if (!string.IsNullOrEmpty(providerId) && !writtenProviderIds.Contains(providerKey)) if (!string.IsNullOrEmpty(providerId) && !writtenProviderIds.Contains(providerKey))
@ -764,7 +768,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
XmlConvert.VerifyName(tagName); XmlConvert.VerifyName(tagName);
Logger.LogDebug("Saving custom provider tagname {0}", tagName); Logger.LogDebug("Saving custom provider tagname {0}", tagName);
writer.WriteElementString(GetTagForProviderKey(providerKey), providerId); writer.WriteElementString(tagName, providerId);
} }
catch (ArgumentException) catch (ArgumentException)
{ {
@ -785,7 +789,10 @@ namespace MediaBrowser.XbmcMetadata.Savers
AddUserData(item, writer, userManager, userDataRepo, options); AddUserData(item, writer, userManager, userDataRepo, options);
AddActors(people, writer, libraryManager, options.SaveImagePathsInNfo); if (item is not MusicAlbum && item is not MusicArtist)
{
AddActors(people, writer, libraryManager, options.SaveImagePathsInNfo);
}
if (item is BoxSet folder) if (item is BoxSet folder)
{ {
@ -797,6 +804,8 @@ namespace MediaBrowser.XbmcMetadata.Savers
{ {
var items = item.LinkedChildren var items = item.LinkedChildren
.Where(i => i.Type == LinkedChildType.Manual) .Where(i => i.Type == LinkedChildType.Manual)
.OrderBy(i => i.Path?.Trim())
.ThenBy(i => i.LibraryItemId?.Trim())
.ToList(); .ToList();
foreach (var link in items) foreach (var link in items)
@ -839,7 +848,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
writer.WriteElementString("poster", GetImagePathToSave(image, libraryManager)); writer.WriteElementString("poster", GetImagePathToSave(image, libraryManager));
} }
foreach (var backdrop in item.GetImages(ImageType.Backdrop)) foreach (var backdrop in item.GetImages(ImageType.Backdrop).OrderBy(b => b.Path?.Trim()))
{ {
writer.WriteElementString("fanart", GetImagePathToSave(backdrop, libraryManager)); writer.WriteElementString("fanart", GetImagePathToSave(backdrop, libraryManager));
} }
@ -913,7 +922,9 @@ namespace MediaBrowser.XbmcMetadata.Savers
private void AddActors(List<PersonInfo> people, XmlWriter writer, ILibraryManager libraryManager, bool saveImagePath) private void AddActors(List<PersonInfo> people, XmlWriter writer, ILibraryManager libraryManager, bool saveImagePath)
{ {
foreach (var person in people) foreach (var person in people
.OrderBy(person => person.SortOrder ?? 0)
.ThenBy(person => person.Name?.Trim()))
{ {
if (person.IsType(PersonKind.Director) || person.IsType(PersonKind.Writer)) if (person.IsType(PersonKind.Director) || person.IsType(PersonKind.Writer))
{ {

3
MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
Unescape View File

@ -8,6 +8,7 @@ using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Providers;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
using MediaBrowser.Model.IO; using MediaBrowser.Model.IO;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -103,7 +104,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
if (item is MusicVideo musicVideo) if (item is MusicVideo musicVideo)
{ {
foreach (var artist in musicVideo.Artists) foreach (var artist in musicVideo.Artists.Trimmed().OrderBy(artist => artist))
{ {
writer.WriteElementString("artist", artist); writer.WriteElementString("artist", artist);
} }

Write Preview
Loading…
Cancel
Save