2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Fix handing of path separators to prevent crashes

Browse source
This commit is contained in:
2Shirt 2018-02-07 20:15:31 -07:00
parent f844977d62
commit e958eedfb6
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.bin/Scripts/functions/data.py
View file

@ -150,6 +150,10 @@ def cleanup_transfer(dest_path):
except Exception: except Exception:
pass pass
def fix_path_sep(path_str):
"""Replace non-native and duplicate dir separators, returns str."""
return re.sub(r'(\\|/)+', lambda s: os.sep, path_str)
def is_valid_wim_file(item): def is_valid_wim_file(item):
"""Checks if the provided os.DirEntry is a valid WIM file, returns bool.""" """Checks if the provided os.DirEntry is a valid WIM file, returns bool."""
valid = bool(item.is_file() and REGEX_WIM_FILE.search(item.name)) valid = bool(item.is_file() and REGEX_WIM_FILE.search(item.name))
@ -378,7 +382,7 @@ def list_source_items(source_obj, rel_path=None):
raise raise
# Strip non-root items # Strip non-root items
items = [re.sub(r'(\\|/)', os.sep, i.strip()) items = [fix_path_sep(i.strip())
for i in items.stdout.decode('utf-8', 'ignore').splitlines()] for i in items.stdout.decode('utf-8', 'ignore').splitlines()]
if rel_path: if rel_path:
items = [i.replace(rel_path, '') for i in items] items = [i.replace(rel_path, '') for i in items]
@ -473,7 +477,7 @@ def scan_source(source_obj, dest_path, rel_path='', interactive=True):
def get_source_item_obj(source_obj, rel_path, item_path): def get_source_item_obj(source_obj, rel_path, item_path):
"""Check if the item exists and return a SourceItem object if it does.""" """Check if the item exists and return a SourceItem object if it does."""
item_obj = None item_obj = None
item_path = re.sub(r'(\\|/)', os.sep, item_path) item_path = fix_path_sep(item_path)
if source_obj.is_dir(): if source_obj.is_dir():
item_obj = SourceItem( item_obj = SourceItem(
name = item_path, name = item_path,