merged. Oh no, we have two different user relationship models. Mine's in relations...

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

diff --git a/floof/model/art.py b/floof/model/art.py
index 725b9e8..bb68c9f 100644 (file)
--- a/floof/model/art.py
+++ b/floof/model/art.py
@@ -4,9 +4,41 @@
 #   Copyright (c) 2009 Scribblr
 #
 
-from elixir import Entity, Field, Integer, Unicode
+# 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 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))
-    # filename = Field(Unicode(120))
+    original_filename = Field(Unicode(120))
+    hash = Field(String, unique=True, required=True)
+
+    uploader = ManyToOne('User', required=True)
+    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
+
+    file = property(get_path, set_file)
+
+    def get_path(self):
+        if self.hash:
+            return get_path("art", self.hash)
 
+    def __unicode__(self):
+        return self.get_path()