aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbnewbold <bnewbold@robocracy.org>2011-04-26 15:58:45 -0400
committerbnewbold <bnewbold@robocracy.org>2011-04-26 15:58:45 -0400
commit309dfaef522a3861fdaae4bddad8197db1c98984 (patch)
tree553929f7e67c7756963375ea30f9c80140134e6f
parent6511e548bbbac7f05572393e272f95d47829d967 (diff)
downloadpiccast-309dfaef522a3861fdaae4bddad8197db1c98984.zip
piccast-309dfaef522a3861fdaae4bddad8197db1c98984.tar.gz
added pic_count to PicSet serializtion
-rw-r--r--README5
-rw-r--r--piccast/feeds/models.py79
2 files changed, 46 insertions, 38 deletions
diff --git a/README b/README
index 0eb3f7f..e8046de 100644
--- a/README
+++ b/README
@@ -39,3 +39,8 @@ Feed Scrape Command
Run "./manage.py scrape_feeds acidcow" to fetch the RSS feed for acid cow and
scape all the (new) picture sets.
+TODO
+----
+- scrape description text from acidcow
+- refactor sets to include pic_count column (generated when scraping, updating)
+
diff --git a/piccast/feeds/models.py b/piccast/feeds/models.py
index ea7a34a..cf8fc77 100644
--- a/piccast/feeds/models.py
+++ b/piccast/feeds/models.py
@@ -11,6 +11,45 @@ class Category(models.Model):
return {'id': self.id,
'name': self.name }
+class Pic(models.Model):
+ #id
+ set = models.ForeignKey('feeds.PicSet', null=True,blank=True)
+ title = models.CharField(max_length=128, blank=False)
+ thumbnail_url = models.URLField(blank=True)
+ thumbnail_height = models.PositiveIntegerField(null=True,blank=True)
+ thumbnail_width = models.PositiveIntegerField(null=True,blank=True)
+ original_url = models.URLField(blank=False)
+ original_height = models.PositiveIntegerField(null=True,blank=True)
+ original_width = models.PositiveIntegerField(null=True,blank=True)
+ source_url = models.URLField(blank=True)
+ caption = models.TextField(blank=True)
+ is_nsfw = models.NullBooleanField(null=True, blank=True)
+
+ def __unicode__(self):
+ return self.title
+
+ def serializable(self):
+ return {'id': self.id,
+ 'set': {'id': self.set.id, 'title': self.set.title },
+ 'thumbnail_url': self.thumbnail_url,
+ 'thumbnail_height': self.thumbnail_height,
+ 'thumbnail_width': self.thumbnail_width,
+ 'original_url': self.original_url,
+ 'original_height': self.original_height,
+ 'original_width': self.original_width,
+ 'source_url': self.source_url,
+ 'caption': self.caption,
+ 'is_nsfw': self.is_nsfw,
+ }
+
+ def serializable_short(self):
+ # TODO: more here?
+ return {'id': self.id,
+ 'original_url': self.original_url,
+ 'original_height': self.original_height,
+ 'original_width': self.original_width,
+ }
+
class PicFeed(models.Model):
#id
created = models.DateTimeField()
@@ -65,46 +104,10 @@ class PicSet(models.Model):
'keywords': self.keywords,
'image':
(self.image.serializable_short() if self.image else None),
+ 'pic_count':
+ Pic.objects.filter(set=self.id).count(),
'category':
(self.category.name if self.category else None),
}
-class Pic(models.Model):
- #id
- set = models.ForeignKey('feeds.PicSet', null=True,blank=True)
- title = models.CharField(max_length=128, blank=False)
- thumbnail_url = models.URLField(blank=True)
- thumbnail_height = models.PositiveIntegerField(null=True,blank=True)
- thumbnail_width = models.PositiveIntegerField(null=True,blank=True)
- original_url = models.URLField(blank=False)
- original_height = models.PositiveIntegerField(null=True,blank=True)
- original_width = models.PositiveIntegerField(null=True,blank=True)
- source_url = models.URLField(blank=True)
- caption = models.TextField(blank=True)
- is_nsfw = models.NullBooleanField(null=True, blank=True)
-
- def __unicode__(self):
- return self.title
-
- def serializable(self):
- return {'id': self.id,
- 'set': {'id': self.set.id, 'title': self.set.title },
- 'thumbnail_url': self.thumbnail_url,
- 'thumbnail_height': self.thumbnail_height,
- 'thumbnail_width': self.thumbnail_width,
- 'original_url': self.original_url,
- 'original_height': self.original_height,
- 'original_width': self.original_width,
- 'source_url': self.source_url,
- 'caption': self.caption,
- 'is_nsfw': self.is_nsfw,
- }
-
- def serializable_short(self):
- # TODO: more here?
- return {'id': self.id,
- 'original_url': self.original_url,
- 'original_height': self.original_height,
- 'original_width': self.original_width,
- }