Implemented initial Feed, Entry, and Subscription models and utility functions for...

Added initial south schema migration.
Added .gitignore rule to ignore pyc.

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..0d20b64
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.pyc

diff --git a/migrations/0001_initial.py b/migrations/0001_initial.py
new file mode 100644 (file)
index 0000000..a745913
--- /dev/null
+++ b/migrations/0001_initial.py
@@ -0,0 +1,119 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding model 'Feed'
+        db.create_table('reader_feed', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('url', self.gf('django.db.models.fields.URLField')(max_length=200)),
+            ('title', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('updated', self.gf('django.db.models.fields.DateTimeField')()),
+        ))
+        db.send_create_signal('reader', ['Feed'])
+
+        # Adding model 'Entry'
+        db.create_table('reader_entry', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('feed', self.gf('django.db.models.fields.related.ForeignKey')(related_name='entries', to=orm['reader.Feed'])),
+            ('uri', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('title', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('published', self.gf('django.db.models.fields.DateTimeField')()),
+            ('updated', self.gf('django.db.models.fields.DateTimeField')()),
+            ('summary', self.gf('django.db.models.fields.TextField')()),
+            ('content', self.gf('django.db.models.fields.TextField')()),
+        ))
+        db.send_create_signal('reader', ['Entry'])
+
+        # Adding model 'Subscription'
+        db.create_table('reader_subscription', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='reader_subscriptions', to=orm['auth.User'])),
+            ('feed', self.gf('django.db.models.fields.related.ForeignKey')(related_name='subscriptions', to=orm['reader.Feed'])),
+            ('custom_title', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
+        ))
+        db.send_create_signal('reader', ['Subscription'])
+
+
+    def backwards(self, orm):
+        
+        # Deleting model 'Feed'
+        db.delete_table('reader_feed')
+
+        # Deleting model 'Entry'
+        db.delete_table('reader_entry')
+
+        # Deleting model 'Subscription'
+        db.delete_table('reader_subscription')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'reader.entry': {
+            'Meta': {'object_name': 'Entry'},
+            'content': ('django.db.models.fields.TextField', [], {}),
+            'feed': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'entries'", 'to': "orm['reader.Feed']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'published': ('django.db.models.fields.DateTimeField', [], {}),
+            'summary': ('django.db.models.fields.TextField', [], {}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'uri': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'reader.feed': {
+            'Meta': {'object_name': 'Feed'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+        },
+        'reader.subscription': {
+            'Meta': {'object_name': 'Subscription'},
+            'custom_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'feed': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'subscriptions'", 'to': "orm['reader.Feed']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'reader_subscriptions'", 'to': "orm['auth.User']"})
+        }
+    }
+
+    complete_apps = ['reader']

diff --git a/migrations/__init__.py b/migrations/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/models.py b/models.py
new file mode 100644 (file)
index 0000000..28adb66
--- /dev/null
+++ b/models.py
@@ -0,0 +1,28 @@
+from django.db import models
+from django.contrib.auth.models import User
+
+
+class Feed(models.Model):
+       url = models.URLField()
+       title = models.CharField(max_length=255)
+       updated = models.DateTimeField()
+
+
+class Entry(models.Model):
+       feed = models.ForeignKey(Feed, related_name='entries')
+       uri = models.CharField(max_length=255)
+       title = models.CharField(max_length=255)
+       published = models.DateTimeField()
+       updated = models.DateTimeField()
+       summary = models.TextField()
+       content = models.TextField()
+
+
+class Subscription(models.Model):
+       user = models.ForeignKey(User, related_name='reader_subscriptions')
+       feed = models.ForeignKey(Feed, related_name='subscriptions')
+       custom_title = models.CharField(max_length=255, blank=True, null=True)
+       
+       @property
+       def title(self):
+               return self.custom_title if self.custom_title else self.feed.title
\ No newline at end of file

diff --git a/utils.py b/utils.py
new file mode 100644 (file)
index 0000000..2215ec8
--- /dev/null
+++ b/utils.py
@@ -0,0 +1,17 @@
+from .models import Feed, Entry
+import datetime
+import feedparser
+
+
+def refresh_feed(feed, save=True):
+       parsed = feedparser.parse(feed.url)
+       feed.title = parsed.feed.get('title', feed.url)
+       feed.updated = datetime.datetime(*(parsed.feed.get('updated_parsed', datetime.datetime.now().timetuple())[0:6]))
+       if save:
+               feed.save()
+
+
+def add_feed(url):
+       feed = Feed(url=url)
+       refresh_feed(feed)
+       return feed
\ No newline at end of file