--- versionedFile/versionedFile.py 2004/03/23 10:43:55 1.2 +++ versionedFile/versionedFile.py 2005/01/12 14:08:19 1.25 @@ -1,54 +1,172 @@ from OFS.Folder import Folder from OFS.Image import File from OFS.Image import cookId -from Globals import DTMLFile, InitializeClass +from Globals import DTMLFile, InitializeClass,package_home from Products.PageTemplates.PageTemplateFile import PageTemplateFile from AccessControl import getSecurityManager from Products.PageTemplates.PageTemplate import PageTemplate +from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate from AccessControl import ClassSecurityInfo +import os.path +import time +try: + from Products.ECHO_content.ECHO_collection import ECHO_basis +except: + print "ECHO Elements not imported" + class ECHO_basis: + """leer""" + manage_options=() + + def sortv(x,y): return cmp(x[0],y[0]) -class versionedFileFolder(Folder): +class versionedFileFolder(Folder,ECHO_basis): """Folder with versioned files""" + meta_type = "versionedFileFolder" security= ClassSecurityInfo() security.declareProtected('AUTHENTICATED_USER','addFileForm') + + if ECHO_basis: + optTMP= Folder.manage_options+ECHO_basis.manage_options + else: + optTMP= Folder.manage_options + + manage_options =optTMP+( + {'label':'Generate Index.html','action':'generateIndexHTML'}, + {'label':'Generate history_template.html','action':'generateHistoryHTML'}, + ) + + - def getVersionedFiles(self): + def helpDownload(self): + """download help""" + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','helpDownload')).__of__(self) + return pt() + + def generateIndexHTML(self,RESPONSE=None): + """lege standard index.html an""" + + + if not self.ZopeFind(self,obj_ids=['index.html']): + zt=ZopePageTemplate('index.html') + self._setObject('index.html',zt) + default_content_fn = os.path.join(package_home(globals()), + 'zpt/versionFileFolderMain.zpt') + text = open(default_content_fn).read() + zt.pt_edit(text, 'text/html') + + else: + return "already exists!" + + if RESPONSE is not None: + RESPONSE.redirect('manage_main') + + + def generateHistoryHTML(self,RESPONSE=None): + """lege standard index.html an""" + + + + if not self.ZopeFind(self,obj_ids=['history_template.html']): + zt=ZopePageTemplate('history_template.html') + self._setObject('history_template.html',zt) + default_content_fn = os.path.join(package_home(globals()), + 'zpt/versionHistory.zpt') + text = open(default_content_fn).read() + zt.pt_edit(text, 'text/html') + + else: + return "already exists!" + + if RESPONSE is not None: + RESPONSE.redirect('manage_main') + + def getVersionedFiles(self,sortField='title'): """get all versioned files""" - print "hi" + + def sortName(x,y): + return cmp(x[1].title.lower(),y[1].title.lower()) + + def sortDate(x,y): + return cmp(y[1].getLastVersion().getTime(),x[1].getLastVersion().getTime()) + + def sortAuthor(x,y): + + return cmp(x[1].getLastVersion().lastEditor(),y[1].getLastVersion().lastEditor()) + versionedFiles=self.ZopeFind(self,obj_metatypes=['versionedFile']) - print "hi",versionedFiles + + if sortField=='title': + versionedFiles.sort(sortName) + elif sortField=='date': + versionedFiles.sort(sortDate) + elif sortField=='author': + versionedFiles.sort(sortAuthor) + return versionedFiles - + + def header_html(self): + """zusätzlicher header""" + ext=self.ZopeFind(self,obj_ids=["header.html"]) + if ext: + return ext[0][1]() + else: + return "" + def index_html(self): """main""" - pt=PageTemplateFile('Products/versionedFile/zpt/versionFileFolderMain').__of__(self) + ext=self.ZopeFind(self,obj_ids=["index.html"]) + if ext: + return ext[0][1]() + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','versionFileFolderMain')).__of__(self) return pt() def addFileForm(self): """add a file""" + ext=self.ZopeFind(self,obj_ids=["addFileForm.dtml"]) + if ext: + return ext[0][1]('',globals(),version='1',AUTHENTICATED_USER=self.REQUEST.AUTHENTICATED_USER) + out=DTMLFile('dtml/newFileAdd', globals(),Kind='VersionedFileObject',kind='versionedFileObject',version='1').__of__(self) return out() - def addFile(self,vC,file,content_type='',RESPONSE=None): + def addFile(self,vC,file,author,newName='',content_type='',RESPONSE=None): """ add a new file""" - id=file.filename + if newName=='': + filename=file.filename + id=filename[max(filename.rfind('/'), + filename.rfind('\\'), + filename.rfind(':'), + )+1:] + + else: + id=newName vC=self.REQUEST.form['vC'] manage_addVersionedFile(self,id,'','') + #if (getattr(self,'commentNonEmpty',0)==1) and vC.strip()=="": + + ob=self._getOb(id) ob.title=id + file2=file - ob.manage_addVersionedFileObject(self,id,vC,file,content_type=content_type) + obj=ob.manage_addVersionedFileObject(id,vC,author,file2,content_type=content_type) + if obj.getSize()==0: + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self) + return pt() + RESPONSE.redirect(self.REQUEST['URL1']) @@ -95,7 +213,41 @@ class versionedFileObject(File): Kind='File',kind='file') manage_editForm._setName('manage_editForm') + def getTime(self): + """getTime""" + #return self.bobobase_modification_time().ISO() + if hasattr(self,'time'): + return time.strftime("%Y-%m-%d %H:%M:%S",self.time) + elif hasattr(self,'timefixed'): + return self.timefixed + else: + setattr(self,'timefixed',self.bobobase_modification_time().ISO()) + return self.bobobase_modification_time().ISO() + + + + + def download(self): + """download and lock""" + + + self.content_type="application/octet-stream" + self.REQUEST.RESPONSE.redirect(self.absolute_url()) + + def downloadLocked(self): + """download and lock""" + + + if self.REQUEST['AUTHENTICATED_USER']=='Anonymous User': + return "please login first" + if not self.aq_parent.lockedBy=="": + return "cannot be locked because is already locked by %s"%self.lockedBy + self.aq_parent.lockedBy=self.REQUEST['AUTHENTICATED_USER'] + + self.content_type="application/octet-stream" + self.REQUEST.RESPONSE.redirect(self.absolute_url()) + def setVersionNumber(self,versionNumber): """set version""" self.versionNumber=versionNumber @@ -106,17 +258,22 @@ class versionedFileObject(File): def lastEditor(self): """last Editor""" - jar=self._p_jar - oid=self._p_oid - if jar is None or oid is None: return None - return jar.db().history(oid)[0]['user_name'] + if hasattr(self,'author'): + return self.author + else: + jar=self._p_jar + oid=self._p_oid + + if jar is None or oid is None: return None + + return jar.db().history(oid)[0]['user_name'] manage_addVersionedFileObjectForm=DTMLFile('dtml/fileAdd', globals(),Kind='VersionedFileObject',kind='versionedFileObject', version='1') -def manage_addVersionedFileObject(self,id,vC='',file='',title='',precondition='', content_type='', +def manage_addVersionedFileObject(self,id,vC='',author='', file='',title='',precondition='', content_type='', REQUEST=None): """Add a new File object. @@ -126,7 +283,7 @@ def manage_addVersionedFileObject(self,i title=str(title) content_type=str(content_type) precondition=str(precondition) - + id, title = cookId(id, title, file) self=self.this() @@ -134,6 +291,9 @@ def manage_addVersionedFileObject(self,i # First, we create the file without data: self._setObject(id, versionedFileObject(id,title,'',content_type, precondition)) self._getOb(id).versionComment=str(vC) + self._getOb(id).time=time.localtime() + + setattr(self._getOb(id),'author',author) # Now we "upload" the data. By doing this in two steps, we # can use a database trick to make the upload more efficient. @@ -151,14 +311,17 @@ def manage_addVersionedFileObject(self,i class versionedFile(Folder): """Versioniertes File""" - def __init__(self, id, title, lockedBy): + def __init__(self, id, title, lockedBy,author): """init""" self.id=id self.title=title self.lockedBy=lockedBy + self.author=author + meta_type="versionedFile" + def getLastVersion(self): """Last Version""" tmp=0 @@ -177,7 +340,7 @@ class versionedFile(Folder): """main view""" lastVersion=self.getLastVersion() #return "File:"+self.title+" Version:%i"%lastVersion.versionNumber," modified:",lastVersion.bobobase_modification_time()," size:",lastVersion.getSize(),"modified by:",lastVersion.lastEditor() - return "File: %s Version:%i modified:%s size:%s modified by:%s"%(self.title,lastVersion.versionNumber,lastVersion.bobobase_modification_time(),lastVersion.getSize(),lastVersion.lastEditor()) + return "File: %s Version:%i modified:%s size:%s modified by:%s"%(self.title,lastVersion.versionNumber,lastVersion.getTime(),lastVersion.getSize(),lastVersion.lastEditor()) def getVersion(self): tmp=0 @@ -193,8 +356,13 @@ class versionedFile(Folder): security.declareProtected('AUTHENTICATED_USER','unlock') def history(self): - """history""" - pt=PageTemplateFile('Products/versionedFile/zpt/versionHistory').__of__(self) + """history""" + + ext=self.ZopeFind(self.aq_parent,obj_ids=["history_template.html"]) + if ext: + return getattr(self,ext[0][1].getId())() + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','versionHistory')).__of__(self) return pt() def getVersions(self): @@ -206,7 +374,7 @@ class versionedFile(Folder): ret.sort(sortv) return ret - + security.declareProtected('AUTHENTICATED_USER','unlock') def unlock(self,RESPONSE): """unlock""" if str(self.lockedBy) in [str(self.REQUEST['AUTHENTICATED_USER'])]: @@ -215,7 +383,7 @@ class versionedFile(Folder): else: return "Sorry, not locked by you! (%s,%s)"%(self.lockedBy,self.REQUEST['AUTHENTICATED_USER']) - security= ClassSecurityInfo() + security.declareProtected('AUTHENTICATED_USER','addVersionedFileObjectForm') def addVersionedFileObjectForm(self): @@ -229,19 +397,47 @@ class versionedFile(Folder): else: return "Sorry file is locked by somebody else" - def manage_addVersionedFileObject(self,id,vC,file='',title='',precondition='', content_type='',RESPONSE=None): + def manage_addVersionedFileObject(self,id,vC,author,file='',title='',precondition='', content_type='',changeName='no',newName='', RESPONSE=None): """add""" vC=self.REQUEST['vC'] + author=self.REQUEST['author'] + + if changeName=="yes": + filename=file.filename + self.title=filename[max(filename.rfind('/'), + filename.rfind('\\'), + filename.rfind(':'), + )+1:] + + + if not newName=='': + self.title=newName[0:] + id="V%i"%self.getVersion()+"_"+self.title - manage_addVersionedFileObject(self,id,vC,file,"V%i"%self.getVersion()+"_"+self.title,precondition, content_type) + + manage_addVersionedFileObject(self,id,vC,author,file,"V%i"%self.getVersion()+"_"+self.title,precondition, content_type) objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion())) + if RESPONSE: - RESPONSE.redirect(self.REQUEST['URL2']) + if self.ZopeFind(self,obj_ids=[id])[0][1].getSize()==0: + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self) + return pt() + else: + RESPONSE.redirect(self.REQUEST['URL2']) + + else: + return self.ZopeFind(self,obj_ids=[id])[0][1] + security.declareProtected('AUTHENTICATED_USER','downloadLocked') + def download(self): + """download and lock""" + self.getLastVersion().content_type="application/octet-stream" + self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+'/'+self.getId()+'/'+self.getLastVersion().getId()) + def downloadLocked(self): """download and lock""" if self.REQUEST['AUTHENTICATED_USER']=='Anonymous User': @@ -249,18 +445,19 @@ class versionedFile(Folder): if not self.lockedBy=="": return "cannot be locked because is already locked by %s"%self.lockedBy self.lockedBy=self.REQUEST['AUTHENTICATED_USER'] - + self.getLastVersion().content_type="application/octet-stream" self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+'/'+self.getId()+'/'+self.getLastVersion().getId()) def manage_addVersionedFileForm(self): """interface for adding the OSAS_root""" - pt=PageTemplateFile('Products/versionedFile/zpt/addVersionedFile.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addVersionedFile.zpt')).__of__(self) return pt() -def manage_addVersionedFile(self,id,title,lockedBy, RESPONSE=None): +def manage_addVersionedFile(self,id,title,lockedBy, author=None, RESPONSE=None): """add the OSAS_root""" - newObj=versionedFile(id,title,lockedBy) + newObj=versionedFile(id,title,lockedBy,author) self._setObject(id,newObj) + if RESPONSE is not None: RESPONSE.redirect('manage_main')