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 ef50dcd..b709610 100644 (file)
--- a/floof/model/art.py
+++ b/floof/model/art.py
@@ -6,19 +6,19 @@
 
 # from elixir import Entity, Field, Integer, Unicode
 from elixir import *
 
 # from elixir import Entity, Field, Integer, Unicode
 from elixir import *

+import elixir

 
 from pylons import config
 
 from floof.lib.file_storage import get_path, save_file
 
 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))
 
 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):
     tags = OneToMany('Tag')
 
     # def __init__(self, **kwargs):


@@ -33,7 +33,8 @@ class Art(Entity):
 
     def set_file(self, file):
         self.hash = save_file("art", file)
 
     def set_file(self, file):
         self.hash = save_file("art", file)

-        
+        self.original_filename = file.filename
+

     file = property(get_path, set_file)
 
     def get_path(self):
     file = property(get_path, set_file)
 
     def get_path(self):


@@ -42,16 +43,36 @@ class Art(Entity):
 
 
     def add_tags(self, tags, user):
 
 
     def add_tags(self, tags, user):

-        for tag in tags.split():
-            if len(tag) > 50:
-                raise "Long Tag!" # can we handle this more gracefully?
-            # sqlite seems happy to store strings much longer than the supplied limit...
+        for text in tags.split():
+            if text[0] == '-':
+                # Nega-tags
+                tagtext = TagText.get_by(text=text[1:])
+                if tagtext:
+                    tag = Tag.get_by(art=self, tagger=user, tagtext=tagtext)
+                    if tag:
+                        elixir.session.delete(tag)
+
+            else: 
+                if len(text) > 50:
+                    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)
+

 
 

-            # elixir should really have its own find_or_create.
-            tagtext = find_or_create(TagText, text=tag)
-            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()
 
     def __unicode__(self):
         return self.get_path()
 


@@ -59,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')
 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
     tagtext = ManyToOne('TagText')
 
     # this text setter is no longer useful since I changed the way Art#add_tags works


@@ -75,11 +96,27 @@ class Tag(Entity):
         if not self.tagtext:
             return "(broken)"
         return unicode(self.tagtext)
         if not self.tagtext:
             return "(broken)"
         return unicode(self.tagtext)

-    
-    
+
+

 class TagText(Entity):
     text = Field(Unicode(50)) # gotta enforce this somehow
     tags = OneToMany('Tag')
 class TagText(Entity):
     text = Field(Unicode(50)) # gotta enforce this somehow
     tags = OneToMany('Tag')

-    
+

     def __unicode__(self):
     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