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

rclrar: only decode the ipath if it's not str already

Browse Source
This commit is contained in:
Jean-Francois Dockes 2019-02-19 20:53:49 +01:00
parent d121444429
commit 39712d03f3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/filters/rclrar
View File

@ -62,7 +62,8 @@ class RarExtractor:
try: try:
if using_unrar: if using_unrar:
ipath = ipath.decode('UTF-8') if type(ipath) == type(b''):
ipath = ipath.decode('UTF-8')
rarinfo = self.rar.getinfo(ipath) rarinfo = self.rar.getinfo(ipath)
# dll.hpp RHDF_DIRECTORY: 0x20 # dll.hpp RHDF_DIRECTORY: 0x20
isdir = ((rarinfo.flag_bits & 0x20) != 0) isdir = ((rarinfo.flag_bits & 0x20) != 0)
@ -70,7 +71,8 @@ class RarExtractor:
rarinfo = self.rar.getinfo(ipath) rarinfo = self.rar.getinfo(ipath)
isdir = rarinfo.isdir() isdir = rarinfo.isdir()
except Exception as err: except Exception as err:
self.em.rclog("extractone: rar.getinfo failed: [%s]" % err) self.em.rclog("extractone: using_unrar %d rar.getinfo failed: [%s]"
% (using_unrar,err))
return (True, docdata, ipath, False) return (True, docdata, ipath, False)
if not isdir: if not isdir: