Andee lives on your phone or Mac and uses any app like you do—no integrations, no root, any model; memory and passwords never leave your device | Andee 住进你的手机或 Mac,像你一样操作任何 App——无需集成、无需 Root、支持任意模型,记忆和密码绝不离开设备。
fix: the nightly picture todo names no tool and no language
booboosui0eaaa33d8b11
diff --git a/app/src/main/java/net/kuafuai/andee/config/Notebook.kt b/app/src/main/java/net/kuafuai/andee/config/Notebook.ktindex c4bc8ba..e5964d1 100644--- a/app/src/main/java/net/kuafuai/andee/config/Notebook.kt+++ b/app/src/main/java/net/kuafuai/andee/config/Notebook.kt@@ -181,8 +181,7 @@ object Notebook {internal fun toJson(t: Todo): JSONObject = NotebookBook.toJson(t)fun newTodoId(): String = NotebookBook.newTodoId()fun addTodo(context: Context, todo: Todo) = book(context).addTodo(todo)- fun seedDefaults(context: Context): List<Todo> =- book(context).seedDefaults(zh = VoiceConfig.uiLanguage(context) == "zh")+ fun seedDefaults(context: Context): List<Todo> = book(context).seedDefaults()fun patchTodo(context: Context,id: String,diff --git a/core/src/main/kotlin/net/kuafuai/andee/config/NotebookBook.kt b/core/src/main/kotlin/net/kuafuai/andee/config/NotebookBook.ktindex 2c91f84..0739cda 100644--- a/core/src/main/kotlin/net/kuafuai/andee/config/NotebookBook.kt+++ b/core/src/main/kotlin/net/kuafuai/andee/config/NotebookBook.kt@@ -497,26 +497,33 @@ class NotebookBook(private val store: NotebookStore) {* next start, and a wipe (清空小本本, 恢复出厂设置) takes the flag with it and a fresh notebook gets it again.* Not added beside an open todo on the same schedule, which is how it would be set by hand.*- * Returns what was added, for the caller to arm; empty when there was nothing to do. Throws when the store+ * An earlier wording of the same todo ([NIGHTLY_PICTURE_OLD]) is rewritten in place, so a notebook seeded+ * before the text changed gets the new one without a second todo.+ *+ * Returns what was added, for the caller to arm; empty when there was nothing to add. Throws when the store* refuses, like every other write here.*/@Synchronized- fun seedDefaults(zh: Boolean, now: Long = System.currentTimeMillis()): List<Todo> {+ fun seedDefaults(now: Long = System.currentTimeMillis()): List<Todo> {val b = JSONObject(book().toString())+ val arr = b.optJSONArray("todos") ?: JSONArray()+ var rewrote = false+ for (i in 0 until arr.length()) {+ val o = arr.optJSONObject(i) ?: continue+ if (o.optString("what") in NIGHTLY_PICTURE_OLD) { o.put("what", NIGHTLY_PICTURE); rewrote = true }+ }val meta = b.optJSONObject("meta") ?: JSONObject()- if (meta.optBoolean(META_SEEDED)) return emptyList()- val open = todos("pending")+ if (meta.optBoolean(META_SEEDED)) {+ if (rewrote) { b.put("todos", arr); write(b) }+ return emptyList()+ }val added = mutableListOf<Todo>()- if (open.none { it.mode == "cron" && it.cronExpr == NIGHTLY_PICTURE_CRON }) {+ if (todos("pending").none { it.mode == "cron" && it.cronExpr == NIGHTLY_PICTURE_CRON }) {val next = CronExpr.nextAfter(NIGHTLY_PICTURE_CRON, now)if (next != null) {- added += Todo(- newTodoId(), if (zh) NIGHTLY_PICTURE_ZH else NIGHTLY_PICTURE_EN, "cron", 0L,- NIGHTLY_PICTURE_CRON, next, 0L, "", "", "active", now, false,- )+ added += Todo(newTodoId(), NIGHTLY_PICTURE, "cron", 0L, NIGHTLY_PICTURE_CRON, next, 0L, "", "", "active", now, false)}}- val arr = b.optJSONArray("todos") ?: JSONArray()added.forEach { arr.put(toJson(it)) }b.put("todos", arr)b.put("meta", meta.put(META_SEEDED, true))@@ -695,17 +702,27 @@ class NotebookBook(private val store: NotebookStore) {const val NIGHTLY_PICTURE_CRON = "0 21 * * *"/**- * Model-facing (it is what the wake-up message carries) and shown in 待办, so in the user's language.- * It says what to do and leaves how to the model: a market image tool, a page, its own drawing code —- * whichever this body has.+ * Model-facing, like every wake-up line, so it is English and names no language for the reply: the+ * notebook may be seeded before anyone has said a word, so the language it must follow is whatever the+ * conversation turns out to be in. And it names no tool: an image tool exists only where one is+ * (CodeFlying's market), and a page is what every body can always make.*/- const val NIGHTLY_PICTURE_ZH =+ const val NIGHTLY_PICTURE =+ "Evening look-back: go over today (the conversation, what you did, your diary) and from it make a " ++ "picture of \"you and me\" with some mood to it. If you have an image-generation tool (the market " ++ "may have one), use it; if not, make it a page with show_html — drawn in HTML, that is enough. Put " ++ "it on the screen and say in a sentence or two what it shows. Write the page and speak in the " ++ "language of your recent conversation with the user; only if there has been none, use the " ++ "interface language. If nothing much happened today, paint a quiet day rather than inventing one."++ /** Earlier wordings, rewritten to [NIGHTLY_PICTURE] where a notebook still holds them. */+ private val NIGHTLY_PICTURE_OLD = setOf("每晚回顾:把今天的事过一遍(对话、做过的事、日记),据此画一张「你和我」的图,要有意境。" +- "画好放到屏幕上给用户看,再用一两句话说画的是什么。今天没什么事就画安静的一天,不要硬凑。"- const val NIGHTLY_PICTURE_EN =+ "画好放到屏幕上给用户看,再用一两句话说画的是什么。今天没什么事就画安静的一天,不要硬凑。","Evening look-back: go over today (the conversation, what you did, your diary) and from it make a " +"picture of \"you and me\" with some mood to it. Put it on the screen for the user and say in a " +- "sentence or two what it shows. If nothing much happened, paint a quiet day rather than inventing one."+ "sentence or two what it shows. If nothing much happened, paint a quiet day rather than inventing one.",+ )/*** A todo's `what` that numbers several items ("1) … 2) …", "①…②…"): refused with the reason, because one tododiff --git a/core/src/test/kotlin/net/kuafuai/andee/config/NotebookBookTest.kt b/core/src/test/kotlin/net/kuafuai/andee/config/NotebookBookTest.ktindex d90f88e..3b19175 100644--- a/core/src/test/kotlin/net/kuafuai/andee/config/NotebookBookTest.kt+++ b/core/src/test/kotlin/net/kuafuai/andee/config/NotebookBookTest.kt@@ -100,7 +100,7 @@ class NotebookBookTest {@Testfun `a fresh notebook gets the nightly picture once, and again after a wipe`() {val (_, b) = fresh()- val seeded = b.seedDefaults(zh = true)+ val seeded = b.seedDefaults()assertEquals(1, seeded.size)val t = seeded.single()assertEquals("cron", t.mode)@@ -111,19 +111,42 @@ class NotebookBookTest {// Dropped by the user: the next start must not bring it back.b.patchTodo(t.id, status = "dropped")- assertTrue(b.seedDefaults(zh = true).isEmpty())+ assertTrue(b.seedDefaults().isEmpty())assertEquals(0, b.todos("pending").size)b.wipe()- assertEquals(1, b.seedDefaults(zh = false).size)- assertEquals(NotebookBook.NIGHTLY_PICTURE_EN, b.todos("pending").single().what)+ assertEquals(1, b.seedDefaults().size)+ assertEquals(NotebookBook.NIGHTLY_PICTURE, b.todos("pending").single().what)}@Testfun `not seeded beside one already set on the same schedule`() {val (_, b) = fresh()b.addTodo(Todo("t1", "my own nine o'clock", "cron", 0L, NotebookBook.NIGHTLY_PICTURE_CRON, 1L, 0L, "", "", "active", 0L, false))- assertTrue(b.seedDefaults(zh = true).isEmpty())+ assertTrue(b.seedDefaults().isEmpty())assertEquals(listOf("t1"), b.todos("pending").map { it.id })}++ @Test+ fun `the old Chinese wording is rewritten in place, not added beside`() {+ val (_, b) = fresh()+ b.seedDefaults()+ val id = b.todos("pending").single().id+ // Simulate a notebook seeded with the first wording.+ b.wipe()+ val old = "每晚回顾:把今天的事过一遍(对话、做过的事、日记),据此画一张「你和我」的图,要有意境。" ++ "画好放到屏幕上给用户看,再用一两句话说画的是什么。今天没什么事就画安静的一天,不要硬凑。"+ b.addTodo(Todo(id, old, "cron", 0L, NotebookBook.NIGHTLY_PICTURE_CRON, 1L, 0L, "", "", "active", 0L, false))+ b.seedDefaults() // first pass on this book: sets the flag, rewrites, adds nothing beside it+ assertTrue(b.seedDefaults().isEmpty())+ val t = b.todos("pending").single()+ assertEquals(id, t.id)+ assertEquals(NotebookBook.NIGHTLY_PICTURE, t.what)+ assertTrue(t.what.contains("show_html"))++ // Already seeded (the flag is set) and still holding the old wording: rewritten all the same.+ b.addTodo(Todo("t9", old, "cron", 0L, "0 22 * * *", 1L, 0L, "", "", "active", 0L, false))+ assertTrue(b.seedDefaults().isEmpty())+ assertEquals(NotebookBook.NIGHTLY_PICTURE, b.todoById("t9")!!.what)+ }}diff --git a/desktop/src/main/kotlin/net/kuafuai/andee/desktop/NotebookTools.kt b/desktop/src/main/kotlin/net/kuafuai/andee/desktop/NotebookTools.ktindex 958e9a4..22b4625 100644--- a/desktop/src/main/kotlin/net/kuafuai/andee/desktop/NotebookTools.kt+++ b/desktop/src/main/kotlin/net/kuafuai/andee/desktop/NotebookTools.kt@@ -108,7 +108,7 @@ object DesktopScheduler {* while the app was closed.*/fun catchUp() {- runCatching { DesktopNotebook.book.seedDefaults(zh = Strings.lang() == "zh") }+ runCatching { DesktopNotebook.book.seedDefaults() }.onFailure { Log.w(TAG, "could not seed default todos", it) }val now = System.currentTimeMillis()for (t in DesktopNotebook.book.todos("pending")) {