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

Use StringSplitOptions.TrimEntries where possible (#11421)

Browse Source
This commit is contained in:
Bond-009 2024-04-24 16:35:15 +02:00 committed by GitHub
parent 428283f787
commit ac108690a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1342,9 +1342,8 @@ namespace MediaBrowser.MediaEncoding.Probing
return null; return null;
} }
return value.Split('/', StringSplitOptions.RemoveEmptyEntries) return value.Split('/', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
.Select(i => i.Trim()) .FirstOrDefault();
.FirstOrDefault(i => !string.IsNullOrWhiteSpace(i));
} }
/// <summary> /// <summary>
@ -1353,17 +1352,13 @@ namespace MediaBrowser.MediaEncoding.Probing
/// <param name="val">The val.</param> /// <param name="val">The val.</param>
/// <param name="allowCommaDelimiter">if set to <c>true</c> [allow comma delimiter].</param> /// <param name="allowCommaDelimiter">if set to <c>true</c> [allow comma delimiter].</param>
/// <returns>System.String[][].</returns> /// <returns>System.String[][].</returns>
private IEnumerable<string> Split(string val, bool allowCommaDelimiter) private string[] Split(string val, bool allowCommaDelimiter)
{ {
// Only use the comma as a delimiter if there are no slashes or pipes. // Only use the comma as a delimiter if there are no slashes or pipes.
// We want to be careful not to split names that have commas in them // We want to be careful not to split names that have commas in them
var delimiter = !allowCommaDelimiter || _nameDelimiters.Any(i => val.Contains(i, StringComparison.Ordinal)) ? return !allowCommaDelimiter || _nameDelimiters.Any(i => val.Contains(i, StringComparison.Ordinal)) ?
_nameDelimiters : val.Split(_nameDelimiters, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) :
new[] { ',' }; val.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
return val.Split(delimiter, StringSplitOptions.RemoveEmptyEntries)
.Where(i => !string.IsNullOrWhiteSpace(i))
.Select(i => i.Trim());
} }
private IEnumerable<string> SplitDistinctArtists(string val, char[] delimiters, bool splitFeaturing) private IEnumerable<string> SplitDistinctArtists(string val, char[] delimiters, bool splitFeaturing)
@ -1387,9 +1382,7 @@ namespace MediaBrowser.MediaEncoding.Probing
} }
} }
var artists = val.Split(delimiters, StringSplitOptions.RemoveEmptyEntries) var artists = val.Split(delimiters, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
.Where(i => !string.IsNullOrWhiteSpace(i))
.Select(i => i.Trim());
artistsFound.AddRange(artists); artistsFound.AddRange(artists);
return artistsFound.DistinctNames(); return artistsFound.DistinctNames();
@ -1514,15 +1507,12 @@ namespace MediaBrowser.MediaEncoding.Probing
if (tags.TryGetValue("WM/Genre", out var genres) && !string.IsNullOrWhiteSpace(genres)) if (tags.TryGetValue("WM/Genre", out var genres) && !string.IsNullOrWhiteSpace(genres))
{ {
var genreList = genres.Split(new[] { ';', '/', ',' }, StringSplitOptions.RemoveEmptyEntries) var genreList = genres.Split(new[] { ';', '/', ',' }, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
.Where(i => !string.IsNullOrWhiteSpace(i))
.Select(i => i.Trim())
.ToList();
// If this is empty then don't overwrite genres that might have been fetched earlier // If this is empty then don't overwrite genres that might have been fetched earlier
if (genreList.Count > 0) if (genreList.Length > 0)
{ {
video.Genres = genreList.ToArray(); video.Genres = genreList;
} }
} }
@ -1533,10 +1523,9 @@ namespace MediaBrowser.MediaEncoding.Probing
if (tags.TryGetValue("WM/MediaCredits", out var people) && !string.IsNullOrEmpty(people)) if (tags.TryGetValue("WM/MediaCredits", out var people) && !string.IsNullOrEmpty(people))
{ {
video.People = people.Split(new[] { ';', '/' }, StringSplitOptions.RemoveEmptyEntries) video.People = Array.ConvertAll(
.Where(i => !string.IsNullOrWhiteSpace(i)) people.Split(new[] { ';', '/' }, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries),
.Select(i => new BaseItemPerson { Name = i.Trim(), Type = PersonKind.Actor }) i => new BaseItemPerson { Name = i, Type = PersonKind.Actor });
.ToArray();
} }
if (tags.TryGetValue("WM/OriginalReleaseTime", out var year) && int.TryParse(year, NumberStyles.Integer, CultureInfo.InvariantCulture, out var parsedYear)) if (tags.TryGetValue("WM/OriginalReleaseTime", out var year) && int.TryParse(year, NumberStyles.Integer, CultureInfo.InvariantCulture, out var parsedYear))

5
MediaBrowser.Providers/Plugins/Omdb/OmdbProvider.cs
View File

@ -447,11 +447,6 @@ namespace MediaBrowser.Providers.Plugins.Omdb
var actorList = result.Actors.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries); var actorList = result.Actors.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
foreach (var actor in actorList) foreach (var actor in actorList)
{ {
if (string.IsNullOrWhiteSpace(actor))
{
continue;
}
var person = new PersonInfo var person = new PersonInfo
{ {
Name = actor, Name = actor,

4
src/Jellyfin.LiveTv/TunerHosts/M3uParser.cs
View File

@ -273,12 +273,12 @@ namespace Jellyfin.LiveTv.TunerHosts
var numberIndex = nameInExtInf.IndexOf(' ', StringComparison.Ordinal); var numberIndex = nameInExtInf.IndexOf(' ', StringComparison.Ordinal);
if (numberIndex > 0) if (numberIndex > 0)
{ {
var numberPart = nameInExtInf.Substring(0, numberIndex).Trim(new[] { ' ', '.' }); var numberPart = nameInExtInf.AsSpan(0, numberIndex).Trim(new[] { ' ', '.' });
if (double.TryParse(numberPart, CultureInfo.InvariantCulture, out _)) if (double.TryParse(numberPart, CultureInfo.InvariantCulture, out _))
{ {
// channel.Number = number.ToString(); // channel.Number = number.ToString();
nameInExtInf = nameInExtInf.Substring(numberIndex + 1).Trim(new[] { ' ', '-' }); nameInExtInf = nameInExtInf.AsSpan(numberIndex + 1).Trim(new[] { ' ', '-' }).ToString();
} }
} }
} }