Merged add_tags and lib.search into lib.tags.

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

diff --git a/floof/model/art.py b/floof/model/art.py
index bb68c9f..0452e32 100644 (file)
--- a/floof/model/art.py
+++ b/floof/model/art.py
@@ -4,7 +4,6 @@
 #   Copyright (c) 2009 Scribblr
 #
 
 #   Copyright (c) 2009 Scribblr
 #
 

-# from elixir import Entity, Field, Integer, Unicode

 from elixir import *
 import elixir
 
 from elixir import *
 import elixir
 


@@ -12,33 +11,48 @@ from pylons import config
 
 from floof.lib.file_storage import get_path, save_file
 from floof.lib.dbhelpers import find_or_create, update_or_create
 
 from floof.lib.file_storage import get_path, save_file
 from floof.lib.dbhelpers import find_or_create, update_or_create

-import floof.model.comments
+from floof.model.users import User

 
 
 
 

-# Note: Art is the most important class.  To keep its size down, and to better organize the source code,
-# other modules will mix into it automatically by adding to its __bases__.
-

 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, unique=True, required=True)
+    hash = Field(Unicode(40), unique=True, required=True)
+    mimetype = Field(Unicode(32), required=True)

 
     uploader = ManyToOne('User', required=True)
     tags = OneToMany('Tag')
     discussion = ManyToOne('Discussion')
 
 
     uploader = ManyToOne('User', required=True)
     tags = OneToMany('Tag')
     discussion = ManyToOne('Discussion')
 

-    user_relations = OneToMany('UserRelation')
+    art_users = OneToMany('ArtUser')
+
+    @property
+    def file_path(self):
+        return get_path("art", self.hash)
+
+    # Associated users
+    # XXX ok these could stand to do the filtering sql-side
+    @property
+    def artists(self):
+        return (au.user for au in self.art_users if au.type == ArtUserType.BY)

 
 

+    @property
+    def recipients(self):
+        return (au.user for au in self.art_users if au.type == ArtUserType.FOR)

 
 

-    def set_file(self, file):
-        self.hash = save_file("art", file)
-        self.original_filename = file.filename
+    @property
+    def participants(self):
+        return (au.user for au in self.art_users if au.type == ArtUserType.OF)

 
 

-    file = property(get_path, set_file)
+class ArtUserType(object):
+    BY = 1
+    FOR = 2
+    OF = 3

 
 

-    def get_path(self):
-        if self.hash:
-            return get_path("art", self.hash)
+class ArtUser(Entity):
+    art = ManyToOne('Art', required=True)
+    user = ManyToOne('User', required=True)
+    type = Field(Integer, required=True)  # ArtUserType

 
 

-    def __unicode__(self):
-        return self.get_path()
+    # TODO: admin log ought to remember who confirmed the relation.
+    #       (tag history will remember who proposed it)