From b6120afeef885b6d823fc847a9205c3c5c307392 Mon Sep 17 00:00:00 2001 From: ngfchl Date: Mon, 26 Dec 2022 16:38:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AA=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C=E7=AB=99=E7=82=B9=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=86=8D=E6=88=91=E7=9A=84=E6=95=B0=E6=8D=AE=E4=B8=AD?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- auto_pt/views.py | 94 ++++++++++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/auto_pt/views.py b/auto_pt/views.py index e2f9cc7..bff6ad4 100644 --- a/auto_pt/views.py +++ b/auto_pt/views.py @@ -562,54 +562,54 @@ def site_status_api(request): 'seeding_size': 0, 'last_active': datetime.strftime(my_site.updated_at, '%Y年%m月%d日%H:%M:%S'), } - continue - site_info = site_info_list.first() - downloaded += site_info.downloaded - uploaded += site_info.uploaded - seeding += my_site.seed - leeching += my_site.leech - sp += site_info.my_sp - sp_hour += (float(my_site.sp_hour) if my_site.sp_hour != '' else 0) - bonus += site_info.my_bonus - leeching += my_site.leech - seeding_size += site_info.seed_vol - weeks = (now - my_site.time_join).days // 7 - days = (now - my_site.time_join).days % 7 + else: # continue + site_info = site_info_list.first() + downloaded += site_info.downloaded + uploaded += site_info.uploaded + seeding += my_site.seed + leeching += my_site.leech + sp += site_info.my_sp + sp_hour += (float(my_site.sp_hour) if my_site.sp_hour != '' else 0) + bonus += site_info.my_bonus + leeching += my_site.leech + seeding_size += site_info.seed_vol + weeks = (now - my_site.time_join).days // 7 + days = (now - my_site.time_join).days % 7 - if sign_in_support: - sign_in_list = my_site.signin_set.filter(created_at__date=now.date()) - sign_in_state = sign_in_list.first().sign_in_today if len(sign_in_list) > 0 else False - else: - sign_in_state = False - site_info = { - 'id': my_site.id, - 'name': my_site.site.name, - 'icon': my_site.site.logo, - 'url': my_site.site.url, - 'class': my_site.my_level, - 'sign_in_support': sign_in_support, - 'sign_in_state': sign_in_state, - 'invite': my_site.invitation, - 'sp_hour': float(my_site.sp_hour) if my_site.sp_hour != '' else 0, - 'sp_hour_full': '{:.2%}'.format( - float(my_site.sp_hour) / my_site.site.sp_full) if my_site.site.sp_full != 0 else '0%', - 'seeding': my_site.seed, - 'leeching': my_site.leech, - 'weeks': f'{weeks}周 {days}天', - 'time_join': my_site.time_join, - 'hr': my_site.my_hr, - 'mail': my_site.mail, - 'sort_id': my_site.sort_id, - 'sp': site_info.my_sp, - 'bonus': site_info.my_bonus, - # 'uploaded': FileSizeConvert.parse_2_file_size(site_info.uploaded), - # 'downloaded': FileSizeConvert.parse_2_file_size(site_info.downloaded), - # 'seeding_size': FileSizeConvert.parse_2_file_size(site_info.seed_vol), - 'uploaded': site_info.uploaded, - 'downloaded': site_info.downloaded, - 'seeding_size': site_info.seed_vol, - 'last_active': datetime.strftime(site_info.updated_at, '%Y年%m月%d日%H:%M:%S'), - } + if sign_in_support: + sign_in_list = my_site.signin_set.filter(created_at__date=now.date()) + sign_in_state = sign_in_list.first().sign_in_today if len(sign_in_list) > 0 else False + else: + sign_in_state = False + site_info = { + 'id': my_site.id, + 'name': my_site.site.name, + 'icon': my_site.site.logo, + 'url': my_site.site.url, + 'class': my_site.my_level, + 'sign_in_support': sign_in_support, + 'sign_in_state': sign_in_state, + 'invite': my_site.invitation, + 'sp_hour': float(my_site.sp_hour) if my_site.sp_hour != '' else 0, + 'sp_hour_full': '{:.2%}'.format( + float(my_site.sp_hour) / my_site.site.sp_full) if my_site.site.sp_full != 0 else '0%', + 'seeding': my_site.seed, + 'leeching': my_site.leech, + 'weeks': f'{weeks}周 {days}天', + 'time_join': my_site.time_join, + 'hr': my_site.my_hr, + 'mail': my_site.mail, + 'sort_id': my_site.sort_id, + 'sp': site_info.my_sp, + 'bonus': site_info.my_bonus, + # 'uploaded': FileSizeConvert.parse_2_file_size(site_info.uploaded), + # 'downloaded': FileSizeConvert.parse_2_file_size(site_info.downloaded), + # 'seeding_size': FileSizeConvert.parse_2_file_size(site_info.seed_vol), + 'uploaded': site_info.uploaded, + 'downloaded': site_info.downloaded, + 'seeding_size': site_info.seed_vol, + 'last_active': datetime.strftime(site_info.updated_at, '%Y年%m月%d日%H:%M:%S'), + } status_list.append(site_info) # 按上传量排序 # status_list.sort(key=lambda x: x['mail'], reverse=False)