Browse Source

Cache userscript url download

pull/110/head
Ruud 13 years ago
parent
commit
35769b3d91
  1. 2
      couchpotato/core/providers/userscript/allocine/main.py
  2. 2
      couchpotato/core/providers/userscript/appletrailers/main.py
  3. 8
      couchpotato/core/providers/userscript/base.py
  4. 2
      couchpotato/core/providers/userscript/rottentomatoes/main.py

2
couchpotato/core/providers/userscript/allocine/main.py

@ -11,7 +11,7 @@ class AlloCine(UserscriptBase):
return 'Url isn\'t from a movie' return 'Url isn\'t from a movie'
try: try:
data = self.urlopen(url) data = self.getUrl(url)
except: except:
return return

2
couchpotato/core/providers/userscript/appletrailers/main.py

@ -9,7 +9,7 @@ class AppleTrailers(UserscriptBase):
def getMovie(self, url): def getMovie(self, url):
try: try:
data = self.urlopen(url) data = self.getUrl(url)
except: except:
return return

8
couchpotato/core/providers/userscript/base.py

@ -1,5 +1,6 @@
from couchpotato.core.event import addEvent, fireEvent 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.logger import CPLog
from couchpotato.core.plugins.base import Plugin from couchpotato.core.plugins.base import Plugin
from urlparse import urlparse from urlparse import urlparse
@ -42,9 +43,12 @@ class UserscriptBase(Plugin):
return return
def getUrl(self, url):
return self.getCache(md5(simplifyString(url)), url = url)
def getMovie(self, url): def getMovie(self, url):
try: try:
data = self.urlopen(url) data = self.getUrl(url)
except: except:
data = '' data = ''
return self.getInfo(getImdb(data)) return self.getInfo(getImdb(data))

2
couchpotato/core/providers/userscript/rottentomatoes/main.py

@ -9,7 +9,7 @@ class RottenTomatoes(UserscriptBase):
def getMovie(self, url): def getMovie(self, url):
try: try:
data = self.urlopen(url) data = self.getUrl(url)
except: except:
return return

Loading…
Cancel
Save