update

plugins/draw_card/announcement.py

@@ -3,7 +3,6 @@ from bs4 import BeautifulSoup
 import re
 from datetime import datetime
 from .config import DRAW_PATH
-from util.utils import get_local_proxy
 from pathlib import Path
 try:
     import ujson as json
@@ -12,9 +11,53 @@ except ModuleNotFoundError:
 
 headers = {'User-Agent': '"Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; TencentTraveler 4.0)"'}
 
-up_char_file = Path(DRAW_PATH + "/draw_card_up/prts_up_char.json")
+prts_up_char = Path(DRAW_PATH + "/draw_card_up/prts_up_char.json")
+genshin_up_char = Path(DRAW_PATH + "/draw_card_up/genshin_up_char.json")
 
 prts_url = "https://wiki.biligame.com/arknights/%E6%96%B0%E9%97%BB%E5%85%AC%E5%91%8A"
+genshin_url = "https://wiki.biligame.com/ys/%E7%A5%88%E6%84%BF"
+
+
+# 是否过时
+def is_expired(data: dict):
+    times = data['time'].split('-')
+    for i in range(len(times)):
+        times[i] = str(datetime.now().year) + '-' + times[i].split('日')[0].strip().replace('月', '-')
+    start_date = datetime.strptime(times[0], '%Y-%m-%d').date()
+    end_date = datetime.strptime(times[1], '%Y-%m-%d').date()
+    now = datetime.now().date()
+    return start_date < now < end_date
+
+
+# 检查写入
+def check_write(data: dict, up_char_file, game_name: str = ''):
+    tmp = data
+    if game_name == 'genshin':
+        tmp = data['char']
+    if not is_expired(tmp):
+        if game_name == 'genshin':
+            data['char']['title'] = ''
+            data['arms']['title'] = ''
+        else:
+            data['title'] = ''
+    else:
+        with open(up_char_file, 'w', encoding='utf8') as f:
+            json.dump(data, f, indent=4, ensure_ascii=False)
+    if not up_char_file.exists():
+        with open(up_char_file, 'w', encoding='utf8') as f:
+            json.dump(data, f, indent=4, ensure_ascii=False)
+    else:
+        with open(up_char_file, 'r', encoding='utf8') as f:
+            old_data = json.load(f)
+            tmp = old_data
+            if game_name == 'genshin':
+                tmp = old_data['char']
+        if is_expired(tmp):
+            return old_data
+        else:
+            with open(up_char_file, 'w', encoding='utf8') as f:
+                json.dump(data, f, indent=4, ensure_ascii=False)
+    return data
 
 
 def _get_up_char(r: str, text: str):
@@ -39,13 +82,13 @@ class PrtsAnnouncement:
                     if a.text.find('寻访') != -1:
                         url = a.get('href')
                         break
-            async with session.get(f'https://wiki.biligame.com/{url}', proxy=get_local_proxy(), timeout=7) as res:
+            async with session.get(f'https://wiki.biligame.com/{url}', timeout=7) as res:
                 return await res.text(), a.text[:-4]
 
     @staticmethod
     async def update_up_char():
-        up_char_file.parent.mkdir(parents=True, exist_ok=True)
-        data = {'up_char': {'6': {}, '5': {}, '4': {}}, 'title': '', 'time': ''}
+        prts_up_char.parent.mkdir(parents=True, exist_ok=True)
+        data = {'up_char': {'6': {}, '5': {}, '4': {}}, 'title': '', 'time': '', 'pool_img': ''}
         text, title = await PrtsAnnouncement.get_announcement_text()
         soup = BeautifulSoup(text, 'lxml')
         data['title'] = title
@@ -87,34 +130,66 @@ class PrtsAnnouncement:
                 char = char.replace('[限定]', '').replace('[', '').replace(']', '')
                 data['up_char'][star][char.strip()] = f'权{weight}'
         # data['time'] = '03月09日16:00 - 05月23日03:59'
-        if not is_expired(data):
-            data['title'] = ''
-        else:
-            with open(up_char_file, 'w', encoding='utf8') as f:
-                json.dump(data, f, indent=4, ensure_ascii=False)
-        if not up_char_file.exists():
-            with open(up_char_file, 'w', encoding='utf8') as f:
-                json.dump(data, f, indent=4, ensure_ascii=False)
-        else:
-            with open(up_char_file, 'r', encoding='utf8') as f:
-                old_data = json.load(f)
-            if is_expired(old_data):
-                return old_data
-            else:
-                with open(up_char_file, 'w', encoding='utf8') as f:
-                    json.dump(data, f, indent=4, ensure_ascii=False)
-        return data
+        return check_write(data, prts_up_char)
+
+
+class GenshinAnnouncement:
+
+    @staticmethod
+    async def get_announcement_text():
+        async with aiohttp.ClientSession(headers=headers) as session:
+            async with session.get(genshin_url, timeout=7) as res:
+                return await res.text()
+
+    @staticmethod
+    async def update_up_char():
+        genshin_up_char.parent.mkdir(exist_ok=True, parents=True)
+        data = {
+            'char': {'up_char': {'5': {}, '4': {}}, 'title': '', 'time': '', 'pool_img': ''},
+            'arms': {'up_char': {'5': {}, '4': {}}, 'title': '', 'time': '', 'pool_img': ''}
+        }
+        text = await GenshinAnnouncement.get_announcement_text()
+        soup = BeautifulSoup(text, 'lxml')
+        try:
+            div = soup.find_all('div', {'class': 'row'})[1]
+            tables = div.find_all('table', {'class': 'wikitable'})
+            for table in tables:
+                trs = table.find('tbody').find_all('tr')
+                pool_img = trs[0].find('th').find('img')
+                if pool_img['title'].find('角色活动') == -1:
+                    itype = 'arms'
+                else:
+                    itype = 'char'
+                try:
+                    data[itype]['pool_img'] = str(pool_img['srcset']).split(' ')[0]
+                except KeyError:
+                    data[itype]['pool_img'] = pool_img['src']
+                data[itype]['title'] = str(pool_img['title']).split(f'期{"角色" if itype == "char" else "武器"}')[0][:-3]
+                data[itype]['time'] = trs[1].find('td').text
+                if data[itype]['time'][-1] == '\n':
+                    data[itype]['time'] = data[itype]['time'][:-1]
+                tmp = ''
+                for tm in data[itype]['time'].split('~'):
+                    date_time_sp = tm.split('/')
+                    date_time_sp[2] = date_time_sp[2].strip().replace(' ', '日 ')
+                    tmp += date_time_sp[1] + '月' + date_time_sp[2] + ' - '
+                data[itype]['time'] = tmp[:-2].strip()
+                for a in trs[2].find('td').find_all('a'):
+                    char_name = a['title']
+                    data[itype]['up_char']['5'][char_name] = "50"
+                for a in trs[3].find('td').find_all('a'):
+                    char_name = a['title']
+                    data[itype]['up_char']['4'][char_name] = "50"
+        except Exception as e:
+            print(f'更新原神UP失败，疑似UP池已结束， e：{e}')
+            with open(genshin_up_char, 'r', encoding='utf8') as f:
+                data = json.load(f)
+                data['char']['title'] = ''
+                data['arms']['title'] = ''
+            with open(genshin_up_char, 'w', encoding='utf8') as wf:
+                json.dump(data, wf, ensure_ascii=False, indent=4)
+            return data
+        return check_write(data, genshin_up_char, 'genshin')
 
 
-# 是否过时
-def is_expired(data: dict):
-    times = data['time'].split('-')
-    for i in range(len(times)):
-        times[i] = str(datetime.now().year) + '-' + times[i].split('日')[0].strip().replace('月', '-')
-    start_date = datetime.strptime(times[0], '%Y-%m-%d').date()
-    end_date = datetime.strptime(times[1], '%Y-%m-%d').date()
-    now = datetime.now().date()
-    return start_date < now < end_date
 
-# ad = Announcement('https://wiki.biligame.com/arknights/%E6%96%B0%E9%97%BB%E5%85%AC%E5%91%8A')
-# asyncio.get_event_loop().run_until_complete(check_up_char('prts'))