Browse Source

chat: enforce storage_total_size + media orphan cleanup; async_dns: fix use-after-free

- media cache: удаление сирот на старте (сверка ФС с сообщениями) + лимит
  storage_total_size (удаление самых старых файлов, только старше backfill_days)
- ma_dir_walk(): кроссплатформенный рекурсивный обход каталога (POSIX/Windows)
- async_dns: первый драйв slow-пути отложен через call_soon (исключён
  double-free при синхронном завершении запроса); cancel унифицирован
- chat: видимый WARN 'media too large' + честный счётчик started/skipped
v2
evgeny 3 weeks ago
parent
commit
1eb0566cb5
  1. 2
      AGENTS.md
  2. 24
      lib/async_dns.c
  3. 269
      src/chat/chat_msg.c
  4. 56
      src/media_async/media_async.c
  5. 5
      src/media_async/media_async.h
  6. 16
      tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/ChatScreen.kt
  7. 2
      tools/chatgui/src/mainwindow.cpp

2
AGENTS.md

@ -729,7 +729,7 @@ void lottie_animation_destroy(Lottie_Animation *anim);
Android-версия чатгуи — P2P чат на STCP (TCP), UI на Jetpack Compose (Kotlin). Android-версия чатгуи — P2P чат на STCP (TCP), UI на Jetpack Compose (Kotlin).
C-ядро: `libutun_lite` (выборочная компиляция нужных .c из `lib/` и `src/`). C-ядро: `libutun_lite` (выборочная компиляция нужных .c из `lib/` и `src/`).
Сборка: CMake (headless, Linux) + Gradle/NDK (Android APK). Сборка: CMake (headless, Linux) + Gradle/NDK (Android APK).
- 'fw' - собрать и обновить chatgui-android на телефоне (clean + сборка + install) - 'fw' - собрать и обновить chatgui-android на всех подключенных телефонах (clean + сборка + install)
**Подробная инструкция:** `tools/chatgui-android/AGENTS.md` **Подробная инструкция:** `tools/chatgui-android/AGENTS.md`
**Chat-модули:** все файлы из `src/chat/` (описаны выше в секции «Chat») компилируются в `libutun_lite`. **Chat-модули:** все файлы из `src/chat/` (описаны выше в секции «Chat») компилируются в `libutun_lite`.

24
lib/async_dns.c

@ -40,7 +40,7 @@ struct adns_query {
char* name; char* name;
int fast; /* 1 = готовый /etc/hosts-ответ, без libdns */ int fast; /* 1 = готовый /etc/hosts-ответ, без libdns */
struct adns_result fast_result; struct adns_result fast_result;
void* call_soon_id; /* отложенный вызов для fast-пути */ void* call_soon_id; /* отложенный вызов (fast-путь и первый драйв slow-пути) */
}; };
static void adns_drive(struct adns_query* q); static void adns_drive(struct adns_query* q);
@ -397,6 +397,17 @@ static void adns_fast_ready_cb(void* arg) {
u_free(nm); u_free(nm);
} }
// Отложенный первый драйв slow-пути (libdns): adns_resolve возвращает живой handle,
// а реальный запуск запроса происходит в event loop. Это исключает ситуацию, когда
// dns_res_check завершается синхронно прямо внутри adns_resolve() и освобождает q
// до того, как вызывающий код получил и сохранил handle.
static void adns_drive_trampoline(void* arg) {
struct adns_query* q = (struct adns_query*)arg;
q->call_soon_id = NULL;
if (q->finished) return; // отменён до срабатывания
adns_drive(q);
}
/* ─── public API ─── */ /* ─── public API ─── */
struct adns_query* adns_resolve(struct UASYNC* ua, const char* name, struct adns_query* adns_resolve(struct UASYNC* ua, const char* name,
@ -466,15 +477,22 @@ struct adns_query* adns_resolve(struct UASYNC* ua, const char* name,
DEBUG_DEBUG(ADNS_DEBUG_CAT, "adns: resolving '%s' via %d server(s), timeout=%dms attempts=%d", DEBUG_DEBUG(ADNS_DEBUG_CAT, "adns: resolving '%s' via %d server(s), timeout=%dms attempts=%d",
name, count, timeout_ms, attempts); name, count, timeout_ms, attempts);
adns_drive(q); q->call_soon_id = uasync_call_soon(ua, q, adns_drive_trampoline);
if (!q->call_soon_id) {
DEBUG_ERROR(ADNS_DEBUG_CAT, "adns: uasync_call_soon failed for '%s'", name);
dns_res_close(q->res);
u_free(q->name);
u_free(q);
return NULL;
}
return q; return q;
} }
void adns_cancel(struct adns_query* q) { void adns_cancel(struct adns_query* q) {
if (!q || q->finished) return; if (!q || q->finished) return;
q->finished = 1; q->finished = 1;
if (q->fast) {
if (q->call_soon_id) { uasync_call_soon_cancel(q->ua, q->call_soon_id); q->call_soon_id = NULL; } if (q->call_soon_id) { uasync_call_soon_cancel(q->ua, q->call_soon_id); q->call_soon_id = NULL; }
if (q->fast) {
u_free(q->name); u_free(q->name);
u_free(q); u_free(q);
return; return;

269
src/chat/chat_msg.c

@ -30,6 +30,8 @@ chat_whisper_trigger_fn g_chat_whisper_trigger = NULL;
void chat_core_submit_media_message(struct chat_msg_submit* req); void chat_core_submit_media_message(struct chat_msg_submit* req);
static void wh_transcribe_done_cb(void* arg, const char* ch_id, const char* text, int err, static void wh_transcribe_done_cb(void* arg, const char* ch_id, const char* text, int err,
uint64_t reply_ts, uint64_t reply_node); uint64_t reply_ts, uint64_t reply_node);
static void chat_media_cache_cleanup_orphans(void);
static void chat_media_cache_enforce(void);
/* ─── отправка сообщения (GUI → uasync) ─── */ /* ─── отправка сообщения (GUI → uasync) ─── */
@ -574,6 +576,9 @@ static void md_download_done_cb(void* arg, int err) {
ctx->ts, ctx->author_node_id, ctx->ts, ctx->author_node_id,
wh_transcribe_done_cb, NULL); wh_transcribe_done_cb, NULL);
} }
/* после докачки — применить лимит медиакеша */
chat_media_cache_enforce();
} else { } else {
DEBUG_ERROR(DEBUG_CATEGORY_GENERAL, "%s: media download failed ch=%s err=%d", CC_ID, ctx->channel_id, err); DEBUG_ERROR(DEBUG_CATEGORY_GENERAL, "%s: media download failed ch=%s err=%d", CC_ID, ctx->channel_id, err);
/* пометить сообщение ошибкой, чтобы UI показал «повторить» */ /* пометить сообщение ошибкой, чтобы UI показал «повторить» */
@ -750,25 +755,25 @@ static int md_start_download(struct UTUN_INSTANCE* inst,
return 0; return 0;
} }
static void md_auto_download(struct UTUN_INSTANCE* inst, static int md_auto_download(struct UTUN_INSTANCE* inst,
const char* data_str, size_t data_len, const char* data_str, size_t data_len,
const char* ch_id, const char* base_filename, const char* ch_id, const char* base_filename,
uint64_t ts, const uint8_t* author_sig, uint64_t ts, const uint8_t* author_sig,
uint64_t author, int64_t msg_id, uint64_t author, int64_t msg_id,
const char* content_type) { const char* content_type) {
if (!chat_setting_get_int("storage_autoload", 1)) return; if (!chat_setting_get_int("storage_autoload", 1)) return 0;
uint64_t max_size = g_cc.inst->config->global.chatserver_storage_unit_size; uint64_t max_size = g_cc.inst->config->global.chatserver_storage_unit_size;
const char* p = data_str; const char* p = data_str;
while (*p && *p != '|') p++; while (*p && *p != '|') p++;
if (!*p) return; p++; if (!*p) return 0; p++;
long long fsize = strtoll(p, (char**)&p, 10); long long fsize = strtoll(p, (char**)&p, 10);
if (max_size > 0 && fsize > (long long)max_size) { if (max_size > 0 && fsize > (long long)max_size) {
DEBUG_INFO(DEBUG_CATEGORY_CHAT_SYNC, "%s: media too large (%lld > %llu bytes), skip auto-download", DEBUG_WARN(DEBUG_CATEGORY_GENERAL, "%s: media too large (%lld > %llu bytes), skip auto-download ch=%s file=%s",
CC_ID, fsize, (unsigned long long)max_size); CC_ID, fsize, (unsigned long long)max_size, ch_id, base_filename);
return; return 0;
} }
md_start_download(inst, data_str, data_len, ch_id, base_filename, ts, author_sig, author, msg_id, content_type); return md_start_download(inst, data_str, data_len, ch_id, base_filename, ts, author_sig, author, msg_id, content_type) == 0 ? 1 : 0;
} }
/* ─── db_sync callback ─── */ /* ─── db_sync callback ─── */
@ -1041,7 +1046,7 @@ void chat_media_autodownload_backfill(void) {
if (last_slash) snprintf(media_base, sizeof(media_base), "%.*s", (int)(last_slash - g_cc.db_path), g_cc.db_path); if (last_slash) snprintf(media_base, sizeof(media_base), "%.*s", (int)(last_slash - g_cc.db_path), g_cc.db_path);
else snprintf(media_base, sizeof(media_base), "%s", g_cc.db_path); else snprintf(media_base, sizeof(media_base), "%s", g_cc.db_path);
int scanned = 0, present = 0, started = 0; int scanned = 0, present = 0, started = 0, skipped = 0;
sqlite3_stmt* cs = NULL; sqlite3_stmt* cs = NULL;
if (sqlite3_prepare_v2(g_cc.db, "SELECT channel_id FROM channels", -1, &cs, NULL) != SQLITE_OK) return; if (sqlite3_prepare_v2(g_cc.db, "SELECT channel_id FROM channels", -1, &cs, NULL) != SQLITE_OK) return;
@ -1106,17 +1111,256 @@ void chat_media_autodownload_backfill(void) {
uint8_t author_sig[64]; memcpy(author_sig, sig_blob, 64); uint8_t author_sig[64]; memcpy(author_sig, sig_blob, 64);
DEBUG_INFO(DEBUG_CATEGORY_GENERAL, "%s: autodownload missing ch=%s id=%lld file=%s size=%lld", DEBUG_INFO(DEBUG_CATEGORY_GENERAL, "%s: autodownload missing ch=%s id=%lld file=%s size=%lld",
CC_ID, ch_id, (long long)msg_id, final_name, (long long)result.file_size); CC_ID, ch_id, (long long)msg_id, final_name, (long long)result.file_size);
md_auto_download(g_cc.inst, body, dlen, ch_id, base_filename, ts, author_sig, author, msg_id, content_type); if (md_auto_download(g_cc.inst, body, dlen, ch_id, base_filename, ts, author_sig, author, msg_id, content_type))
started++; started++;
else
skipped++;
u_free(body);
media_index_result_free(&result);
}
sqlite3_finalize(ms);
}
sqlite3_finalize(cs);
DEBUG_INFO(DEBUG_CATEGORY_GENERAL, "%s: autodownload backfill done scanned=%d present=%d started=%d skipped=%d days=%d",
CC_ID, scanned, present, started, skipped, days);
}
/* ─── Кеш медиафайлов: очистка сирот + лимит storage_total_size ───
* Возраст файла = timestamp исходного сообщения (msg_<ch>.timestamp).
* Сироты (файлы без сообщения, включая .chunk_* остатки) удаляются на старте.
* Лимит: при превышении storage_total_size удаляются самые старые файлы, но только
* старше storage_backfill_days (их backfill уже не докачает на следующем старте). */
struct media_msg_file {
char rel_path[1536]; // media/<ch_id>/<final_name>
char full_path[1536]; // <media_base>/media/<ch_id>/<final_name>
uint64_t ts_ms;
};
typedef void (*media_msg_file_cb)(const struct media_msg_file* f, void* arg);
static void chat_media_base(char* out, size_t out_sz) {
const char* ls = strrchr(g_cc.db_path, '/');
if (ls) snprintf(out, out_sz, "%.*s", (int)(ls - g_cc.db_path), g_cc.db_path);
else snprintf(out, out_sz, "%s", g_cc.db_path);
}
/* Итератор по всем медиасообщениям всех каналов (без фильтра по node_id/времени). */
static void chat_media_foreach_media_message(const char* media_base, media_msg_file_cb cb, void* arg) {
if (!g_cc.db || !cb) return;
sqlite3_stmt* cs = NULL;
if (sqlite3_prepare_v2(g_cc.db, "SELECT channel_id FROM channels", -1, &cs, NULL) != SQLITE_OK) return;
while (sqlite3_step(cs) == SQLITE_ROW) {
const char* ch_id = (const char*)sqlite3_column_text(cs, 0);
if (!ch_id || !ch_id[0]) continue;
char tbl[80]; msg_table_name(ch_id, tbl, sizeof(tbl));
char sql[256];
snprintf(sql, sizeof(sql), "SELECT timestamp, data FROM \"%s\"", tbl);
sqlite3_stmt* ms = NULL;
if (sqlite3_prepare_v2(g_cc.db, sql, -1, &ms, NULL) != SQLITE_OK) continue;
while (sqlite3_step(ms) == SQLITE_ROW) {
uint64_t ts = (uint64_t)sqlite3_column_int64(ms, 0);
const char* jdata = (const char*)sqlite3_column_text(ms, 1);
if (!jdata) continue;
const char* ds = strstr(jdata, "\"d\":\"");
if (!ds) continue;
const char* d_start = ds + 5;
const char* d_end = strchr(d_start, '"');
if (!d_end) continue;
size_t dlen = (size_t)(d_end - d_start);
if (dlen == 0 || dlen > 65536) continue;
char* body = u_malloc(dlen + 1);
if (!body) { DEBUG_ERROR(DEBUG_CATEGORY_GENERAL, "%s: cache scan malloc failed ch=%s", CC_ID, ch_id); continue; }
memcpy(body, d_start, dlen); body[dlen] = '\0';
struct media_index_result result;
if (chat_msg_parse_media_body(body, &result) != 0) { u_free(body); continue; }
char content_type[32] = {0};
const char* ct = strstr(jdata, "\"ct\":\"");
if (ct) {
const char* cv = ct + 6;
int i = 0;
while (cv[i] && cv[i] != '"' && i < (int)sizeof(content_type) - 1) content_type[i++] = cv[i];
content_type[i] = '\0';
}
char base_filename[256];
extract_base_filename(body, base_filename, sizeof(base_filename));
char final_name[256];
media_final_name(&result, content_type, base_filename, final_name, sizeof(final_name));
struct media_msg_file f;
snprintf(f.rel_path, sizeof(f.rel_path), "media/%s/%s", ch_id, final_name);
snprintf(f.full_path, sizeof(f.full_path), "%s/media/%s/%s", media_base, ch_id, final_name);
f.ts_ms = ts;
cb(&f, arg);
u_free(body); u_free(body);
media_index_result_free(&result); media_index_result_free(&result);
} }
sqlite3_finalize(ms); sqlite3_finalize(ms);
} }
sqlite3_finalize(cs); sqlite3_finalize(cs);
}
struct cache_file { char full_path[1536]; uint64_t ts_ms; int64_t size; };
struct cache_rel_list { char** items; int count, cap; };
struct cache_file_list { struct cache_file* files; int count, cap; };
static int cache_str_cmp(const void* a, const void* b) {
return strcmp(*(const char* const*)a, *(const char* const*)b);
}
static int cache_file_cmp_ts(const void* a, const void* b) {
const struct cache_file* x = (const struct cache_file*)a;
const struct cache_file* y = (const struct cache_file*)b;
if (x->ts_ms < y->ts_ms) return -1;
if (x->ts_ms > y->ts_ms) return 1;
return 0;
}
static int cache_rel_add(struct cache_rel_list* l, const char* rel) {
if (l->count == l->cap) {
int nc = l->cap ? l->cap * 2 : 64;
char** ni = u_realloc(l->items, (size_t)nc * sizeof(char*));
if (!ni) { DEBUG_ERROR(DEBUG_CATEGORY_GENERAL, "%s: cache rel list realloc failed (%d)", CC_ID, nc); return -1; }
l->items = ni; l->cap = nc;
}
l->items[l->count] = u_strdup(rel);
if (!l->items[l->count]) { DEBUG_ERROR(DEBUG_CATEGORY_GENERAL, "%s: cache rel strdup failed", CC_ID); return -1; }
l->count++;
return 0;
}
static int cache_file_add(struct cache_file_list* l, const char* full_path, uint64_t ts_ms, int64_t size) {
if (l->count == l->cap) {
int nc = l->cap ? l->cap * 2 : 64;
struct cache_file* ni = u_realloc(l->files, (size_t)nc * sizeof(struct cache_file));
if (!ni) { DEBUG_ERROR(DEBUG_CATEGORY_GENERAL, "%s: cache file list realloc failed (%d)", CC_ID, nc); return -1; }
l->files = ni; l->cap = nc;
}
snprintf(l->files[l->count].full_path, sizeof(l->files[l->count].full_path), "%s", full_path);
l->files[l->count].ts_ms = ts_ms;
l->files[l->count].size = size;
l->count++;
return 0;
}
static void cache_rel_collect_cb(const struct media_msg_file* f, void* arg) {
cache_rel_add((struct cache_rel_list*)arg, f->rel_path);
}
static void cache_file_collect_cb(const struct media_msg_file* f, void* arg) {
int fsz = ma_file_size(f->full_path);
if (fsz > 0) cache_file_add((struct cache_file_list*)arg, f->full_path, f->ts_ms, (int64_t)fsz);
}
struct orphan_walk_ctx {
const char* media_base;
size_t mb_len;
char** rels; int rel_count;
int removed; uint64_t removed_bytes;
};
static void orphan_walk_cb(void* arg, const char* full_path, int64_t size) {
struct orphan_walk_ctx* ow = (struct orphan_walk_ctx*)arg;
const char* rel = full_path;
if (strncmp(full_path, ow->media_base, ow->mb_len) == 0 && full_path[ow->mb_len] == '/')
rel = full_path + ow->mb_len + 1;
else return;
char* found = bsearch(&rel, ow->rels, (size_t)ow->rel_count, sizeof(char*), cache_str_cmp);
if (found) return;
if (remove(full_path) == 0) {
ow->removed++;
ow->removed_bytes += (uint64_t)(size > 0 ? size : 0);
DEBUG_INFO(DEBUG_CATEGORY_GENERAL, "%s: cache orphan removed: %s (%lld bytes)",
CC_ID, rel, (long long)size);
} else {
DEBUG_WARN(DEBUG_CATEGORY_GENERAL, "%s: cache orphan remove failed: %s", CC_ID, full_path);
}
}
static void chat_media_cache_cleanup_orphans(void) {
if (!g_cc.initialized || !g_cc.db || !g_cc.inst) return;
char media_base[512]; chat_media_base(media_base, sizeof(media_base));
char media_dir[600]; snprintf(media_dir, sizeof(media_dir), "%s/media", media_base);
struct cache_rel_list rels = {0};
chat_media_foreach_media_message(media_base, cache_rel_collect_cb, &rels);
if (rels.count > 1) qsort(rels.items, (size_t)rels.count, sizeof(char*), cache_str_cmp);
struct orphan_walk_ctx ow;
ow.media_base = media_base; ow.mb_len = strlen(media_base);
ow.rels = rels.items; ow.rel_count = rels.count;
ow.removed = 0; ow.removed_bytes = 0;
ma_dir_walk(media_dir, orphan_walk_cb, &ow);
DEBUG_INFO(DEBUG_CATEGORY_GENERAL, "%s: cache orphan cleanup done removed=%d bytes=%llu",
CC_ID, ow.removed, (unsigned long long)ow.removed_bytes);
for (int i = 0; i < rels.count; i++) u_free(rels.items[i]);
u_free(rels.items);
}
static void chat_media_cache_enforce(void) {
if (!g_cc.initialized || !g_cc.db || !g_cc.inst) return;
uint64_t limit = g_cc.inst->config->global.chatserver_storage_total_size;
if (limit == 0) return;
char media_base[512]; chat_media_base(media_base, sizeof(media_base));
struct cache_file_list files = {0};
chat_media_foreach_media_message(media_base, cache_file_collect_cb, &files);
uint64_t total = 0;
for (int i = 0; i < files.count; i++) total += (uint64_t)(files.files[i].size > 0 ? files.files[i].size : 0);
if (total <= limit) {
DEBUG_INFO(DEBUG_CATEGORY_GENERAL, "%s: cache limit ok total=%llu limit=%llu files=%d",
CC_ID, (unsigned long long)total, (unsigned long long)limit, files.count);
u_free(files.files);
return;
}
if (files.count > 1) qsort(files.files, (size_t)files.count, sizeof(struct cache_file), cache_file_cmp_ts);
int days = chat_setting_get_int("storage_backfill_days", 7);
uint64_t now_ms = (uint64_t)ntp_time_get_seconds(g_cc.inst) * 1000ULL;
uint64_t cutoff_ms = now_ms - (uint64_t)days * 86400ULL * 1000ULL;
int deleted = 0; uint64_t deleted_bytes = 0;
for (int i = 0; i < files.count && total > limit; i++) {
if (files.files[i].ts_ms >= cutoff_ms) continue;
if (remove(files.files[i].full_path) == 0) {
DEBUG_INFO(DEBUG_CATEGORY_GENERAL, "%s: cache evict: %s ts=%llu size=%lld",
CC_ID, files.files[i].full_path,
(unsigned long long)files.files[i].ts_ms, (long long)files.files[i].size);
total -= (uint64_t)(files.files[i].size > 0 ? files.files[i].size : 0);
deleted_bytes += (uint64_t)(files.files[i].size > 0 ? files.files[i].size : 0);
deleted++;
} else {
DEBUG_WARN(DEBUG_CATEGORY_GENERAL, "%s: cache evict failed: %s", CC_ID, files.files[i].full_path);
}
}
if (total > limit)
DEBUG_WARN(DEBUG_CATEGORY_GENERAL, "%s: cache still over limit total=%llu limit=%llu (older-than-%d-days files exhausted)",
CC_ID, (unsigned long long)total, (unsigned long long)limit, days);
else
DEBUG_INFO(DEBUG_CATEGORY_GENERAL, "%s: cache limit enforced total=%llu limit=%llu deleted=%d bytes=%llu",
CC_ID, (unsigned long long)total, (unsigned long long)limit, deleted, (unsigned long long)deleted_bytes);
DEBUG_INFO(DEBUG_CATEGORY_GENERAL, "%s: autodownload backfill done scanned=%d present=%d started=%d days=%d", u_free(files.files);
CC_ID, scanned, present, started, days);
} }
/* ─── Триггер: после первого SYNC_DONE (+ дебаунс) — анонс локальных блоков + докачка ─── */ /* ─── Триггер: после первого SYNC_DONE (+ дебаунс) — анонс локальных блоков + докачка ─── */
@ -1132,6 +1376,9 @@ static void media_startup_backfill_timer_cb(void* arg) {
/* 1) переанонс локальных блоков суперузлам (block_availability), 2) докачка недостающего */ /* 1) переанонс локальных блоков суперузлам (block_availability), 2) докачка недостающего */
media_delivery_announce_local_blocks(inst); media_delivery_announce_local_blocks(inst);
chat_media_autodownload_backfill(); chat_media_autodownload_backfill();
/* 3) сверка кеша: удалить сироты и применить лимит storage_total_size */
chat_media_cache_cleanup_orphans();
chat_media_cache_enforce();
} }
static void media_startup_backfill_done_cb(struct DB_SYNC_INSTANCE* si, uint64_t peer_node_id, void* arg) { static void media_startup_backfill_done_cb(struct DB_SYNC_INSTANCE* si, uint64_t peer_node_id, void* arg) {

56
src/media_async/media_async.c

@ -13,6 +13,12 @@
#include <string.h> #include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef _WIN32
#include <windows.h>
#else
#include <dirent.h>
#endif
struct media_async { struct media_async {
int initialized; int initialized;
}; };
@ -152,3 +158,53 @@ int ma_file_size(const char* path) {
void ma_uuid(uint8_t uuid_out[16]) { void ma_uuid(uint8_t uuid_out[16]) {
RAND_bytes(uuid_out, 16); RAND_bytes(uuid_out, 16);
} }
/* ─── Рекурсивный обход каталога (кроссплатформенный) ─── */
struct ma_walk_ctx { ma_dir_walk_cb cb; void* arg; };
#ifndef _WIN32
static void ma_walk_recursive(const char* dir, struct ma_walk_ctx* wc) {
DIR* d = opendir(dir);
if (!d) return;
struct dirent* e;
while ((e = readdir(d)) != NULL) {
const char* n = e->d_name;
if (n[0] == '.' && (n[1] == '\0' || (n[1] == '.' && n[2] == '\0'))) continue;
char full[4096];
snprintf(full, sizeof(full), "%s/%s", dir, n);
struct stat st;
if (lstat(full, &st) != 0) continue;
if (S_ISDIR(st.st_mode)) ma_walk_recursive(full, wc);
else if (S_ISREG(st.st_mode)) wc->cb(wc->arg, full, (int64_t)st.st_size);
}
closedir(d);
}
#else
static void ma_walk_recursive(const char* dir, struct ma_walk_ctx* wc) {
char pattern[4096];
snprintf(pattern, sizeof(pattern), "%s/*", dir);
WIN32_FIND_DATAA fd;
HANDLE h = FindFirstFileA(pattern, &fd);
if (h == INVALID_HANDLE_VALUE) return;
do {
const char* n = fd.cFileName;
if (n[0] == '.' && (n[1] == '\0' || (n[1] == '.' && n[2] == '\0'))) continue;
char full[4096];
snprintf(full, sizeof(full), "%s/%s", dir, n);
if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ma_walk_recursive(full, wc);
else {
LARGE_INTEGER sz; sz.HighPart = fd.nFileSizeHigh; sz.LowPart = fd.nFileSizeLow;
wc->cb(wc->arg, full, (int64_t)sz.QuadPart);
}
} while (FindNextFileA(h, &fd));
FindClose(h);
}
#endif
int ma_dir_walk(const char* dir, ma_dir_walk_cb cb, void* arg) {
if (!dir || !dir[0] || !cb) return -1;
struct ma_walk_ctx wc; wc.cb = cb; wc.arg = arg;
ma_walk_recursive(dir, &wc);
return 0;
}

5
src/media_async/media_async.h

@ -30,6 +30,11 @@ int ma_copy_file(const char* src, const char* dst);
int ma_file_size(const char* path); int ma_file_size(const char* path);
void ma_uuid(uint8_t uuid_out[16]); void ma_uuid(uint8_t uuid_out[16]);
/* Рекурсивный обход каталога: для каждого regular-файла вызывается cb(full_path, size).
* Пути строятся с '/' (принимается и POSIX, и Win32 API). 0 = ok, -1 = неверные аргументы. */
typedef void (*ma_dir_walk_cb)(void* arg, const char* full_path, int64_t size);
int ma_dir_walk(const char* dir, ma_dir_walk_cb cb, void* arg);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

16
tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/ChatScreen.kt

@ -111,8 +111,22 @@ fun ChatScreen(
val playbackState by viewModel.playbackState.collectAsState() val playbackState by viewModel.playbackState.collectAsState()
var initialScrolled by remember { mutableStateOf(false) }
LaunchedEffect(messages.size) { LaunchedEffect(messages.size) {
if (messages.isNotEmpty()) listState.animateScrollToItem(messages.size - 1) if (messages.isEmpty()) return@LaunchedEffect
val lastIndex = messages.size - 1
if (!initialScrolled) {
/* первый вход — мгновенный прыжок вниз без анимации */
listState.scrollToItem(lastIndex)
initialScrolled = true
return@LaunchedEffect
}
/* новое сообщение: анимируем только если пользователь у нижнего края */
val lastVisible = listState.layoutInfo.visibleItemsInfo.lastOrNull()?.index ?: -1
if (lastIndex - lastVisible <= 1) {
listState.animateScrollToItem(lastIndex)
}
} }
Column( Column(

2
tools/chatgui/src/mainwindow.cpp

@ -493,8 +493,10 @@ void MainWindow::requestShutdown() {
} }
void MainWindow::onShutdownCheck() { void MainWindow::onShutdownCheck() {
#ifndef _WIN32
if (g_signalFlag) if (g_signalFlag)
requestShutdown(); requestShutdown();
#endif
} }
void MainWindow::onTrayActivated(QSystemTrayIcon::ActivationReason reason) { void MainWindow::onTrayActivated(QSystemTrayIcon::ActivationReason reason) {

Loading…
Cancel
Save