import elixir
from floof.model.users import User
-from floof.model.art import Art, Rating, UserRelation
+from floof.model import Art, Rating, UserRelation
from floof.model.comments import Discussion
from sqlalchemy.exceptions import IntegrityError
from sqlalchemy import and_
from floof.lib.base import BaseController, render
-from floof.model.art import Art
+from floof.model import Art
from floof.model.comments import Comment
log = logging.getLogger(__name__)
log = logging.getLogger(__name__)
-from floof.model.art import Art, UserRelation
+from floof.model import Art, UserRelation
from floof.model.users import User
import elixir
log = logging.getLogger(__name__)
-from floof.model.art import Art, Tag, TagText
-from floof.model.search import SavedSearch, GalleryWidget
+from floof.model import Art, Tag, TagText
+from floof.model import SavedSearch, GalleryWidget
import elixir
class SearchController(BaseController):
log = logging.getLogger(__name__)
import elixir
-from floof.model.art import Art, Tag
+from floof.model import Art, Tag
class TagController(BaseController):
-from floof.model.art import Art, Tag, TagText
+from floof.model import Art, Tag, TagText
def do_search(query):
tags = query.split()
# # import other entities here, e.g.
# from floof.model.blog import BlogEntry, BlogComment
-from floof.model import art, users, search
+from floof.model.art import *
+from floof.model.ratings import *
+from floof.model.comments import *
+from floof.model.search import *
+from floof.model.tags import *
+from floof.model.users import *
+from floof.model.relations import *
+
# Finally, call elixir to set up the tables.
# but not if using reflected tables
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))
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):
- user = ManyToOne("User")
- art = ManyToOne("Art")
- kind = Field(String) # by for of
- creator = ManyToOne("User")
- confirmed_by_related_user = Field(Boolean)
-
- # it is useful to record which authority figure on a given artwork
- # confirmed the validity of this relation.
- confirmed_by_authority = ManyToOne("User")
-
- def __init__(self, **kwargs):
- super(UserRelation, self).__init__(**kwargs)
- assert self.user and self.art and self.kind and self.creator
-
- if self.creator == self.user:
- self.confirmed_by_related_user = True
- # TODO: implement authorities
- # if self.creator in self.art.authorities
- # self.confirmed_by_authority = self.creator
-
- def __unicode__(self):
- return "%s: %s" % (self.kind, self.related_user)
-
-
-
-# class CharacterRelation(Entity):
-# pass
--- /dev/null
+from elixir import *
+from art import Art
+from floof.lib.dbhelpers import find_or_create, update_or_create
+
+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 RatingMixin(object):
+ 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
+
+Art.__bases__ += (RatingMixin,)
\ No newline at end of file
--- /dev/null
+from elixir import *
+from art import Art
+
+
+class UserRelation(Entity):
+ user = ManyToOne("User")
+ art = ManyToOne("Art")
+ kind = Field(String) # by for of
+ creator = ManyToOne("User")
+ confirmed_by_related_user = Field(Boolean)
+
+ # it is useful to record which authority figure on a given artwork
+ # confirmed the validity of this relation.
+ confirmed_by_authority = ManyToOne("User")
+
+ def __init__(self, **kwargs):
+ super(UserRelation, self).__init__(**kwargs)
+ assert self.user and self.art and self.kind and self.creator
+
+ if self.creator == self.user:
+ self.confirmed_by_related_user = True
+ # TODO: implement authorities
+ # if self.creator in self.art.authorities
+ # self.confirmed_by_authority = self.creator
+
+ def __unicode__(self):
+ return "%s: %s" % (self.kind, self.related_user)
+
+
+class RelationMixin(object):
+ def add_relation(creator, kind, user):
+ return UserRelation(art=self, creator=creator, kind=kind, user=user)
+
+Art.__bases__ += (RelationMixin,)
from elixir import *
# from users import User
-from floof.lib.search import do_search
class SavedSearch(Entity):
string = Field(Unicode) # I tried calling this query, but it broke elixir
@property
def results(self):
+ # This caused some cyclic dependencies when I tried importing it
+ # at the module level. I wonder why that is...
+ from floof.lib.search import do_search
return do_search(self.string)
--- /dev/null
+from elixir import *
+from art import Art
+from floof.lib.dbhelpers import find_or_create, update_or_create
+
+
+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 TagMixin(object):
+ 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)
+
+Art.__bases__ += (TagMixin, )
<%inherit file="/base.mako" />
<%namespace name="comments" file="/comments/lib.mako" />
-<%! from floof.model.art import Rating %>
+<%! from floof.model import Rating %>
<h1>Viewing Art</h1>
projects / zzz-floof.git / commitdiff
