Merge branch 'comments'

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

diff --git a/floof/model/art.py b/floof/model/art.py
index c3fba3a..0732684 100644 (file)
--- a/floof/model/art.py
+++ b/floof/model/art.py
@@ -12,27 +12,20 @@ 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.lib.file_storage import get_path, save_file
 from floof.lib.dbhelpers import find_or_create, update_or_create

+import floof.model.comments

 
 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(String, unique=True, required=True)

 
 

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

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

-
-    # 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.
+    discussion = ManyToOne('Discussion')

 
     def set_file(self, file):
         self.hash = save_file("art", file)
 
     def set_file(self, file):
         self.hash = save_file("art", file)

+        self.original_filename = file.filename

 
     file = property(get_path, set_file)
 
 
     file = property(get_path, set_file)
 


@@ -51,7 +44,7 @@ class Art(Entity):
                     if tag:
                         elixir.session.delete(tag)
 
                     if tag:
                         elixir.session.delete(tag)
 

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


@@ -65,7 +58,7 @@ class Art(Entity):
 
     def rate(self, score, user):
         return update_or_create(Rating, {"rater":user, "art":self}, {"score":score})
 
     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:
     def user_score(self, user):
         rating = Rating.get_by(rater=user, art=self)
         if rating:


@@ -82,15 +75,6 @@ class Tag(Entity):
     tagger = ManyToOne('User', ondelete='cascade')
     tagtext = ManyToOne('TagText')
 
     tagger = ManyToOne('User', ondelete='cascade')
     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)"
     def __unicode__(self):
         if not self.tagtext:
             return "(broken)"


@@ -103,16 +87,15 @@ class TagText(Entity):
 
     def __unicode__(self):
         return self.text
 
     def __unicode__(self):
         return self.text

-        
+

 
 class Rating(Entity):
     art = ManyToOne('Art', ondelete='cascade')
     rater = ManyToOne('User', ondelete='cascade')
     score = Field(Integer)
 
 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 = {-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
+
+Rating.reverse_options = dict (zip(Rating.options.values(), Rating.options.keys()))