Fixing a few issues here and there around feed fetching.

This commit is contained in:
Samuel Clay 2011-08-27 14:13:28 -07:00
parent 6a68181974
commit e9b88c8cc9
2 changed files with 8 additions and 4 deletions

View file

@ -114,6 +114,9 @@ class Feed(models.Model):
max_feed_title = Feed._meta.get_field('feed_title').max_length
if len(self.feed_title) > max_feed_title:
self.feed_title = self.feed_title[:max_feed_title]
max_feed_address = Feed._meta.get_field('feed_address').max_length
if len(self.feed_address) > max_feed_address:
self.feed_address = self.feed_address[:max_feed_address]
try:
super(Feed, self).save(*args, **kwargs)
@ -613,11 +616,10 @@ class Feed(models.Model):
self.data.save()
return
if not feed_tags:
tags_list = []
elif isinstance(feed_tags, unicode):
tags_list = []
if feed_tags and isinstance(feed_tags, unicode):
tags_list = json.decode(feed_tags)
if len(tags_list) > 1:
if len(tags_list) >= 1:
self.save_popular_tags(tags_list[:-1])
def save_popular_authors(self, feed_authors=None):

View file

@ -3,6 +3,7 @@ import re
import urlparse
import traceback
import feedparser
import time
from utils import log as logging
from apps.rss_feeds.models import MFeedPage
from utils.feed_functions import timelimit, mail_feed_error_to_admin
@ -26,6 +27,7 @@ class PageImporter(object):
try:
request = urllib2.Request(self.url, headers=HEADERS)
response = urllib2.urlopen(request)
time.sleep(0.01) # Grrr, GIL.
data = response.read()
html = self.rewrite_page(data)
self.save_page(html)