更新v1.8

Author: azmiao

README.md

@@ -1,13 +1,9 @@
-# 2022-03-04 本插件已整合进 [uma_plugin](https://github.com/azmiao/uma_plugin) ，虽然目前后续更新两个仓库都会同步更新，但强烈建议直接使用整合版，有更多功能
-
-## 注意
-
-有什么其他功能需求欢迎提交issue
-
-虽然不一定经常更新，但要不点个star支持一下？
+# 2022-03-04 本插件已整合进 [uma_plugin](https://github.com/azmiao/uma_plugin) ，虽然目前后续更新两个仓库都会同步更新，但强烈建议直接使用整合版，有更多功能，另外整合版的新闻插件和本插件代码仍有部分不同。
 
 ## 更新日志
 
+22-04-28    v1.8    和整合版部分代码同步，全部更换异步函数，并移除pyyaml的依赖，减少一点响应延迟
+
 22-01-11    v1.7    精简翻译功能，去除了每次启动星乃的连接翻译服务器时间，无需安装翻译依赖了，所以可以`pip uninstall translators`了
 
 21-11-09    v1.6    修复部分Html代码的影响，并通过各种预防方法尽量让插件不容易被马娘官网的反爬虫发现
@@ -27,11 +23,7 @@
 news_text = news_text.replace('大米洗澡', '米浴')
 ```
 
-2. v1.5新增了马娘名/其他游戏术语的文本替换，替换内容均在`replace_dict.json`里，后续好兄弟们觉得可以增加可以直接pull request
-
-3. 如果只更新文件`replace_dict.json`的时候可直接热重载，更新完改文件后无需重新启动hoshinobot
-
-4. v1.6开始使用命令反应可能会慢一拍，因为我加了1秒的延迟
+2. 马娘名/其他游戏术语的文本替换在`replace_dict.json`里，但无法自动更新，但马娘插件整合版可以自动更新
 
 ## umamusume_news
 
@@ -75,7 +67,6 @@ git clone https://github.com/azmiao/umamusume_news
 
 到HoshinoBot\hoshino\modules\umamusume_news目录下，打开powershell运行
 ```
-pip install pyyaml -i http://mirrors.aliyun.com/pypi/simple
 pip install pathos -i http://mirrors.aliyun.com/pypi/simple
 ```
 
@@ -89,4 +80,4 @@ pip install pathos -i http://mirrors.aliyun.com/pypi/simple
 ```
 开启 umamusume-news-poller
 ```
-可以通过发消息输入"lssv"查看这个功能前面是不是⚪来确认是否开启成功
+可以通过发消息输入"lssv"查看这个功能前面是不是⚪来确认是否开启成功

__init__.py

@@ -1,9 +1,8 @@
 import os
 import shutil
-import hoshino
-from hoshino import Service, R, priv
-from hoshino.typing import *
-from hoshino.util import FreqLimiter, concat_pic, pic2b64, silence
+import asyncio
+from hoshino import Service, R
+from hoshino.util import FreqLimiter
 from .news_spider import *
 
 sv_help = '''=====功能=====
@@ -18,14 +17,15 @@
 _limtime = 20    # 单个人翻译冷却时间（单位：喵）
 _flmt = FreqLimiter(_limtime)
 
-if os.path.exists(R.img('umamusume_news').path):
-    shutil.rmtree(R.img('umamusume_news').path)  #删除目录，包括目录下的所有文件
-    os.mkdir(R.img('umamusume_news').path)
+dir_path = os.path.join(R.img('umamusume').path, 'umamusume_news/')
+if os.path.exists(dir_path):
+    shutil.rmtree(dir_path)  #删除目录，包括目录下的所有文件
+    os.mkdir(dir_path)
 else:
-    os.mkdir(R.img('umamusume_news').path)
+    os.mkdir(dir_path)
 
-sv = Service('umamusume_news', help_=sv_help, enable_on_default=True, bundle='马娘新闻订阅')
-svuma = Service('umamusume-news-poller', enable_on_default=False, help_='马娘新闻播报')
+sv = Service('umamusume_news', enable_on_default=True)
+svuma = Service('umamusume-news-poller', enable_on_default=False)
 
 # 帮助界面
 @sv.on_fullmatch("马娘新闻帮助")
@@ -36,7 +36,7 @@ async def help(bot, ev):
 @sv.on_fullmatch(('马娘新闻', '赛马娘新闻'))
 async def uma_news(bot, ev):
     try:
-        msg = get_news()
+        msg = await get_news()
     except:
         msg = '获取新闻失败，请等5分钟后再次尝试'
     await bot.send(ev, msg)
@@ -45,9 +45,10 @@ async def uma_news(bot, ev):
 @svuma.scheduled_job('cron', minute='*/5')
 async def uma_news_poller():
     try:
-        if (judge() == True):
+        flag = await judge()
+        if flag:
             svuma.logger.info('检测到马娘新闻更新！')
-            await svuma.broadcast(news_broadcast(), 'umamusume-news-poller', 0.2)
+            await svuma.broadcast(await news_broadcast(), 'umamusume-news-poller', 0.2)
         else:
             svuma.logger.info('暂未检测到马娘新闻更新')
             return
@@ -62,7 +63,7 @@ async def select_source(bot, ev):
         await bot.send(ev, f'请勿频繁操作，冷却时间为{_limtime}秒！', at_sender=True)
         return
     try:
-        news_list = sort_news()
+        news_list = await sort_news()
     except Exception as e:
         msg = f'错误！马娘官网连接失败，原因：{e}'
         await bot.send(ev, msg)
@@ -86,5 +87,10 @@ async def select_source(bot, ev):
             msg = f'马娘新闻《{news.news_title}》翻译内容如下：\n\n'
             news_url_tmp = news.news_url
             news_id = int(news_url_tmp.replace('▲https://umamusume.jp/news/detail.php?id=', ''))
-            msg = msg + translate_news(news_id)
-            await bot.send(ev, msg)
+            await asyncio.sleep(0.5)
+            msg += await translate_news(news_id)
+            try:
+                await bot.send(ev, msg)
+            except Exception as err:
+                if err == '<ActionFailed, retcode=100>':
+                    await bot.send(ev, "翻译内容被风控，发送失败！请稍后尝试！")

news_spider.py

@@ -8,28 +8,30 @@
 import operator
 from .translator_lite.apis import youdao
 from io import BytesIO
-import yaml
 import random
-import time
+import asyncio
 from hoshino import R
 
+# 随机挑选一个小可爱作为header
 user_agent_list = ["Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.106 Safari/537.36",
     "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.99 Safari/537.36",
     "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.186 Safari/537.36",
     "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.62 Safari/537.36",
     "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36",
     "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)",
     "Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10.5; en-US; rv:1.9.2.15) Gecko/20110303 Firefox/3.6.15",
-    ]
+]
 
+# 新闻类
 class news_class:
     def __init__(self,news_time,news_url,news_title):
         self.news_time = news_time
         self.news_url = news_url
         self.news_title = news_title
 
-def get_item():
-    time.sleep(1)
+# 获取列表
+async def get_item():
+    await asyncio.sleep(0.5)
     url = 'https://umamusume.jp/api/ajax/pr_info_index?format=json'
     data = {}
     data['announce_label'] = 0
@@ -46,13 +48,14 @@ def get_item():
         'accept-language': 'zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6',
         'content-type': 'application/json;charset=UTF-8'
     }
-    with requests.post(url=url,data=json.dumps(data),headers=headers, timeout=(5,10), stream = True) as res:
+    with requests.post(url = url, data = json.dumps(data), headers = headers, timeout=(5,10), stream = True) as res:
         res_dict = res.json()
         res.close()
     return res_dict
 
-def sort_news():
-    res_dict = get_item()
+# 调整新闻列表
+async def sort_news():
+    res_dict = await get_item()
     news_list = []
     for n in range(0, 5):
         if (res_dict['information_list'][n]['update_at'] == None):
@@ -69,26 +72,26 @@ def sort_news():
     news_list.sort(key = news_key, reverse = True)
     return news_list
 
-def get_news():
-    news_list = sort_news()
+# 获取新闻
+async def get_news():
+    news_list = await sort_news()
     msg = '◎◎ 马娘官网新闻 ◎◎\n'
     for news in news_list:
         time_tmp = datetime.datetime.strptime(news.news_time, '%Y-%m-%d %H:%M:%S')
         news_time = time_tmp - timedelta(hours=1)
         msg = msg + '\n' + str(news_time) + '\n' + news.news_title + '\n' + news.news_url + '\n'
     current_dir = os.path.join(os.path.dirname(__file__), 'prev_time.yml')
     prev_time = news_list[0].news_time
-    file = open(current_dir, 'w', encoding="UTF-8")
-    file.write(str(prev_time))
-    file.close()
+    with open(current_dir, 'w', encoding="UTF-8") as f:
+        f.write(str(prev_time))
     return msg
 
-def news_broadcast():
-    news_list = sort_news()
+# 获取新闻更新
+async def news_broadcast():
+    news_list = await sort_news()
     current_dir = os.path.join(os.path.dirname(__file__), 'prev_time.yml')
-    file = open(current_dir, 'r', encoding="UTF-8")
-    init_time = str(file.read())
-    file.close()
+    with open(current_dir, 'r', encoding="UTF-8") as f:
+        init_time = str(f.read())
     init_time = datetime.datetime.strptime(init_time, '%Y-%m-%d %H:%M:%S')
     msg = '◎◎ 马娘官网新闻更新 ◎◎\n'
     for news in news_list:
@@ -103,32 +106,27 @@ def news_broadcast():
     for news in news_list:
         set_time = news.news_time
         break
-    file = open(current_dir, 'w', encoding="UTF-8")
-    file.write(str(set_time))
-    file.close()
+    with open(current_dir, 'w', encoding="UTF-8") as f:
+        f.write(str(set_time))
     return msg
 
 # 判断一下是否有更新，为什么要单独写一个函数呢
 # 函数单独写一个是怎么回事呢？函数相信大家都很熟悉，但是函数单独写一个是怎么回事呢，下面就让小编带大家一起了解吧。
 # 函数单独写一个，其实就是我想单独写一个函数，大家可能会很惊讶函数怎么会单独写一个呢？但事实就是这样，小编也感到非常惊讶。
 # 这就是关于函数单独写一个的事情了，大家有什么想法呢，欢迎在评论区告诉小编一起讨论哦！
-def judge() -> bool:
+async def judge() -> bool:
     current_dir = os.path.join(os.path.dirname(__file__), 'prev_time.yml')
-    if (os.path.exists(current_dir) == True):
-        file = open(current_dir, 'r', encoding="UTF-8")
-        init_time = str(file.read())
-        file.close()
+    news_list = await sort_news()
+    if os.path.exists(current_dir):
+        with open(current_dir, 'r', encoding="UTF-8") as f:
+            init_time = str(f.read())
     else:
-        news_list = sort_news()
         for news in news_list:
             init_time = news.news_time
             break
         current_dir = os.path.join(os.path.dirname(__file__), 'prev_time.yml')
-        file = open(current_dir, 'w', encoding="UTF-8")
-        file.write(str(init_time))
-        file.close()
-
-    news_list = sort_news()
+        with open(current_dir, 'w', encoding="UTF-8") as f:
+            f.write(str(init_time))
     for news in news_list:
         prev_time = news.news_time
         break
@@ -139,7 +137,7 @@ def judge() -> bool:
         return False
 
 # 替换不必要的文本
-def replace_text(text_tmp):
+async def replace_text(text_tmp):
     # 替换多余的html关键字
     text = text_tmp.replace(' ', ' ')
     text = re.sub(r'<div.*?>', '', text)
@@ -157,24 +155,21 @@ def replace_text(text_tmp):
     text = re.sub(r'<br>', '\n\n', text)
     # 替换赛马娘游戏术语
     current_dir = os.path.join(os.path.dirname(__file__), 'replace_dict.json')
-    file = open(current_dir, 'r', encoding = 'UTF-8')
-    file_data = file.read()
-    file.close()
-    config = yaml.load(file_data, Loader = yaml.FullLoader)
-    keys_list = list(config.keys())
-    for key in keys_list:
-        value = config[key]
+    with open(current_dir, 'r', encoding = 'UTF-8') as other_file:
+        other_dict = json.load(other_file)
+    for key in list(other_dict.keys()):
+        value = other_dict[key]
         text = text.replace(f'{key}', f'{value}')
     return text
 
 # 翻译完如果把中文又翻译一遍导致出问题可以在这里，再次替换一下？
-def second_replace(news_text):
+async def second_replace(news_text):
     # news_text = news_text.replace('', '') # 我先注释了
     return news_text
 
 # 翻译新闻
-def translate_news(news_id):
-    time.sleep(1)
+async def translate_news(news_id):
+    await asyncio.sleep(0.5)
     url = 'https://umamusume.jp/api/ajax/pr_info_detail?format=json'
     data = {}
     data['announce_id'] = news_id
@@ -195,31 +190,31 @@ def translate_news(news_id):
             res_dict = res.json()
             res.close()
         if res_dict['detail']['title'] == '現在確認している不具合について':
-            news_msg = res_dict['detail']['message'][:500] + '...'
+            news_msg = res_dict['detail']['message'][:1000] + '...'
             flag = 1
         else:
             news_msg = res_dict['detail']['message']
-        news_msg = replace_text(news_msg)
+        news_msg = await replace_text(news_msg)
     except:
         news_text = '错误！马娘官网连接失败'
         return news_text
     try:
         news_text = youdao(news_msg, 'ja', 'zh')
-        news_text = second_replace(news_text)
+        news_text = await second_replace(news_text)
         if flag == 1:
-            news_text = '(该新闻特别长，因此只显示前500个字符)\n\n' + news_text
+            news_text = '(该新闻特别长，因此只显示前1000个字符)\n\n' + news_text
         if res_dict['detail']['image_big'] != '':
             img_url = res_dict['detail']['image_big']
             response = requests.get(img_url)
             ls_f = base64.b64encode(BytesIO(response.content).read())
             imgdata = base64.b64decode(ls_f)
-            save_dir = R.img('umamusume_news').path
+            save_dir = os.path.join(R.img('umamusume').path, 'umamusume_news/')
             path_dir = os.path.join(save_dir,'news_img.jpg')
             file = open(path_dir,'wb')
             file.write(imgdata)
             file.close()
             news_img = ' '.join(map(str, [
-                R.img(f'umamusume_news/news_img.jpg').cqcode,
+                R.img(f'umamusume/umamusume_news/news_img.jpg').cqcode,
             ]))
             news_text = f'{news_img}' + news_text
     except Exception as e: