[Zapp-cvs-commit] ZApp ZApp_CMFBase.py,1.41,1.42
Brought to you by:
sspickle
|
From: Steve S. <ssp...@us...> - 2004-03-29 04:31:23
|
Update of /cvsroot/zapp/ZApp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21858 Modified Files: ZApp_CMFBase.py Log Message: added better 'size' caching.. Index: ZApp_CMFBase.py =================================================================== RCS file: /cvsroot/zapp/ZApp/ZApp_CMFBase.py,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** ZApp_CMFBase.py 29 Mar 2004 03:29:49 -0000 1.41 --- ZApp_CMFBase.py 29 Mar 2004 04:20:00 -0000 1.42 *************** *** 473,477 **** fileObj = self.fs_object ! fileObj.PUT( REQUEST, RESPONSE) manage_FTPget = index_html --- 473,480 ---- fileObj = self.fs_object ! if fileObj: ! fileObj.PUT( REQUEST, RESPONSE) ! self.content_type = fileObj.content_type ! self.size = fileObj.get_size() manage_FTPget = index_html *************** *** 527,534 **** Returns the size of the file or image. """ ! size = 0 ! if self.fs_object: ! size = self.fs_object.get_size() ! return size --- 530,540 ---- Returns the size of the file or image. """ ! size = getattr(self, 'size', None) ! if size is None: ! if self.fs_object: ! size = self.fs_object.get_size() ! else: ! size = 0 ! self.size = size return size *************** *** 541,545 **** Returns the content type (MIME type) of a file or image. """ ! return self.content_type def __str__(self): --- 547,551 ---- Returns the content type (MIME type) of a file or image. """ ! return getattr(self, 'content_type', 'none') def __str__(self): *************** *** 587,591 **** self.width = fileObj.width self.height = fileObj.height ! return oldID, newID, newTitle --- 593,597 ---- self.width = fileObj.width self.height = fileObj.height ! self.size = fileObj.get_size() return oldID, newID, newTitle *************** *** 604,608 **** fileObj = self.fs_object ! fileObj.PUT( REQUEST, RESPONSE) extendProperties(ZApp_CMF_FSImage, []) --- 610,620 ---- fileObj = self.fs_object ! if fileObj: ! fileObj.PUT( REQUEST, RESPONSE) ! self.content_type = fileObj.content_type ! self.width = fileObj.width ! self.height = fileObj.height ! self.size = fileObj.get_size() ! extendProperties(ZApp_CMF_FSImage, []) |