Userscript: Apple Trailer, Allocine

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<id>(var trailerTitle(.+);))', data)
-        name = name.group('id').split(' = \'')[1].strip()[:-2].decode('string_escape')
+        name = re.search("trailerTitle.*=.*\'(?P<name>.*)\';", data)
+        name = name.group('name').decode('string_escape')
 
-        date = re.search('(?P<id>(var releaseDate(.+);))', data)
-        year = date.group('id').split(' = \'')[1].strip()[:-2]
+        date = re.search("releaseDate.*=.*\'(?P<date>.*)\';", 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)