From 392ca2939b5990c626747b519930a57ac5a27985 Mon Sep 17 00:00:00 2001
From: Rolux <rolux@Rolux.local>
Date: Fri, 25 Jul 2008 16:03:04 +0200
Subject: [PATCH] more allmovie data; allmovie id is 123456, not 1:123456

---
 oxweb/allmovie.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/oxweb/allmovie.py b/oxweb/allmovie.py
index 34a4182..a124f1f 100644
--- a/oxweb/allmovie.py
+++ b/oxweb/allmovie.py
@@ -6,21 +6,28 @@ import time
 from oxlib import stripTags, findRe
 from oxlib.cache import getUrlUnicode
 
-def getMovieData(amgId):
-    html = getUrlUnicode("http://www.allmovie.com/cg/avg.dll?p=avg&sql=%s~T0" % amgId)
+def getMovieData(allmovieId):
+    html = getUrlUnicode("http://www.allmovie.com/cg/avg.dll?p=avg&sql=1:%s~T0" % allmovieId)
     data = {}
     data['poster'] = findRe(html, '<img src="(http://image.*?)"')
     data['synopsis'] = stripTags(findRe(html, 'Plot Synopsis</td>.*?<td colspan="2"><p>(.*?)</td>'))
     data['year'] = findRe(html, '<a href="/cg/avg.dll\?p=avg&amp;sql=24:\d{4}">(\d{4})</a>')
     data['rating'] = findRe(html, '" alt="(\d+?) Stars"')
     data['country'] = findRe(html, '<a href="/cg/avg.dll\?p=avg&sql=24:D\|\|\|206">(.*?)</')
-    html = getUrlUnicode("http://www.allmovie.com/cg/avg.dll?p=avg&sql=%s~T1" % amgId)
+    data['director'] = stripTags(findRe(html, '<td class="formed-sub"><a href="/cg/avg.dll\?p=avg&sql=2:\d+">(.*?)</td>')).split(', ')
+    data['genre'] = map(lambda x: stripTags(x), findRe(html, '<span>Genre / Type</span>(.*?)</table>').split('</li><li>'))
+    data['keywords'] = map(lambda x: stripTags(x), findRe(html, '<span>Keywords</span>(.*?)</table>').split('</li><li>'))
+    data['themes'] = map(lambda x: stripTags(x), findRe(html, '<span>Themes</span>(.*?)</table>').split('</li><li>'))
+    html = getUrlUnicode("http://www.allmovie.com/cg/avg.dll?p=avg&sql=1:%s~T1" % allmovieId)
     data['review'] = stripTags(findRe(html, 'Review</td>.*?<td colspan="2"><p>(.*?)</td>'))
     return data
 
-def getMoviePoster(amgId):
-    data = getMovieData(amgId)
+def getMoviePoster(allmovieId):
+    data = getMovieData(allmovieId)
     if data:
         return data['poster']
     return ''
 
+if __name__ == '__main__':
+    print getMovieData('177524')
+