Browse Source

Search with imdbid. closes #133

pull/152/head
Ruud 13 years ago
parent
commit
b924e9aa34
  1. 7
      couchpotato/core/plugins/movie/main.py
  2. 3
      couchpotato/core/plugins/movie/static/search.js

7
couchpotato/core/plugins/movie/main.py

@ -4,6 +4,7 @@ from couchpotato.core.event import fireEvent, fireEventAsync, addEvent
from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode, \ from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode, \
simplifyString simplifyString
from couchpotato.core.helpers.request import getParams, jsonified, getParam from couchpotato.core.helpers.request import getParams, jsonified, getParam
from couchpotato.core.helpers.variable import getImdb
from couchpotato.core.logger import CPLog from couchpotato.core.logger import CPLog
from couchpotato.core.plugins.base import Plugin from couchpotato.core.plugins.base import Plugin
from couchpotato.core.settings.model import Movie, Library, LibraryTitle from couchpotato.core.settings.model import Movie, Library, LibraryTitle
@ -239,7 +240,11 @@ class MoviePlugin(Plugin):
movies = Env.get('cache').get(cache_key) movies = Env.get('cache').get(cache_key)
if not movies: if not movies:
movies = fireEvent('movie.search', q = q, merge = True)
if getImdb(q):
movies = [fireEvent('movie.info', identifier = q, merge = True)]
else:
movies = fireEvent('movie.search', q = q, merge = True)
Env.get('cache').set(cache_key, movies) Env.get('cache').set(cache_key, movies)
return jsonified({ return jsonified({

3
couchpotato/core/plugins/movie/static/search.js

@ -148,6 +148,9 @@ Block.Search = new Class({
$(m).inject(self.results) $(m).inject(self.results)
self.movies[movie.imdb || 'r-'+Math.floor(Math.random()*10000)] = m self.movies[movie.imdb || 'r-'+Math.floor(Math.random()*10000)] = m
if(q == movie.imdb)
m.showOptions()
}); });
if(q != self.q()) if(q != self.q())

Loading…
Cancel
Save