修改格式化

This commit is contained in:
halliday 2023-11-20 21:59:21 +08:00
parent 9c24f49d79
commit fc029d5b55
1 changed files with 7 additions and 5 deletions

View File

@ -1,8 +1,10 @@
#!/usr/bin/python3 #!/usr/bin/python3
import _load
import psutil import psutil
import smtplib import smtplib
import os import os
import argparse import argparse
import yaml
from datetime import datetime from datetime import datetime
from pathlib import Path from pathlib import Path
@ -76,7 +78,7 @@ def get_disk_info():
# 磁盘总空间单位G # 磁盘总空间单位G
total_disk_size = disk_info.total//1024//1024//1024 total_disk_size = disk_info.total//1024//1024//1024
# 当前磁盘使用率、剩余空间G和磁盘总空间信息 # 当前磁盘使用率、剩余空间G和磁盘总空间信息
info = " %s盘使用率:%s%% 剩余空间:%iG 总大小:%sG" % (disk_name, str(disk_info.percent),free_disk_size,total_disk_size) info = " {0}盘使用率:{1}% 剩余空间:{2}G 总大小:{3}G".format(disk_name, str(disk_info.percent),free_disk_size,total_disk_size)
# print(info) # print(info)
# 拼接多个磁盘的信息 # 拼接多个磁盘的信息
content.append(info) content.append(info)
@ -96,11 +98,11 @@ def get_dir_size(path):
get_dir_size(pathTmp) # 是目录就继续递归查找 get_dir_size(pathTmp) # 是目录就继续递归查找
elif os.path.isfile(pathTmp): # 判断是否为文件 elif os.path.isfile(pathTmp): # 判断是否为文件
filesize = os.path.getsize(pathTmp) # 如果是文件,则获取相应文件的大小 filesize = os.path.getsize(pathTmp) # 如果是文件,则获取相应文件的大小
str_tex = ' %s文件的大小为:%d字节' % (pathTmp,filesize) str_tex = ' {0}文件的大小为:{1}字节'.format(pathTmp,filesize)
print(str_tex) print(str_tex)
dir_content.append(str_tex) dir_content.append(str_tex)
list1.append(filesize) # 将文件的大小添加到列表 list1.append(filesize) # 将文件的大小添加到列表
str_dir_tex = ' %s 目录的大小为: %.4f MB' % (path, (sum(list1)/1024/1024)) str_dir_tex = ' {0} 目录的大小为: {1:.4f} MB'.format(path, (sum(list1)/1024/1024))
print(str_dir_tex) print(str_dir_tex)
dir_content.append(str_dir_tex) dir_content.append(str_dir_tex)
@ -109,7 +111,7 @@ def get_dir_size(path):
# cpu信息 # cpu信息
def get_cpu_info(): def get_cpu_info():
cpu_percent = psutil.cpu_percent(interval=1) cpu_percent = psutil.cpu_percent(interval=1)
cpu_info = ["","CPU使用率%i%%" % cpu_percent,""] cpu_info = ["","CPU使用率{0}%".format(cpu_percent),""]
print(cpu_info) print(cpu_info)
# return cpu_info # return cpu_info
save_txt(cpu_info) save_txt(cpu_info)
@ -120,7 +122,7 @@ def get_memory_info():
used_memory = virtual_memory.used/1024/1024/1024 used_memory = virtual_memory.used/1024/1024/1024
free_memory = virtual_memory.free/1024/1024/1024 free_memory = virtual_memory.free/1024/1024/1024
memory_percent = virtual_memory.percent memory_percent = virtual_memory.percent
memory_info = ["内存使用:%0.2fG使用率%0.1f%%,剩余内存:%0.2fG" % (used_memory, memory_percent, free_memory),""] memory_info = ["内存使用:{0:0.2f}G使用率{1:0.1f}%,剩余内存:{2:0.2f}G".format(used_memory, memory_percent, free_memory),""]
print(memory_info) print(memory_info)
# return memory_info # return memory_info
save_txt(memory_info) save_txt(memory_info)