diff --git a/couchpotato/core/plugins/userscript/main.py b/couchpotato/core/plugins/userscript/main.py index b731a487..0ceda58c 100644 --- a/couchpotato/core/plugins/userscript/main.py +++ b/couchpotato/core/plugins/userscript/main.py @@ -50,4 +50,4 @@ class Extension(Plugin): log.error('Failed adding movie via url: %s' % url) params['error'] = params['movie'] if params['movie'] else 'Failed getting movie info' - return self.renderTemplate(__file__, 'template.js', **params) + return jsonified(params) diff --git a/couchpotato/core/providers/userscript/allocine/main.py b/couchpotato/core/providers/userscript/allocine/main.py index 5fe0cb02..e34de97b 100644 --- a/couchpotato/core/providers/userscript/allocine/main.py +++ b/couchpotato/core/providers/userscript/allocine/main.py @@ -1,5 +1,4 @@ from beautifulsoup import BeautifulSoup -from couchpotato.core.event import fireEvent from couchpotato.core.providers.userscript.base import UserscriptBase class AlloCine(UserscriptBase): @@ -20,8 +19,4 @@ class AlloCine(UserscriptBase): name = split[0][:-5].strip() year = split[0][-4:] - result = self.search(name, year) - if result: - movie = fireEvent('movie.info', identifier = result.get('imdb'), merge = True) - - return movie + return self.search(name, year) diff --git a/couchpotato/core/providers/userscript/appletrailers/main.py b/couchpotato/core/providers/userscript/appletrailers/main.py index a138fd01..8e5eae90 100644 --- a/couchpotato/core/providers/userscript/appletrailers/main.py +++ b/couchpotato/core/providers/userscript/appletrailers/main.py @@ -1,4 +1,3 @@ -from couchpotato.core.event import fireEvent from couchpotato.core.providers.userscript.base import UserscriptBase import re @@ -11,14 +10,10 @@ class AppleTrailers(UserscriptBase): data = self.urlopen(url) - name = re.search('(?P(var trailerTitle(.+);))', data) - name = name.group('id').split(' = \'')[1].strip()[:-2].decode('string_escape') + name = re.search("trailerTitle.*=.*\'(?P.*)\';", data) + name = name.group('name').decode('string_escape') - date = re.search('(?P(var releaseDate(.+);))', data) - year = date.group('id').split(' = \'')[1].strip()[:-2] + date = re.search("releaseDate.*=.*\'(?P.*)\';", data) + year = date.group('date')[:4] - result = self.search(name, year) - if result: - movie = fireEvent('movie.info', identifier = result.get('imdb'), merge = True) - - return movie + return self.search(name, year) diff --git a/couchpotato/core/providers/userscript/base.py b/couchpotato/core/providers/userscript/base.py index eb2434aa..d60ea5a2 100644 --- a/couchpotato/core/providers/userscript/base.py +++ b/couchpotato/core/providers/userscript/base.py @@ -21,10 +21,11 @@ class UserscriptBase(Plugin): addEvent('userscript.get_movie_via_url', self.belongsTo) def search(self, name, year = None): - movie = fireEvent('movie.search', q = '%s %s' % (name, year), limit = 1, merge = True) + result = fireEvent('movie.search', q = '%s %s' % (name, year), limit = 1, merge = True) - if len(movie) > 0: - return movie[0] + if len(result) > 0: + movie = fireEvent('movie.info', identifier = result[0].get('imdb'), merge = True) + return movie else: return None