Restrict usernames to lowercase, digits, and hyphens.

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

diff --git a/floof/model/art.py b/floof/model/art.py
index 1df10cc..0452e32 100644 (file)
--- a/floof/model/art.py
+++ b/floof/model/art.py
@@ -4,30 +4,55 @@
 #   Copyright (c) 2009 Scribblr
 #
 
-# 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, update_or_create
+from floof.model.users import User
+
 
 class Art(Entity):
     title = Field(Unicode(120))
     original_filename = Field(Unicode(120))
-    hash = Field(String)
-    uploaded_by = ManyToOne('User')
-
-    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 get_path(self):
-        if self.hash:
-            return get_path("art", self.hash)
+    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')
+
+    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)
+
+    @property
+    def participants(self):
+        return (au.user for au in self.art_users if au.type == ArtUserType.OF)
+
+class ArtUserType(object):
+    BY = 1
+    FOR = 2
+    OF = 3
+
+class ArtUser(Entity):
+    art = ManyToOne('Art', required=True)
+    user = ManyToOne('User', required=True)
+    type = Field(Integer, required=True)  # ArtUserType
+
+    # TODO: admin log ought to remember who confirmed the relation.
+    #       (tag history will remember who proposed it)