Merge pull request #1576 from softworkz/TvDbProviderFix

TheTVDB Episode Provider: Fixed incorrect fallback to absolute episode numbering
pull/702/head
Luke 9 years ago
commit ce65615e55

@ -259,28 +259,26 @@ namespace MediaBrowser.Providers.TV
return files; return files;
} }
if (seasonNumber == null) var usingAbsoluteData = false;
{
return files;
}
if (seasonNumber.HasValue)
{
var file = Path.Combine(seriesDataPath, string.Format("episode-{0}-{1}.xml", seasonNumber.Value, episodeNumber)); var file = Path.Combine(seriesDataPath, string.Format("episode-{0}-{1}.xml", seasonNumber.Value, episodeNumber));
var fileInfo = _fileSystem.GetFileInfo(file); var fileInfo = _fileSystem.GetFileInfo(file);
var usingAbsoluteData = false;
if (fileInfo.Exists) if (fileInfo.Exists)
{ {
files.Add(fileInfo); files.Add(fileInfo);
} }
}
else else
{ {
file = Path.Combine(seriesDataPath, string.Format("episode-abs-{0}.xml", episodeNumber)); usingAbsoluteData = true;
fileInfo = _fileSystem.GetFileInfo(file); var file = Path.Combine(seriesDataPath, string.Format("episode-abs-{0}.xml", episodeNumber));
var fileInfo = _fileSystem.GetFileInfo(file);
if (fileInfo.Exists) if (fileInfo.Exists)
{ {
files.Add(fileInfo); files.Add(fileInfo);
usingAbsoluteData = true;
} }
} }
@ -289,6 +287,8 @@ namespace MediaBrowser.Providers.TV
while (episodeNumber <= end) while (episodeNumber <= end)
{ {
string file;
if (usingAbsoluteData) if (usingAbsoluteData)
{ {
file = Path.Combine(seriesDataPath, string.Format("episode-abs-{0}.xml", episodeNumber)); file = Path.Combine(seriesDataPath, string.Format("episode-abs-{0}.xml", episodeNumber));
@ -298,7 +298,7 @@ namespace MediaBrowser.Providers.TV
file = Path.Combine(seriesDataPath, string.Format("episode-{0}-{1}.xml", seasonNumber.Value, episodeNumber)); file = Path.Combine(seriesDataPath, string.Format("episode-{0}-{1}.xml", seasonNumber.Value, episodeNumber));
} }
fileInfo = _fileSystem.GetFileInfo(file); var fileInfo = _fileSystem.GetFileInfo(file);
if (fileInfo.Exists) if (fileInfo.Exists)
{ {
files.Add(fileInfo); files.Add(fileInfo);

Loading…
Cancel
Save