feat(reader): M27 书架按目录分组（ui.shelf_group=folder|format，默认 format 不变）
- 新增 shelf_model.c/.h：扫描/行序列从 shelf.c 拆出（纯 C，宿主可测）；shelf_book 加 group[96]（相对 Books/ 的目录路径，根下空串），path 语义/内容完全不变（进度键仍为 rdprog_hash(path)） - folder 模式：目录段头（根下=未分类），未分类置顶、其余按目录名排序；组内沿用最近阅读优先/其次书名；空目录不产生段头 - format 模式逐行保持旧行为；新增 reader.conf ui.shelf_group，缺键默认 format - 上限 256→2048（SHELF_MAX_ROWS=2N=4096，段头≤书数），超限置可读提示，不再静默截断 - 顶栏加「目录/格式」切换，设置页加「书架分组」；UTF-8 安全截断长中文目录名 - 单测 test/shelf_group_smoke.c（38 断言）+ 计时 test/shelf_scan_bench.c - build_reader.sh：链 meow_ui.a 解析冒烟 stbi_*；无 qemu 时跳过执行而非失败
This commit is contained in:
AskaEth committed
1 parent
db672cbe8f
commit
409fd1edf7
11 files changed
+800
-129
No files matched your search
@@ -21,6 +21,17 @@ SYSROOT="$ROOT/.tools/mipsel-linux-muslsf-cross/mipsel-linux-muslsf"
|
||||
HOST_CC="${HOST_CC:-gcc}"
|
||||
VENDOR="$PWD/vendor"
|
||||
OBJ="$VENDOR/build"
|
||||
# qemu-mipsel 运行时冒烟：宿主没装 qemu（如 Termux 无 mipsel user-mode 包）时，
|
||||
# 仍编译 mipsel 冒烟二进制，只跳过执行；设 QEMU_BIN=<路径> 可指定其它模拟器。
|
||||
QEMU_BIN="${QEMU_BIN:-qemu-mipsel}"
|
||||
run_qemu() {
|
||||
if [ "${SKIP_QEMU:-0}" = 1 ] || ! command -v "$QEMU_BIN" >/dev/null 2>&1; then
|
||||
shift
|
||||
echo " SKIP qemu 执行（未找到 $QEMU_BIN）：$*"
|
||||
return 0
|
||||
fi
|
||||
timeout "$@"
|
||||
}
|
||||
mkdir -p "$OBJ"
|
||||
|
||||
# ---------- 1) vendor 拉取/对齐 ----------
|
||||
@@ -101,6 +112,13 @@ echo "==> host chapter test (R3.3)"
|
||||
$HOST_CC -O2 -Wall -Wextra -Icore test/chapter_smoke.c core/rdchapter.c core/seg.c core/rdenc.c -o test/chapter_smoke_host -lm
|
||||
./test/chapter_smoke_host
|
||||
|
||||
echo "==> host shelf group test (M27)"
|
||||
$HOST_CC -O2 -Wall -Wextra -Iapp -I../sdk test/shelf_group_smoke.c app/shelf_model.c app/progress.c app/reader_conf.c -o test/shelf_group_smoke_host
|
||||
./test/shelf_group_smoke_host
|
||||
|
||||
echo "==> host shelf scan bench (M27，只编不跑；用法 ./test/shelf_scan_bench_host <Books目录> [progress|noop] [轮数])"
|
||||
$HOST_CC -O2 -Wall -Wextra -Iapp -I../sdk test/shelf_scan_bench.c app/shelf_model.c app/progress.c -o test/shelf_scan_bench_host
|
||||
|
||||
echo "==> host loaders test"
|
||||
HOBJ="$OBJ/host"; mkdir -p "$HOBJ"
|
||||
for f in vendor/miniz/miniz_tinfl.c vendor/miniz/miniz_tdef.c vendor/miniz/miniz_zip.c vendor/miniz/miniz.c; do
|
||||
@@ -120,28 +138,30 @@ $HOST_CC -O2 -Wall -Wextra $COREINC test/loaders_smoke.c "$HOBJ"/*.o -lz -lm -o
|
||||
# ---------- 5) qemu-mipsel FreeType 冒烟 ----------
|
||||
echo "==> mipsel ft smoke"
|
||||
$CC -Os -static -Wall -Wextra -Iengine $FT_INCS test/rdft_smoke.c engine/rdft.c "$FT_BUILD/libfreetype.a" -o test/rdft_smoke_mipsel
|
||||
timeout 120 qemu-mipsel ./test/rdft_smoke_mipsel "${FONT:-$ROOT/font/src/MiSans-Regular.otf}"
|
||||
run_qemu 120 "$QEMU_BIN" ./test/rdft_smoke_mipsel "${FONT:-$ROOT/font/src/MiSans-Regular.otf}"
|
||||
|
||||
# ---------- 6) qemu-mipsel 书桥冒烟（TXT + 四格式） ----------
|
||||
# rdimg.o 引用 stbi_*，实现只在 sdk/meow_ui.a 里（见步骤 3 注释）；冒烟不链 UI 主体，
|
||||
# 但必须链该归档才能解析 stbi_*（归档按需只拉 stb_image.o）。
|
||||
echo "==> mipsel book smoke (TXT)"
|
||||
$CC -Os -static -Wall -Wextra -Iapp -Icore -Iengine $FT_INCS $COREINC test/book_smoke.c \
|
||||
app/book.c core/rdenc.c core/rdlayout.c core/rdtxt.c core/seg.c core/rdchapter.c core/rdxml.c core/rdhtml.c core/rdsb.c core/rdzip.c \
|
||||
core/rdsrc.c core/rdepub.c core/rdfb2.c core/rdmobi.c core/rdcbz.c engine/rdft.c \
|
||||
"$OBJ"/mz_*.o "$OBJ"/lm_*.o "$OBJ"/rdimg.o "$SYSROOT/lib/libz.a" "$FT_BUILD/libfreetype.a" -o test/book_smoke_mipsel
|
||||
timeout 120 qemu-mipsel ./test/book_smoke_mipsel "${FONT:-$ROOT/font/src/MiSans-Regular.otf}"
|
||||
"$OBJ"/mz_*.o "$OBJ"/lm_*.o "$OBJ"/rdimg.o ../sdk/meow_ui.a "$SYSROOT/lib/libz.a" "$FT_BUILD/libfreetype.a" -o test/book_smoke_mipsel
|
||||
run_qemu 120 "$QEMU_BIN" ./test/book_smoke_mipsel "${FONT:-$ROOT/font/src/MiSans-Regular.otf}"
|
||||
|
||||
echo "==> mipsel formats smoke"
|
||||
$CC -Os -static -Wall -Wextra -Iapp -Icore -Iengine $FT_INCS $COREINC test/formats_smoke.c \
|
||||
app/book.c core/rdenc.c core/rdlayout.c core/rdtxt.c core/seg.c core/rdchapter.c core/rdxml.c core/rdhtml.c core/rdsb.c core/rdzip.c \
|
||||
core/rdsrc.c core/rdepub.c core/rdfb2.c core/rdmobi.c core/rdcbz.c engine/rdft.c \
|
||||
"$OBJ"/mz_*.o "$OBJ"/lm_*.o "$OBJ"/rdimg.o "$SYSROOT/lib/libz.a" "$FT_BUILD/libfreetype.a" -o test/formats_smoke_mipsel
|
||||
timeout 150 qemu-mipsel ./test/formats_smoke_mipsel "${FONT:-$ROOT/font/src/MiSans-Regular.otf}" /tmp/rd_samples
|
||||
"$OBJ"/mz_*.o "$OBJ"/lm_*.o "$OBJ"/rdimg.o ../sdk/meow_ui.a "$SYSROOT/lib/libz.a" "$FT_BUILD/libfreetype.a" -o test/formats_smoke_mipsel
|
||||
run_qemu 150 "$QEMU_BIN" ./test/formats_smoke_mipsel "${FONT:-$ROOT/font/src/MiSans-Regular.otf}" /tmp/rd_samples
|
||||
|
||||
# ---------- 7) reader 二进制（mipsel 静态） ----------
|
||||
echo "==> reader binary"
|
||||
CORE_L="core/rdenc.c core/rdlayout.c core/rdtxt.c core/seg.c core/rdchapter.c core/rdxml.c core/rdhtml.c core/rdsb.c core/rdzip.c core/rdsrc.c core/rdepub.c core/rdfb2.c core/rdmobi.c core/rdcbz.c"
|
||||
ENGINE_L="engine/rdft.c"
|
||||
APP_L="app.c app/shelf.c app/reader.c app/book.c app/progress.c app/settings.c app/reader_conf.c app/reader_ipc.c"
|
||||
APP_L="app.c app/shelf.c app/shelf_model.c app/reader.c app/book.c app/progress.c app/settings.c app/reader_conf.c app/reader_ipc.c"
|
||||
$CC -Os -static -Wall -Wextra -I../sdk -I../meow_launcherd -I. -Icore -Iapp -Iengine $FT_INCS $COREINC \
|
||||
$CORE_L $APP_L $ENGINE_L "$OBJ"/mz_*.o "$OBJ"/lm_*.o "$OBJ"/rdimg.o \
|
||||
../sdk/meow_ui.a "$SYSROOT/lib/libz.a" "$FT_BUILD/libfreetype.a" -lpthread -o reader
|
||||
|
||||
Reference in new issue
Block a user