Search with imdbid. closes #133
This commit is contained in:
1 parent
d7d8d7acce
commit
b924e9aa34
2 files changed
+9
-1
No files matched your search
@@ -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({
|
||||||
|
|||||||
@@ -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())
|
||||||
|
|||||||
Reference in new issue
Block a user