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.
This commit is contained in:
1 parent
db918f83a0
commit
2836bf2c33
19 files changed
+260
-17
No files matched your search
@@ -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 \
|
||||
|
||||
+13
-1
@@ -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
|
||||
---
|
||||
|
||||
+13
-1
@@ -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
|
||||
---
|
||||
|
||||
@@ -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
|
||||
---
|
||||
|
||||
+13
-1
@@ -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
|
||||
---
|
||||
|
||||
+13
-1
@@ -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
|
||||
---
|
||||
|
||||
+13
-1
@@ -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
|
||||
---
|
||||
|
||||
+13
-1
@@ -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
|
||||
---
|
||||
|
||||
+13
-1
@@ -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]
|
||||
名前
|
||||
---
|
||||
|
||||
+13
-1
@@ -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]
|
||||
이름
|
||||
---
|
||||
|
||||
+13
-1
@@ -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
|
||||
---
|
||||
|
||||
+13
-1
@@ -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]
|
||||
Название
|
||||
---
|
||||
|
||||
+13
-1
@@ -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]
|
||||
名称
|
||||
---
|
||||
|
||||
@@ -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" {
|
||||
|
||||
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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")
|
||||
@@ -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
|
||||
}
|
||||
Executable
+28
@@ -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"
|
||||
Reference in new issue
Block a user