From 46ea7f24391191bbdda9292d9240b9f5032c2f58 Mon Sep 17 00:00:00 2001
From: ZhehaoMi <1125263974@qq.com>
Date: Tue, 20 Aug 2019 23:17:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BB=A3=E7=A0=81=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/music_163/config_default.py |  4 ++--
 plugins/music_163/music_163.py      | 27 +++++++++++----------------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/plugins/music_163/config_default.py b/plugins/music_163/config_default.py
index 8a3981a..a3251da 100644
--- a/plugins/music_163/config_default.py
+++ b/plugins/music_163/config_default.py
@@ -1,3 +1,3 @@
-api_url = "http://127.0.0.1:3000"
+API_URL = "http://127.0.0.1:3000"
 
-search_limit = 10
\ No newline at end of file
+SEARCH_LIMIT = 10
\ No newline at end of file
diff --git a/plugins/music_163/music_163.py b/plugins/music_163/music_163.py
index 725c2f2..3956cd8 100644
--- a/plugins/music_163/music_163.py
+++ b/plugins/music_163/music_163.py
@@ -14,9 +14,8 @@ def plugin():
         "description":"网易云点歌"
     }
 
-def search_music(key):
-    url = config.api_url + "/search?keywords=%s&limit=%d" % (urllib.parse.quote(key), config.search_limit)
-    data = None
+def search_music(key:str) -> dict:
+    url = config.API_URL + f"/search?keywords={urllib.parse.quote(key)}&limit={config.SEARCH_LIMIT}"
     with urllib.request.urlopen(url) as f:
         data = json.JSONDecoder().decode(f.read().decode("utf8"))
     if 'result' in data:
@@ -24,9 +23,8 @@ def search_music(key):
     else:
         return {'songCount':0}
 
-def check_music(music_id):
-    url = config.api_url + "/check/music?id=%d" % music_id
-    data = None
+def check_music(music_id:int) -> bool:
+    url = config.API_URL + f"/check/music?id={music_id}"
     try:
         with urllib.request.urlopen(url) as f:
             data = json.JSONDecoder().decode(f.read().decode("utf8"))
@@ -34,9 +32,8 @@ def check_music(music_id):
         return False
     return data['success']
 
-def get_music_url(music_id):
-    url = config.api_url + "/song/url?id=%d&br=320000" % music_id
-    data = None
+def get_music_url(music_id:int) -> str:
+    url = config.API_URL + f"/song/url?id={music_id}&br=320000"
     with urllib.request.urlopen(url) as f:
         data = json.JSONDecoder().decode(f.read().decode("utf8"))
     return data['data'][0]['url']
@@ -66,10 +63,10 @@ def music(bot,context,args):
                 return
             else:
                 if raw :
-                    bot.send(context,"[CQ:music,type=163,id=%d]" % music_id)
+                    bot.send(context,f"[CQ:music,type=163,id={music_id}]")
                 else:
                     url = get_music_url(music_id)
-                    bot.send(context,"[CQ:record,file=%s]" % url)
+                    bot.send(context,f"[CQ:record,file={url}]")
                 return
         
         key = " ".join(args[1:])
@@ -83,16 +80,14 @@ def music(bot,context,args):
             music_id = item['id']
             if check_music(music_id):
                 if raw:
-                    bot.send(context,"[CQ:music,type=163,id=%d]" % music_id)
+                    bot.send(context,f"[CQ:music,type=163,id={music_id}]")
                 else:
                     url = get_music_url(music_id)
-                    bot.send(context,"[CQ:record,file=%s]" % url)
+                    bot.send(context,f"[CQ:record,file={url}]")
                 return
         
         bot.send(context,"您搜索的歌曲不存在或无版权")
         
     threading.Thread(target=handle).start()
            
-                
-
-        
\ No newline at end of file
+                
\ No newline at end of file
-- 
Gitee