Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

add utils.date_human() - use it in badges.py

Browse source
This commit is contained in:
jesopo 2019-10-30 10:25:07 +00:00
parent 2c1b838172
commit 3634b72622
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/badges.py
View file

@ -6,7 +6,6 @@ from src import ModuleManager, utils
RE_HUMAN_FORMAT = re.compile(r"(\d\d\d\d)-(\d?\d)-(\d?\d)") RE_HUMAN_FORMAT = re.compile(r"(\d\d\d\d)-(\d?\d)-(\d?\d)")
HUMAN_FORMAT_HELP = "year-month-day (e.g. 2018-12-29)" HUMAN_FORMAT_HELP = "year-month-day (e.g. 2018-12-29)"
DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ" DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
DATE_FORMAT = "%Y-%m-%d"
class Module(ModuleManager.BaseModule): class Module(ModuleManager.BaseModule):
def _parse_date(self, dt: str): def _parse_date(self, dt: str):
@ -24,7 +23,7 @@ class Module(ModuleManager.BaseModule):
).replace(tzinfo=datetime.timezone.utc) ).replace(tzinfo=datetime.timezone.utc)
def _date_str(self, dt: datetime.datetime): def _date_str(self, dt: datetime.datetime):
return datetime.datetime.strftime(dt, DATE_FORMAT) return utils.date_human(dt)
def _round_up_day(self, dt: datetime.datetime): def _round_up_day(self, dt: datetime.datetime):
return dt.date()+datetime.timedelta(days=1) return dt.date()+datetime.timedelta(days=1)

3
src/utils/__init__.py
View file

@ -14,6 +14,7 @@ ISO8601_FORMAT_TZ = "%z"
DATETIME_HUMAN = "%Y/%m/%d %H:%M:%S" DATETIME_HUMAN = "%Y/%m/%d %H:%M:%S"
DATE_HUMAN = "%Y-%m-%d"
def datetime_utcnow() -> datetime.datetime: def datetime_utcnow() -> datetime.datetime:
return datetime.datetime.utcnow().replace(tzinfo=datetime.timezone.utc) return datetime.datetime.utcnow().replace(tzinfo=datetime.timezone.utc)
@ -35,6 +36,8 @@ def iso8601_parse(s: str, microseconds: bool=False) -> datetime.datetime:
def datetime_human(dt: datetime.datetime): def datetime_human(dt: datetime.datetime):
return datetime.datetime.strftime(dt, DATETIME_HUMAN) return datetime.datetime.strftime(dt, DATETIME_HUMAN)
def date_human(dt: datetime.datetime):
return datetime.datetime.strftime(dt, DATE_HUMAN)
TIME_SECOND = 1 TIME_SECOND = 1
TIME_MINUTE = TIME_SECOND*60 TIME_MINUTE = TIME_SECOND*60