fz0x1/HPI
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

small formatting/variable fixes

Browse source
This commit is contained in:
Sean Breckenridge 2021-07-01 09:42:01 -07:00
parent f076263993
commit b51a88e137
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
my/core/structure.py
View file

@ -112,11 +112,10 @@ def match_structure(
# sanity check before we start creating directories/rm-tree'ing things # sanity check before we start creating directories/rm-tree'ing things
assert base.exists(), f"zipfile at {base} doesn't exist" assert base.exists(), f"zipfile at {base} doesn't exist"
sd = Path(tempfile.mkdtemp(dir=tdir)) searchdir = Path(tempfile.mkdtemp(dir=tdir))
searchdir = Path(sd)
zf = zipfile.ZipFile(base) zf = zipfile.ZipFile(base)
zf.extractall(path=sd) zf.extractall(path=str(searchdir))
else: else:
if not searchdir.is_dir(): if not searchdir.is_dir():
@ -138,9 +137,7 @@ def match_structure(
possible_targets.append(p / f.name) possible_targets.append(p / f.name)
if len(matches) == 0: if len(matches) == 0:
core_warnings.high( core_warnings.high(f"""While searching {base}, could not find a matching folder structure. Expected {expected}. You're probably missing required files in the gdpr/export""")
f"""While searching {base}, could not find a matching folder structure. Expected {expected}. You're probably missing required files in the gdpr/export"""
)
yield tuple(matches) yield tuple(matches)
@ -148,8 +145,6 @@ def match_structure(
if is_zip: if is_zip:
# make sure we're not mistakenly deleting data # make sure we're not mistakenly deleting data
assert str(searchdir).startswith( assert str(searchdir).startswith(str(tdir)), f"Expected the temporary directory for extracting zip to start with the temporary directory prefix ({tdir}), found {searchdir}"
str(tdir)
), f"Expected the temporary directory for extracting zip to start with the temporary directory prefix ({tdir}), found {searchdir}"
shutil.rmtree(str(searchdir)) shutil.rmtree(str(searchdir))