Searching for one tag works. Two tags acts like or and returns multiple copies.

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

diff --git a/floof/model/art.py b/floof/model/art.py
index 1df10cc..420dff8 100644 (file)
--- a/floof/model/art.py
+++ b/floof/model/art.py
@@ -10,24 +10,76 @@ from elixir import *
 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')
+    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)
-        
+    # 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.
 
+    def set_file(self, file):
+        self.hash = save_file("art", file)
+
+    file = property(get_path, set_file)
 
     def get_path(self):
         if self.hash:
             return get_path("art", self.hash)
+
+
+    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...
+
+            # 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 __unicode__(self):
+        return self.get_path()
+
+
+class Tag(Entity):
+    # look into how ondelete works.  This just sets a database property.
+    art = ManyToOne('Art', ondelete='cascade')
+    tagger = ManyToOne('User')
+    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)"
+        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