Add the ability to supply an api key

diff --git a/pyva/pypsd.example.yml b/pyva/pypsd.example.yml
index bae275193855793e250fd8a8d6a49a62fb645fa1..632c5e17d87d3919e149201ffe68f61870bcec36 100644 (file)
--- a/pyva/pypsd.example.yml
+++ b/pyva/pypsd.example.yml
@@ -60,6 +60,7 @@ internets:
   key_wolframalpha: xxx
   key_steam: xxx
   key_google: xxx
+  key_imdb: xxx
   outputlimit: 10
   maxlinelength: 500
   yt_parse_delay: 180

diff --git a/pyva/pyva/src/main/python/internets/api/imdb.py b/pyva/pyva/src/main/python/internets/api/imdb.py
index 4cdab9d49182e36c3e848554ccd67737a85d8211..782599e723b884b3b2bb311838aa7dac7555bd37 100644 (file)
--- a/pyva/pyva/src/main/python/internets/api/imdb.py
+++ b/pyva/pyva/src/main/python/internets/api/imdb.py
@@ -2,10 +2,12 @@ import urllib
 from feed import get_json
 
 class Imdb(object):
-       def __init__(self):
-               pass #TODO: cache?
+       def __init__(self, api_key):
+               self.api_key = api_key
+               #TODO: cache?
        
        def get(self, title):
-               url = 'http://www.omdbapi.com/?y=&plot=short&r=json&'
-               url += urllib.urlencode({'t': title})
+               url = 'http://www.omdbapi.com/?y=&plot=short&r=json&' +\
+               urllib.urlencode({'apikey': self.api_key}) + '&' +\
+               urllib.urlencode({'t': title})
                return get_json(url)

diff --git a/pyva/pyva/src/main/python/internets/internets.py b/pyva/pyva/src/main/python/internets/internets.py
index ee8cb8906e77204595991d2ff2d5d0311258d709..38c0eb0a53fcf72255b9f2ebea194085eb8d95ef 100644 (file)
--- a/pyva/pyva/src/main/python/internets/internets.py
+++ b/pyva/pyva/src/main/python/internets/internets.py
@@ -126,7 +126,7 @@ class internets(
                                self.log.exception('Error initializing internets bing API (%s)' % err)
                        self.nsp = calc.NumericStringParser()
                        self.google = google.Google(self.config.get('internets').get('key_google'), self.config.get('internets').get('yt_parse_delay'))
-                       self.imdb = imdb.Imdb()
+                       self.imdb = imdb.Imdb(self.config.get('internets').get('key_imdb'))
                        self.ipinfo = ipinfo.IpInfo(self.config.get('internets').get('key_ipinfodb'))
                        self.lastfm = lastfm.LastFm(self.config.get('internets').get('key_lastfm'))
                        self.quotes = quotes.Quotes(self.config.get('internets').get('key_fml'))