nas/ptools
1
0
Fork 0
mirror of https://github.com/ngfchl/ptools synced 2023-07-10 13:41:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化通知显示

Browse Source
This commit is contained in:
ngfchl
2022-10-11 12:10:35 +08:00
parent 4891af1250
commit 836168ef15
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pt_site/UtilityTool.py
View File

@@ -622,13 +622,13 @@ class PtSpider:
return '0' if len(res_list) == 0 else res_list[0]
def do_sign_in(self, pool, queryset: QuerySet[MySite]):
message_list = '### <font color="orange">未显示的站点已经签到过了哟！</font> \n'
message_list = '### <font color="orange">未显示的站点已经签到过了哟！</font> \n\n'
if datetime.now().hour < 9:
# U2每天九点前不签到
queryset = [my_site for my_site in queryset if 'u2.dmhy.org' not in my_site.site.url and
my_site.signin_set.filter(created_at__date__gte=datetime.today()).count() <= 0
and my_site.cookie and my_site.site.sign_in_support]
message = '> <font color="red">站点 U2 早上九点之前不执行签到任务哦！</font> \n'
message = '> <font color="red">站点 U2 早上九点之前不执行签到任务哦！</font> \n\n'
logger.info(message)
message_list = message + message_list
else:
@@ -637,7 +637,7 @@ class PtSpider:
sign_in_today=True).count() <= 0]
logger.info(len(queryset))
if len(queryset) <= 0:
message_list = '> <font color="orange">已全部签到或无需签到！</font> \n'
message_list = '> <font color="orange">已全部签到或无需签到！</font> \n\n'
logger.info(message_list)
return 0
# results = pool.map(pt_spider.sign_in, site_list)
@@ -646,10 +646,12 @@ class PtSpider:
for my_site, result in zip(queryset, results):
logger.info('自动签到：{}, {}'.format(my_site, result))
if result.code == StatusCodeEnum.OK.code:
message_list += ('> ' + my_site.site.name + ' 签到成功！' + converter.convert(result.msg) + ' \n')
message_list += (
'> <font color="orange">' + my_site.site.name + '</font> 签到成功！' + converter.convert(
result.msg) + ' \n\n')
logger.info(my_site.site.name + '签到成功！' + result.msg)
else:
message = '> <font color="red">' + my_site.site.name + ' 签到失败！' + result.msg + '</font> \n'
message = '> <font color="red">' + my_site.site.name + ' 签到失败！' + result.msg + '</font> \n\n'
message_list = message + message_list
logger.error(my_site.site.name + '签到失败！原因：' + result.msg)
return message_list

12
pt_site/views.py
View File

@@ -80,18 +80,18 @@ def auto_get_status():
my_site.my_hr
)
logger.info('组装Message：{}'.format(message))
message_list += ('> ' + my_site.site.name + ' 信息更新成功！' + message + ' \n')
message_list += ('> <font color="orange">' + my_site.site.name + '</font> 信息更新成功！' + message + ' \n\n')
# pt_spider.send_text(my_site.site.name + ' 信息更新成功！' + message)
logger.info(my_site.site.name + '信息更新成功！' + message)
else:
print(res)
message = '> <font color="red">' + my_site.site.name + ' 信息更新失败！原因：' + res.msg + '</font> \n'
message = '> <font color="red">' + my_site.site.name + ' 信息更新失败！原因：' + res.msg + '</font> \n\n'
message_list = message + message_list
# pt_spider.send_text(my_site.site.name + ' 信息更新失败！原因：' + str(res[0]))
logger.warning(my_site.site.name + '信息更新失败！原因：' + res.msg)
else:
# pt_spider.send_text(my_site.site.name + ' 信息更新失败！原因：' + str(result[1]))
message = '> <font color="red">' + my_site.site.name + ' 信息更新失败！原因：' + result.msg + '</font> \n'
message = '> <font color="red">' + my_site.site.name + ' 信息更新失败！原因：' + result.msg + '</font> \n\n'
message_list = message + message_list
logger.warning(my_site.site.name + '信息更新失败！原因：' + result.msg)
end = time.time()
@@ -119,8 +119,10 @@ def auto_update_torrents():
res = pt_spider.get_torrent_info_list(my_site, result.data)
# 通知推送
if res.code == StatusCodeEnum.OK.code:
message = '> {} 种子抓取成功！新增种子{}条，更新种子{}条! \n'.format(my_site.site.name, res.data[0],
res.data[1])
message = '> <font color="orange">{}</font> 种子抓取成功！新增种子{}条，更新种子{}条! \n\n'.format(
my_site.site.name,
res.data[0],
res.data[1])
message_list += message
else:
message = '> <font color="red">' + my_site.site.name + '抓取种子信息失败！原因：' + res.msg + '</font> \n'