rclzip: add useSkippedNames variable to also use the base skippedNames

2018-06-04 09:05:23 +02:00
parent ec4bb12df0
commit f3d3f5b0bf
3 changed files with 39 additions and 6 deletions
@@ -28,6 +28,7 @@ from zipfile import ZipFile

 try:
    from recoll import rclconfig
+    from recoll import conftree
    hasrclconfig = True
 except:
    hasrclconfig = False
@@ -118,10 +119,14 @@ class ZipExtractor:
        if hasrclconfig:
            config = rclconfig.RclConfig()
            config.setKeyDir(os.path.dirname(filename))
+            usebaseskipped = config.getConfParam("zipUseSkippedNames")
+            if usebaseskipped:
+                skipped = config.getConfParam("skippedNames")
+                self.em.rclog("skippedNames: %s"%self.skiplist)
+                self.skiplist += conftree.stringToStrings(skipped)
            skipped = config.getConfParam("zipSkippedNames")
            if skipped is not None:
-                self.skiplist = skipped.split(" ")
-
+                self.skiplist += conftree.stringToStrings(skipped)
        try:
            if rclexecm.PY3:
                # Note: py3 ZipFile wants an str file name, which