diff --git a/utils/compress.py b/utils/compress.py index f6d6165..633ad39 100644 --- a/utils/compress.py +++ b/utils/compress.py @@ -54,5 +54,5 @@ def webcam_compress(compressStyle, is_autoCompressName, compressName, preCompres compress_file.close() compress_endTime = time.time() # 压缩结束时间 compress_totalTime = compress_endTime - compress_startTime - # print(f'文件压缩成功!用时:{time_format(compress_totalTime)},已保存在:{compressName}') - print(f'文件压缩成功!用时:{compress_totalTime:.3f}秒,已保存在:{compressName}') + print(f'文件压缩成功!用时:{time_format(compress_totalTime)},已保存在:{compressName}') + # print(f'文件压缩成功!用时:{compress_totalTime:.3f}秒,已保存在:{compressName}') diff --git a/utils/time_format.py b/utils/time_format.py index 9662cd1..1a51af9 100644 --- a/utils/time_format.py +++ b/utils/time_format.py @@ -1,6 +1,6 @@ # 时间格式化 # 创建人:曾逸夫 -# 创建时间:2022-01-19 +# 创建时间:2022-01-20 import sys @@ -20,15 +20,12 @@ def time_format(preTime): if (0 < s < 1): time_str = f'{s:.3f}秒' - print(time_str) return time_str elif (h == 0 and m == 0 and s >= 1): time_str = f'{s}秒' - print(time_str) return time_str elif (h == 0 and m > 0): time_str = f'{m}分{s}秒' - print(time_str) return time_str elif (h > 0): if (h >= 24): @@ -36,7 +33,6 @@ def time_format(preTime): time_str = f'{h}天{m}分{s}秒' else: time_str = f'{h}时{m}分{s}秒' - print(time_str) return time_str else: print(f'时间格式化失败!程序结束!')