view progress, data changes, model changes, graph

Author: Mark Ng

aggregator/models.py

@@ -1,5 +1,5 @@
-from django.db import models
-import feedparser
+from django.db import models, connection
+import feedparser, pprint
 import djangofeedparserdates
 
 # Create your models here.
@@ -15,6 +15,8 @@ class Admin:
 class Feed(models.Model):
   """Feed to be aggregated"""
   url = models.URLField("Feed URL",max_length=255)
+  #username = models.CharField("Feed Username", max_length=255, blank=True)
+  #password = models.CharField("Feed Password", max_length=255, blank=True)
   title = models.TextField("Feed Title",blank=True)
   link = models.URLField("Link to site",verify_exists=False, max_length=255,blank=True)
   description = models.TextField("Feed description",blank=True)
@@ -73,11 +75,12 @@ def refresh(self):
           feeditem.author_name = getattr(entry.author_detail, 'name', '')		
           feeditem.author_email = getattr(entry.author_detail, 'email', '')		
           feeditem.author_link = getattr(entry.author_detail, 'href', '')
-        feeditem.content = getattr(entry, 'content')
+        if hasattr(entry,'content'):
+          feeditem.content = entry.content[0].value
         feeditem.unique_id = getattr(entry, 'id', '')
         feeditem.save()
       except Exception, e:
-        pass
+        print e
     return self, 'updated'
 
 class FeedItem(models.Model):

aggregator/models.pyc

@@ -10,9 +10,33 @@
     <div>
       <h1><img src="/images/dotDorset.png" alt="dotDorset" /></h1>
       {% block content %}
-        {% for item in blogitems %}
-          {{ item.title }}
-        {% endfor %}
+        <div id="blogs">
+          <h2>Blogs</h2>
+          {% for item in blogitems %}
+          <h3><a href="{{ item.link }}">{{ item.title }}</a></h3>
+          <h4><a href="{{ item.feed.link }}">{{ item.feed }}</a></h4>
+          <p>{{ item.description|striptags }}</p>
+          {% endfor %}
+        </div>
+        
+        <div id="twitter">
+          <h2>Twitter</h2>
+          {% for item in twitteritems %}
+          <h3><a href="{{ item.link }}">{{ item.title }}</a></h3>
+          <h4><a href="{{ item.feed.link }}">{{ item.feed }}</a></h4>
+          <p>{{ item.description|striptags }}</p>
+          {% endfor %}
+          
+        </div>
+        
+        <div id="mailinglist">
+          <h2>Mailing List</h2>
+          {% for item in mlitems %}
+          <h3><a href="{{ item.link }}">{{ item.title }}</a></h3>
+          <h4><a href="{{ item.feed.link }}">{{ item.feed }}</a></h4>
+          <p>{{ item.description|striptags }}</p>
+          {% endfor %}          
+        </div>
       {% endblock %}
     </div>
     <script type="text/javascript">

aggregator/templates/index.html

@@ -6,7 +6,8 @@
 
 def index(request):
   """index view"""
-  blogitems = FeedItem.objects.filter(feed__category__name='Blogs').order_by('pub_date')
-  twitteritems = FeedItem.objects.filter(feed__category__name='Twitter').order_by('pub_date')
-  rendered = render_to_string('index.html', {'blogitems': blogitems, 'twitteritems': twitteritems})
+  blogitems = FeedItem.objects.filter(feed__category__name='Blogs').order_by('-pub_date')[0:5]
+  twitteritems = FeedItem.objects.filter(feed__category__name='Twitter').order_by('-pub_date')[0:10]
+  mlitems = FeedItem.objects.filter(feed__category__name='Mailing List').order_by('-pub_date')[0:10]
+  rendered = render_to_string('index.html', {'blogitems': blogitems, 'twitteritems': twitteritems, 'mlitems': mlitems})
   return HttpResponse(rendered)

aggregator/views.py

@@ -23,7 +23,7 @@ p {margin:0 0 1.5em;}
 p img {float:left;margin:1.5em 1.5em 1.5em 0;padding:0;}
 p img.right {float:right;margin:1.5em 0 1.5em 1.5em;}
 a:focus, a:hover {color:#000;}
-a {color:#009;text-decoration:underline;}
+a {color:#000;text-decoration:underline;}
 blockquote {margin:1.5em;color:#666;font-style:italic;}
 strong {font-weight:bold;}
 em, dfn {font-style:italic;}
@@ -53,4 +53,35 @@ body div
 {
 	width: 960px;
 	margin: 0 auto;
-}
+}
+
+div.half, div#blogs, div#twitter, div#mailinglist
+{
+  width: 470px;
+  float:left;
+  margin-right:10px;
+}
+
+div.third
+{
+  width: 310px;
+  float:left;
+  margin-right:10px;
+}
+
+div.quarter
+{
+  width: 230px;
+  float:left;
+  margin-right:10px;
+}
+
+div.last, div#twitter
+{
+  margin-right: 0px;
+}
+
+div#blogs h4 a
+{
+  font-style: italic;
+}

aggregator/views.pyc

@@ -630,6 +630,20 @@ subgraph cluster_dotdorset_aggregator_models {
         ><FONT COLOR="#7B7B7B" FACE="Helvetica Bold">DateTimeField</FONT
         ></TD></TR>
 
+        <TR><TD ALIGN="LEFT" BORDER="0"
+        ><FONT COLOR="#7B7B7B" FACE="Helvetica Bold">last_modified</FONT
+        ></TD>
+        <TD ALIGN="LEFT"
+        ><FONT COLOR="#7B7B7B" FACE="Helvetica Bold">DateTimeField</FONT
+        ></TD></TR>
+        
+        <TR><TD ALIGN="LEFT" BORDER="0"
+        ><FONT COLOR="#7B7B7B" FACE="Helvetica Bold">etag</FONT
+        ></TD>
+        <TD ALIGN="LEFT"
+        ><FONT COLOR="#7B7B7B" FACE="Helvetica Bold">TextField</FONT
+        ></TD></TR>
+        
         <TR><TD ALIGN="LEFT" BORDER="0"
         ><FONT FACE="Helvetica Bold">category</FONT
         ></TD>
@@ -720,10 +734,10 @@ subgraph cluster_dotdorset_aggregator_models {
         ></TD></TR>
 
         <TR><TD ALIGN="LEFT" BORDER="0"
-        ><FONT COLOR="#7B7B7B" FACE="Helvetica Bold">pub_date</FONT
+        ><FONT FACE="Helvetica Bold">pub_date</FONT
         ></TD>
         <TD ALIGN="LEFT"
-        ><FONT COLOR="#7B7B7B" FACE="Helvetica Bold">TimeField</FONT
+        ><FONT FACE="Helvetica Bold">DateTimeField</FONT
         ></TD></TR>
 
         <TR><TD ALIGN="LEFT" BORDER="0"