Browse Source

Attach shows to searcher

pull/2352/head
Ruud 12 years ago
parent
commit
6070209d33
  1. 4
      couchpotato/core/media/movie/_base/static/search.js
  2. 17
      couchpotato/core/media/show/_base/static/search.js
  3. 1
      couchpotato/core/providers/info/thetvdb/main.py

4
couchpotato/core/media/movie/_base/static/search.js

@ -27,7 +27,7 @@ Block.Search.MovieItem = new Class({
self.options_el = new Element('div.options.inlay'), self.options_el = new Element('div.options.inlay'),
self.data_container = new Element('div.data', { self.data_container = new Element('div.data', {
'events': { 'events': {
'click': self.movieOptions.bind(self) 'click': self.showOptions.bind(self)
} }
}).adopt( }).adopt(
self.info_container = new Element('div.info').adopt( self.info_container = new Element('div.info').adopt(
@ -71,7 +71,7 @@ Block.Search.MovieItem = new Class({
return this.info[key] return this.info[key]
}, },
movieOptions: function(){ showOptions: function(){
var self = this; var self = this;
self.createOptions(); self.createOptions();

17
couchpotato/core/media/show/_base/static/search.js

@ -16,7 +16,7 @@ Block.Search.ShowItem = new Class({
var self = this, var self = this,
info = self.info; info = self.info;
self.el = new Element('div.show_result', { self.el = new Element('div.media_result', {
'id': info.id 'id': info.id
}).adopt( }).adopt(
self.thumbnail = info.images && info.images.poster.length > 0 ? new Element('img.thumbnail', { self.thumbnail = info.images && info.images.poster.length > 0 ? new Element('img.thumbnail', {
@ -98,10 +98,7 @@ Block.Search.ShowItem = new Class({
Api.request('show.add', { Api.request('show.add', {
'data': { 'data': {
'identifier': self.info.id, 'identifier': self.info.imdb,
'id': self.info.id,
'type': self.info.type,
'primary_provider': self.info.primary_provider,
'title': self.title_select.get('value'), 'title': self.title_select.get('value'),
'profile_id': self.profile_select.get('value'), 'profile_id': self.profile_select.get('value'),
'category_id': self.category_select.get('value') 'category_id': self.category_select.get('value')
@ -110,7 +107,7 @@ Block.Search.ShowItem = new Class({
self.options_el.empty(); self.options_el.empty();
self.options_el.adopt( self.options_el.adopt(
new Element('div.message', { new Element('div.message', {
'text': json.added ? 'Show successfully added.' : 'Show didn\'t add properly. Check logs' 'text': json.added ? 'Movie successfully added.' : 'Movie didn\'t add properly. Check logs'
}) })
); );
self.mask.fade('out'); self.mask.fade('out');
@ -144,10 +141,10 @@ Block.Search.ShowItem = new Class({
self.options_el.grab( self.options_el.grab(
new Element('div', { new Element('div', {
'class': self.info.in_wanted && self.info.in_wanted.profile || in_library ? 'in_library_wanted' : '' 'class': self.info.in_wanted && self.info.in_wanted.profile_id || in_library ? 'in_library_wanted' : ''
}).adopt( }).adopt(
self.info.in_wanted && self.info.in_wanted.profile ? new Element('span.in_wanted', { self.info.in_wanted && self.info.in_wanted.profile_id ? new Element('span.in_wanted', {
'text': 'Already in wanted list: ' + self.info.in_wanted.profile.label 'text': 'Already in wanted list: ' + Quality.getProfile(self.info.in_wanted.profile_id).get('label')
}) : (in_library ? new Element('span.in_library', { }) : (in_library ? new Element('span.in_library', {
'text': 'Already in library: ' + in_library.join(', ') 'text': 'Already in library: ' + in_library.join(', ')
}) : null), }) : null),
@ -208,7 +205,7 @@ Block.Search.ShowItem = new Class({
self.options_el.addClass('set'); self.options_el.addClass('set');
if(categories.length == 0 && self.title_select.getElements('option').length == 1 && profiles.length == 1 && if(categories.length == 0 && self.title_select.getElements('option').length == 1 && profiles.length == 1 &&
!(self.info.in_wanted && self.info.in_wanted.profile || in_library)) !(self.info.in_wanted && self.info.in_wanted.profile_id || in_library))
self.add(); self.add();
} }

1
couchpotato/core/providers/info/thetvdb/main.py

@ -18,6 +18,7 @@ log = CPLog(__name__)
class TheTVDb(ShowProvider): class TheTVDb(ShowProvider):
def __init__(self): def __init__(self):
addEvent('info.search', self.search, priority = 1)
addEvent('show.search', self.search, priority = 1) addEvent('show.search', self.search, priority = 1)
addEvent('show.info', self.getShowInfo, priority = 1) addEvent('show.info', self.getShowInfo, priority = 1)
addEvent('season.info', self.getSeasonInfo, priority = 1) addEvent('season.info', self.getSeasonInfo, priority = 1)

Loading…
Cancel
Save