--- versionedFile/versionedFile.py 2004/11/30 09:43:04 1.21 +++ versionedFile/versionedFile.py 2005/11/21 20:03:31 1.52 @@ -7,7 +7,21 @@ from AccessControl import getSecurityMan from Products.PageTemplates.PageTemplate import PageTemplate from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate from AccessControl import ClassSecurityInfo + + +from Products.ZCatalog.CatalogPathAwareness import CatalogAware + +try: + from Products.ImageArchive.ImageArchive import manage_AddImageZogiLib +except: + print "no images" + + +from threading import Thread +import shutil +import tempfile import os.path +import urllib import time try: @@ -15,13 +29,89 @@ try: except: print "ECHO Elements not imported" class ECHO_basis: - """leer""" - manage_options=() + """leer""" + manage_options=() def sortv(x,y): return cmp(x[0],y[0]) +tdir = "/tmp/downloadVersionedFiles" + +class generateDownloadZip: + """generateDownloadSet""" + + def __init__(self,folderObject,url): + """init downloadzip""" + self.folder=folderObject + self.done=None + self.response="" + self.url=url + + def __call__(self): + """call generate download zip""" + storeTempDir=tempfile.tempdir + tempfile.tempdir=tdir + + tmpPath=tempfile.mktemp() + tmpZip=tempfile.mktemp()+".gtz" + tmpFn=os.path.split(tmpZip)[1] + + if not os.path.exists(tempfile.tempdir): + os.mkdir(tempfile.tempdir) + + if not os.path.exists(tmpPath): + os.mkdir(tmpPath) + + self.response="

1. step: getting the files

" + + for files in self.folder.ZopeFind(self.folder,obj_metatypes=['versionedFile']): + lastV=files[1].getLastVersion() + self.response+=str("

Get File: %s
\n"%lastV.title) + + savePath=os.path.join(tmpPath,lastV.title) + fh=file(savePath,"w") + fh.write(lastV.data) + fh.close() + + self.response+="

2. step: creating the downloadable file

" + self.response+="

Create gtar
" + self.response+="

This can take a while....
\n" + + fh=os.popen2("tar zcvf %s %s/*"%(tmpZip,tmpPath),1)[1] + self.response+="
" + for c in fh.read(): + self.response+=c + if c==")": + self.response+="
\n" + + + + + shutil.rmtree(tmpPath) + + self.response+="

finished
\n" + + len=os.stat(tmpZip)[6] + downloadUrl=self.url+"/downloadSet" + self.response+="""

Click here for download ( %i Byte)

\n"""%(tmpFn,len) + self.response+="""

The file you receive is a tar (gnutar) compressed file, after unpacking you will find a new folder tmp where the files are stored in.

""" + self.response+="""

The file will be stored for a while, you can download it later, the URL is:

+

%s?fn=%s\n"""%(tmpFn,downloadUrl,tmpFn) + + self.done=True + + def getResult(self): + """get result""" + return self.response + + def isDone(self): + if self.done: + return True + else: + return False + + class versionedFileFolder(Folder,ECHO_basis): """Folder with versioned files""" @@ -30,7 +120,7 @@ class versionedFileFolder(Folder,ECHO_ba security= ClassSecurityInfo() security.declareProtected('AUTHENTICATED_USER','addFileForm') - + filesMetaType=['versionedFile'] if ECHO_basis: optTMP= Folder.manage_options+ECHO_basis.manage_options else: @@ -38,24 +128,181 @@ class versionedFileFolder(Folder,ECHO_ba manage_options =optTMP+( {'label':'Generate Index.html','action':'generateIndexHTML'}, + {'label':'Generate Image Index.html','action':'generateIndexHTML_image'}, {'label':'Generate history_template.html','action':'generateHistoryHTML'}, + {'label':'Import Folder','action':'importFolderForm'}, + {'label':'Export Folder','action':'exportFolder'}, + {'label':'Position of version number','action':'changeHistoryFileNamesForm'}, ) - + def changeHistoryFileNamesForm(self): + """change position of version num""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeHistoryFileNamesForm.zpt')).__of__(self) + return pt() + + def changeHistoryFileNames(self,positionVersionNum="front",RESPONSE=None): + """change position of version num""" + + + + versions=self.ZopeFind(self,obj_metatypes=['versionedFileObject'],search_sub=1) + + if not (getattr(self,'positionVersionNum','front')==positionVersionNum): + + for version in versions: + + if positionVersionNum=="front": + + titleTmp=os.path.splitext(version[1].title) + titleTmp2="_".join(titleTmp[0].split("_")[0:-1]) + if len(titleTmp)>1: + id=titleTmp[0].split("_")[-1]+"_"+titleTmp2+"."+titleTmp[1] + else: + id=titleTmp[0].split("_")[-1]+"_"+titleTmp2 + + else: + titleTmp="_".join(version[1].getId().split("_")[1:]) + tmp=os.path.splitext(titleTmp) + if len(tmp)>1: + id=tmp[0]+"_"+version[1].getId().split("_")[0]+tmp[1] + else: + id=tmp[0]+"_"+version[1].getId().split("_")[0] + + print version[0],id + + version[1].aq_parent.manage_renameObjects(ids=[version[1].getId()],new_ids=[id]) + version[1].title=id + + + self.positionVersionNum=positionVersionNum + if RESPONSE: + RESPONSE.redirect("manage_main") + + + + def importFolderForm(self): + """form fuer folder import""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','importFolderForm.zpt')).__of__(self) + return pt() + + def importFolder(self,path,comment="",author=None,lockedBy=None,RESPONSE=None): + """importiere inhalt eines folders""" + + for fileName in os.listdir(path): + if os.path.isfile(os.path.join(path,fileName)): + manage_addVersionedFile(self,fileName,'','') + id=fileName + ob=self._getOb(fileName) + ob.title=id + file2=file(os.path.join(path,fileName)) + + obj=ob.manage_addVersionedFileObject(id,comment,author,file2,content_type='') + + if RESPONSE: + RESPONSE.redirect(self.REQUEST['URL1']) + + zipThreads={} + zipThreads2={} + + def refreshTxt(self): + """txt fuer refresh""" + tn=self.REQUEST.SESSION['threadName'] + return """ 2;url=%s?repeat=%s """%(self.absolute_url()+"/exportFolder",tn) + + def exportFolder(self,repeat=None): + """exportiert alle akutellen files des folders""" + threadName=repeat + + downloadZip=generateDownloadZip(self,self.absolute_url()) + downloadZip() + return downloadZip.getResult() + ## if not threadName or threadName=="": +## threadStart=generateDownloadZip(self,self.absolute_url()) +## thread=Thread(target=threadStart) + +## thread.start() + + +## self.zipThreads[thread.getName()[0:]]=threadStart +## self.zipThreads2[thread.getName()[0:]]=thread +## self.REQUEST.SESSION['threadName']=thread.getName()[0:] +## wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['zip_wait_template']) +## if wait_template: +## return wait_template[0][1]() +## pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','zip_wait.zpt')).__of__(self) +## return pt() + +## else: +## self.REQUEST.SESSION['threadName']=threadName + +## if (self.zipThreads[threadName].getResult()==None): + +## wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template']) +## if wait_template: +## return wait_template[0][1]() + +## pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','zip_wait.zpt')).__of__(self) +## return pt() +## else: +## if self.zipThreads[threadName].isDone(): +## self.REQUEST.SESSION['result']=self.zipThreads[threadName].getResult() +## self.zipThreads2[threadName].join() +## del(self.zipThreads2[threadName]) +## del(self.zipThreads[threadName]) +## pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','zip_result.zpt')).__of__(self) +## return pt() + +## else: +## self.REQUEST.SESSION['result']=self.zipThreads[threadName].getResult() +## self.REQUEST.SESSION['threadName']=threadName +## pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','zip_wait_result.zpt')).__of__(self) +## return pt() + + def downloadSet(self,fn): + """download prepared set""" + filename=os.path.join(tdir,fn) + + + self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s" """%"downloadFileFolder.tgz") + self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") + len=os.stat(filename)[6] + self.REQUEST.RESPONSE.setHeader("Content-Length",len) + images=file(filename).read() + self.REQUEST.RESPONSE.write(images) + self.REQUEST.RESPONSE.close() + + + def helpDownload(self): """download help""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','helpDownload')).__of__(self) return pt() - def generateIndexHTML(self,RESPONSE=None): + def generateIndexHTML_image(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_image.zpt') + text = open(default_content_fn).read() + zt.pt_edit(text, 'text/html') + + else: + return "already exists!" - if not hasattr(self,'index.html'): + if RESPONSE is not None: + RESPONSE.redirect('manage_main') + + 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()), @@ -75,8 +322,7 @@ class versionedFileFolder(Folder,ECHO_ba - - if not hasattr(self,'history_template.html'): + 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()), @@ -90,6 +336,9 @@ class versionedFileFolder(Folder,ECHO_ba if RESPONSE is not None: RESPONSE.redirect('manage_main') + + + def getVersionedFiles(self,sortField='title'): """get all versioned files""" @@ -99,18 +348,52 @@ class versionedFileFolder(Folder,ECHO_ba def sortDate(x,y): return cmp(y[1].getLastVersion().getTime(),x[1].getLastVersion().getTime()) + + def sortComment(x,y): + + + + try: + xc=getattr(x[1],'comment','ZZZZZZZZZZZZZ').lower() + except: + xc='ZZZZZZZZZZZZZ'.lower() + try: + yc=getattr(y[1],'comment','ZZZZZZZZZZZZZ').lower() + except: + yc='ZZZZZZZZZZZZZ'.lower() + + + if (xc=='') or (xc=='ZZZZZZZZZZZZZ'.lower()): + + try: + xc=x[1].getLastVersion().getVComment().lower() + except: + xc='ZZZZZZZZZZZZZ'.lower() + + if (yc=='') or (yc=='ZZZZZZZZZZZZZ'.lower()): + try: + yc=y[1].getLastVersion().getVComment().lower() + except: + yc='ZZZZZZZZZZZZZ'.lower() + + + return cmp(xc,yc) + def sortAuthor(x,y): - return cmp(x[1].getLastVersion().lastEditor(),y[1].getLastVersion().lastEditor()) + return cmp(x[1].getLastVersion().lastEditor().lower(),y[1].getLastVersion().lastEditor().lower()) + + versionedFiles=self.ZopeFind(self,obj_metatypes=self.filesMetaType) + - versionedFiles=self.ZopeFind(self,obj_metatypes=['versionedFile']) - if sortField=='title': versionedFiles.sort(sortName) elif sortField=='date': versionedFiles.sort(sortDate) elif sortField=='author': versionedFiles.sort(sortAuthor) + elif sortField=='comment': + versionedFiles.sort(sortComment) return versionedFiles @@ -122,7 +405,9 @@ class versionedFileFolder(Folder,ECHO_ba return ext[0][1]() else: return "" - + + + security.declareProtected('View','index_html') def index_html(self): """main""" ext=self.ZopeFind(self,obj_ids=["index.html"]) @@ -146,7 +431,12 @@ class versionedFileFolder(Folder,ECHO_ba def addFile(self,vC,file,author,newName='',content_type='',RESPONSE=None): """ add a new file""" if newName=='': - id=file.filename + filename=file.filename + id=filename[max(filename.rfind('/'), + filename.rfind('\\'), + filename.rfind(':'), + )+1:] + else: id=newName @@ -158,10 +448,30 @@ class versionedFileFolder(Folder,ECHO_ba ob=self._getOb(id) ob.title=id file2=file - ob.manage_addVersionedFileObject(id,vC,author,file2,content_type=content_type) - + + obj=ob.manage_addVersionedFileObject(id,vC,author,file2,content_type=content_type) + self.REQUEST.SESSION['objID']=ob.getId() + self.REQUEST.SESSION['objID_parent']=None + + if obj.getSize()==0: + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self) + return pt() + RESPONSE.redirect(self.REQUEST['URL1']) + + def deleteEmptyObject(self,submit,RESPONSE=None): + """deleteemptyobject""" + if submit=="delete it": + if self.REQUEST.SESSION['objID_parent']: + obj=getattr(self,self.REQUEST.SESSION['objID_parent']) + + else: + obj=self + obj.manage_delObjects([self.REQUEST.SESSION['objID']]) + + RESPONSE.redirect(self.REQUEST['URL1']) + manage_addVersionedFileFolderForm=DTMLFile('dtml/folderAdd', globals()) @@ -199,13 +509,58 @@ def manage_addVersionedFileFolder(self, class versionedFileObject(File): """File Object im Folder""" - + security= ClassSecurityInfo() meta_type = "versionedFileObject" manage_editForm =DTMLFile('dtml/fileEdit',globals(), Kind='File',kind='file') manage_editForm._setName('manage_editForm') + + security.declarePublic('getVComment') + + def getVComment(self): + """get the comment of this file""" + if not hasattr(self,'vComment') or (not self.vComment) or (self.vComment.lstrip()==""): + return "Add comment" + + else: + return self.vComment + + def manageVCommentForm(self): + """add a comment""" + + self.REQUEST.SESSION['refer']=self.REQUEST['HTTP_REFERER'] + + + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addVComment')).__of__(self) + return pt() + + def manageVComment(self,text,comment_author,submit,REQUEST=None): + """manage comments""" + if submit =='change': + if text=='': + self.vComment=None + else: + self.vComment=text + self.vComment_author=comment_author + + self.vComment_date=time.strftime("%Y-%m-%d %H:%M:%S",time.localtime()) + + if self.REQUEST.SESSION.has_key('refer'): + + return REQUEST.RESPONSE.redirect(self.REQUEST.SESSION['refer']) + return REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url()+"/history") + + + security.declarePublic('getVersionComment') + def getVersionComment(self): + """getversioncomment""" + return self.versionComment + + security.declarePublic('getTime') + def getTime(self): """getTime""" #return self.bobobase_modification_time().ISO() @@ -221,12 +576,25 @@ class versionedFileObject(File): - def download(self): + def download(self,REQUEST=None,RESPONSE=None): """download and lock""" - + self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%self.getId()) + self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") + #try: + # txt=self.index_html() + #except: + # txt=self.index_html(REQUEST,RESPONSE) + # + #self.REQUEST.RESPONSE.setHeader("Content-Length","str(len(txt)+1000)") + self.content_type="application/octet-stream" self.REQUEST.RESPONSE.redirect(self.absolute_url()) + #txt=urllib.urlopen(self.absolute_url()).read() + #self.REQUEST.RESPONSE.write(txt) + + + #self.REQUEST.close() def downloadLocked(self): """download and lock""" @@ -245,14 +613,29 @@ class versionedFileObject(File): """set version""" self.versionNumber=versionNumber + + security.declarePublic('getVersionNumber') + def getVersionNumber(self): """get version""" return self.versionNumber + security.declarePublic('getVersionComment') + def getVersionComment(self): + """get version""" + return self.versionComment + + + + security.declarePublic('lastEditor') + def lastEditor(self): """last Editor""" if hasattr(self,'author'): - return self.author + ret=self.author.replace("-","\n") + ret=ret.replace("\r","\n") + return ret + else: jar=self._p_jar oid=self._p_oid @@ -301,25 +684,107 @@ def manage_addVersionedFileObject(self,i -class versionedFile(Folder): +class versionedFile(CatalogAware,Folder): """Versioniertes File""" + default_catalog='fileCatalog' + + def PrincipiaSearchSource(self): + """Return cataloguable key for ourselves.""" + return str(self) + def __init__(self, id, title, lockedBy,author): """init""" self.id=id self.title=title self.lockedBy=lockedBy self.author=author - + + def manageImagesForm(self): + """manage Images attached to the file""" + + self.REQUEST.SESSION['refer']=self.REQUEST['HTTP_REFERER'] + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','manageImage')).__of__(self) + return pt() + + def manageImages(self,imageUrl=None,caption=None,REQUEST=None): + """manage URL""" + if imageUrl and (not imageUrl==""): + manage_AddImageZogiLib(self,libPath=imageUrl,caption=caption) + + if self.REQUEST.SESSION.has_key('refer'): + + return REQUEST.RESPONSE.redirect(self.REQUEST.SESSION['refer']) + return REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url()) + + + + def changeImages(self,caption=None,submit=None,id=None,REQUEST=None): + """manage URL""" + if submit=="change caption": + image=self.ZopeFind(self,obj_ids=[id]) + if image: + image[0][1].caption=caption[0:] + + elif submit=="delete": + image=self.ZopeFind(self,obj_ids=[id]) + if image: + self.manage_delObjects([image[0][1].getId()]) + + + if self.REQUEST.SESSION.has_key('refer'): + + return REQUEST.RESPONSE.redirect(self.REQUEST.SESSION['refer']) + return REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url()) + + + + + def getImages(self): + """get Images""" + images=self.ZopeFind(self,obj_metatypes=["ImageZogiLib"]) + if not images: + return None + else: + return images + + + def getComment(self): + """get the comment of this file""" + if not hasattr(self,'comment') or (not self.comment) or (self.comment.lstrip()==""): + return "Add comment" + + else: + return self.comment + meta_type="versionedFile" - + def manageCommentForm(self): + """add a comment""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addComment')).__of__(self) + return pt() + + def manageComment(self,text,comment_author,submit,REQUEST=None): + """manage comments""" + if submit =='change': + if text=='': + self.comment=None + else: + self.comment=text + self.comment_author=comment_author + + self.comment_date=time.strftime("%Y-%m-%d %H:%M:%S",time.localtime()) + + return REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url()) + def getLastVersion(self): """Last Version""" tmp=0 lastVersion=None + for version in self.ZopeFind(self): if hasattr(version[1],'versionNumber'): @@ -327,6 +792,9 @@ class versionedFile(Folder): if int(version[1].versionNumber) > tmp: tmp=int(version[1].versionNumber,) lastVersion=version[1] + if lastVersion==None: + lastVersion=version[1] + lastVersion.versionNumber=1 return lastVersion def index_html(self): @@ -334,7 +802,8 @@ class versionedFile(Folder): 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.getTime(),lastVersion.getSize(),lastVersion.lastEditor()) - + security= ClassSecurityInfo() + security.declarePublic('getVersion') def getVersion(self): tmp=0 for version in self.ZopeFind(self): @@ -345,7 +814,7 @@ class versionedFile(Folder): tmp=int(version[1].versionNumber,) return tmp+1 - security= ClassSecurityInfo() + security.declareProtected('AUTHENTICATED_USER','unlock') def history(self): @@ -367,6 +836,11 @@ class versionedFile(Folder): ret.sort(sortv) return ret + security.declareProtected('AUTHENTICATED_USER','forceunlock') + def forceunlock(self,RESPONSE): + """unlock""" + self.lockedBy='' + security.declareProtected('AUTHENTICATED_USER','unlock') def unlock(self,RESPONSE): """unlock""" @@ -376,6 +850,7 @@ class versionedFile(Folder): else: return "Sorry, not locked by you! (%s,%s)"%(self.lockedBy,self.REQUEST['AUTHENTICATED_USER']) + security.declareProtected('AUTHENTICATED_USER','addVersionedFileObjectForm') @@ -392,28 +867,78 @@ class versionedFile(Folder): def manage_addVersionedFileObject(self,id,vC,author,file='',title='',precondition='', content_type='',changeName='no',newName='', RESPONSE=None): """add""" + try: #der ganze vC unsinn muss ueberarbeitet werden + vC=self.REQUEST['vC'] + except: + pass - vC=self.REQUEST['vC'] author=self.REQUEST['author'] if changeName=="yes": - self.title=file.filename[0:] + 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,author,file,"V%i"%self.getVersion()+"_"+self.title,precondition, content_type) + + + positionVersionNum=getattr(self,'positionVersionNum','front') + + if positionVersionNum=='front': + id="V%i"%self.getVersion()+"_"+self.title + else: + tmp=os.path.splitext(self.title) + if len(tmp)>1: + id=tmp[0]+"_V%i"%self.getVersion()+tmp[1] + else: + id=tmp[0]+"_V%i"%self.getVersion() + + + manage_addVersionedFileObject(self,id,vC,author,file,id,precondition, content_type) objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion())) + self.REQUEST.SESSION['objID_parent']=self.getId() if RESPONSE: - RESPONSE.redirect(self.REQUEST['URL2']) + obj=self.ZopeFind(self,obj_ids=[id])[0][1] + if obj.getSize()==0: + self.REQUEST.SESSION['objID']=obj.getId() + 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.setHeader("Content-Disposition","""attachement; filename=%s"""%self.getLastVersion().getId()) + self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") + + #try: + # txt=self.getLastVersion.index_html() + #except: + # txt=self.getLastVersion.index_html(REQUEST,RESPONSE) + + #self.REQUEST.RESPONSE.setHeader("Content-Length","str(len(txt)+1000)") + + self.content_type="application/octet-stream" + #self.REQUEST.RESPONSE.write("bl") + #self.REQUEST.RESPONSE.write(txt) + #self.REQUEST.close() + + #self.getLastVersion().content_type="application/octet-stream" self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+'/'+self.getId()+'/'+self.getLastVersion().getId()) def downloadLocked(self):