Added MIT license.

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

diff --git a/floof/model/art.py b/floof/model/art.py
index 420dff8..0732684 100644 (file)
--- a/floof/model/art.py
+++ b/floof/model/art.py
@@ -6,33 +6,26 @@
 
 # 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
+import floof.model.comments

 
 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')
     tags = OneToMany('Tag')

-
-    # def __init__(self, **kwargs):
-    #     # I wanted to check for the existence of the file, but...
-    #     # for some reason this FieldStorage object always conditions as falsey.
-    #     # self.hash = save_file("art", kwargs.pop('file'))
-    #     super(Art, self).__init__(**kwargs)
-    #     # this is what super is doing, pretty much.
-    #     # for key, value in kwargs.items():
-    #     #     setattr(self, key, value)
-    # left for posterity.
+    discussion = ManyToOne('Discussion')

 
     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)
 
 
     file = property(get_path, set_file)
 


@@ -42,15 +35,35 @@ 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,18 +72,9 @@ 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')
 
     tagtext = ManyToOne('TagText')
 

-    # this text setter is no longer useful since I changed the way Art#add_tags works
-    # but I'll leave it in here just for several minutes nostalgia.
-    # def set_text(self, text):
-    #     self.tagtext = TagText.get_by(text=text)
-    #     if not self.tagtext:
-    #         self.tagtext = TagText(text=text)
-    #
-    # text = property(lambda self: self.tagtext.text, set_text)
-

     def __unicode__(self):
         if not self.tagtext:
             return "(broken)"
     def __unicode__(self):
         if not self.tagtext:
             return "(broken)"


@@ -82,4 +86,16 @@ class TagText(Entity):
     tags = OneToMany('Tag')
 
     def __unicode__(self):
     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)
+
+    options = {-1:"sucks", 0:"undecided", 1:"good", 2:"great"}
+    default = 0
+
+
+Rating.reverse_options = dict (zip(Rating.options.values(), Rating.options.keys()))