Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update baiduwp api to 4.0.1 #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update baiduwp api to 4.0.1 #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions bot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ async def baidu_jx(_, message: Message):
parameter = ' '.join(message.command[1:])
parameter = parameter or (message.reply_to_message.text if message.reply_to_message else None)
baidu = Baidu()
parse_count = await baidu.parse_count()
last_parse = await baidu.last_parse()
parse_count,last_parse = await baidu.parse_count()
#last_parse = await baidu.last_parse()
text = f"""
{parse_count}

Expand Down Expand Up @@ -315,18 +315,24 @@ def __init__(self, page_results: dict = None):
@staticmethod
async def parse_count() -> str:
async with httpx.AsyncClient() as client:
result = await client.get(f'{baidu_url}/api.php?m=ParseCount')
result = result.json()['msg'].replace('<br />', '\n')
return result

result = await client.get(f'{baidu_url}/system')
count = result.json()['count']
last = result.json()['account']
last_flag = '已被限速' if last.get('limit') else "状态正常"
parse_count = "系统使用统计\n累计解析: "+str(count['all']['times'])+" ("+str(pybyte(count['all']['flow']))+ \
")\n今日解析: "+str(count['today']['times'])+" ("+str(pybyte(count['today']['flow']))+")"
last_parse = "SVIP账号状态\n上次解析: "+str(last['last_time'])+"\n账号状态: "+last_flag
return parse_count ,last_parse

'''
# 获取上次解析数据
@staticmethod
async def last_parse() -> str:
async with httpx.AsyncClient() as client:
result = await client.get(f'{baidu_url}/api.php?m=LastParse')
result = result.json()['msg'].replace('<br />', '\n')
return result

'''
# 解析链接根目录
@staticmethod
async def get_root_list(
Expand Down Expand Up @@ -376,7 +382,7 @@ async def get_root_list(
}

async with httpx.AsyncClient() as client:
result = await client.post(f'{baidu_url}/api.php?m=GetList', data=data)
result = await client.post(f'{baidu_url}/parse/list', data=data)
return result.json()

# 解析链接文件夹
Expand Down Expand Up @@ -431,7 +437,7 @@ async def get_list(
'uk': self.uk, 'password': password,
}
async with httpx.AsyncClient() as client:
result = await client.post(f'{baidu_url}/api.php?m=GetList', data=data)
result = await client.post(f'{baidu_url}/parse/list', data=data)
result = result.json()
# 对文件重新排序
result['filedata'] = sorted(sorted(result['filedata'], key=lambda x: x['name']),
Expand Down Expand Up @@ -480,7 +486,7 @@ async def get_dlurl(
'password': password,
}
async with httpx.AsyncClient() as client:
result = await client.post(f'{baidu_url}/api.php?m=Download', data=data)
result = await client.post(f'{baidu_url}/parse/link', data=data)
return result.json()


Expand Down