Merge branch 'master' of github.com:FinalsClub/karmaworld

[oweals/karmaworld.git] / karmaworld / apps / notes / models.py

diff --git a/karmaworld/apps/notes/models.py b/karmaworld/apps/notes/models.py
index 21f0441d99eed9a383f6994d80de8211cc323479..386171336e9b14f828b006f263608b8efd906721 100644 (file)
--- a/karmaworld/apps/notes/models.py
+++ b/karmaworld/apps/notes/models.py
@@ -8,13 +8,22 @@
 """
 import datetime
 
-from django.template import defaultfilters
+from django.conf import settings
+from django.core.files.storage import FileSystemStorage
 from django.db import models
+from django.template import defaultfilters
 from taggit.managers import TaggableManager
 from oauth2client.client import Credentials
 
 from karmaworld.apps.courses.models import Course
 
+try:
+    from secrets.drive import GOOGLE_USER
+except:
+    GOOGLE_USER = u'admin@karmanotes.org'
+
+fs = FileSystemStorage(location=settings.MEDIA_ROOT)
+
 class Note(models.Model):
     """ A django model representing an uploaded file and associated metadata.
     """
@@ -31,50 +40,58 @@ class Note(models.Model):
     tags            = TaggableManager(blank=True)
 
     name            = models.CharField(max_length=255, blank=True, null=True)
-    slug            = models.SlugField(null=True)
+    slug            = models.SlugField(max_length=255, null=True)
     desc            = models.TextField(max_length=511, blank=True, null=True)
     uploaded_at     = models.DateTimeField(null=True, default=datetime.datetime.utcnow)
 
-    file_type   = models.CharField(max_length=15, blank=True, null=True, choices=FILE_TYPE_CHOICES, default=UNKNOWN_FILE)
+    file_type       = models.CharField(max_length=15,
+                            choices=FILE_TYPE_CHOICES,
+                            default=UNKNOWN_FILE,
+                            blank=True, null=True)
+
     # Upload files to MEDIA_ROOT/notes/YEAR/MONTH/DAY, 2012/10/30/filename
-    note_file   = models.FileField(upload_to="notes/%Y/%m/%j/", blank=True, null=True)
+    note_file       = models.FileField(
+                            storage=fs,
+                            upload_to="notes/%Y/%m/%j/",
+                            blank=True, null=True)
 
     ## post gdrive conversion data
-    embed_url   = models.URLField(max_length=1024, blank=True, null=True)
-    download_url = models.URLField(max_length=1024, blank=True, null=True)
+    embed_url       = models.URLField(max_length=1024, blank=True, null=True)
+    download_url    = models.URLField(max_length=1024, blank=True, null=True)
     # for word processor documents
-    html        = models.TextField(blank=True, null=True)
-    text        = models.TextField(blank=True, null=True)
+    html            = models.TextField(blank=True, null=True)
+    text            = models.TextField(blank=True, null=True)
 
-    # FIXME: Not Implemented
-    #uploader    = models.ForeignKey(User, blank=True, null=True, related_name='notes')
-    #course      = models.ForeignKey(Course, blank=True, null=True, related_name="files")
-    #school      = models.ForeignKey(School, blank=True, null=True)
+
+    class Meta:
+        """ Sort files by most recent first """
+        ordering = ['-uploaded_at']
 
 
     def __unicode__(self):
         return u"{0}: {1} -- {2}".format(self.file_type, self.name, self.uploaded_at)
 
-
     def save(self, *args, **kwargs):
         """ override built-in save to ensure contextual self.name """
         # TODO: If self.name isn't set, generate one based on uploaded_name
         # if we fail to set the Note.name earlier than this, use the saved filename
 
-        if not self.slug:
+        if not self.slug and self.name:
+            # only generate a slug if the name has been set, and slug hasn't
             self.slug = defaultfilters.slugify(self.name)
         super(Note, self).save(*args, **kwargs)
 
-
     def get_absolute_url(self):
         """ Resolve note url, use 'note' route and slug if slug
-            otherwise use note and id
+            otherwise use note.id
         """
-        return u"/{0}/{1}/{2}".format(self.course.school.slug, self.course.slug, self.slug)
-
+        if self.slug is not None:
+            # return a url ending in slug
+            return u"/{0}/{1}/{2}".format(self.course.school.slug, self.course.slug, self.slug)
+        else:
+            # return a url ending in id
+            return u"/{0}/{1}/{2}".format(self.course.school.slug, self.course.slug, self.id)
 
-# FIXME: replace the following GOOGLE_USER in a settings.py
-GOOGLE_USER = 'seth.woodworth@gmail.com'
 
 class DriveAuth(models.Model):
     """ stored google drive authentication and refresh token