mirror/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2024-12-25 17:27:59 +00:00
Code Issues Releases Wiki Activity

Renamed image is in effect.

Browse source 
Series Detail by series will now store episodeFileId.
This commit is contained in:
Mark McDowall 2011-06-05 15:19:07 -07:00
parent 723882ea48
commit 381d67e56b
3 changed files with 39 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
NzbDrone.Web/Controllers/SeriesController.cs
View file

@ -123,20 +123,7 @@ public ActionResult _DeleteAjaxSeriesEditing(int id)
[GridAction] [GridAction]
public ActionResult _AjaxSeasonGrid(int seriesId, int seasonNumber) public ActionResult _AjaxSeasonGrid(int seriesId, int seasonNumber)
{ {
var episodes = _episodeProvider.GetEpisodesBySeason(seriesId, seasonNumber).Select(c => new EpisodeModel var episodes = GetEpisodeModels(_episodeProvider.GetEpisodesBySeason(seriesId, seasonNumber));
{
EpisodeId = c.EpisodeId,
EpisodeNumber = c.EpisodeNumber,
SeasonNumber = c.SeasonNumber,
Title = c.Title,
Overview = c.Overview,
AirDate = c.AirDate,
Path = GetEpisodePath(c.EpisodeFile),
Status = c.Status.ToString(),
Quality = c.EpisodeFile == null
? String.Empty
: c.EpisodeFile.Quality.ToString()
});
return View(new GridModel(episodes)); return View(new GridModel(episodes));
} }
@ -151,16 +138,6 @@ public JsonResult GetEpisodeCount(int seriesId)
}, JsonRequestBehavior.AllowGet); }, JsonRequestBehavior.AllowGet);
} }
//Local Helpers
private string GetEpisodePath(EpisodeFile file)
{
if (file == null)
return String.Empty;
//Return the path relative to the Series' Folder
return file.Path;
}
public ActionResult SearchForSeries(string seriesName) public ActionResult SearchForSeries(string seriesName)
{ {
var model = new List<SeriesSearchResultModel>(); var model = new List<SeriesSearchResultModel>();
@ -281,6 +258,42 @@ private List<SeriesModel> GetSeriesModels(List<Series> seriesInDb)
return series; return series;
} }
private List<EpisodeModel> GetEpisodeModels(IList<Episode> episodesInDb)
{
var episodes = new List<EpisodeModel>();
foreach (var e in episodesInDb)
{
var episodeFile = e.EpisodeFile;
var episodePath = String.Empty;
var episodeFileId = 0;
if (episodeFile != null)
{
episodePath = episodeFile.Path;
episodeFileId = episodeFile.EpisodeFileId;
}
episodes.Add(new EpisodeModel
{
EpisodeId = e.EpisodeId,
EpisodeNumber = e.EpisodeNumber,
SeasonNumber = e.SeasonNumber,
Title = e.Title,
Overview = e.Overview,
AirDate = e.AirDate,
Path = episodePath,
EpisodeFileId = episodeFileId,
Status = e.Status.ToString(),
Quality = e.EpisodeFile == null
? String.Empty
: e.EpisodeFile.Quality.ToString()
});
}
return episodes;
}
private string GetSeasonString(int seasonNumber) private string GetSeasonString(int seasonNumber)
{ {
if (seasonNumber == 0) if (seasonNumber == 0)

1
NzbDrone.Web/Models/EpisodeModel.cs
View file

@ -7,6 +7,7 @@ public class EpisodeModel
{ {
public string Title { get; set; } public string Title { get; set; }
public int EpisodeId { get; set; } public int EpisodeId { get; set; }
public int EpisodeFileId { get; set; }
public int EpisodeNumber { get; set; } public int EpisodeNumber { get; set; }
public int SeasonNumber { get; set; } public int SeasonNumber { get; set; }
public string Overview { get; set; } public string Overview { get; set; }

2
NzbDrone.Web/NzbDrone.Web.csproj
View file

@ -606,7 +606,7 @@
<Content Include="Content\Images\Indexers\NzbMatrix.png"> <Content Include="Content\Images\Indexers\NzbMatrix.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Images\Indexers\NzbsOrg.png"> <Content Include="Content\Images\Indexers\Nzbs.org.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Images\Indexers\NzbsRus.png"> <Content Include="Content\Images\Indexers\NzbsRus.png">