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

episodes for series are now fetched using a single call and broken into seasons.

This commit is contained in:
kay.one 2013-06-01 12:31:39 -07:00
parent f7c78da4ed
commit 0c63e5ad81
12 changed files with 120 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NzbDrone.Api/Episodes/EpisodeModule.cs
View File

@ -19,19 +19,13 @@ namespace NzbDrone.Api.Episodes
private List<EpisodeResource> GetEpisodes()
{
var seriesId = (int?)Request.Query.SeriesId;
var seasonNumber = (int?)Request.Query.SeasonNumber;
if (seriesId == null)
{
throw new BadRequestException("seriesId is missing");
}
if (seasonNumber == null)
{
return ToListResource(() => _episodeService.GetEpisodeBySeries(seriesId.Value));
}
return ToListResource(() => _episodeService.GetEpisodesBySeason(seriesId.Value, seasonNumber.Value));
return ToListResource(() => _episodeService.GetEpisodeBySeries(seriesId.Value));
}
}
}

28
UI/Content/base.less
View File

@ -1,4 +1,6 @@
.progress {
@import "bootstrap/bootstrap";
.progress {
width: 125px;
position: relative;
margin-bottom: 2px;
@ -20,20 +22,24 @@
overflow: hidden;
}
}
html {
overflow: -moz-scrollbars-vertical;
overflow-y: scroll;
}
.input-append {
.add-on {
margin-left: 0;
}
}
.line &>[class^="icon-"], .line &>[class*=" icon-"] {
margin-top: 1em;
height: 1em;
line-height: 1em;
}
#localSeriesLookup {
width: 220px;
border: 0px;
@ -42,6 +48,7 @@ html {
padding: 4px;
font-size: 13px;
}
#footer-region {
font-size: 16px;
text-decoration: none;
@ -51,11 +58,13 @@ html {
text-decoration: underline;
}
}
#in-sub-nav {
ul {
margin: 0 0 80px 0;
}
}
#notification-region {
pre {
font-size: 12px;
@ -67,14 +76,21 @@ html {
padding-right: 10px;
}
}
.nz-spinner {
font-size: 56px;
text-align: center;
.nz-loading {
.text-center;
font-size: 40px;
font-weight: 300;
padding: 30px;
}
.nz-spinner {
.text-center;
font-size: 56px;
padding: 30px;
}
.page-toolbar{
.page-toolbar {
margin-top: 10px;
margin-bottom: 30px;
}
@ -89,4 +105,4 @@ button::-moz-focus-inner, a::-moz-focus-inner {
a:focus {
outline: none;
}
}

4
UI/Controller.js
View File

@ -7,7 +7,7 @@ define(['app',
'Shared/NotificationView',
'Shared/NotFoundView',
'MainMenuView',
'Series/Details/SeriesDetailsView',
'Series/Details/SeriesDetailsLayout',
'Series/EpisodeCollection',
'Settings/SettingsLayout',
'Missing/MissingLayout',
@ -27,7 +27,7 @@ define(['app',
series.fetch({
success: function (seriesModel) {
self._setTitle(seriesModel.get('title'));
NzbDrone.mainRegion.show(new NzbDrone.Series.Details.SeriesDetailsView({ model: seriesModel }));
NzbDrone.mainRegion.show(new NzbDrone.Series.Details.SeriesDetailsLayout({ model: seriesModel }));
}
});
},

24
UI/Series/Details/SeasonCollectionView.js Normal file
View File

@ -0,0 +1,24 @@
"use strict";
define(['app', 'Series/Details/SeasonLayout', 'Series/SeasonCollection', 'Series/EpisodeCollection'], function () {
NzbDrone.Series.Details.SeasonCollectionView = Backbone.Marionette.CollectionView.extend({
itemView : NzbDrone.Series.Details.SeasonLayout,
initialize: function (options) {
if (!options.episodeCollection) {
throw 'episodeCollection is needed';
}
this.episodeCollection = options.episodeCollection;
},
itemViewOptions: function () {
return {
episodeCollection: this.episodeCollection
};
}
});
});

15
UI/Series/Details/SeasonLayout.js
View File

@ -36,23 +36,22 @@ define(['app', 'Series/Details/EpisodeStatusCell', 'Series/Details/EpisodeTitleC
}
],
initialize: function () {
this.episodeCollection = new NzbDrone.Series.EpisodeCollection();
this.episodeCollection.fetch({data: {
seriesId : this.model.get('seriesId'),
seasonNumber: this.model.get('seasonNumber')
}});
initialize: function (options) {
if (!options.episodeCollection) {
throw 'episodeCollection is needed';
}
this.episodeCollection = options.episodeCollection.bySeason(this.model.get('seasonNumber'));
},
onShow: function () {
this.episodeGrid.show(new Backgrid.Grid(
{
columns : this.columns,
collection: this.episodeCollection,
className : 'table table-hover'
}));
}
});
});

36
UI/Series/Details/SeriesDetailsLayout.js Normal file
View File

@ -0,0 +1,36 @@
"use strict";
define(['app', 'Series/Details/SeasonCollectionView','Shared/LoadingView'], function () {
NzbDrone.Series.Details.SeriesDetailsLayout = Backbone.Marionette.Layout.extend({
itemViewContainer: '.x-series-seasons',
template : 'Series/Details/SeriesDetailsTemplate',
regions: {
seasons: '#seasons'
},
onShow: function () {
var self = this;
this.seasons.show(new NzbDrone.Shared.LoadingView());
this.seasonCollection = new NzbDrone.Series.SeasonCollection();
this.episodeCollection = new NzbDrone.Series.EpisodeCollection();
$.when(this.episodeCollection.fetch({data: { seriesId: this.model.id }}), this.seasonCollection.fetch({data: { seriesId: this.model.id }}))
.done(function () {
self.seasons.show(new NzbDrone.Series.Details.SeasonCollectionView({
collection : self.seasonCollection,
episodeCollection: self.episodeCollection
}));
}
);
},
onClose: function () {
$('.backstretch').remove();
}
});
}
);

5
UI/Series/Details/SeriesDetailsTemplate.html
View File

@ -1,4 +1,4 @@
<div class="row series-page-header">
<div class="row series-page-header series-detail-summary">
<div class="span2">
<a href="{{traktUrl}}" target="_blank">
<img class="series-poster img-polaroid" src="{{poster}}">
@ -18,5 +18,4 @@
</div>
</div>
</div>
<div class="x-series-seasons"></div>
<div id="seasons"></div>

20
UI/Series/Details/SeriesDetailsView.js
View File

@ -1,20 +0,0 @@
"use strict";
define(['app', 'Quality/QualityProfileCollection', 'Series/Details/SeasonLayout', 'Series/SeasonCollection'], function () {
NzbDrone.Series.Details.SeriesDetailsView = Backbone.Marionette.CompositeView.extend({
itemView : NzbDrone.Series.Details.SeasonLayout,
itemViewContainer: '.x-series-seasons',
template : 'Series/Details/SeriesDetailsTemplate',
initialize: function () {
this.collection = new NzbDrone.Series.SeasonCollection();
this.collection.fetch({data: { seriesId: this.model.get('id') }});
//$.backstretch(this.model.get('fanArt'));
},
onClose: function(){
$('.backstretch').remove();
}
});
});

10
UI/Series/EpisodeCollection.js
View File

@ -2,6 +2,14 @@
define(['app', 'Series/EpisodeModel'], function () {
NzbDrone.Series.EpisodeCollection = Backbone.Collection.extend({
url : NzbDrone.Constants.ApiRoot + '/episodes',
model: NzbDrone.Series.EpisodeModel
model: NzbDrone.Series.EpisodeModel,
bySeason: function (season) {
var filtered = this.filter(function (episode) {
return episode.get("seasonNumber") === season;
});
return new NzbDrone.Series.EpisodeCollection(filtered);
}
});
});

7
UI/Series/series.less
View File

@ -111,4 +111,9 @@
display: none;
}
}
}
}
.series-detail-summary {
margin-bottom: 50px;
}

1
UI/Shared/LoadingTemplate.html Normal file
View File

@ -0,0 +1 @@
loading ...

10
UI/Shared/LoadingView.js Normal file
View File

@ -0,0 +1,10 @@
"use strict";
define(['app'], function () {
NzbDrone.Shared.LoadingView = Backbone.Marionette.ItemView.extend({
template : 'Shared/LoadingTemplate',
className: 'nz-loading row'
});
});