From 35769b3d91794ca8c5481c745eb858e27514f3d3 Mon Sep 17 00:00:00 2001 From: Ruud Date: Sat, 7 Apr 2012 13:33:40 +0200 Subject: [PATCH] Cache userscript url download --- couchpotato/core/providers/userscript/allocine/main.py | 2 +- couchpotato/core/providers/userscript/appletrailers/main.py | 2 +- couchpotato/core/providers/userscript/base.py | 8 ++++++-- couchpotato/core/providers/userscript/rottentomatoes/main.py | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/couchpotato/core/providers/userscript/allocine/main.py b/couchpotato/core/providers/userscript/allocine/main.py index 91b44d9..8213ac2 100644 --- a/couchpotato/core/providers/userscript/allocine/main.py +++ b/couchpotato/core/providers/userscript/allocine/main.py @@ -11,7 +11,7 @@ class AlloCine(UserscriptBase): return 'Url isn\'t from a movie' try: - data = self.urlopen(url) + data = self.getUrl(url) except: return diff --git a/couchpotato/core/providers/userscript/appletrailers/main.py b/couchpotato/core/providers/userscript/appletrailers/main.py index d7ce8ab..693065d 100644 --- a/couchpotato/core/providers/userscript/appletrailers/main.py +++ b/couchpotato/core/providers/userscript/appletrailers/main.py @@ -9,7 +9,7 @@ class AppleTrailers(UserscriptBase): def getMovie(self, url): try: - data = self.urlopen(url) + data = self.getUrl(url) except: return diff --git a/couchpotato/core/providers/userscript/base.py b/couchpotato/core/providers/userscript/base.py index d4b3b9f..571b76c 100644 --- a/couchpotato/core/providers/userscript/base.py +++ b/couchpotato/core/providers/userscript/base.py @@ -1,5 +1,6 @@ from couchpotato.core.event import addEvent, fireEvent -from couchpotato.core.helpers.variable import getImdb +from couchpotato.core.helpers.encoding import simplifyString +from couchpotato.core.helpers.variable import getImdb, md5 from couchpotato.core.logger import CPLog from couchpotato.core.plugins.base import Plugin from urlparse import urlparse @@ -42,9 +43,12 @@ class UserscriptBase(Plugin): return + def getUrl(self, url): + return self.getCache(md5(simplifyString(url)), url = url) + def getMovie(self, url): try: - data = self.urlopen(url) + data = self.getUrl(url) except: data = '' return self.getInfo(getImdb(data)) diff --git a/couchpotato/core/providers/userscript/rottentomatoes/main.py b/couchpotato/core/providers/userscript/rottentomatoes/main.py index cb36b6c..bbce0d8 100644 --- a/couchpotato/core/providers/userscript/rottentomatoes/main.py +++ b/couchpotato/core/providers/userscript/rottentomatoes/main.py @@ -9,7 +9,7 @@ class RottenTomatoes(UserscriptBase): def getMovie(self, url): try: - data = self.urlopen(url) + data = self.getUrl(url) except: return