Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
This commit is contained in:
commit
c5d74a6e93
|
@ -259,28 +259,26 @@ 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 (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
|
||||
{
|
||||
file = Path.Combine(seriesDataPath, string.Format("episode-abs-{0}.xml", episodeNumber));
|
||||
fileInfo = _fileSystem.GetFileInfo(file);
|
||||
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);
|
||||
usingAbsoluteData = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -289,6 +287,8 @@ namespace MediaBrowser.Providers.TV
|
|||
|
||||
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);
|
||||
|
|
Loading…
Reference in New Issue
Block a user