Added User Pages, which you can now display galleries on. Also detected

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

diff --git a/floof/model/art.py b/floof/model/art.py
index 58601a7..b709610 100644 (file)
--- a/floof/model/art.py
+++ b/floof/model/art.py
@@ -11,15 +11,14 @@ import elixir
 from pylons import config
 
 from floof.lib.file_storage import get_path, save_file
-from floof.lib.dbhelpers import find_or_create
-
+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)
+    hash = Field(String, unique=True, required=True)
 
-    uploaded_by = ManyToOne('User')
+    uploader = ManyToOne('User', required=True)
     tags = OneToMany('Tag')
 
     # def __init__(self, **kwargs):
@@ -34,6 +33,7 @@ class Art(Entity):
 
     def set_file(self, file):
         self.hash = save_file("art", file)
+        self.original_filename = file.filename
 
     file = property(get_path, set_file)
 
@@ -57,13 +57,22 @@ 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)
 
 
+
+
+    def rate(self, score, user):
+        return update_or_create(Rating, {"rater":user, "art":self}, {"score":score})
+        
+    def user_score(self, user):
+        rating = Rating.get_by(rater=user, art=self)
+        if rating:
+            return rating.score
+        return Rating.default
+
     def __unicode__(self):
         return self.get_path()
 
@@ -71,7 +80,7 @@ class Art(Entity):
 class Tag(Entity):
     # look into how ondelete works.  This just sets a database property.
     art = ManyToOne('Art', ondelete='cascade')
-    tagger = ManyToOne('User')
+    tagger = ManyToOne('User', ondelete='cascade')
     tagtext = ManyToOne('TagText')
 
     # this text setter is no longer useful since I changed the way Art#add_tags works
@@ -94,4 +103,20 @@ class TagText(Entity):
     tags = OneToMany('Tag')
 
     def __unicode__(self):
-        return self.text
\ No newline at end of file
+        return self.text
+        
+
+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
+    # options = ["sucks","neutral","good","great"]
+    
+
+Rating.reverse_options = dict (zip(Rating.options.values(), Rating.options.keys()))
\ No newline at end of file