From 2536557d541400da32548818c4a3cf544efc1b12 Mon Sep 17 00:00:00 2001 From: STadas Date: Tue, 3 May 2022 12:40:40 +0300 Subject: [PATCH] Actually fix #20 --- src/main.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main.py b/src/main.py index 305395c..3ee11c4 100644 --- a/src/main.py +++ b/src/main.py @@ -156,29 +156,29 @@ def __update_rpc_next_state(self) -> None: return due_count = 0 - node = collection.sched.deck_due_tree() count_deck = self.__cfg_val(self.main_cfg, 'count_deck', bool) if count_deck and self.last_deck is not None: - try: - last_id = int(self.last_deck['id']) - node = next(d for d in node.children if d.deck_id == last_id) - except StopIteration as ex: - print("Couldn't find deck:", ex) + node = collection.sched.deck_due_tree(self.last_deck['id']) + else: + node = collection.sched.deck_due_tree() try: - if count_deck and self.last_deck is not None: + if node and node.children: + counts = { + "new": sum(ch.new_count for ch in node.children), + "learn": sum(ch.learn_count for ch in node.children), + "review": sum(ch.review_count for ch in node.children), + } + elif node: counts = { "new": node.new_count, "learn": node.learn_count, "review": node.review_count, } else: - counts = { - "new": sum(ch.new_count for ch in node.children), - "learn": sum(ch.learn_count for ch in node.children), - "review": sum(ch.review_count for ch in node.children), - } + counts = {} + counts_keys = self.__cfg_val(self.main_cfg, 'counts', list) if isinstance(counts_keys, list): for key in counts_keys: