mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-05 21:37:10 -04:00
add comma delimiters for writers and actors
This commit is contained in:
parent
aeb5984ee8
commit
4a5831adb6
@ -240,7 +240,7 @@ namespace MediaBrowser.Providers.TV
|
|||||||
{
|
{
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
IEnumerable<XmlDocument> extraEpisodesNode = new XmlDocument[]{};
|
IEnumerable<XmlDocument> extraEpisodesNode = new XmlDocument[] { };
|
||||||
|
|
||||||
if (episode.IndexNumberEnd.HasValue)
|
if (episode.IndexNumberEnd.HasValue)
|
||||||
{
|
{
|
||||||
@ -320,13 +320,14 @@ namespace MediaBrowser.Providers.TV
|
|||||||
var persons = Regex.Matches(actors, @"([^|()]|\([^)]*\)*)+")
|
var persons = Regex.Matches(actors, @"([^|()]|\([^)]*\)*)+")
|
||||||
.Cast<Match>()
|
.Cast<Match>()
|
||||||
.Select(m => m.Value).Where(i => !string.IsNullOrWhiteSpace(i) && !string.IsNullOrEmpty(i));
|
.Select(m => m.Value).Where(i => !string.IsNullOrWhiteSpace(i) && !string.IsNullOrEmpty(i));
|
||||||
foreach (var person in persons.Select(str => {
|
foreach (var person in persons.Select(str =>
|
||||||
var nameGroup = str.Split(new[] {'('}, 2, StringSplitOptions.RemoveEmptyEntries);
|
{
|
||||||
|
var nameGroup = str.Split(new[] { '(' }, 2, StringSplitOptions.RemoveEmptyEntries);
|
||||||
var name = nameGroup[0].Trim();
|
var name = nameGroup[0].Trim();
|
||||||
var roles = nameGroup.Count() > 1 ? nameGroup[1].Trim() : null;
|
var roles = nameGroup.Count() > 1 ? nameGroup[1].Trim() : null;
|
||||||
if (roles != null)
|
if (roles != null)
|
||||||
roles = roles.EndsWith(")") ? roles.Substring(0, roles.Length - 1) : roles;
|
roles = roles.EndsWith(")") ? roles.Substring(0, roles.Length - 1) : roles;
|
||||||
return new PersonInfo {Type = PersonType.GuestStar, Name = name, Role = roles};
|
return new PersonInfo { Type = PersonType.GuestStar, Name = name, Role = roles };
|
||||||
}))
|
}))
|
||||||
{
|
{
|
||||||
episode.AddPerson(person);
|
episode.AddPerson(person);
|
||||||
@ -340,13 +341,14 @@ namespace MediaBrowser.Providers.TV
|
|||||||
var persons = Regex.Matches(extraActors, @"([^|()]|\([^)]*\)*)+")
|
var persons = Regex.Matches(extraActors, @"([^|()]|\([^)]*\)*)+")
|
||||||
.Cast<Match>()
|
.Cast<Match>()
|
||||||
.Select(m => m.Value).Where(i => !string.IsNullOrWhiteSpace(i) && !string.IsNullOrEmpty(i));
|
.Select(m => m.Value).Where(i => !string.IsNullOrWhiteSpace(i) && !string.IsNullOrEmpty(i));
|
||||||
foreach (var person in persons.Select(str => {
|
foreach (var person in persons.Select(str =>
|
||||||
var nameGroup = str.Split(new[] {'('}, 2, StringSplitOptions.RemoveEmptyEntries);
|
{
|
||||||
|
var nameGroup = str.Split(new[] { '(' }, 2, StringSplitOptions.RemoveEmptyEntries);
|
||||||
var name = nameGroup[0].Trim();
|
var name = nameGroup[0].Trim();
|
||||||
var roles = nameGroup.Count() > 1 ? nameGroup[1].Trim() : null;
|
var roles = nameGroup.Count() > 1 ? nameGroup[1].Trim() : null;
|
||||||
if (roles != null)
|
if (roles != null)
|
||||||
roles = roles.EndsWith(")") ? roles.Substring(0, roles.Length - 1) : roles;
|
roles = roles.EndsWith(")") ? roles.Substring(0, roles.Length - 1) : roles;
|
||||||
return new PersonInfo {Type = PersonType.GuestStar, Name = name, Role = roles};
|
return new PersonInfo { Type = PersonType.GuestStar, Name = name, Role = roles };
|
||||||
}).Where(person => !episode.People.Any(x => x.Type == person.Type && x.Name == person.Name))
|
}).Where(person => !episode.People.Any(x => x.Type == person.Type && x.Name == person.Name))
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
@ -358,9 +360,9 @@ namespace MediaBrowser.Providers.TV
|
|||||||
if (directors != null)
|
if (directors != null)
|
||||||
{
|
{
|
||||||
// Sometimes tvdb actors have leading spaces
|
// Sometimes tvdb actors have leading spaces
|
||||||
foreach (var person in directors.Split(new[] {'|'}, StringSplitOptions.RemoveEmptyEntries)
|
foreach (var person in directors.Split(new[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries)
|
||||||
.Where(i => !string.IsNullOrWhiteSpace(i))
|
.Where(i => !string.IsNullOrWhiteSpace(i))
|
||||||
.Select(str => new PersonInfo {Type = PersonType.Director, Name = str.Trim()}))
|
.Select(str => new PersonInfo { Type = PersonType.Director, Name = str.Trim() }))
|
||||||
{
|
{
|
||||||
episode.AddPerson(person);
|
episode.AddPerson(person);
|
||||||
}
|
}
|
||||||
@ -371,9 +373,9 @@ namespace MediaBrowser.Providers.TV
|
|||||||
if (writers != null)
|
if (writers != null)
|
||||||
{
|
{
|
||||||
// Sometimes tvdb actors have leading spaces
|
// Sometimes tvdb actors have leading spaces
|
||||||
foreach (var person in writers.Split(new[] {'|'}, StringSplitOptions.RemoveEmptyEntries)
|
foreach (var person in writers.Split(new[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries)
|
||||||
.Where(i => !string.IsNullOrWhiteSpace(i))
|
.Where(i => !string.IsNullOrWhiteSpace(i))
|
||||||
.Select(str => new PersonInfo {Type = PersonType.Writer, Name = str.Trim()}))
|
.Select(str => new PersonInfo { Type = PersonType.Writer, Name = str.Trim() }))
|
||||||
{
|
{
|
||||||
episode.AddPerson(person);
|
episode.AddPerson(person);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user