--- lbbs/src/article_cache.c 2025/06/21 06:52:24 1.22 +++ lbbs/src/article_cache.c 2025/11/22 10:36:37 1.37 @@ -1,18 +1,14 @@ -/*************************************************************************** - article_cache.c - description - ------------------- - Copyright : (C) 2004-2025 by Leaflet - Email : leaflet@leafok.com - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/* SPDX-License-Identifier: GPL-3.0-or-later */ +/* + * article_cache + * - convert article content from DB to local cache with LML conversion and line offset index + * + * Copyright (C) 2004-2025 Leaflet + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "article_cache.h" #include "lml.h" @@ -27,10 +23,12 @@ #include #include -#define ARTICLE_HEADER_MAX_LEN 4096 -#define ARTICLE_CONTENT_MAX_LEN 1024 * 1024 * 4 // 4MB -#define ARTICLE_FOOTER_MAX_LEN 4096 -#define SUB_DT_MAX_LEN 50 +enum _article_cache_constant_t +{ + ARTICLE_HEADER_MAX_LEN = 4096, + ARTICLE_FOOTER_MAX_LEN = 4096, + SUB_DT_MAX_LEN = 50, +}; static const char *BBS_article_footer_color[] = { "\033[31m", @@ -49,7 +47,7 @@ inline static int article_cache_path(cha { if (file_path == NULL || cache_dir == NULL || p_article == NULL) { - log_error("article_cache_path() NULL pointer error\n"); + log_error("NULL pointer error\n"); return -1; } @@ -69,6 +67,8 @@ int article_cache_generate(const char *c char header[ARTICLE_HEADER_MAX_LEN]; size_t header_len; long header_line_cnt; + size_t body_len; + long body_line_cnt; char footer[ARTICLE_FOOTER_MAX_LEN]; size_t footer_len; long footer_line_cnt; @@ -76,7 +76,7 @@ int article_cache_generate(const char *c if (cache_dir == NULL || p_article == NULL || content == NULL) { - log_error("article_cache_generate() NULL pointer error\n"); + log_error("NULL pointer error\n"); return -1; } @@ -111,40 +111,46 @@ int article_cache_generate(const char *c // Generate article header / footer localtime_r(&(p_article->sub_dt), &tm_sub_dt); - strftime(str_sub_dt, sizeof(str_sub_dt), "%c", &tm_sub_dt); + strftime(str_sub_dt, sizeof(str_sub_dt), "%c %Z", &tm_sub_dt); - snprintf(header, sizeof(header), "发布者: %s (%s), 版块: %s (%s)\n标 题: %s\n发布于: %s (%s)\n\n", + snprintf(header, sizeof(header), "鍙戝竷鑰: %s (%s), 鐗堝潡: %s (%s)\n鏍 棰: %s\n鍙戝竷浜: %s (%s)\n\n", p_article->username, p_article->nickname, p_section->sname, p_section->stitle, p_article->title, BBS_name, str_sub_dt); snprintf(footer, sizeof(footer), - "\n--\n%s※ 来源: %s http://%s [FROM: %s]\033[m\n\n", + "\n--\n%s鈥 鏉ユ簮: %s http://%s [FROM: %s]\033[m\n\n", BBS_article_footer_color[p_article->aid % BBS_article_footer_color_count], BBS_name, BBS_server, sub_ip); header_len = strnlen(header, sizeof(header)); footer_len = strnlen(footer, sizeof(footer)); - header_line_cnt = split_data_lines(header, SCREEN_COLS, cache.line_offsets, MAX_SPLIT_FILE_LINES, 1); + header_line_cnt = split_data_lines(header, SCREEN_COLS, cache.line_offsets, + MAX_SPLIT_FILE_LINES, 1, NULL); if (header_len != cache.line_offsets[header_line_cnt]) { #ifdef _DEBUG - log_error("Header of article(aid=%d) is truncated from %ld to %ld\n", p_article->aid, header_len, cache.line_offsets[header_line_cnt]); + log_error("Header of article(aid=%d) is truncated from %ld to %ld\n, body_line=%ld, body_line_limit=%ld", + p_article->aid, header_len, cache.line_offsets[header_line_cnt], + header_line_cnt, MAX_SPLIT_FILE_LINES); #endif header_len = (size_t)cache.line_offsets[header_line_cnt]; } // Apply LML render to content body - cache.data_len = header_len + (size_t)lml_plain(content, content_f, ARTICLE_CONTENT_MAX_LEN); + body_len = (size_t)lml_render(content, content_f, ARTICLE_CONTENT_MAX_LEN, SCREEN_COLS, 0); + cache.data_len = header_len + body_len; - cache.line_total = header_line_cnt + - split_data_lines(content_f, SCREEN_COLS, cache.line_offsets + header_line_cnt, MAX_SPLIT_FILE_LINES - header_line_cnt, 1); + body_line_cnt = split_data_lines(content_f, SCREEN_COLS + 1, &(cache.line_offsets[header_line_cnt]), + MAX_SPLIT_FILE_LINES - header_line_cnt, 1, NULL); + cache.line_total = header_line_cnt + body_line_cnt; - if (cache.data_len - header_len != (size_t)cache.line_offsets[cache.line_total]) + if (body_len != (size_t)cache.line_offsets[cache.line_total]) { #ifdef _DEBUG - log_error("Body of article(aid=%d) is truncated from %ld to %ld\n", - p_article->aid, cache.data_len - header_len, cache.line_offsets[cache.line_total]); + log_error("Body of article(aid=%d) is truncated from %ld to %ld, body_line=%ld, body_line_limit=%ld\n", + p_article->aid, body_len, cache.line_offsets[cache.line_total], + body_line_cnt, MAX_SPLIT_FILE_LINES - header_line_cnt); #endif cache.data_len = header_len + (size_t)(cache.line_offsets[cache.line_total]); } @@ -154,13 +160,15 @@ int article_cache_generate(const char *c cache.line_offsets[i] += (long)header_len; } - footer_line_cnt = split_data_lines(footer, SCREEN_COLS, cache.line_offsets + cache.line_total, MAX_SPLIT_FILE_LINES - cache.line_total, 1); + footer_line_cnt = split_data_lines(footer, SCREEN_COLS, &(cache.line_offsets[cache.line_total]), + MAX_SPLIT_FILE_LINES - cache.line_total, 1, NULL); if (footer_len != cache.line_offsets[cache.line_total + footer_line_cnt]) { #ifdef _DEBUG - log_error("Footer of article(aid=%d) is truncated from %ld to %ld\n", - p_article->aid, footer_len, cache.line_offsets[cache.line_total + footer_line_cnt]); + log_error("Footer of article(aid=%d) is truncated from %ld to %ld, footer_line=%ld, footer_line_limit=%ld\n", + p_article->aid, footer_len, cache.line_offsets[cache.line_total + footer_line_cnt], + footer_line_cnt, MAX_SPLIT_FILE_LINES - cache.line_total); #endif footer_len = (size_t)(cache.line_offsets[cache.line_total + footer_line_cnt]); } @@ -227,7 +235,7 @@ int article_cache_load(ARTICLE_CACHE *p_ if (p_cache == NULL || cache_dir == NULL || p_article == NULL) { - log_error("article_cache_load() NULL pointer error\n"); + log_error("NULL pointer error\n"); return -1; } @@ -274,7 +282,7 @@ int article_cache_load(ARTICLE_CACHE *p_ memcpy((void *)p_cache, p_mmap, (size_t)(((ARTICLE_CACHE *)p_mmap)->mmap_len - ((ARTICLE_CACHE *)p_mmap)->data_len)); p_cache->p_mmap = p_mmap; - p_cache->p_data = p_mmap + (p_cache->mmap_len - p_cache->data_len); + p_cache->p_data = (char *)p_mmap + (p_cache->mmap_len - p_cache->data_len); return 0; } @@ -283,7 +291,7 @@ int article_cache_unload(ARTICLE_CACHE * { if (p_cache == NULL || p_cache->p_mmap == NULL) { - log_error("article_cache_unload() NULL pointer error\n"); + log_error("NULL pointer error\n"); return -1; }