Add more synthesized melodies from Wenhao, and update genre handler to load both datasets

data/genre/word_data.json

@@ -1,56 +0,0 @@
-[
-    {
-        "id": "001",
-        "score": [
-            [[0.0, 0.22, 55], [0.22, 0.33, 0], [0.33, 0.54, 55], [0.54, 0.9, 58], [0.9, 0.96, 60], [0.96, 1.6, 58], [1.6, 2.0, 56], [2.0, 2.22, 0], [2.22, 2.51, 54], [2.51, 2.86, 58], [2.86, 3.05, 60], [3.05, 3.92, 60], [3.92, 5.52, 58]],
-            [[0.0, 0.2, 61], [0.2, 0.26, 61], [0.26, 0.52, 61], [0.52, 0.58, 60], [0.58, 0.77, 60], [0.77, 0.99, 56], [0.99, 1.58, 60], [1.58, 1.75, 58], [1.75, 2.05, 56], [2.05, 2.68, 55]],
-            [[0.0, 0.57, 0], [0.57, 0.75, 55], [0.75, 0.83, 55], [0.83, 0.9, 0], [0.9, 1.36, 58], [1.36, 1.54, 60], [1.54, 1.86, 60], [1.86, 2.09, 58], [2.09, 2.59, 56], [2.59, 2.96, 56], [2.96, 3.0, 0]],
-            [[0.0, 0.15, 59], [0.15, 0.49, 59], [0.49, 0.69, 60], [0.69, 1.02, 60], [1.02, 1.28, 62], [1.28, 1.58, 63], [1.58, 1.64, 63], [1.64, 3.05, 56], [3.05, 6.44, 0]]
-        ],
-        "note_lyrics": [
-            ["在", "SP", "午", "夜", "的", "街", "角", "SP", "点", "燃", "一", "支", "烟"],
-            ["看", "霓", "虹", "把", "孤", "独", "拉", "得", "很", "长"],
-            ["SP", "我", "们", "SP", "像", "破", "碎", "的", "镜", "子", "AP"],
-            ["反", "射", "着", "不", "完", "整", "的", "谎", "AP"]
-        ],
-        "genre": "Alternative Rock",
-        "super-genre": "Rock",
-        "gender": "male"
-    },
-    {
-        "id": "002",
-        "score": [
-            [[0.0, 0.28, 58], [0.28, 0.41, 58], [0.41, 0.83, 65], [0.83, 1.13, 67], [1.13, 1.28, 65], [1.28, 1.81, 65], [1.81, 2.05, 63], [2.05, 2.39, 62], [2.39, 3.27, 62]],
-            [[0.0, 0.18, 60], [0.18, 0.4, 60], [0.4, 0.69, 58], [0.69, 1.03, 60], [1.03, 1.32, 60], [1.32, 1.37, 0], [1.37, 1.76, 60], [1.76, 1.97, 58], [1.97, 2.24, 56], [2.24, 2.87, 55], [2.87, 2.94, 0]],
-            [[0.0, 0.25, 0], [0.25, 0.44, 55], [0.44, 0.7, 62], [0.7, 0.94, 58], [0.94, 1.43, 60], [1.43, 1.55, 60], [1.55, 2.11, 59], [2.11, 2.17, 67], [2.17, 3.25, 65], [3.25, 3.32, 65]],
-            [[0.0, 0.33, 0], [0.33, 0.43, 55], [0.43, 0.8, 61], [0.8, 0.87, 58], [0.87, 1.36, 58], [1.36, 1.86, 54], [1.86, 2.26, 53], [2.26, 3.14, 55], [3.14, 4.63, 0]]
-        ],
-        "note_lyrics": [
-            ["霓", "虹", "闪", "烁", "的", "街", "角", "转", "身"],
-            ["听", "见", "心", "跳", "在", "SP", "耳", "畔", "沸", "腾", "AP"],
-            ["SP", "掌", "心", "藏", "着", "未", "说", "的", "星", "辰"],
-            ["SP", "等", "一", "个", "眼", "神", "确", "认", "AP"]
-        ],
-        "genre": "Asian Pop",
-        "super-genre": "Pop",
-        "gender": "female"
-    },
-    {
-        "id": "003",
-        "score": [
-            [[0.0, 0.14, 55], [0.14, 0.31, 55], [0.31, 0.48, 55], [0.48, 0.74, 56], [0.74, 1.01, 52], [1.01, 1.15, 53], [1.15, 1.3, 56], [1.3, 1.46, 58], [1.46, 1.59, 60], [1.59, 2.12, 61], [2.12, 2.6, 0]],
-            [[0.0, 0.03, 0], [0.03, 0.15, 53], [0.15, 0.38, 54], [0.38, 0.41, 54], [0.41, 0.7, 56], [0.7, 0.98, 52], [0.98, 1.12, 54], [1.12, 1.43, 55], [1.43, 1.57, 60], [1.57, 2.15, 58], [2.15, 2.64, 0]],
-            [[0.0, 0.08, 56], [0.08, 0.29, 56], [0.29, 0.5, 56], [0.5, 0.72, 56], [0.72, 0.93, 52], [0.93, 1.07, 54], [1.07, 1.19, 56], [1.19, 1.37, 57], [1.37, 1.43, 60], [1.43, 1.96, 60]],
-            [[0.0, 0.28, 60], [0.28, 0.41, 60], [0.41, 0.59, 60], [0.59, 0.71, 58], [0.71, 0.75, 0], [0.75, 0.92, 56], [0.92, 1.02, 50], [1.02, 1.18, 53], [1.18, 1.73, 53], [1.73, 3.64, 0]]
-        ],
-        "note_lyrics": [
-            ["午", "夜", "琴", "键", "跳", "动", "着", "老", "故", "事", "AP"],
-            ["SP", "左", "手", "低", "音", "像", "心", "跳", "不", "止", "AP"],
-            ["右", "手", "指", "尖", "溜", "過", "即", "興", "的", "詩"],
-            ["酒", "馆", "木", "地", "SP", "板", "在", "咯", "吱", "AP"]
-        ],
-        "genre": "Classical Blues",
-        "super-genre": "Blues",
-        "gender": "male"
-    }
-]

data_handlers/genre.py

@@ -7,10 +7,13 @@ class Genre(MelodyDatasetHandler):
     def __init__(self, melody_type, *args, **kwargs):
         import json
 
-        with open("data/genre/word_data.json", "r", encoding="utf-8") as f:
-            song_db = json.load(f)
-        song_db = {song["id"]: song for song in song_db} # id as major
-        self.song_db = song_db
+        with open("data/genre/word_data_zh.json", "r", encoding="utf-8") as f:
+            song_db_zh = json.load(f)
+        song_db_zh = {f"zh_{song['id']}": song for song in song_db_zh}  # id as major
+        with open("data/genre/word_data_en.json", "r", encoding="utf-8") as f:
+            song_db_en = json.load(f)
+        song_db_en = {f"en_{song['id']}": song for song in song_db_en} # id as major
+        self.song_db = {**song_db_zh, **song_db_en}
 
     def get_song_ids(self):
         return list(self.song_db.keys())