X-Git-Url: http://git.veekun.com/zzz-floof.git/blobdiff_plain/4d414773b1f0106e2d8c1cbe2bb0fed28a4d02de..55270a42bf0699bd78b95a945fddd73a165507ee:/floof/model/art.py diff --git a/floof/model/art.py b/floof/model/art.py index e462d0b..6fd2036 100644 --- a/floof/model/art.py +++ b/floof/model/art.py @@ -11,17 +11,14 @@ 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 class Art(Entity): title = Field(Unicode(120)) original_filename = Field(Unicode(120)) hash = Field(String) - uploaded_by = ManyToOne('User') + uploaded_by = ManyToOne('User') tags = OneToMany('Tag') # def __init__(self, **kwargs): @@ -36,7 +33,7 @@ class Art(Entity): def set_file(self, file): self.hash = save_file("art", file) - + file = property(get_path, set_file) def get_path(self): @@ -59,21 +56,30 @@ class Art(Entity): 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. It just sets a database property. + # look into how ondelete works. This just sets a database property. art = ManyToOne('Art', ondelete='cascade') - tagger = ManyToOne('User') + tagger = ManyToOne('User', ondelete='cascade') tagtext = ManyToOne('TagText') # this text setter is no longer useful since I changed the way Art#add_tags works @@ -89,11 +95,24 @@ class Tag(Entity): 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 + 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 + # options = ["sucks","neutral","good","great"] + + +Rating.reverse_options = dict (zip(Rating.options.values(), Rating.options.keys())) \ No newline at end of file