lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev

Browse Source
This commit is contained in:
Luke Pulverenti 2016-03-23 11:46:35 -04:00
commit c5d74a6e93
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs
View File

@ -259,36 +259,36 @@ namespace MediaBrowser.Providers.TV
return files; 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; var usingAbsoluteData = false;
if (fileInfo.Exists) if (seasonNumber.HasValue)
{ {
files.Add(fileInfo); var file = Path.Combine(seriesDataPath, string.Format("episode-{0}-{1}.xml", seasonNumber.Value, episodeNumber));
} var fileInfo = _fileSystem.GetFileInfo(file);
else
{ if (fileInfo.Exists)
file = Path.Combine(seriesDataPath, string.Format("episode-abs-{0}.xml", episodeNumber)); {
fileInfo = _fileSystem.GetFileInfo(file); files.Add(fileInfo);
if (fileInfo.Exists) }
{ }
files.Add(fileInfo); else
usingAbsoluteData = true; {
} 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; var end = endingEpisodeNumber ?? episodeNumber;
episodeNumber++; episodeNumber++;
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);