trying out resource routing. Works decently. Added lots of notes.

[zzz-floof.git] / floof / model / art.py

diff --git a/floof/model/art.py b/floof/model/art.py
index 7d93e6b..9ff00c5 100644 (file)
--- a/floof/model/art.py
+++ b/floof/model/art.py
@@ -13,13 +13,12 @@ from pylons import config
 from floof.lib.file_storage import get_path, save_file
 from floof.lib.dbhelpers import find_or_create, update_or_create
 
-
 class Art(Entity):
     title = Field(Unicode(120))
     original_filename = Field(Unicode(120))
     hash = Field(String)
 
-    uploaded_by = ManyToOne('User')    
+    uploader = ManyToOne('User')
     tags = OneToMany('Tag')
 
     # def __init__(self, **kwargs):
@@ -34,7 +33,7 @@ class Art(Entity):
 
     def set_file(self, file):
         self.hash = save_file("art", file)
-        
+
     file = property(get_path, set_file)
 
     def get_path(self):
@@ -57,8 +56,6 @@ class Art(Entity):
                     raise "Long Tag!" # can we handle this more gracefully?
                 # sqlite seems happy to store strings much longer than the supplied limit...
 
-
-
                 # elixir should really have its own find_or_create.
                 tagtext = find_or_create(TagText, text=text)
                 tag     = find_or_create(Tag, art=self, tagger=user, tagtext=tagtext)
@@ -98,12 +95,12 @@ class Tag(Entity):
         if not self.tagtext:
             return "(broken)"
         return unicode(self.tagtext)
-    
-    
+
+
 class TagText(Entity):
     text = Field(Unicode(50)) # gotta enforce this somehow
     tags = OneToMany('Tag')
-    
+
     def __unicode__(self):
         return self.text
         
@@ -112,6 +109,9 @@ class Rating(Entity):
     art = ManyToOne('Art', ondelete='cascade')
     rater = ManyToOne('User', ondelete='cascade')
     score = Field(Integer)
+    
+    # @score.setter
+    # def score(self, value):    
         
     options = {-1:"sucks", 0:"undecided", 1:"good", 2:"great"}
     default = 0