升级内置Irregular Verbs字典

dict/grammar_dict.py

@@ -12,7 +12,7 @@ def check_extra_dict(dict_dir):
     if dict_dir is None:
         return 0
     try:
-        with open(f"{ENV.DATA_DIR}/res/grammar.csv", 'r') as csvfile:
+        with open(f"{dict_dir}/res/grammar.csv", 'r') as csvfile:
             word_dict = gen_grammar_dict_from_csv(
                 csvfile)
             print(f"Grammar条目：{len(word_dict)}个")

res/iverbs.csv

@@ -10,9 +10,9 @@ bet,bet,bet,下注
 bite,bit,bitten,咬
 bleed,bled,bled,流血
 blow,blew,blown,吹
-broadcast,broadcast,broadcast,播送
 break,broke,broken,打破
 bring,brought,brought,带来
+broadcast,broadcast,broadcast,播送
 build,built,built,建造
 burn,burned/burnt,burned/burnt,烧伤
 burst,burst,burst,爆裂
@@ -64,8 +64,8 @@ knit,knit/knitted,knit/knitted,针织
 know,knew,known,知道
 lay,laid,laid,放下、躺下、下蛋
 lead,led,led,带领
-learn,learned/learnt,learned/learnt,学习
 leap,leapt,leapt,飞跃
+learn,learned/learnt,learned/learnt,学习
 leave,left,left,离开
 lend,lent,lent,借
 let,let,let,让
@@ -75,6 +75,7 @@ lose,lost,lost,失去
 make,made,made,制作
 mean,meant,meant,意思
 meet,met,met,遇见
+must,had to,,必须
 pay,paid,paid,支付
 prove,proved,proved/proven,证明
 put,put,put,放

tests/dict/grammar_dict_test.py

@@ -9,3 +9,12 @@ def test_get_grammar_list():
 
 def test_get_grammar():
     assert len(grammar_dict.get_grammar('Past Continuous')) > 0
+    assert grammar_dict.get_grammar('papapa') is None
+
+
+def test_check_extra_dict(shared_datadir):
+    assert grammar_dict.check_extra_dict(shared_datadir) == 0
+
+
+def test_get_grammar_button_list():
+    assert len(grammar_dict.get_grammar_button_list("gram:")) > 0

word_dict.json

@@ -83,9 +83,6 @@
   "blown": [
     "Irregular Verbs: blow blew blown 吹 "
   ],
-  "broadcast": [
-    "Irregular Verbs: broadcast broadcast broadcast 播送 "
-  ],
   "break": [
     "Irregular Verbs: break broke broken 打破 "
   ],
@@ -101,6 +98,9 @@
   "brought": [
     "Irregular Verbs: bring brought brought 带来 "
   ],
+  "broadcast": [
+    "Irregular Verbs: broadcast broadcast broadcast 播送 "
+  ],
   "build": [
     "Irregular Verbs: build built built 建造 "
   ],
@@ -459,6 +459,12 @@
   "led": [
     "Irregular Verbs: lead led led 带领 "
   ],
+  "leap": [
+    "Irregular Verbs: leap leapt leapt 飞跃 "
+  ],
+  "leapt": [
+    "Irregular Verbs: leap leapt leapt 飞跃 "
+  ],
   "learn": [
     "Irregular Verbs: learn learned/learnt learned/learnt 学习 "
   ],
@@ -468,12 +474,6 @@
   "learnt": [
     "Irregular Verbs: learn learned/learnt learned/learnt 学习 "
   ],
-  "leap": [
-    "Irregular Verbs: leap leapt leapt 飞跃 "
-  ],
-  "leapt": [
-    "Irregular Verbs: leap leapt leapt 飞跃 "
-  ],
   "leave": [
     "Irregular Verbs: leave left left 离开 "
   ],
@@ -528,6 +528,15 @@
   "met": [
     "Irregular Verbs: meet met met 遇见 "
   ],
+  "must": [
+    "Irregular Verbs: must had to 必须 "
+  ],
+  "had to": [
+    "Irregular Verbs: must had to 必须 "
+  ],
+  "": [
+    "Irregular Verbs: must had to 必须 "
+  ],
   "pay": [
     "Irregular Verbs: pay paid paid 支付 "
   ],