fix: 部分修复重构数据格式差异

src/heurams/interface/screens/memoqueue.py

@@ -28,7 +28,7 @@ logger = get_logger(__name__)
 class MemScreen(Screen):
     BINDINGS = [
         ("q", "pop_screen", "返回"),
-        #    ("p", "prev", "复习上一个"),
+        #("p", "prev", "复习上一个"),
         ("d", "toggle_dark", ""),
         ("v", "play_voice", "朗读"),
         ("0,1,2,3", "app.push_screen('about')", ""),
@@ -40,65 +40,61 @@ class MemScreen(Screen):
 
     def __init__(
         self,
-        atoms: list,
-        name: str | None = None,
-        id: str | None = None,
-        classes: str | None = None,
+        phaser: Phaser,
+        name = None,
+        id = None,
+        classes = None,
     ) -> None:
         super().__init__(name, id, classes)
-        self.atoms = atoms
-        self.phaser = Phaser(atoms)
-        # logger.debug(self.phaser.state)
-        self.procession: Procession = self.phaser.current_procession()  # type: ignore
-        self.atom: pt.Atom = self.procession.current_atom
-        # logger.debug(self.phaser.state)
-        # self.procession.forward(1)
-
-    def on_mount(self):
-        self.load_puzzle()
-        pass
-
-    def puzzle_widget(self):
-        try:
-            logger.debug(self.phaser.state)
-            logger.debug(self.procession.cursor)
-            logger.debug(self.atom)
-            self.fission = Fission(self.atom, self.phaser.state)
-            puzzle_debug = next(self.fission.generate())
-            # logger.debug(puzzle_debug)
-            return shim.puzzle2widget[puzzle_debug["puzzle"]](
-                atom=self.atom, alia=puzzle_debug["alia"]
-            )
-        except (KeyError, StopIteration, AttributeError) as e:
-            logger.debug(f"调度展开出错: {e}")
-            return Static("无法生成谜题")
-        # logger.debug(shim.puzzle2widget[puzzle_debug["puzzle"]])
+        self.phaser = phaser
+        self.update_state()
 
     def compose(self) -> ComposeResult:
         yield Header(show_clock=True)
         with ScrollableContainer():
             yield Label(self._get_progress_text(), id="progress")
-
-            # self.mount(self.current_widget()) # type: ignore
             yield ScrollableContainer(id="puzzle-container")
-        # yield Button("重新学习此单元", id="re-recognize", variant="warning")
         yield Footer()
 
+    def update_state(self):
+        """更新状态机"""
+        self.procession: Procession = self.phaser.current_procession()  # type: ignore
+        self.atom: pt.Atom = self.procession.current_atom # type: ignore
+
+    def on_mount(self):
+        self.mount_puzzle()
+        self.update_display()
+
+    def puzzle_widget(self):
+        try:
+            self.fission = self.procession.get_fission()
+            puzzle = self.fission.get_current_puzzle()
+            # logger.debug(puzzle_debug)
+            return shim.puzzle2widget[puzzle["puzzle"]]( # type: ignore
+                atom=self.atom, alia=puzzle["alia"] # type: ignore
+            )
+        except (KeyError, StopIteration, AttributeError) as e:
+            logger.debug(f"调度展开出错: {e}")
+            return Static(f"无法生成谜题 {e}")
+        # logger.debug(shim.puzzle2widget[puzzle_debug["puzzle"]])
+
     def _get_progress_text(self):
         return f"当前进度: {self.procession.process() + 1}/{self.procession.total_length()}"
 
     def update_display(self):
+        """更新进度显示"""
         progress_widget = self.query_one("#progress")
         progress_widget.update(self._get_progress_text())  # type: ignore
 
-    def load_puzzle(self):
-        self.atom: pt.Atom = self.procession.current_atom
+    def mount_puzzle(self):
+        """挂载当前谜题组件"""
         container = self.query_one("#puzzle-container")
         for i in container.children:
             i.remove()
         container.mount(self.puzzle_widget())
 
-    def load_finished_widget(self):
+    def mount_finished_widget(self):
+        """挂载已完成组件"""
         container = self.query_one("#puzzle-container")
         for i in container.children:
             i.remove()
@@ -109,39 +105,6 @@ class MemScreen(Screen):
     def on_button_pressed(self, event):
         event.stop()
 
-    def watch_rating(self, old_rating, new_rating) -> None:
-        if self.procession == 0:
-            return
-        if new_rating == -1:
-            return
-        forwards = 1 if new_rating >= 4 else 0
-        self.rating = -1
-        logger.debug(f"试图前进: {"允许" if forwards else "禁止"}")
-        if forwards:
-            ret = self.procession.forward(1)
-            if ret == 0:  # 若结束了此次队列
-                self.procession = self.phaser.current_procession()  # type: ignore
-                if self.procession == 0:  # 若所有队列都结束了
-                    logger.debug(f"记忆进程结束")
-                    for i in self.atoms:
-                        i: pt.Atom
-                        i.revise()
-                        i.persist("electron")
-                    self.load_finished_widget()
-                    return
-                else:
-                    logger.debug(f"建立新队列 {self.procession.phase}")
-            self.load_puzzle()
-        else:  # 若不通过
-            self.procession.append()
-        self.update_display()
-
-    def action_quick_pass(self):
-        self.rating = 5
-        self.atom.minimize(5)
-        self.atom.registry["electron"].activate()
-        self.atom.lock(1)
-
     def action_play_voice(self):
         self.run_worker(self.play_voice, exclusive=True, thread=True)
 
@@ -155,20 +118,13 @@ class MemScreen(Screen):
         path = Path(config_var.get()["paths"]["cache_dir"])
         path = (
             path
-            / f"{get_md5(self.atom.registry['nucleon'].metadata["formation"]["tts_text"])}.wav"
+            / f"{get_md5(self.atom.registry['nucleon']["tts_text"])}.wav"
         )
         if path.exists():
             play_by_path(path)
         else:
             from heurams.services.tts_service import convertor
-
             convertor(
-                self.atom.registry["nucleon"].metadata["formation"]["tts_text"], path
+                self.atom.registry["nucleon"]["tts_text"], path
             )
-            play_by_path(path)
-
-    def action_toggle_dark(self):
-        self.app.action_toggle_dark()
-
-    def action_pop_screen(self):
-        self.app.pop_screen()
+            play_by_path(path)