mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

EpisodeFile parsing was incorrect due to change of relationship with Episode

This commit is contained in:
markus101 2011-02-22 16:26:03 -08:00
parent 891acfff44
commit ce6bcbfec1
1 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
NzbDrone.Core/Providers/MediaFileProvider.cs
View File

@ -51,37 +51,49 @@ namespace NzbDrone.Core.Providers
{ {
var episodesInFile = Parser.ParseEpisodeInfo(filePath); var episodesInFile = Parser.ParseEpisodeInfo(filePath);
//Stores the list of episodes to add to the EpisodeFile
var episodes = new List<Episode>(); var episodes = new List<Episode>();
foreach (var parsedEpisode in episodesInFile) foreach (var parsedEpisode in episodesInFile)
{ {
EpisodeParseResult closureEpisode = parsedEpisode; EpisodeParseResult closureEpisode = parsedEpisode;
var episode = _episodeProvider.GetEpisode(series.SeriesId, closureEpisode.SeasonNumber, var episode = _episodeProvider.GetEpisode(series.SeriesId, closureEpisode.SeasonNumber,
closureEpisode.EpisodeNumber); closureEpisode.EpisodeNumber);
episodes.Add(episode);
if (episode != null) if (episode != null)
{ {
var episodeFile = new EpisodeFile(); episodes.Add(episode);
episodeFile.DateAdded = DateTime.Now;
episodeFile.SeriesId = series.SeriesId;
episodeFile.Episodes = episodes;
episodeFile.Path = Parser.NormalizePath(filePath);
episodeFile.Size = _diskProvider.GetSize(filePath);
episodeFile.Quality = Parser.ParseQuality(filePath);
episodeFile.Proper = Parser.ParseProper(filePath);
_repository.Add(episodeFile);
Logger.Trace("File {0}:{1} attached to '{2}'", episodeFile.FileId, filePath, episode.EpisodeId);
return episodeFile;
} }
Logger.Warn("Unable to find Series:{0} Season:{1} Episode:{2} in the database. File:{3}", series.Title, closureEpisode.SeasonNumber, closureEpisode.EpisodeNumber, filePath); else
Logger.Warn("Unable to find Series:{0} Season:{1} Episode:{2} in the database. File:{3}", series.Title, closureEpisode.SeasonNumber, closureEpisode.EpisodeNumber, filePath);
} }
}
else //Return null if no Episodes exist in the DB for the parsed episodes from file
{ if (episodes.Count < 1)
Logger.Trace("[{0}] already exists in the database. skipping.", filePath); return null;
var episodeFile = new EpisodeFile();
episodeFile.DateAdded = DateTime.Now;
episodeFile.SeriesId = series.SeriesId;
episodeFile.Episodes = episodes;
episodeFile.Path = Parser.NormalizePath(filePath);
episodeFile.Size = _diskProvider.GetSize(filePath);
episodeFile.Quality = Parser.ParseQuality(filePath);
episodeFile.Proper = Parser.ParseProper(filePath);
_repository.Add(episodeFile);
//This is for logging, a little ugly...
string episodeList = String.Empty;
foreach (var ep in episodes)
{
episodeList += String.Format(", {0}", ep.EpisodeId).Trim(' ', ',');
}
Logger.Trace("File {0}:{1} attached to episode(s): '{2}'", episodeFile.FileId, filePath, episodeList);
return episodeFile;
} }
Logger.Trace("[{0}] already exists in the database. skipping.", filePath);
return null; return null;
} }