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-11-29 18:22:36 +08:00
parent 6976640622
commit 1374a07a44
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pt_site/UtilityTool.py
View File

@@ -816,17 +816,18 @@ class PtSpider:
def do_sign_in(self, pool, queryset: QuerySet[MySite]):
message_list = '# 自动签到通知 \n\n### <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\n'
# U2/52PT 每天九点前不签到
queryset = [my_site for my_site in queryset if my_site.site.url not in [
'https://u2.dmhy.org/', 'https://52pt.site/'
] and my_site.signin_set.filter(created_at__date__gte=datetime.today()).count() <= 0
and my_site.cookie]
message = '> <font color="red">站点：`U2`以及`52PT` 早上九点之前不执行签到任务哦！</font> \n\n'
logger.info(message)
message_list = message + message_list
else:
queryset = [my_site for my_site in queryset if my_site.cookie and my_site.site.sign_in_support
and my_site.signin_set.filter(created_at__date__gte=datetime.today(),
sign_in_today=True).count() <= 0]
queryset = [my_site for my_site in queryset if my_site.cookie and
my_site.signin_set.filter(created_at__date__gte=datetime.today(),
sign_in_today=True).count() <= 0]
logger.info(len(queryset))
if len(queryset) <= 0:
message_list = '> <font color="orange">已全部签到或无需签到！</font> \n\n'
@@ -1045,6 +1046,7 @@ class PtSpider:
msg='签到失败！'
)
if 'hares.top' in site.url:
logger.info(res.text)
code = res.json().get('code')
# logger.info('白兔返回码：'+ type(code))
if int(code) == 0:

8
pt_site/admin.py
View File

@@ -460,9 +460,11 @@ class MySiteAdmin(AjaxAdmin): # instead of ModelAdmin
def sign_in(self, request, queryset):
start = time.time()
queryset = [my_site for my_site in queryset if
my_site.cookie and my_site.site.sign_in_support and my_site.signin_set.filter(
created_at__date__gte=datetime.today(), sign_in_today=True).count() <= 0]
queryset = [my_site for my_site in queryset if my_site.sign_in and
my_site.cookie and my_site.site.sign_in_support and
my_site.signin_set.filter(
created_at__date__gte=datetime.today(),
sign_in_today=True).count() <= 0]
if len(queryset) <= 0:
messages.success(request, '已签到或无需签到！')
results = pool.map(pt_spider.sign_in, queryset)

4
pt_site/views.py
View File

@@ -33,8 +33,8 @@ logger = logging.getLogger('ptools')
def auto_sign_in():
"""自动签到"""
start = time.time()
# 获取本人所有站点
queryset = MySite.objects.all()
# 获取工具支持且本人开启签到的所有站点
queryset = MySite.objects.filter(site__sign_in_support=True).filter(sign_in=True).all()
message_list = pt_spider.do_sign_in(pool, queryset)
end = time.time()
consuming = '> <font color="blue">{} 任务运行成功！耗时：{}完成时间：{} </font>\n'.format(