X-Git-Url: http://git.veekun.com/zzz-floof.git/blobdiff_plain/3bdc7971c3359efe7f38eb1b94253b416471b87b..525fe6090b7ff002198c4a58dc9cb90d774b8cd0:/floof/model/art.py

diff --git a/floof/model/art.py b/floof/model/art.py
index 66cbe0b..58601a7 100644
--- a/floof/model/art.py
+++ b/floof/model/art.py
@@ -6,21 +6,20 @@
 
 # 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 floof.lib.dbhelpers import find_or_create
 
 
-
 class Art(Entity):
     title = Field(Unicode(120))
     original_filename = Field(Unicode(120))
     hash = Field(String)
 
-    uploaded_by = ManyToOne('User')    
+    uploaded_by = ManyToOne('User')
     tags = OneToMany('Tag')
 
     # def __init__(self, **kwargs):
@@ -35,7 +34,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):
@@ -44,14 +43,25 @@ class Art(Entity):
 
 
     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=tag)
-            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=text)
+                tag     = find_or_create(Tag, art=self, tagger=user, tagtext=tagtext)
 
 
     def __unicode__(self):
@@ -59,7 +69,7 @@ class Art(Entity):
 
 
 class Tag(Entity):
-    # look into how ondelete works.  It just sets a database property.
+    # look into how ondelete works.  This just sets a database property.
     art = ManyToOne('Art', ondelete='cascade')
     tagger = ManyToOne('User')
     tagtext = ManyToOne('TagText')
@@ -77,11 +87,11 @@ 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
\ No newline at end of file