Userscript

couchpotato/core/providers/userscript/imdb/main.py

@@ -18,53 +18,9 @@ class IMDB(UserscriptBase):
         # Don't add TV show
         for head in headers:
             if 'seasons' in head.lower():
-                return False
+                return 'IMDB url is a TV Show'
 
         identifier = re.search('(?P<id>tt[0-9{7}]+)', url).group('id')
-        movie = fireEvent('movie.info', identifier = identifier)
+        movie = fireEvent('movie.info', identifier = identifier, merge = True)
 
-        return {
-            'id': re.search('(?P<id>tt[0-9{7}]+)', url).group('id'),
-            'year': self.getYear(html)
-        }
-
-
-#CouchPotato['imdb.com'] = (function(){
-#
-#    function isMovie(){
-#        var series = document.getElementsByTagName('h5')
-#        for (var i = 0; i < series.length; i++) {
-#            if (series[i].innerHTML == 'Seasons:') {
-#                return false;
-#            }
-#        }
-#        return true;
-#    }
-#
-#    function getId(){
-#        return 'tt' + location.href.replace(/[^\d+]+/g, '');
-#    }
-#
-#    function getYear(){
-#        try {
-#            return document.getElementsByTagName('h1')[0].getElementsByTagName('a')[0].text;
-#        } catch (e) {
-#            var spans = document.getElementsByTagName('h1')[0].getElementsByTagName('span');
-#            var pattern = /^\((TV|Video) ([0-9]+)\)$/;
-#            for (var i = 0; i < spans.length; i++) {
-#                if (spans[i].innerHTML.search(pattern)) {
-#                    return spans[i].innerHTML.match(pattern)[1];
-#                }
-#            }
-#        }
-#    }
-#
-#    var constructor = function(){
-#        if(isMovie()){
-#            lib.osd(getId(), getYear());
-#        }
-#    }
-#
-#    return constructor;
-#
-#})();
+        return movie