From 2cf42b8b53eaed1210531f90f279db9d7cebe223 Mon Sep 17 00:00:00 2001 From: TechShrimp <939178127@qq.com> Date: Mon, 2 Oct 2023 16:18:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AEPR=E6=84=8F=E8=A7=81=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E4=BF=AE=E6=94=B9=20=E4=BD=BF=E7=94=A8autopep8?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- report_reminder.py => func_report_reminder.py | 23 +++++++++++-------- main.py | 3 ++- 2 files changed, 15 insertions(+), 11 deletions(-) rename report_reminder.py => func_report_reminder.py (76%) diff --git a/report_reminder.py b/func_report_reminder.py similarity index 76% rename from report_reminder.py rename to func_report_reminder.py index b76e909..1252fec 100644 --- a/report_reminder.py +++ b/func_report_reminder.py @@ -7,12 +7,12 @@ from robot import Robot class ReportReminder: @staticmethod - def remind(robot) -> None: + def remind(robot: Robot) -> None: receivers = robot.config.REPORT_REMINDERS if not receivers: receivers = ["filehelper"] - #日报周报月报提醒 + # 日报周报月报提醒 for receiver in receivers: today = datetime.datetime.now().date() # 如果是非工作日 @@ -24,7 +24,7 @@ class ReportReminder: # 如果是本周最后一个工作日 if ReportReminder.last_work_day_of_week(today) == today: robot.sendTextMsg("该发周报啦", receiver) - # 如果本日是本月最后一整周的最后一个一个工作日: + # 如果本日是本月最后一整周的最后一个工作日: if ReportReminder.last_work_friday_of_month(today) == today: robot.sendTextMsg("该发月报啦", receiver) @@ -34,14 +34,15 @@ class ReportReminder: days_in_month = calendar.monthrange(d.year, d.month)[1] weekday = calendar.weekday(d.year, d.month, days_in_month) if weekday == 4: - last_friday_of_month = datetime.date(d.year, d.month, days_in_month) + last_friday_of_month = datetime.date( + d.year, d.month, days_in_month) else: if weekday >= 5: - last_friday_of_month = datetime.date(d.year, d.month, days_in_month) - datetime.timedelta( - days=(weekday - 4)) + last_friday_of_month = datetime.date(d.year, d.month, days_in_month) - \ + datetime.timedelta(days=(weekday - 4)) else: - last_friday_of_month = datetime.date(d.year, d.month, days_in_month) - datetime.timedelta( - days=(weekday + 3)) + last_friday_of_month = datetime.date(d.year, d.month, days_in_month) - \ + datetime.timedelta(days=(weekday + 3)) while not is_workday(last_friday_of_month): last_friday_of_month = last_friday_of_month - datetime.timedelta(days=1) return last_friday_of_month @@ -50,8 +51,10 @@ class ReportReminder: @staticmethod def last_work_day_of_week(d: datetime.date) -> datetime.date: weekday = calendar.weekday(d.year, d.month, d.day) - last_work_day_of_week = datetime.date(d.year, d.month, d.day) + datetime.timedelta(days=(6 - weekday)) + last_work_day_of_week = datetime.date( + d.year, d.month, d.day) + datetime.timedelta(days=(6 - weekday)) while not is_workday(last_work_day_of_week): - last_work_day_of_week = last_work_day_of_week - datetime.timedelta(days=1) + last_work_day_of_week = last_work_day_of_week - \ + datetime.timedelta(days=1) return last_work_day_of_week diff --git a/main.py b/main.py index 2e6d60c..5e3288d 100644 --- a/main.py +++ b/main.py @@ -6,7 +6,7 @@ import signal from wcferry import Wcf from configuration import Config -from report_reminder import ReportReminder +from func_report_reminder import ReportReminder from robot import Robot @@ -24,6 +24,7 @@ def weather_report(robot: Robot) -> None: robot.sendTextMsg(report, r) # robot.sendTextMsg(report, r, "nofity@all") # 发送消息并@所有人 + def main(): config = Config() wcf = Wcf(debug=True)