tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rclzip: close file when done (windows temp file cleanup)

Browse Source
This commit is contained in:
Jean-Francois Dockes 2019-07-20 14:45:11 +02:00
parent 0b7e12200a
commit 703caf2ee4
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/filters/rclzip
View File

@ -75,9 +75,21 @@ if not hasrclconfig:
# #
class ZipExtractor: class ZipExtractor:
def __init__(self, em): def __init__(self, em):
self.filename = None
self.f = None
self.zip = None
self.currentindex = 0 self.currentindex = 0
self.em = em self.em = em
def closefile(self):
#self.em.rclog("Closing %s" % self.filename)
if self.zip:
self.zip.close()
if self.f:
self.f.close()
self.f = None
self.zip = None
def extractone(self, ipath): def extractone(self, ipath):
#self.em.rclog("extractone: [%s]" % ipath) #self.em.rclog("extractone: [%s]" % ipath)
docdata = "" docdata = ""
@ -107,12 +119,15 @@ class ZipExtractor:
ok = False ok = False
iseof = rclexecm.RclExecM.noteof iseof = rclexecm.RclExecM.noteof
if self.currentindex >= len(self.zip.namelist()) -1: if self.currentindex >= len(self.zip.namelist()) -1:
self.closefile()
iseof = rclexecm.RclExecM.eofnext iseof = rclexecm.RclExecM.eofnext
return (ok, docdata, rclexecm.makebytes(ipath), iseof) return (ok, docdata, rclexecm.makebytes(ipath), iseof)
###### File type handler api, used by rclexecm ----------> ###### File type handler api, used by rclexecm ---------->
def openfile(self, params): def openfile(self, params):
self.closefile()
filename = params["filename:"] filename = params["filename:"]
self.filename = filename
self.currentindex = -1 self.currentindex = -1
self.skiplist = [] self.skiplist = []
@ -132,8 +147,8 @@ class ZipExtractor:
# Note: py3 ZipFile wants an str file name, which # Note: py3 ZipFile wants an str file name, which
# is wrong: file names are binary. But it accepts an # is wrong: file names are binary. But it accepts an
# open file, and open() has no such restriction # open file, and open() has no such restriction
f = open(filename, 'rb') self.f = open(filename, 'rb')
self.zip = ZipFile(f) self.zip = ZipFile(self.f)
else: else:
self.zip = ZipFile(filename) self.zip = ZipFile(filename)
return True return True
@ -159,6 +174,7 @@ class ZipExtractor:
self.currentindex = 0 self.currentindex = 0
self.em.setmimetype('text/plain') self.em.setmimetype('text/plain')
if len(self.zip.namelist()) == 0: if len(self.zip.namelist()) == 0:
self.closefile()
eof = rclexecm.RclExecM.eofnext eof = rclexecm.RclExecM.eofnext
else: else:
eof = rclexecm.RclExecM.noteof eof = rclexecm.RclExecM.noteof
@ -166,6 +182,7 @@ class ZipExtractor:
if self.currentindex >= len(self.zip.namelist()): if self.currentindex >= len(self.zip.namelist()):
#self.em.rclog("getnext: EOF hit") #self.em.rclog("getnext: EOF hit")
self.closefile()
return (False, "", "", rclexecm.RclExecM.eofnow) return (False, "", "", rclexecm.RclExecM.eofnow)
else: else:
entryname = self.zip.namelist()[self.currentindex] entryname = self.zip.namelist()[self.currentindex]
@ -181,6 +198,7 @@ class ZipExtractor:
break break
self.currentindex += 1 self.currentindex += 1
if entryname is None: if entryname is None:
self.closefile()
return (False, "", "", rclexecm.RclExecM.eofnow) return (False, "", "", rclexecm.RclExecM.eofnow)
ret= self.extractone(entryname) ret= self.extractone(entryname)