diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-12-03 16:46:06 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-12-03 16:46:06 -0500 |
| commit | 83ad945015541aefbe2a0cd2a00ed6e0c151f72c (patch) | |
| tree | 897a65a1ed789d7165526134aea84eb84e55cc87 /MediaBrowser.XbmcMetadata | |
| parent | f5467021b0e8a86bf17d13404e8a6cff1d87d587 (diff) | |
update xml readers
Diffstat (limited to 'MediaBrowser.XbmcMetadata')
| -rw-r--r-- | MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs | 20 | ||||
| -rw-r--r-- | MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs | 2 |
2 files changed, 12 insertions, 10 deletions
diff --git a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs index 5484033470..4bee8c3ca9 100644 --- a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs +++ b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs @@ -123,7 +123,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers reader.Read(); // Loop through each element - while (!reader.EOF) + while (!reader.EOF && reader.ReadState == ReadState.Interactive) { cancellationToken.ThrowIfCancellationRequested(); @@ -203,7 +203,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers reader.Read(); // Loop through each element - while (!reader.EOF) + while (!reader.EOF && reader.ReadState == ReadState.Interactive) { cancellationToken.ThrowIfCancellationRequested(); @@ -607,7 +607,8 @@ namespace MediaBrowser.XbmcMetadata.Parsers case "director": { - foreach (var p in SplitNames(reader.ReadElementContentAsString()).Select(v => new PersonInfo { Name = v.Trim(), Type = PersonType.Director })) + var val = reader.ReadElementContentAsString(); + foreach (var p in SplitNames(val).Select(v => new PersonInfo { Name = v.Trim(), Type = PersonType.Director })) { if (string.IsNullOrWhiteSpace(p.Name)) { @@ -640,7 +641,8 @@ namespace MediaBrowser.XbmcMetadata.Parsers case "writer": { - foreach (var p in SplitNames(reader.ReadElementContentAsString()).Select(v => new PersonInfo { Name = v.Trim(), Type = PersonType.Writer })) + var val = reader.ReadElementContentAsString(); + foreach (var p in SplitNames(val).Select(v => new PersonInfo { Name = v.Trim(), Type = PersonType.Writer })) { if (string.IsNullOrWhiteSpace(p.Name)) { @@ -957,7 +959,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers reader.Read(); // Loop through each element - while (!reader.EOF) + while (!reader.EOF && reader.ReadState == ReadState.Interactive) { if (reader.NodeType == XmlNodeType.Element) { @@ -996,7 +998,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers reader.Read(); // Loop through each element - while (!reader.EOF) + while (!reader.EOF && reader.ReadState == ReadState.Interactive) { if (reader.NodeType == XmlNodeType.Element) { @@ -1029,7 +1031,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers reader.Read(); // Loop through each element - while (!reader.EOF) + while (!reader.EOF && reader.ReadState == ReadState.Interactive) { if (reader.NodeType == XmlNodeType.Element) { @@ -1062,7 +1064,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers reader.Read(); // Loop through each element - while (!reader.EOF) + while (!reader.EOF && reader.ReadState == ReadState.Interactive) { if (reader.NodeType == XmlNodeType.Element) { @@ -1128,7 +1130,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers reader.Read(); // Loop through each element - while (!reader.EOF) + while (!reader.EOF && reader.ReadState == ReadState.Interactive) { if (reader.NodeType == XmlNodeType.Element) { diff --git a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs index 125ac5291d..18936df013 100644 --- a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs +++ b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs @@ -1066,7 +1066,7 @@ namespace MediaBrowser.XbmcMetadata.Savers reader.Read(); // Loop through each element - while (!reader.EOF) + while (!reader.EOF && reader.ReadState == ReadState.Interactive) { if (reader.NodeType == XmlNodeType.Element) { |