add "n" and select/deselect button

app.py

@@ -4,21 +4,33 @@ from copy import deepcopy
 import gradio as gr
 from romkan import to_hiragana, to_katakana, to_roma
 
-a_base = ["a", "k", "s", "t", "n", "h", "m", "y", "r", "w"]
+a_base = ["a", "k", "s", "t", "n", "h", "m", "y", "r", "w", "nn"]
 a_ext1 = ["g", "z", "d", "b"]
 a_ext2 = ["p"]
 
 b_base = ["a", "i", "u", "e", "o"]
 b_ext = ["ya", "yo", "yu"]
 
+c_opt = ["濁音", "半濁音", "拗音"]
+
 invalid = ["yi", "ye", "wi", "wu", "we"]
 spec_map = {"cya": "cha", "cyu": "chu", "cyo": "cho"}
 
 
 def next_question(hira, kata, c, quiz_list):
+    info_flag = False
+
     if not quiz_list:
-        gr.Info("已完成一輪測試！")
+        info_flag = True
         quiz_list = init_question(hira, kata, c)
+
+    if not quiz_list:
+        gr.Info("請選擇至少一項測驗！")
+        return None, quiz_list
+
+    if info_flag:
+        gr.Info("已完成一輪測試！")
+
     return quiz_list.pop(), quiz_list
 
 
@@ -39,6 +51,7 @@ def init_question(hira, kata, c):
     kata_list = [to_kata(a, b) for a in curr_kata for b in curr_b if is_valid(a, b)]
 
     quiz_list = hira_list + kata_list
+    quiz_list = list(set(quiz_list))
     random.shuffle(quiz_list)
 
     return quiz_list
@@ -68,6 +81,8 @@ def to_kata(a, b):
 
 
 def combine(a, b):
+    if a == "nn":
+        return "n"
     if a == "a":
         a = ""
     return f"{a}{b}"
@@ -103,6 +118,14 @@ def reset_score():
     return 0, 0, "0/0", ""
 
 
+def select_all():
+    return a_base, a_base, c_opt
+
+
+def deselect_all():
+    return [], [], []
+
+
 font = gr.themes.GoogleFont("NotoSans CJK")
 theme = gr.themes.Soft(font=font)
 
@@ -124,8 +147,11 @@ with gr.Blocks(theme=theme, title="假名小測驗") as app:
             with gr.Tab("設定"):
                 setting_hira = gr.CheckboxGroup(a_base, value=a_base[:5], label="平假名")
                 setting_kata = gr.CheckboxGroup(a_base, label="片假名")
-                setting_c = gr.CheckboxGroup(["濁音", "半濁音", "拗音"], label="延伸")
-                apply_btn = gr.Button("開始測驗")
+                setting_c = gr.CheckboxGroup(c_opt, label="延伸")
+                with gr.Row():
+                    select_all_btn = gr.Button("全選")
+                    deselect_all_btn = gr.Button("全不選")
+                    apply_btn = gr.Button("開始測驗")
 
     chk_inn = [question, answer, correct, total]
     chk_out = [correct, total, score, answer]
@@ -141,7 +167,11 @@ with gr.Blocks(theme=theme, title="假名小測驗") as app:
 
     reset_arg = dict(fn=reset_score, outputs=chk_out, show_progress="hidden")
 
+    opt_out = [setting_hira, setting_kata, setting_c]
+
     answer.submit(**chk_arg).then(**nq_arg)
     apply_btn.click(**ini_arg).then(**reset_arg).then(**nq_arg)
+    select_all_btn.click(select_all, outputs=opt_out, show_progress="hidden")
+    deselect_all_btn.click(deselect_all, outputs=opt_out, show_progress="hidden")
 
 app.launch(favicon_path="icon.png")