Changeset 81

Timestamp:

09/18/07 00:10:03 (1 year ago)

Author:

pragma

Message:

• Improved ORM behavior for batch updates.
  
• Finished Profile Avatar and Bio editing (watch mgmt is next)
  
• Removed legacy code from Avatar
  
• Took note of broken search and timeline
  
• Updated published schema for postgres (is very raw, so beware)
  

Files:

• trunk/sql/postgres.sql (modified) (1 diff)
• trunk/todo.txt (modified) (2 diffs)
• trunk/tracforums/model.py (modified) (2 diffs)
• trunk/tracforums/models/avatar.py (modified) (5 diffs)
• trunk/tracforums/models/forum.py (modified) (1 diff)
• trunk/tracforums/models/profile.py (modified) (8 diffs)
• trunk/tracforums/models/watch.py (modified) (2 diffs)
• trunk/tracforums/orm.py (modified) (6 diffs)
• trunk/tracforums/templates/tracforums/forum/edit.cs (modified) (1 diff)
• trunk/tracforums/templates/tracforums/forum/view.cs (modified) (1 diff)
• trunk/tracforums/templates/tracforums/main/index.cs (modified) (2 diffs)
• trunk/tracforums/templates/tracforums/main/manage.cs (modified) (1 diff)
• trunk/tracforums/templates/tracforums/profile/avatars.cs (modified) (2 diffs)
• trunk/tracforums/templates/tracforums/profile/edit.cs (modified) (3 diffs)
• trunk/tracforums/templates/tracforums/profile/forums.cs (added)
• trunk/tracforums/templates/tracforums/profile/projects.cs (added)
• trunk/tracforums/templates/tracforums/profile/topics.cs (added)
• trunk/tracforums/templates/tracforums/profile/view.cs (modified) (1 diff)
• trunk/tracforums/templates/tracforums/profile/watches.cs (modified) (2 diffs)
• trunk/tracforums/templates/tracforums/topic/edit.cs (modified) (1 diff)

trunk/sql/postgres.sql

@@ -1 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-CREATE SEQUENCE avatar_id_seq
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-CREATE SEQUENCE forum_id_seq
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-CREATE SEQUENCE message_id_seq
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-CREATE SEQUENCE profile_id_seq
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-CREATE SEQUENCE topic_id_seq
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/todo.txt

@@ -9 +9 @@
-    * Document code
-    * Complete console interface (?)
+    * Publish updated database schema
-Macros:
-    * Blog-style reports and displays
@@ -16 +17 @@
-    * Potential security flaws in selection/move/delete interface 
-    * clamp "forum get" security to current project for non trac-admins, system wide
-Refactor:
-    * reduce SQL redundancy in models
-    * reduce repeated code blocks in models    
-Wishlist:
-    * RSS

trunk/tracforums/model.py

@@ -139 +139 @@
-    def get(self,name,defaultValue=None):
-        val = dict.get(self,name,defaultValue)
-not val
+val == None
-        return val
-        
@@ -219 +219 @@
-    def getProfilePath(self):
-        return self.env.config.get("tracforums","profilepath",'/')
-
+
+
+
+
+
+
+
+
+
-    def forumRedirect(self,path,suffix=""):
-        self.db.commit()

trunk/tracforums/models/avatar.py

@@ -10 +10 @@
-    Avatar
-"""
-AvatarModel = 
-   
-   
-       
+class AvatarModel(
+    
+    
+        
-        "username":  ORMColumn(),
-        "mimetype":  ORMColumn(),
@@ -19 +19 @@
-        "avatarid":  ORMAlias(sql="id"),
-    }
-
-
-
+
-    mimeMap = {
-  
+   
-        'cod':  'image/cis-cod',
-   
+    
-        'ief':  'image/ief',
- 
+  
-        'jpeg': 'image/jpeg',
-        'jpg':  'image/jpeg',
-   
-   
+    
+    
-        'tif':  'image/tiff',
-        'tiff': 'image/tiff',
@@ -38 +36 @@
-        'ico':  'image/x-icon',
-        'png':  'iimage/png',
-   
-   
-   
- 
+    
+    
+    
+  
-        'rgb':  'image/x-rgb',
-        'xbm':  'image/x-xbitmap',
-        'xpm':  'image/x-xpixmap',
-   
+    
-    }
-    
+    def save(self,data={}):
+        self.getBase().save(self,data)
+        
+        if "filedata" in self.__dict__:
+            #get the mime-type by file extension
+            suffix = self.filedata.filename.split('.')[-1]           
+            self.mimetype = self.mimeMap[suffix]
+                
+            # store the file
+            flags = os.O_CREAT + os.O_WRONLY + os.O_EXCL
+            if hasattr(os, 'O_BINARY'):
+                flags += os.O_BINARY
+                            
+            targetPath = self.getTargetPath()
+            try: # Q&D way to clear out the file if it's already there
+                os.remove(targetPath)
+            except Exception,e: pass
+            
+            targetFile = os.fdopen(os.open(targetPath, flags), 'w')
+                    
+            shutil.copyfileobj(self.filedata.file,targetFile)
+            targetFile.close()
+            
+            # save again - forces the ORM to update this record with the mimetype
+            self.getBase().save(self) 
+    
+    def delete(self,data={}):
+        self.getBase().delete(self,data)
+            
+        # reset default any associated profile avatar ids if set
+        from tracforums.models.profile import ProfileModel
+        ProfileModel(self.db,self.formatContext).updateMany({"defaultavatarid":self.id},{"defaultavatarid":0})
+        
+        from tracforums.models.message import MessageModel
+        ProfileModel(self.db,self.formatContext).updateMany({"avatarid":self.id},{"avatarid":0})
+            
+        # remove avatar image
+        os.remove(self.getTargetPath())
+    
+    def validate(self):
+        reasons = []
+        
+        if self.username == None or self.username == "":
+            reasons.append("The avatar username is required.")
+  
+        # check if the file has been uploaded                
+        if "filedata" in self.__dict__:
+            print "FILE:",self.filedata
+            metrics = self.formatContext.getAvatarMetrics()
+            
+            if not hasattr(self.filedata, 'filename') or not self.filedata.filename:
+                reasons.append("No file uploaded.")
+                return reasons
+            # check the file size               
+                
+            if hasattr(self.filedata.file, 'fileno'):
+                size = os.fstat(self.filedata.file.fileno())[6]
+            else:
+                size = self.filedata.file.len
+            
+            if size == 0:
+                reasons.append("Can't upload empty file")
+                return reasons
+            elif size >= metrics["size"]:
+                reasons.append("File size cannot exceed %s bytes" % metrics["size"])
+                return reasons
+                            
+            # check the mime type    
+            suffix = self.filedata.filename.split('.')[-1]
+            if not (suffix in self.mimeMap):
+                reasons.append("Unrecognized file type: '" + suffix + "'")
+                return reasons
+                
+            # check the file dimensions (via PIL)
+            import Image
+            
+            img = Image.open(self.filedata.file)
+            (width,height) = img.size
+            if height > metrics["height"] or width > metrics["width"]:
+                reasons.append("File exceeds allowed width and or height (%spx high by %spx wide )" % (metrics["height"],metrics["width"]))
+                
+            self.filedata.file.seek(0)
+        return reasons
+    
+    def validateCreate(self):
+        reasons = self.validate() 
+        
+        totalAvatars = len(self.getColumnValues("id"))
+        metrics = self.formatContext.getAvatarMetrics()
+        if totalAvatars > metrics["number"]:
+            reasons.append("This user already has the maximum number of allowed avatars (%s)." % metrics.number)
+ 
+        return reasons
+          
+    def validateSave(self):
+        reasons = self.validate()
+        return reasons
+    
+    def getTargetPath(self):
+        # get the target path
+        targetPath = os.path.join(self.formatContext.getProfilePath(),'avatar')
+        
+        # make the directory if it's not there
+        if not os.access(targetPath, os.F_OK):
+            os.makedirs(targetPath)
+        
+        # extend the path to point to the correct file
+        targetPath = os.path.join(targetPath,str(self.id) + ".data")
+        
+        return targetPath        
+
+AvatarModelWithDetails = ORMSchema(
+    base = AvatarModel,
+    columns = {
+        "usedcount" : ORMAlias(sql="""
+            select count(m.id)
+            from message as m 
+            where m.avatarid = avatar.id
+        """),
+        "recentpostid" : ORMAlias(sql="""
+            select max(m.id) 
+            from message as m 
+            where m.avatarid = avatar.id
+        """),
+        "recentpost":  ORMJoin(
+            model         = ORMImportModel("tracforums.models.message","MessageModel"),
+            relationship  = {"recentpostid":"messageid"}
+        )
+    }
+)
+
+class AvatarController(Controller):            
-    def __init__(self,req,env,db):
-        Controller.__init__(self,req,env,db)
@@ -54 +184 @@
-        args = self.getArgs()
-        avatar = AvatarModel(self.db,self).load({"id":args["viewid"]})
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        return "", None        
-        
@@ -73 +192 @@
-        "default": doView
-    }
-
-####################################################
-
-
-class Avatar(ISecurityContext,IModel,IUIModel):
-    def __init__(self,db):
-        self.db = db
-        self.instance = {}
-        
-    def _getTargetPath(self):
-        # get the target path
-        targetPath = os.path.join(self.instance["profilepath"],'avatar')
-        
-        # make the directory if it's not there
-        if not os.access(targetPath, os.F_OK):
-            os.makedirs(targetPath)
-        
-        # extend the path to point to the correct file
-        targetPath = os.path.join(targetPath,str(self.instance["id"]) + ".data")
-        return targetPath
-        
-    mimeMap = {
-        'bmp':  'image/bmp',
-        'cod':  'image/cis-cod',
-        'gif':  'image/gif',    
-        'ief':  'image/ief',
-        'jpe':  'image/jpeg',   
-        'jpeg': 'image/jpeg',
-        'jpg':  'image/jpeg',
-        'jfif': 'image/pipeg',
-        'svg':  'image/svg+xml',    
-        'tif':  'image/tiff',
-        'tiff': 'image/tiff',
-        'ras':  'image/x-cmu-raster',
-        'cmx':  'image/x-cmx',
-        'ico':  'image/x-icon',
-        'png':  'iimage/png',
-        'pnm':  'image/x-portable-anymap',
-        'pbm':  'image/x-portable-bitmap',
-        'pgm':  'image/x-portable-graymap',
-        'ppm':  'image/x-portable-pixmap',          
-        'rgb':  'image/x-rgb',
-        'xbm':  'image/x-xbitmap',
-        'xpm':  'image/x-xpixmap',
-        'xwd':  'image/x-xwindowdump' 
-    }
-                
-    ### IUIModel Methods ###
-    
-    def _getAssets(self,context):
-        assets = {}
-        self.instance['filedata'] = '' # strike filedata from display set
-        assets['avatar'] = self.instance
-        return assets
-
-    def getViewTemplate(self,context):
-        context.renderAsFile(self._getTargetPath(),self.instance["mimetype"])
-        return "", None
-        
-    def getEditTemplate(self,context):
-        return "avatar/edit.cs",self._getAssets(context)
-        
-    def getSaveTemplate(self,context):        
-        from tracforums.models.profile import Profile
-        profile = Profile(self.db).getById(context.getAuthname(),context)
-        
-        if profile['isexpert']:
-            context.forumRedirect("/profile/" + str(self.instance['username']));
-        else:    
-            return "avatar/save.cs",self._getAssets(context)
-        
-    def getNewTemplate(self,context):
-        return self.getEditTemplate(context)
-        
-    def getCreateTemplate(self,context):
-        return self.getSaveTemplate(context)
-
-    def getDeletedTemplate(self,context):
-        return self.getSaveTemplate(context)
-
-    ### ISecurityContext Methods ###
-        
-    def canView(self,context):
-        return context.isForumGuest()
-               
-    def canCreate(self,context):
-        return context.isForumUser()
-                    
-    def canModify(self,context):
-        if context.isForumAdmin():
-            return True
-        else:
-            return context.getAuthname() == self.instance['username']
-        
-    def canDelete(self,context):
-        if context.isForumAdmin():
-            return True
-        else:
-            return context.getAuthname() == self.instance['username']
-
-    ### IModel Methods ###
-    
-    def load(self,context):
-        args = context.getArgs()
-        if "id" in args:
-            id = args["id"]
-        else:
-            raise TracError("cannot load profile avatar")
-            
-        # load instance (if possible)
-        cursor = self.db.cursor()
-        columns = ('id','username','mimetype','name')
-        cursor.execute(
-            "SELECT id, username, mimetype, name "
-            "FROM avatar WHERE id = %s",
-            (id,))
-        row = cursor.fetchone()
-        self.instance = dict(zip(columns, row))
-        self.instance["profilepath"] = args["profilepath"]
-                    
-    def set(self,context):
-        args = context.getArgs()
-        # populate instance with changes and fresh values 
-        self.instance = {
-            'id':          self.getDefault((args,self.instance),'id',''),
-            'username':    self.getDefault((args,self.instance),'username',''),
-            'mimetype':    self.getDefault((args,self.instance),'mimetype',''),
-            'name':        self.getDefault((args,self.instance),'name',''),
-            'profilepath': args["profilepath"],
-            'filedata':    self.getDefault((args,self.instance),'filedata',{})
-        }
-                
-    def _saveAvatarImage(self,context):
-        # store the file
-        flags = os.O_CREAT + os.O_WRONLY + os.O_EXCL
-        if hasattr(os, 'O_BINARY'):
-            flags += os.O_BINARY
-            
-        targetPath = self._getTargetPath()
-        targetFile = os.fdopen(os.open(targetPath, flags), 'w')
-                
-        shutil.copyfileobj(self.instance['filedata'].file,targetFile)
-        targetFile.close()
-        
-    def _setMimeType(self,context):
-        #get the mime-type by file extension
-        filedata = self.instance['filedata']
-        suffix = filedata.filename.split('.')[-1]           
-        self.instance['mimetype'] = self.mimeMap[suffix]
-        
-    def create(self,context):
-        self._setMimeType(context)
-    
-        cursor = self.db.cursor()
-        cursor.execute(
-            "INSERT INTO avatar (username,mimetype,name) "
-            "VALUES (%(username)s, %(mimetype)s, %(name)s)",
-            self.instance)
-        self.instance["id"] = self.db.get_last_id(cursor, 'avatar')
-        
-        self._saveAvatarImage(context)              
-        
-    def save(self,context):
-        # do file stuff if the file was changed
-        filedata = self.instance["filedata"]
-        if not hasattr(filedata, 'filename') or not filedata.filename:
-            self._saveAvatarImage(context)
-            self._setMimeType(context)
-        
-        # update database
-        cursor = self.db.cursor()
-        cursor.execute(
-            "UPDATE avatar "
-            "SET name=%(name)s, mimetype=%(mimetype)s "
-            "WHERE id=%(id)s ",
-            self.instance)       
-              
-    def delete(self,context):
-        cursor = self.db.cursor()
-        cursor.execute(
-            "DELETE FROM avatar WHERE id=%(id)s",
-            self.instance)
-            
-        # reset default profile avatar id if set
-        cursor.execute(
-            "UPDATE profile SET defaultavatarid = 0 WHERE profile.defaultavatarid = %(id)s",
-            self.instance)
-            
-        # remove avatar image
-        os.remove(self._getTargetPath())
-        
-    def _validate(self,context):
-        reasons = []
-        
-        if self.instance['username'] == "":
-            reasons.append("The avatar username is required.")
-            
-        if self.instance['name'] == "":
-            reasons.append("The avatar name is required.")            
-                        
-        return reasons
-            
-    def validateCreate(self,context):
-        reasons = self._validate(context)
-        cursor = self.db.cursor()      
-            
-        cursor.execute("SELECT count(id) FROM avatar WHERE username=%(username)s",self.instance)
-        row = cursor.fetchone()
-        if row and row[0] > 10: #TODO: use a configurable value
-            reasons.append("This user already has the maximum number of allowed avatars.")
-            return reasons
-   
-        # check if the file has been uploaded
-        filedata = self.instance["filedata"]
-        
-        if not hasattr(filedata, 'filename') or not filedata.filename:
-            reasons.append("No file uploaded")
-            return reasons
-