构建系统重构: buildsh 模块化 + apt 风格进度条
This commit is contained in:
1 parent
22e1b8fbb9
commit
5e0b46b3f3
3 files changed
+84
-513
No files matched your search
+18
-11
@@ -22,24 +22,31 @@ _now() { date +%s; }
|
||||
|
||||
# 加权总进度:前序步骤权重之和 + 当前步骤权重*完成度
|
||||
_progress_overall() {
|
||||
_sum=0; _i=0
|
||||
_sum=0; _i=1
|
||||
for _w in $PROGRESS_WEIGHTS; do
|
||||
if [ "$_i" -lt "$PROGRESS_IDX" ]; then _sum=$((_sum + _w)); fi
|
||||
if [ "$_i" -lt "$PROGRESS_IDX" ]; then
|
||||
_sum=$((_sum + _w)) # 已完成的步骤:全额
|
||||
elif [ "$_i" -eq "$PROGRESS_IDX" ]; then
|
||||
_sum=$((_sum + _w * PROGRESS_CUR / 100)) # 当前步骤:按完成度
|
||||
fi
|
||||
_i=$((_i + 1))
|
||||
done
|
||||
_cw=$(echo "$PROGRESS_WEIGHTS" | awk -v i="$((PROGRESS_IDX+1))" '{print $i}')
|
||||
[ -z "$_cw" ] && _cw=1
|
||||
_sum=$((_sum + _cw * PROGRESS_CUR / 100))
|
||||
echo $((_sum * 100 / PROGRESS_TOTAL))
|
||||
_p=$((_sum * 100 / PROGRESS_TOTAL))
|
||||
[ "$_p" -gt 100 ] && _p=100
|
||||
echo "$_p"
|
||||
}
|
||||
|
||||
# 剩余时间:基于「已完成总进度 / 已用时间」线性外推
|
||||
_progress_eta() {
|
||||
_p=$(_progress_overall)
|
||||
[ "$_p" -le 0 ] && { echo "--"; return; }
|
||||
_t=$(( $(_now) - PROGRESS_STARTED ))
|
||||
[ "$_t" -le 0 ] && { echo "--"; return; }
|
||||
_eta=$(( _t * (100 - _p) / _p ))
|
||||
# 前期用「预估总时长」估算(按各步骤经验权重),后期用实测速率外推,更稳
|
||||
if [ "$_p" -le 3 ] || [ "$_t" -le 0 ]; then
|
||||
_eta=$(( PROGRESS_TOTAL * 8 / 100 )) # 粗估:每 1% 约 8 秒 -> 总约 800s? 见下
|
||||
_eta=$(( 240 )) # 默认预估 4 分钟
|
||||
else
|
||||
_eta=$(( _t * (100 - _p) / _p ))
|
||||
fi
|
||||
if [ "$_eta" -ge 60 ]; then echo "$(( _eta / 60 ))m$((_eta % 60))s"; else echo "${_eta}s"; fi
|
||||
}
|
||||
|
||||
@@ -58,8 +65,8 @@ progress_draw() {
|
||||
_i=$((_i + 1))
|
||||
done
|
||||
|
||||
# \r 回到行首,用 \033[K 清到行尾;底部固定一行
|
||||
printf '\r\033[K[%s] %-16s %3d%% 总 %3d%% %s' \
|
||||
# 底部一行:任务 当前任务进度 总进度 剩余时间
|
||||
printf '\r\033[K[%s] %-14s %3d%% %3d%% %s' \
|
||||
"$_bar" "$_task" "$_cur" "$_overall" "$_eta"
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user