X-Git-Url: http://git.veekun.com/zzz-floof.git/blobdiff_plain/f267b2f2841d407dcdf9c3c0f5406f8c10403ccb..ac3d66885419d71d6e6d16080fcf09ecffa66fe9:/floof/model/art.py?ds=sidebyside

diff --git a/floof/model/art.py b/floof/model/art.py
index 8b328d8..bb68c9f 100644
--- a/floof/model/art.py
+++ b/floof/model/art.py
@@ -14,6 +14,10 @@ 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
 
+
+# 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))
@@ -23,6 +27,9 @@ class Art(Entity):
     tags = OneToMany('Tag')
     discussion = ManyToOne('Discussion')
 
+    user_relations = OneToMany('UserRelation')
+
+
     def set_file(self, file):
         self.hash = save_file("art", file)
         self.original_filename = file.filename
@@ -33,79 +40,5 @@ class Art(Entity):
         if self.hash:
             return get_path("art", self.hash)
 
-
-    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)
-
-            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=text)
-                tag     = find_or_create(Tag, art=self, tagger=user, tagtext=tagtext)
-
-
-
-
-    def rate(self, score, user):
-        return update_or_create(Rating, {"rater":user, "art":self}, {"score":score})
-
-    def user_score(self, user):
-        rating = Rating.get_by(rater=user, art=self)
-        if rating:
-            return rating.score
-        return Rating.default
-
     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', ondelete='cascade')
-    tagtext = ManyToOne('TagText')
-
-    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
-
-
-class Rating(Entity):
-    art = ManyToOne('Art', ondelete='cascade')
-    rater = ManyToOne('User', ondelete='cascade')
-    score = Field(Integer)
-
-    options = {-1:"sucks", 0:"undecided", 1:"good", 2:"great"}
-    default = 0
-
-Rating.reverse_options = dict (zip(Rating.options.values(), Rating.options.keys()))
-
-
-
-class UserRelation(Entity):
-    related = ManyToOne("User")
-    art = ManyToOne("Art")
-    type = Field(String) # by for of
-    
-    
-# class CharacterRelation(Entity):
-#     pass