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

Fix cleanup_d7ii()

Browse source
This commit is contained in:
2Shirt 2018-10-08 21:47:11 -06:00
parent 122df6240c
commit 93e4bd5c0f
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
.bin/Scripts/functions/cleanup.py
View file

@ -125,27 +125,29 @@ def cleanup_d7ii():
prefix=KIT_NAME_SHORT, prefix=KIT_NAME_SHORT,
date=d7_date, date=d7_date,
**global_vars['Env']) **global_vars['Env'])
os.makedirs(r'{}\d7II'.format(log_dest), exist_ok=True)
os.makedirs(r'{}\Tools'.format(log_dest), exist_ok=True)
# Malware Logs # Malware Logs
if os.path.exists(d7_mlogs): if os.path.exists(d7_mlogs):
m_report = 'MalwareScan_Report.txt' m_report = 'MalwareScan_Report.txt'
for m_entry in os.scandir(d7_mlogs): for m_entry in os.scandir(d7_mlogs):
dest_path = r'{}\{}\{}'.format( if m_entry.name == m_report:
log_dest, dest_path = r'{}\d7II\{}'.format(log_dest, m_entry.name)
'd7II' if m_entry.name == m_report else 'Tools', else:
m_entry.name) dest_path = r'{}\Tools\{}'.format(log_dest, m_entry.name)
dest_path = non_clobber_rename(dest_path) dest_path = non_clobber_rename(dest_path)
shutil.move(entry.path, dest_path) shutil.move(m_entry.path, dest_path)
# Other items # Other items
for o_entry in os.scandir(entry.path): for o_entry in os.scandir(entry.path):
dest_path = r'{log_dest}\d7II\{name}'.format( dest_path = r'{log_dest}\d7II\{name}'.format(
log_dest=log_dest, log_dest=log_dest,
name=m_entry.name) name=o_entry.name)
dest_path = non_clobber_rename(dest_path) dest_path = non_clobber_rename(dest_path)
# Just remove empty folders # Just remove empty folders
if o_entry.isdir(): if o_entry.is_dir():
try: try:
os.rmdir(o_entry.path) os.rmdir(o_entry.path)
except OSError: except OSError:
@ -154,7 +156,7 @@ def cleanup_d7ii():
continue continue
# Move item # Move item
shutil.move(entry.path, dest_path) shutil.move(o_entry.path, dest_path)
# Remove folder # Remove folder
delete_empty_folders(entry.path) delete_empty_folders(entry.path)