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

Fix issue #22

Browse source
This commit is contained in:
2Shirt 2018-03-15 15:28:54 -06:00
parent b080200118
commit 8e22aa22b0
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -97,7 +97,7 @@ def backup_registry():
def get_folder_size(path): def get_folder_size(path):
"""Get (human-readable) size of folder passed, returns str.""" """Get (human-readable) size of folder passed, returns str."""
size = 'Unknown' size = 'Unknown'
cmd = [global_vars['Tools']['Du'], '-nobanner', '-q', path] cmd = [global_vars['Tools']['Du'], '-c', '-nobanner', '-q', path]
try: try:
out = run_program(cmd) out = run_program(cmd)
except FileNotFoundError: except FileNotFoundError:
@ -107,10 +107,13 @@ def get_folder_size(path):
# Failed to get folder size # Failed to get folder size
pass pass
else: else:
size = out.stdout.decode().splitlines()[4] try:
size = re.sub(r'Size:\s+([\d,]+)\sbytes$', r'\1', size) size = out.stdout.decode().split(',')[-2]
size = size.replace(',', '') except IndexError:
size = human_readable_size(size) # Failed to parse csv data
pass
else:
size = human_readable_size(size)
return size return size
def get_installed_office(): def get_installed_office():
@ -442,6 +445,11 @@ def show_user_data_summary(indent=8, width=32):
users = [u for u in users if u['Active']] users = [u for u in users if u['Active']]
get_user_folder_sizes(users) get_user_folder_sizes(users)
for user in users: for user in users:
if ('Size' not in user['Profile']
and not any(user['Shell Folders'])
and not any(user['Extra Folders'])):
# Skip empty users
continue
print_success('{indent}User: {user}'.format( print_success('{indent}User: {user}'.format(
indent = ' '*int(indent/2), indent = ' '*int(indent/2),
user = user['Name'])) user = user['Name']))