aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-03-23 00:54:28 -0400
committerLuke <luke.pulverenti@gmail.com>2016-03-23 00:54:28 -0400
commitce65615e554c0f1105afdf349d2048964a84856a (patch)
tree71a464d16269ba7f7dc417bf2417df70acbf89f2
parent55bbc5d12ac19ad2bfb16b95c56db44d1fa266c7 (diff)
parenta3a333d1682dfa8a890426544e9701cf3b236cd2 (diff)
Merge pull request #1576 from softworkz/TvDbProviderFix
TheTVDB Episode Provider: Fixed incorrect fallback to absolute episode numbering
-rw-r--r--MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs46
1 files changed, 23 insertions, 23 deletions
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs
index 392033048..291214fcd 100644
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs
+++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs
@@ -259,36 +259,36 @@ namespace MediaBrowser.Providers.TV
return files;
}
- if (seasonNumber == null)
- {
- return files;
- }
-
- var file = Path.Combine(seriesDataPath, string.Format("episode-{0}-{1}.xml", seasonNumber.Value, episodeNumber));
-
- var fileInfo = _fileSystem.GetFileInfo(file);
var usingAbsoluteData = false;
- if (fileInfo.Exists)
- {
- files.Add(fileInfo);
- }
- else
- {
- file = Path.Combine(seriesDataPath, string.Format("episode-abs-{0}.xml", episodeNumber));
- fileInfo = _fileSystem.GetFileInfo(file);
- if (fileInfo.Exists)
- {
- files.Add(fileInfo);
- usingAbsoluteData = true;
- }
- }
+ if (seasonNumber.HasValue)
+ {
+ var file = Path.Combine(seriesDataPath, string.Format("episode-{0}-{1}.xml", seasonNumber.Value, episodeNumber));
+ var fileInfo = _fileSystem.GetFileInfo(file);
+
+ if (fileInfo.Exists)
+ {
+ files.Add(fileInfo);
+ }
+ }
+ else
+ {
+ usingAbsoluteData = true;
+ var file = Path.Combine(seriesDataPath, string.Format("episode-abs-{0}.xml", episodeNumber));
+ var fileInfo = _fileSystem.GetFileInfo(file);
+ if (fileInfo.Exists)
+ {
+ files.Add(fileInfo);
+ }
+ }
var end = endingEpisodeNumber ?? episodeNumber;
episodeNumber++;
while (episodeNumber <= end)
{
+ string file;
+
if (usingAbsoluteData)
{
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));
}
- fileInfo = _fileSystem.GetFileInfo(file);
+ var fileInfo = _fileSystem.GetFileInfo(file);
if (fileInfo.Exists)
{
files.Add(fileInfo);