From 4214cba7834a6a5d48cba771eb5d429648465958 Mon Sep 17 00:00:00 2001
From: KM Hook <kuanmin.hu@gmail.com>
Date: Mon, 5 Mar 2012 14:44:27 +0800
Subject: [PATCH] Refactor recommendation

---
 celerybeat-schedule            | Bin 12288 -> 12288 bytes
 mysite.pid                     |   2 +-
 recommendation/doubanbooks.py  |  48 ++++++++++++++++++
 recommendation/doubanbooks.py~ |  40 +++++++++++++++
 recommendation/tasks.py        |  89 +++++++--------------------------
 recommendation/tasks.py~       |  77 ++++++++--------------------
 6 files changed, 129 insertions(+), 127 deletions(-)
 create mode 100644 recommendation/doubanbooks.py
 create mode 100644 recommendation/doubanbooks.py~

diff --git a/celerybeat-schedule b/celerybeat-schedule
index 7e9f0ecab2fced782c243e74425663149b9cad68..ce22e295f2d95913b5358591325d3740f52c757e 100644
GIT binary patch
delta 131
zcmZojXh_%~CcquU%fS1E|1tk<{-Di@0;;?`j2bBghFrnw$w0<tXIVK$MWvVu1M`@Q
zlw=@n48*2DY^JFWBrT$2Dl83@CU?tSXVjXUEN`F=m)8PH8vwD9a!iFqvN~5uP=S#J
SS8=+bIhUuI$>sy{4gvt8m?dxk

delta 133
zcmZojXh_%~Ccy2?%fS1E|1tk<e&@}K0;;^5LuI8IwbWxO49sIHQj&qRQA~xQC6qP+
zvW=l^pqyc<`s9gn*BK2aXUZGs!W4oO7(lUMOofG6OhvMhI#)?hfsqAQak`;7m#3-W
J<^%E$0syI+C{h3b

diff --git a/mysite.pid b/mysite.pid
index 4e21df4..6586a75 100644
--- a/mysite.pid
+++ b/mysite.pid
@@ -1 +1 @@
-5060
+2999
diff --git a/recommendation/doubanbooks.py b/recommendation/doubanbooks.py
new file mode 100644
index 0000000..03904d3
--- /dev/null
+++ b/recommendation/doubanbooks.py
@@ -0,0 +1,48 @@
+from recommendation.models import Book
+from contacts.models import Contact
+try:
+   from douban.service import DoubanService
+   from douban.client import OAuthClient
+except ImportError, e:
+   print e
+   print 'please install douban-python'
+   sys.exit(0)
+
+class DoubanBooks(object):
+
+    def __init__(self):
+        self.HOST = 'http://www.douban.com'
+        self.API_KEY = "0ff1b8ce70b305ab2fd52a6b52191101"
+        self.SECRET = "47c2cb706c4ec51d"
+        self.reco_books = []
+        self.subjects = []
+        self.reco = []
+        self.href = []
+        self.service = DoubanService(self.API_KEY, self.SECRET)
+
+    def get_reco(self):
+        member = Contact.objects.all()
+        book_states = ['read', 'reading', 'wish']
+        for tmp_member in member:
+            for tmp_states in book_states:
+                feed_read = self.service.GetMyCollection('/people/%s/collection'  % tmp_member.douban_id, 'book', 'IST', tmp_states)
+                self.get_book(feed_read, tmp_member.fullname)
+
+    def get_book(self, feed, fullname):
+        for entry in feed.entry:
+            book_href = entry.link[1].href
+            self.href.append(book_href[21:])
+            subject_id = book_href[35:]
+            if subject_id not in self.subjects:
+                book_href = book_href[21:]
+                bookfeed = self.service.GetBook(book_href)
+                self.subjects.append(subject_id)
+                self.reco.append((bookfeed, [fullname], subject_id))
+                continue
+            else:
+                for tmp in self.reco:
+                   if tmp[2] == subject_id:
+                        if fullname not in tmp[1]:
+                            tmp[1].append(fullname)
+                            continue
+
diff --git a/recommendation/doubanbooks.py~ b/recommendation/doubanbooks.py~
new file mode 100644
index 0000000..d99055a
--- /dev/null
+++ b/recommendation/doubanbooks.py~
@@ -0,0 +1,40 @@
+class DoubanBooks(object):
+
+    def __init__(self):
+        self.HOST = 'http://www.douban.com'
+        self.API_KEY = "0ff1b8ce70b305ab2fd52a6b52191101"
+        self.SECRET = "47c2cb706c4ec51d"
+        self.reco_books = []
+        self.subjects = []
+        self.reco = []
+        self.href = []
+        self.service = DoubanService(self.API_KEY, self.SECRET)
+
+    def get_reco(self):
+        member = Contact.objects.all()
+        for tmp in member:
+            feed_read = self.service.GetMyCollection('/people/%s/collection'  % tmp.douban_id, 'book', 'IST','read')
+            self.get_book(feed_read, tmp.fullname)
+            feed_reading = self.service.GetMyCollection('/people/%s/collection' % tmp.douban_id, 'book', 'IST','reading')
+            self.get_book(feed_reading, tmp.fullname)
+            feed_wish = self.service.GetMyCollection('/people/%s/collection' % tmp.douban_id, 'book', 'IST','wish')
+            self.get_book(feed_wish, tmp.fullname)      
+
+    def get_book(self, feed, fullname):
+        for entry in feed.entry:
+            book_href = entry.link[1].href
+            self.href.append(book_href[21:])
+            subject_id = book_href[35:]
+            if subject_id not in self.subjects:
+                book_href = book_href[21:]
+                bookfeed = self.service.GetBook(book_href)
+                self.subjects.append(subject_id)
+                self.reco.append((bookfeed, [fullname], subject_id))
+                continue
+            else:
+                for tmp in self.reco:
+                   if tmp[2] == subject_id:
+                        if fullname not in tmp[1]:
+                            tmp[1].append(fullname)
+                            continue
+
diff --git a/recommendation/tasks.py b/recommendation/tasks.py
index ca27e57..865f2f4 100644
--- a/recommendation/tasks.py
+++ b/recommendation/tasks.py
@@ -2,86 +2,35 @@
 from celery.task.schedules import crontab
 
 import sys
-
-# Create your views here.
 from recommendation.models import Book
-from contacts.models import Contact
-try:
-   from douban.service import DoubanService
-   from douban.client import OAuthClient
-except ImportError, e:
-   print e
-   print 'please install douban-python'
-   sys.exit(0)
-
-class DoubanBooks(object):
-
-    def __init__(self):
-        self.HOST = 'http://www.douban.com'
-        self.API_KEY = "0ff1b8ce70b305ab2fd52a6b52191101"
-        self.SECRET = "47c2cb706c4ec51d"
-        self.reco_books = []
-        self.subjects = []
-        self.reco = []
-        self.href = []
-        self.service = DoubanService(self.API_KEY, self.SECRET)
-
-    def get_reco(self):
-        member = Contact.objects.all()
-        for tmp in member:
-            feed_read = self.service.GetMyCollection('/people/%s/collection'  % tmp.douban_id, 'book', 'IST','read')
-            self.get_book(feed_read, tmp.fullname)
-            feed_reading = self.service.GetMyCollection('/people/%s/collection' % tmp.douban_id, 'book', 'IST','reading')
-            self.get_book(feed_reading, tmp.fullname)
-            feed_wish = self.service.GetMyCollection('/people/%s/collection' % tmp.douban_id, 'book', 'IST','wish')
-            self.get_book(feed_wish, tmp.fullname)      
+# Create your views here.
 
-    def get_book(self, feed, fullname):
-        for entry in feed.entry:
-            book_href = entry.link[1].href
-            self.href.append(book_href[21:])
-            subject_id = book_href[35:]
-            if subject_id not in self.subjects:
-                book_href = book_href[21:]
-                bookfeed = self.service.GetBook(book_href)
-                self.subjects.append(subject_id)
-                self.reco.append((bookfeed, [fullname], subject_id))
-                continue
-            else:
-                for tmp in self.reco:
-                   if tmp[2] == subject_id:
-                        if fullname not in tmp[1]:
-                            tmp[1].append(fullname)
-                            continue
+from doubanbooks import DoubanBooks
 
 @periodic_task(run_every=crontab(hour="*", minute="0", day_of_week="*")) 
 def test():
     douban_books = DoubanBooks()
     douban_books.get_reco()
+
     for reco in douban_books.reco:
-        bid = reco[0].link[1].href
-        title = reco[0].title.text
-        #author = reco[0].author
-        img_url = reco[0].link[2].href
-        recommender = ''
-        author = ''
+        tmp_book = Book()
+        tmp_book.book_id = reco[0].link[1].href
+        tmp_book.book_title = reco[0].title.text
+        tmp_book.book_img_url = reco[0].link[2].href
+        #tmp_book.book_recommender = ''
+        #tmp_book.book_author = ''
         for person in reco[0].author:
-            author += person.name.text + ', '
-        author = author[0:-2]
+            tmp_book.book_author += person.name.text + ', '
+        tmp_book.book_author = tmp_book.book_author[0:-2]
         for person in reco[1]:
-            recommender += ' ' + person 
-        print recommender
-        books = Book.objects.filter(book_id = bid)
+            tmp_book.book_recommender += ' ' + person 
+        print tmp_book.book_recommender
+
+        books = Book.objects.filter(book_id = tmp_book.book_id)
         if not books:
-           book = Book(book_title = title, 
-                     book_author = author,
-                     book_img_url = img_url,
-                     book_id = bid,
-                     book_recommender = recommender)
-           book.save()
+            tmp_book.save()
         else:
-           book = books[0]
-           book.book_recommender = recommender
-           book.book_author = author
-           book.save()
+            book = books[0]
+            book.book_recommender = tmp_book.book_recommender
+            book.save()
 
diff --git a/recommendation/tasks.py~ b/recommendation/tasks.py~
index 72167ec..3c52b6f 100644
--- a/recommendation/tasks.py~
+++ b/recommendation/tasks.py~
@@ -4,72 +4,37 @@ from celery.task.schedules import crontab
 import sys
 
 # Create your views here.
-from annoying.decorators import render_to
-from django.template import Context
-from recommendation.models import Book
-from contacts.models import Contact
-from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
-try:
-   from douban.service import DoubanService
-   from douban.client import OAuthClient
-except ImportError, e:
-   print e
-   print 'please install douban-python'
-   sys.exit(0)
 
-class DoubanBooks(object):
-
-    def __init__(self):
-        self.HOST = 'http://www.douban.com'
-        self.API_KEY = "0ff1b8ce70b305ab2fd52a6b52191101"
-        self.SECRET = "47c2cb706c4ec51d"
-        self.reco_books = []
-        self.subjects = []
-        self.reco = []
-        self.href = []
-        self.service = DoubanService(self.API_KEY, self.SECRET)
-
-    def get_reco(self):
-        member = Contact.objects.all()
-        for tmp in member:
-            feed_read = self.service.GetMyCollection('/people/%s/collection'  % tmp.douban_id, 'book', 'IST','read')
-            self.get_book(feed_read, tmp.fullname)
-            feed_reading = self.service.GetMyCollection('/people/%s/collection' % tmp.douban_id, 'book', 'IST','reading')
-            self.get_book(feed_reading, tmp.fullname)
-            feed_wish = self.service.GetMyCollection('/people/%s/collection' % tmp.douban_id, 'book', 'IST','wish')
-            self.get_book(feed_wish, tmp.fullname)      
-
-    def get_book(self, feed, fullname):
-        for entry in feed.entry:
-            book_href = entry.link[1].href
-            self.href.append(book_href[21:])
-            subject_id = book_href[35:]
-            if subject_id not in self.subjects:
-                book_href = book_href[21:]
-                bookfeed = self.service.GetBook(book_href)
-                self.subjects.append(subject_id)
-                self.reco.append((bookfeed, [fullname]))
-                continue
-            else:
-                for tmp in self.reco:
-                    if tmp.has_key(subject_id):
-                        if fullname not in tmp[1]:
-                            tmp[1].append(fullname)
-                            continue
+from doubanbooks import DoubanBooks
 
 @periodic_task(run_every=crontab(hour="*", minute="*", day_of_week="*")) 
 def test():
     douban_books = DoubanBooks()
     douban_books.get_reco()
     for reco in douban_books.reco:
-        bid = reco.id.text
-        title = reco.title.text
-        author = reco.author
-        img_url = reco.link[2].href
+        bid = reco[0].link[1].href
+        title = reco[0].title.text
+        #author = reco[0].author
+        img_url = reco[0].link[2].href
+        recommender = ''
+        author = ''
+        for person in reco[0].author:
+            author += person.name.text + ', '
+        author = author[0:-2]
+        for person in reco[1]:
+            recommender += ' ' + person 
+        print recommender
         books = Book.objects.filter(book_id = bid)
         if not books:
            book = Book(book_title = title, 
                      book_author = author,
                      book_img_url = img_url,
-                     book_id = bid)
+                     book_id = bid,
+                     book_recommender = recommender)
            book.save()
+        else:
+           book = books[0]
+           book.book_recommender = recommender
+           book.book_author = author
+           book.save()
+