From 2836bf2c33f823ebe6b5d183594dd8b3fc6563be Mon Sep 17 00:00:00 2001 From: Waozi Date: Mon, 28 Sep 2026 12:42:22 -0300 Subject: [PATCH] Stop habit statistics from crashing and add missing labels Opening a habit's statistics aborted the app when checked-in sessions had no before-mood, energy, or stress rating, because the averages divided by a zero count. Averages now skip empty groups and keep their fraction instead of truncating to whole numbers. The habit edit button and the sync review dialog showed raw locale keys; they are now translated in every locale, along with the sync review message, and a test checks that every key the app uses exists in every locale. Habit statistics and calendar screenshot scenes now select a habit so they show those views. --- Makefile | 20 ++++++++++++++++++++ locales/cs.txt | 14 +++++++++++++- locales/de.txt | 14 +++++++++++++- locales/en.txt | 12 ++++++++++++ locales/es.txt | 14 +++++++++++++- locales/fr.txt | 14 +++++++++++++- locales/id.txt | 14 +++++++++++++- locales/it.txt | 14 +++++++++++++- locales/ja.txt | 14 +++++++++++++- locales/ko.txt | 14 +++++++++++++- locales/pt.txt | 14 +++++++++++++- locales/ru.txt | 14 +++++++++++++- locales/zh.txt | 14 +++++++++++++- src/app/screenshots.zi | 6 ++++-- src/storage/mood_average.zi | 9 +++++++++ src/storage/storage_sessions.zi | 9 +++++---- tests/locale_used_keys_test.py | 25 +++++++++++++++++++++++++ tests/mood_average_behavior.zi | 14 ++++++++++++++ tests/mood_average_zi_test.sh | 28 ++++++++++++++++++++++++++++ 19 files changed, 260 insertions(+), 17 deletions(-) create mode 100644 src/storage/mood_average.zi create mode 100644 tests/locale_used_keys_test.py create mode 100644 tests/mood_average_behavior.zi create mode 100755 tests/mood_average_zi_test.sh diff --git a/Makefile b/Makefile index e404ea82a..4d8ec4d64 100644 --- a/Makefile +++ b/Makefile @@ -1315,6 +1315,26 @@ metrics-zi-test: $(ZI2C_BIN) test: metrics-zi-test +.PHONY: mood-average-zi-test +mood-average-zi-test: $(ZI2C_BIN) + @env -u DISPLAY -u WAYLAND_DISPLAY \ + sh tests/mood_average_zi_test.sh $(ZIRAN_BUILD_DIR)/bin + +test: mood-average-zi-test + +.PHONY: habit-session-rules-zi-test +habit-session-rules-zi-test: $(ZI2C_BIN) + @env -u DISPLAY -u WAYLAND_DISPLAY \ + sh tests/habit_session_rules_zi_test.sh $(ZIRAN_BUILD_DIR)/bin + +test: habit-session-rules-zi-test + +.PHONY: locale-used-keys-test +locale-used-keys-test: + @python3 tests/locale_used_keys_test.py + +test: locale-used-keys-test + .PHONY: music-library-zi-test music-library-zi-test: $(ZI2C_BIN) @env -u DISPLAY -u WAYLAND_DISPLAY \ diff --git a/locales/cs.txt b/locales/cs.txt index 1a55e79c1..b17866a3a 100644 --- a/locales/cs.txt +++ b/locales/cs.txt @@ -686,7 +686,16 @@ Synchronizační server uložen Sync needs review --- [sync_review_message] -Review data differences. +Zkontrolujte rozdíly v datech. +--- +[sync_review_title] +Kontrola změn synchronizace +--- +[sync_review_keep_local] +Ponechat toto zařízení +--- +[sync_review_use_remote] +Použít synchronizovaná data --- [sync_review_using_remote] Using remote data @@ -784,6 +793,9 @@ Splnit dnes [habit_edit_title] Upravit návyk --- +[habit_edit_button] +Upravit návyk +--- [habit_name_label] Název --- diff --git a/locales/de.txt b/locales/de.txt index 9c2975caf..4cb9bbdc5 100644 --- a/locales/de.txt +++ b/locales/de.txt @@ -686,7 +686,16 @@ Sync-Server gespeichert Sync needs review --- [sync_review_message] -Review data differences. +Prüfe die Unterschiede in den Daten. +--- +[sync_review_title] +Synchronisierungsänderungen prüfen +--- +[sync_review_keep_local] +Dieses Gerät behalten +--- +[sync_review_use_remote] +Synchronisierte Daten verwenden --- [sync_review_using_remote] Using remote data @@ -784,6 +793,9 @@ Heute abschließen [habit_edit_title] Gewohnheit bearbeiten --- +[habit_edit_button] +Gewohnheit bearbeiten +--- [habit_name_label] Bezeichnung --- diff --git a/locales/en.txt b/locales/en.txt index e2abb222b..dd057931f 100644 --- a/locales/en.txt +++ b/locales/en.txt @@ -967,6 +967,15 @@ Sync needs review [sync_review_message] Review data differences. --- +[sync_review_title] +Review sync changes +--- +[sync_review_keep_local] +Keep this device +--- +[sync_review_use_remote] +Use synced data +--- [sync_review_using_remote] Using remote data --- @@ -1063,6 +1072,9 @@ Complete today [habit_edit_title] Edit Habit --- +[habit_edit_button] +Edit habit +--- [habit_name_label] Name --- diff --git a/locales/es.txt b/locales/es.txt index 9fc663585..28adb46bb 100644 --- a/locales/es.txt +++ b/locales/es.txt @@ -695,7 +695,16 @@ Servidor de sincronización guardado Sync needs review --- [sync_review_message] -Review data differences. +Revisa las diferencias en los datos. +--- +[sync_review_title] +Revisar cambios de sincronización +--- +[sync_review_keep_local] +Mantener este dispositivo +--- +[sync_review_use_remote] +Usar datos sincronizados --- [sync_review_using_remote] Using remote data @@ -793,6 +802,9 @@ Completar hoy [habit_edit_title] Editar hábito --- +[habit_edit_button] +Editar hábito +--- [habit_name_label] Nombre --- diff --git a/locales/fr.txt b/locales/fr.txt index e97edda87..4f257a002 100644 --- a/locales/fr.txt +++ b/locales/fr.txt @@ -722,7 +722,16 @@ Serveur de synchronisation enregistré Sync needs review --- [sync_review_message] -Review data differences. +Vérifiez les différences dans les données. +--- +[sync_review_title] +Vérifier les changements de synchronisation +--- +[sync_review_keep_local] +Garder cet appareil +--- +[sync_review_use_remote] +Utiliser les données synchronisées --- [sync_review_using_remote] Using remote data @@ -820,6 +829,9 @@ Terminer aujourd’hui [habit_edit_title] Modifier l'habitude --- +[habit_edit_button] +Modifier l'habitude +--- [habit_name_label] Nom --- diff --git a/locales/id.txt b/locales/id.txt index 8c9a7741f..3d8738bc8 100644 --- a/locales/id.txt +++ b/locales/id.txt @@ -695,7 +695,16 @@ Server sinkronisasi disimpan Sync needs review --- [sync_review_message] -Review data differences. +Tinjau perbedaan data. +--- +[sync_review_title] +Tinjau perubahan sinkronisasi +--- +[sync_review_keep_local] +Pertahankan perangkat ini +--- +[sync_review_use_remote] +Gunakan data tersinkron --- [sync_review_using_remote] Using remote data @@ -793,6 +802,9 @@ Selesaikan hari ini [habit_edit_title] Edit kebiasaan --- +[habit_edit_button] +Ubah kebiasaan +--- [habit_name_label] Nama --- diff --git a/locales/it.txt b/locales/it.txt index aef562a74..7be3440ad 100644 --- a/locales/it.txt +++ b/locales/it.txt @@ -686,7 +686,16 @@ Server di sincronizzazione salvato Sync needs review --- [sync_review_message] -Review data differences. +Controlla le differenze nei dati. +--- +[sync_review_title] +Controlla le modifiche di sincronizzazione +--- +[sync_review_keep_local] +Mantieni questo dispositivo +--- +[sync_review_use_remote] +Usa i dati sincronizzati --- [sync_review_using_remote] Using remote data @@ -784,6 +793,9 @@ Completa oggi [habit_edit_title] Modifica abitudine --- +[habit_edit_button] +Modifica abitudine +--- [habit_name_label] Nome --- diff --git a/locales/ja.txt b/locales/ja.txt index c49b5fdf7..959e5bed3 100644 --- a/locales/ja.txt +++ b/locales/ja.txt @@ -688,7 +688,16 @@ https:// または localhost:8080 のようなループバックを使用して Sync needs review --- [sync_review_message] -Review data differences. +データの違いを確認してください。 +--- +[sync_review_title] +同期の変更を確認 +--- +[sync_review_keep_local] +この端末のデータを保持 +--- +[sync_review_use_remote] +同期データを使用 --- [sync_review_using_remote] Using remote data @@ -786,6 +795,9 @@ Sync review failed [habit_edit_title] 習慣を編集 --- +[habit_edit_button] +習慣を編集 +--- [habit_name_label] 名前 --- diff --git a/locales/ko.txt b/locales/ko.txt index 7984c083f..9178c8a31 100644 --- a/locales/ko.txt +++ b/locales/ko.txt @@ -686,7 +686,16 @@ https:// 또는 localhost:8080 같은 루프백을 사용하세요 Sync needs review --- [sync_review_message] -Review data differences. +데이터 차이를 검토하세요. +--- +[sync_review_title] +동기화 변경 사항 검토 +--- +[sync_review_keep_local] +이 기기 데이터 유지 +--- +[sync_review_use_remote] +동기화된 데이터 사용 --- [sync_review_using_remote] Using remote data @@ -784,6 +793,9 @@ Sync review failed [habit_edit_title] 습관 편집 --- +[habit_edit_button] +습관 편집 +--- [habit_name_label] 이름 --- diff --git a/locales/pt.txt b/locales/pt.txt index 80fae6690..7b60e621f 100644 --- a/locales/pt.txt +++ b/locales/pt.txt @@ -695,7 +695,16 @@ Servidor de sincronização salvo Sync needs review --- [sync_review_message] -Review data differences. +Revise as diferenças nos dados. +--- +[sync_review_title] +Revisar alterações de sincronização +--- +[sync_review_keep_local] +Manter este dispositivo +--- +[sync_review_use_remote] +Usar dados sincronizados --- [sync_review_using_remote] Using remote data @@ -793,6 +802,9 @@ Concluir hoje [habit_edit_title] Editar hábito --- +[habit_edit_button] +Editar hábito +--- [habit_name_label] Nome --- diff --git a/locales/ru.txt b/locales/ru.txt index e0c9f6e12..b40d4c9e2 100644 --- a/locales/ru.txt +++ b/locales/ru.txt @@ -686,7 +686,16 @@ Trocador Sync needs review --- [sync_review_message] -Review data differences. +Проверьте различия в данных. +--- +[sync_review_title] +Проверка изменений синхронизации +--- +[sync_review_keep_local] +Оставить данные этого устройства +--- +[sync_review_use_remote] +Использовать синхронизированные данные --- [sync_review_using_remote] Using remote data @@ -784,6 +793,9 @@ Sync review failed [habit_edit_title] Изменить привычку --- +[habit_edit_button] +Изменить привычку +--- [habit_name_label] Название --- diff --git a/locales/zh.txt b/locales/zh.txt index 757784894..b0d0002f1 100644 --- a/locales/zh.txt +++ b/locales/zh.txt @@ -686,7 +686,16 @@ Trocador Sync needs review --- [sync_review_message] -Review data differences. +请检查数据差异。 +--- +[sync_review_title] +检查同步更改 +--- +[sync_review_keep_local] +保留此设备的数据 +--- +[sync_review_use_remote] +使用同步的数据 --- [sync_review_using_remote] Using remote data @@ -784,6 +793,9 @@ Sync review failed [habit_edit_title] 编辑习惯 --- +[habit_edit_button] +编辑习惯 +--- [habit_name_label] 名称 --- diff --git a/src/app/screenshots.zi b/src/app/screenshots.zi index a2f21206a..d83f65b4a 100644 --- a/src/app/screenshots.zi +++ b/src/app/screenshots.zi @@ -263,6 +263,8 @@ setup_screenshot_scene :: (app: *InnerBreeze, request: *ScreenshotRequest) { } else if AppTextFromCString(*request.scene[0], 64) == "statistics" { app.main_tab = APP_MAIN_TAB_HABITS app.habits.tab = HABIT_TAB_STATISTICS + app.habits.screen_mode = HABITS_SCREEN_STATISTICS + app.habits.selected = 0 app.breathing.screen = ScreenHabits } else if AppTextFromCString(*request.scene[0], 64) == "profile" { app.main_tab = APP_MAIN_TAB_NONE @@ -348,7 +350,7 @@ setup_screenshot_scene :: (app: *InnerBreeze, request: *ScreenshotRequest) { } else if AppTextFromCString(*request.scene[0], 64) == "calendar_meditation" { app.main_tab = APP_MAIN_TAB_HABITS app.habits.screen_mode = HABITS_SCREEN_HISTORY - app.habits.selected = -1 + app.habits.selected = 0 app.habits.tab = HABIT_TAB_MONTHLY app.breathing.screen = ScreenHabits app.habits.view_mode = HABIT_VIEW_CALENDAR @@ -362,7 +364,7 @@ setup_screenshot_scene :: (app: *InnerBreeze, request: *ScreenshotRequest) { } else if AppTextFromCString(*request.scene[0], 64) == "habits_stats" { app.main_tab = APP_MAIN_TAB_HABITS app.habits.screen_mode = HABITS_SCREEN_STATISTICS - app.habits.selected = -1 + app.habits.selected = 0 app.habits.tab = HABIT_TAB_STATISTICS app.breathing.screen = ScreenHabits } else if AppTextFromCString(*request.scene[0], 64) == "theme_selection" { diff --git a/src/storage/mood_average.zi b/src/storage/mood_average.zi new file mode 100644 index 000000000..9345ce71f --- /dev/null +++ b/src/storage/mood_average.zi @@ -0,0 +1,9 @@ +// Averages of 1-5 mood ratings. A group with no ratings averages to zero +// rather than dividing by zero, and the result keeps its fraction. +#program_export +SessionMoodAverage :: (total: s64, count: s32) -> float32 { + if count <= 0 { + return 0.0 + } + return cast(float32)cast(float64)total / cast(float32)count +} diff --git a/src/storage/storage_sessions.zi b/src/storage/storage_sessions.zi index bd6ef5047..8e7229200 100644 --- a/src/storage/storage_sessions.zi +++ b/src/storage/storage_sessions.zi @@ -3,6 +3,7 @@ STORAGE_ID_SIZE :: 64 time :: (t: *s64) -> s64 #foreign c; localtime :: (t: *s64) -> *Tm #foreign c; mktime :: (tm: *Tm) -> s64 #foreign c; +#import, file "mood_average.zi"; #import "string_range" #import "byte_text_linux" #import "file_linux" @@ -503,10 +504,10 @@ storage_mood_stats :: (activity_mask: s32, days: s32, } SqliteFinalize(stmt) if stats.total > 0 { - stats.average = cast(float32)(after_total / cast(s64)stats.total) - stats.lift = cast(float32)(lift_total / cast(s64)lift_count) - stats.energy = cast(float32)(energy_total / cast(s64)energy_count) - stats.stress = cast(float32)(stress_total / cast(s64)stress_count) + stats.average = SessionMoodAverage(after_total, stats.total) + stats.lift = SessionMoodAverage(lift_total, lift_count) + stats.energy = SessionMoodAverage(energy_total, energy_count) + stats.stress = SessionMoodAverage(stress_total, stress_count) } return stats.total } diff --git a/tests/locale_used_keys_test.py b/tests/locale_used_keys_test.py new file mode 100644 index 000000000..049d1962e --- /dev/null +++ b/tests/locale_used_keys_test.py @@ -0,0 +1,25 @@ +#!/usr/bin/env python3 +"""Every LocaleText key used in the sources exists in every locale file.""" + +from pathlib import Path +import re +import sys + +root = Path(__file__).resolve().parent.parent +used = set() +for source in (root / "src").rglob("*.zi"): + used |= set(re.findall(r'LocaleText\(\s*"([a-z0-9_]+)"', source.read_text(encoding="utf-8"))) + +failures = [] +for locale in sorted((root / "locales").glob("*.txt")): + if locale.name == "index.txt": + continue + keys = set(re.findall(r"(?m)^\[([a-z0-9_]+)\]$", locale.read_text(encoding="utf-8"))) + missing = sorted(used - keys) + if missing: + failures.append(f"{locale.name}: missing {', '.join(missing)}") + +if failures: + print("\n".join(failures), file=sys.stderr) + sys.exit(1) +print(f"All {len(used)} used locale keys exist in every locale") diff --git a/tests/mood_average_behavior.zi b/tests/mood_average_behavior.zi new file mode 100644 index 000000000..3519468f5 --- /dev/null +++ b/tests/mood_average_behavior.zi @@ -0,0 +1,14 @@ +#import, file "../src/storage/mood_average.zi"; + +#program_export +Answer :: () -> s32 { + // Sessions rated after practice but never before: no lift to average. + if SessionMoodAverage(0, 0) != 0.0 { return 0 } + if SessionMoodAverage(12, 0) != 0.0 { return 0 } + // 4 + 5 + 5 over three sessions keeps its fraction. + average := SessionMoodAverage(14, 3) + if average < 4.66 || average > 4.67 { return 0 } + // Mood lift can be negative. + if SessionMoodAverage(-3, 2) != -1.5 { return 0 } + return 42 +} diff --git a/tests/mood_average_zi_test.sh b/tests/mood_average_zi_test.sh new file mode 100755 index 000000000..508b1db3e --- /dev/null +++ b/tests/mood_average_zi_test.sh @@ -0,0 +1,28 @@ +#!/bin/sh +set -eu + +root=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd) +bin=${1:-"$root/build/ziran-toolchain/bin"} +work=$(mktemp -d "$root/build/mood-average-test.XXXXXX") +trap 'rm -rf "$work"' EXIT HUP INT TERM +source=$root/tests/mood_average_behavior.zi + +"$bin/ziran" bundle --root "$root" \ + --module-path "$root/src" \ + --entry mood_average_behavior:Answer \ + -o "$work/mood.zib" "$source" +test "$("$bin/ziran" run "$work/mood.zib")" = 42 + +"$bin/zi2c" --no-main --root "$root" \ + --module-path "$root/src" \ + -o "$work/c" "$source" +cat > "$work/c/main.c" <<'C' +#include "mood_average_behavior.h" +int main(void) { return Answer() == 42 ? 0 : 1; } +C +"${CC:-cc}" -std=c11 -ffunction-sections -fdata-sections \ + -Wl,--gc-sections -I"$root/build/packages/ziran/include" \ + -I"$work/c" -I"$work/c/tests" \ + "$work/c"/*.c "$work/c/tests"/*.c -o "$work/mood-test" +env -u DISPLAY -u WAYLAND_DISPLAY "$work/mood-test" +echo "Session mood averages passed"