feat: 全面迁移到 Flutter + 新增 GitHub 源与 CI 流水线
前端
- 移除全部 Avalonia 依赖,模型渲染与界面统一改用 Flutter
- 新增用户页:登录/注册(SHA-512 + 盐)、签到积分(30 天一循环)、
主题色积分购买、二选一随机、今日人品
- 新增百宝箱页、模型内嵌渲染页、自绘标题栏(最小化/最大化/关闭)
- 下载页显示模型下载进度条,下载源读取加速
- 关于页新增「重新下载启动器」并在下载后做 sha256 完整性校验
- 修复浅色主题下标题栏不跟随主题色、无法连接后端等问题
后端
- 新增 UserService:.GC/user/<用户名>.yaml 存用户名/积分/SHA-512 口令,
登录返回 session token,本地 .GC/user/user.yaml 保存登录态
- 新增 /api/user/{register,login,me,signin,theme} 接口
- 去掉 Avalonia 窗口宿主,后端只提供 HTTP API
下载源
- 新增 GitHub 镜像源(Morris-morris-cloud/GC),与 Xhmcl 并发测速
- 单源探测超时收紧到 2 秒,取最快且可用的源;GitHub 复用 GiteaRemote
(contents 带 ref、releases 带 per_page=100)
构建与 CI
- macOS 上默认只出 macOS 包,Windows 交给原生 Windows 构建
- 修复 Windows 交叉编译中 flutter-cpp-client-wrapper 双层目录嵌套
- 新增 GitHub Actions:
· nightly-prerelease:每天 21:00 编译三平台,发布 nightly 预发布
· build-bot:Issue/PR 评论 @build-bot build <mac|win-amd|win-arm|all>,
发布 ip-prerelease 预发布
· pr-review:检查能否编译、静态分析、合并冲突、是否落后 main
- 忽略 79MB 课件产物等高线.html 与工具链临时备份
This commit is contained in:
1 parent
b9cb56cb8b
commit
ea1fa6b6d1
134 files changed
+4309
-16614
No files matched your search
+61
-53
@@ -1,82 +1,80 @@
|
||||
#!/bin/sh
|
||||
# buildsh/lib/progress.sh —— apt 风格底部实时进度条
|
||||
# buildsh/lib/progress.sh —— 进度显示
|
||||
#
|
||||
# 底部一行:任务 当前任务进度 总进度 剩余时间
|
||||
# 编译MacOS 95% 30% 10s
|
||||
# 终端:底部单行实时进度条 [####....] 编译Mac 45% 30% 1m20s
|
||||
# 非终端(重定向 / CI / 日志):逐行打印步骤,不打 \r,不刷屏
|
||||
#
|
||||
# 用法:
|
||||
# progress_init <总步骤数> <每步权重...>
|
||||
# progress_step <步骤名> # 开始某步骤
|
||||
# progress_tick <0-100> # 更新当前步骤完成度
|
||||
# progress_done # 结束
|
||||
# progress_init <总权重> <每步权重...>
|
||||
# progress_step <步骤名>
|
||||
# progress_tick <0-100> # 当前步骤完成度
|
||||
# progress_done
|
||||
#
|
||||
# GC_NO_PROGRESS=1 可强制关闭进度条(但保留步骤行)
|
||||
|
||||
PROGRESS_TOTAL=1
|
||||
PROGRESS_WEIGHTS=""
|
||||
PROGRESS_IDX=0
|
||||
PROGRESS_CUR=0
|
||||
PROGRESS_STARTED=0
|
||||
PROGRESS_LAST=0
|
||||
PROGRESS_HISTORY=""
|
||||
PROGRESS_TASK="准备"
|
||||
_P_OVERALL=0
|
||||
_P_ETA="--"
|
||||
|
||||
_now() { date +%s; }
|
||||
GC_PROGRESS_TTY=0
|
||||
if [ -t 1 ] && [ -z "${GC_NO_PROGRESS:-}" ] && [ "${GC_QUIET:-0}" != 1 ]; then
|
||||
GC_PROGRESS_TTY=1
|
||||
fi
|
||||
|
||||
# 加权总进度:前序步骤权重之和 + 当前步骤权重*完成度
|
||||
_progress_overall() {
|
||||
# 一次算出整体百分比 + 剩余时间(原来每帧要循环两遍、fork 三次 date)
|
||||
_progress_refresh() {
|
||||
_sum=0; _i=1
|
||||
for _w in $PROGRESS_WEIGHTS; do
|
||||
if [ "$_i" -lt "$PROGRESS_IDX" ]; then
|
||||
_sum=$((_sum + _w)) # 已完成的步骤:全额
|
||||
_sum=$((_sum + _w))
|
||||
elif [ "$_i" -eq "$PROGRESS_IDX" ]; then
|
||||
_sum=$((_sum + _w * PROGRESS_CUR / 100)) # 当前步骤:按完成度
|
||||
_sum=$((_sum + _w * PROGRESS_CUR / 100))
|
||||
fi
|
||||
_i=$((_i + 1))
|
||||
done
|
||||
_p=$((_sum * 100 / PROGRESS_TOTAL))
|
||||
[ "$_p" -gt 100 ] && _p=100
|
||||
echo "$_p"
|
||||
_P_OVERALL=$((_sum * 100 / PROGRESS_TOTAL))
|
||||
[ "$_P_OVERALL" -gt 100 ] && _P_OVERALL=100
|
||||
|
||||
_t=$(( $(date +%s) - PROGRESS_STARTED ))
|
||||
if [ "$_P_OVERALL" -le 3 ] || [ "$_t" -le 0 ]; then
|
||||
_sec=240 # 前期按经验值粗估 4 分钟
|
||||
else
|
||||
_sec=$(( _t * (100 - _P_OVERALL) / _P_OVERALL ))
|
||||
fi
|
||||
if [ "$_sec" -ge 60 ]; then
|
||||
_P_ETA="$((_sec / 60))m$((_sec % 60))s"
|
||||
else
|
||||
_P_ETA="${_sec}s"
|
||||
fi
|
||||
}
|
||||
|
||||
# 剩余时间:基于「已完成总进度 / 已用时间」线性外推
|
||||
_progress_eta() {
|
||||
_p=$(_progress_overall)
|
||||
_t=$(( $(_now) - PROGRESS_STARTED ))
|
||||
# 前期用「预估总时长」估算(按各步骤经验权重),后期用实测速率外推,更稳
|
||||
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
|
||||
_progress_bar() {
|
||||
_filled=$((_P_OVERALL * 20 / 100))
|
||||
_bar=""; _i=0
|
||||
while [ "$_i" -lt 20 ]; do
|
||||
if [ "$_i" -lt "$_filled" ]; then _bar="$_bar#"; else _bar="$_bar."; fi
|
||||
_i=$((_i + 1))
|
||||
done
|
||||
printf '%s' "$_bar"
|
||||
}
|
||||
|
||||
progress_draw() {
|
||||
_task="$PROGRESS_TASK"
|
||||
_cur=$PROGRESS_CUR
|
||||
_overall=$(_progress_overall)
|
||||
_eta=$(_progress_eta)
|
||||
|
||||
# 进度条(20 格)
|
||||
_filled=$((_overall * 20 / 100))
|
||||
_bar=""
|
||||
_i=0
|
||||
while [ "$_i" -lt 20 ]; do
|
||||
if [ "$_i" -lt "$_filled" ]; then _bar="${_bar}#"; else _bar="${_bar}."; fi
|
||||
_i=$((_i + 1))
|
||||
done
|
||||
|
||||
# 底部一行:任务 当前任务进度 总进度 剩余时间
|
||||
printf '\r\033[K[%s] %-14s %3d%% %3d%% %s' \
|
||||
"$_bar" "$_task" "$_cur" "$_overall" "$_eta"
|
||||
[ "$GC_PROGRESS_TTY" = 1 ] || return 0
|
||||
_progress_refresh
|
||||
printf '\r\033[K[%s] %-16s %3d%% %3d%% %s' \
|
||||
"$(_progress_bar)" "$PROGRESS_TASK" "$PROGRESS_CUR" "$_P_OVERALL" "$_P_ETA"
|
||||
}
|
||||
|
||||
progress_init() {
|
||||
PROGRESS_TOTAL=$1
|
||||
shift
|
||||
PROGRESS_TOTAL=$1; shift
|
||||
PROGRESS_WEIGHTS="$*"
|
||||
PROGRESS_IDX=0
|
||||
PROGRESS_CUR=0
|
||||
PROGRESS_STARTED=$(_now)
|
||||
PROGRESS_STARTED=$(date +%s)
|
||||
PROGRESS_TASK="准备"
|
||||
progress_draw
|
||||
}
|
||||
@@ -85,16 +83,26 @@ progress_step() {
|
||||
PROGRESS_TASK="$1"
|
||||
PROGRESS_CUR=0
|
||||
PROGRESS_IDX=$((PROGRESS_IDX + 1))
|
||||
progress_draw
|
||||
if [ "$GC_PROGRESS_TTY" = 1 ]; then
|
||||
progress_draw
|
||||
else
|
||||
# 非终端:一行一步,冒号后给个序号,日志里能看清阶段划分
|
||||
[ "${GC_QUIET:-0}" = 1 ] && return 0
|
||||
printf '==> [%d] %s\n' "$PROGRESS_IDX" "$1"
|
||||
fi
|
||||
}
|
||||
|
||||
progress_tick() {
|
||||
# 非终端不需要刷新,直接返回(省掉每秒几次无用计算)
|
||||
[ "$GC_PROGRESS_TTY" = 1 ] || return 0
|
||||
PROGRESS_CUR=$1
|
||||
progress_draw
|
||||
}
|
||||
|
||||
progress_done() {
|
||||
PROGRESS_CUR=100
|
||||
progress_tick 100
|
||||
printf '\n'
|
||||
if [ "$GC_PROGRESS_TTY" = 1 ]; then
|
||||
progress_draw
|
||||
printf '\n'
|
||||
fi
|
||||
}
|
||||
Reference in new issue
Block a user