@@ -36,7 +36,7 @@ def parse_lyric(hit):
37 content = hit['highlights'][0]['value']
37 content = hit['highlights'][0]['value']
39− content = None
39+ content = ''
40 timestamp = hit['result']['lyrics_updated_at']
40 timestamp = hit['result']['lyrics_updated_at']
41 result = {'url': hit['result']['url'],
41 result = {'url': hit['result']['url'],
42 'title': hit['result']['full_title'],
42 'title': hit['result']['full_title'],
@@ -51,7 +51,7 @@ def parse_lyric(hit):
51def parse_artist(hit):
51def parse_artist(hit):
52 result = {'url': hit['result']['url'],
52 result = {'url': hit['result']['url'],
53 'title': hit['result']['name'],
53 'title': hit['result']['name'],
54− 'content': None,
54+ 'content': '',
55 'thumbnail': hit['result']['image_url'],
55 'thumbnail': hit['result']['image_url'],
56 'template': 'videos.html'}
56 'template': 'videos.html'}
57 return result
57 return result
@@ -61,6 +61,7 @@ def parse_album(hit):
61 result = {'url': hit['result']['url'],
61 result = {'url': hit['result']['url'],
62 'title': hit['result']['full_title'],
62 'title': hit['result']['full_title'],
63 'thumbnail': hit['result']['cover_art_url'],
63 'thumbnail': hit['result']['cover_art_url'],
64 # 'thumbnail': hit['result']['cover_art_thumbnail_url'],
65 # 'thumbnail': hit['result']['cover_art_thumbnail_url'],
65 'template': 'videos.html'}
66 'template': 'videos.html'}
@@ -81,9 +82,7 @@ def response(resp):
81 json = loads(resp.text)
82 json = loads(resp.text)
82 hits = [hit for section in json['response']['sections'] for hit in section['hits']]
83 hits = [hit for section in json['response']['sections'] for hit in section['hits']]
83 for hit in hits:
84 for hit in hits:
85− func = parse[hit['type']]
85+ func = parse.get(hit['type'])
86− except KeyError:
86+ if func:
88− results.append(func(hit))
87+ results.append(func(hit))
89 return results
88 return results