Merge pull request #60 from ydkhatri/master

Fixes issue with illegal chars in paths within zip file
abrignoni · Jul 28, 2020 · c53ac3f · c53ac3f
2 parents 3c8b93f + 013acd5
commit c53ac3f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/scripts/search_files.py b/scripts/search_files.py
@@ -78,9 +78,11 @@ def search(self, filepattern):
         for member in self.name_list:
             if fnmatch.fnmatch(member, filepattern):
                 try:
-                    self.zip_file.extract(member, path=self.temp_folder)
+                    self.zip_file.extract(member, path=self.temp_folder) # already replaces illegal chars with _ when exporting
                     member = member.lstrip("/")
-                    pathlist.append(os.path.join(self.temp_folder, Path(member)))
+                    clean_name = sanitize_file_path(member) # replace illegal chars in path (if any)
+                    full_path = os.path.join(self.temp_folder, Path(clean_name))
+                    pathlist.append(full_path)
                 except Exception as ex:
                     logfunc(f'Could not write file to filesystem, path was {member}' + str(ex))
         return pathlist

diff --git a/scripts/version_info.py b/scripts/version_info.py
@@ -1,4 +1,4 @@
-aleapp_version = '1.3'
+aleapp_version = '1.3.1'
 
 # Contributors List
 # Format = [ Name, Blog-url, Twitter-handle, Github-url]