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 2c631f7..0452e32 100644 (file)
--- a/floof/model/art.py
+++ b/floof/model/art.py
@@ -4,94 +4,55 @@
 #   Copyright (c) 2009 Scribblr
 #
 
 #   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 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
+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))
 
 
 class Art(Entity):
     title = Field(Unicode(120))
     original_filename = Field(Unicode(120))

-    hash = Field(String)
+    hash = Field(Unicode(40), unique=True, required=True)
+    mimetype = Field(Unicode(32), required=True)

 
 

-    uploaded_by = ManyToOne('User')    
+    uploader = ManyToOne('User', required=True)

     tags = OneToMany('Tag')
     tags = OneToMany('Tag')

+    discussion = ManyToOne('Discussion')

 
 

-    # 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.
+    art_users = OneToMany('ArtUser')

 
 

-    def set_file(self, file):
-        self.hash = save_file("art", file)
-        
-    file = property(get_path, set_file)
+    @property
+    def file_path(self):
+        return get_path("art", self.hash)

 
 

-    def get_path(self):
-        if self.hash:
-            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 add_tags(self, tags, user):
-        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)
+    @property
+    def participants(self):
+        return (au.user for au in self.art_users if au.type == ArtUserType.OF)

 
 

-            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...
+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

 
 

-
-                # 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):
-        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
+    # TODO: admin log ought to remember who confirmed the relation.
+    #       (tag history will remember who proposed it)