From 460af24daa93a2c330d3c8ed8a90af05d227b2c2 Mon Sep 17 00:00:00 2001 From: Boris <564773807@qq.com> Date: Thu, 14 Oct 2021 16:25:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=8F=90=E5=8F=96=E6=94=AF?= =?UTF-8?q?=E6=8C=81xx=E4=B8=AA=E6=9C=88=E5=89=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- feapder/VERSION | 2 +- feapder/utils/tools.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/feapder/VERSION b/feapder/VERSION index bcc1d640..c70cbbbf 100644 --- a/feapder/VERSION +++ b/feapder/VERSION @@ -1 +1 @@ -1.6.9-beta1 +1.6.9-beta2 diff --git a/feapder/utils/tools.py b/feapder/utils/tools.py index c12e4be1..08010223 100644 --- a/feapder/utils/tools.py +++ b/feapder/utils/tools.py @@ -1567,6 +1567,12 @@ def transform_lower_num(data_str: str): @run_safe_model("format_time") def format_time(release_time, date_format="%Y-%m-%d %H:%M:%S"): + """ + >>> format_time("2个月前") + '2021-08-15 16:24:21' + >>> format_time("2月前") + '2021-08-15 16:24:36' + """ release_time = transform_lower_num(release_time) release_time = release_time.replace("日", "天").replace("/", "-") @@ -1578,7 +1584,7 @@ def format_time(release_time, date_format="%Y-%m-%d %H:%M:%S"): release_time = years_ago.strftime("%Y-%m-%d %H:%M:%S") elif "月前" in release_time: - months = re.compile("(\d+)\s*月前").findall(release_time) + months = re.compile("(\d+)[\s个]*月前").findall(release_time) months_ago = datetime.datetime.now() - datetime.timedelta( days=int(months[0]) * 30 )