aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modules/badges.py14
-rw-r--r--modules/channel_log.py2
-rw-r--r--modules/coins.py4
-rw-r--r--modules/fediverse/ap_server.py2
-rw-r--r--modules/git_webhooks/github.py5
-rw-r--r--modules/in.py2
-rw-r--r--modules/ircv3_editmsg.py2
-rw-r--r--modules/messages.py2
-rw-r--r--modules/seen.py4
-rw-r--r--modules/stats.py2
-rw-r--r--modules/tell.py7
-rw-r--r--modules/title.py6
-rw-r--r--modules/tweets/format.py3
-rw-r--r--modules/user_time.py2
-rw-r--r--modules/words.py4
-rw-r--r--modules/youtube.py5
-rw-r--r--src/LockFile.py4
-rw-r--r--src/Logging.py2
-rw-r--r--src/core_modules/format_activity.py4
-rw-r--r--src/core_modules/ircv3_server_time.py2
-rw-r--r--src/core_modules/silence.py2
-rw-r--r--src/utils/datetime/__init__.py2
-rw-r--r--src/utils/datetime/common.py42
-rw-r--r--src/utils/datetime/format.py (renamed from src/utils/datetime.py)68
-rw-r--r--src/utils/datetime/parse.py25
-rw-r--r--src/utils/parse/time.py2
26 files changed, 117 insertions, 102 deletions
diff --git a/modules/badges.py b/modules/badges.py
index 5aa16015..942116df 100644
--- a/modules/badges.py
+++ b/modules/badges.py
@@ -22,7 +22,7 @@ class Module(ModuleManager.BaseModule):
).replace(tzinfo=datetime.timezone.utc)
def _date_str(self, dt: datetime.datetime):
- return utils.datetime.date_human(dt)
+ return utils.datetime.format.date_human(dt)
def _round_up_day(self, dt: datetime.datetime):
return dt.date()+datetime.timedelta(days=1)
@@ -57,7 +57,7 @@ class Module(ModuleManager.BaseModule):
found_badge = self._find_badge(badges, badge)
if found_badge:
- dt = utils.datetime.iso8601_parse(badges[found_badge])
+ dt = utils.datetime.parse.iso8601(badges[found_badge])
days_since = self._days_since(now, dt)
event["stdout"].write("(%s) %s on day %s (%s)" % (
event["user"].nickname, found_badge, days_since,
@@ -78,7 +78,7 @@ class Module(ModuleManager.BaseModule):
badges = []
for badge, date in self._get_badges(user).items():
days_since = self._days_since(now,
- utils.datetime.iso8601_parse(date))
+ utils.datetime.parse.iso8601(date))
badges.append("%s on day %s" % (
badge, days_since))
@@ -99,7 +99,7 @@ class Module(ModuleManager.BaseModule):
if badge_name.lower() == badge_lower:
raise utils.EventError("You already have a '%s' badge" % badge)
- badges[badge] = utils.datetime.iso8601_format_now()
+ badges[badge] = utils.datetime.format.iso8601_now()
self._set_badges(event["user"], badges)
event["stdout"].write("Added '%s' badge" % badge)
@@ -135,7 +135,7 @@ class Module(ModuleManager.BaseModule):
found_badge = self._find_badge(badges, badge)
if found_badge:
- badges[found_badge] = utils.datetime.iso8601_format_now()
+ badges[found_badge] = utils.datetime.format.iso8601_now()
self._set_badges(event["user"], badges)
event["stdout"].write("Reset badge '%s'" % found_badge)
else:
@@ -158,7 +158,7 @@ class Module(ModuleManager.BaseModule):
dt = self._parse_date(event["args_split"][-1])
- badges[found_badge] = utils.datetime.iso8601_format(dt)
+ badges[found_badge] = utils.datetime.format.iso8601(dt)
self._set_badges(event["user"], badges)
event["stdout"].write("Updated '%s' badge to %s" % (
found_badge, self._date_str(dt)))
@@ -176,7 +176,7 @@ class Module(ModuleManager.BaseModule):
found_badge = self._find_badge(badges, badge)
dt = self._parse_date(event["args_split"][-1])
- badges[found_badge or badge] = utils.datetime.iso8601_format(dt)
+ badges[found_badge or badge] = utils.datetime.format.iso8601(dt)
self._set_badges(event["user"], badges)
add_or_update = "Added" if not found_badge else "Updated"
diff --git a/modules/channel_log.py b/modules/channel_log.py
index 5f57a439..98ce59a0 100644
--- a/modules/channel_log.py
+++ b/modules/channel_log.py
@@ -27,7 +27,7 @@ class Module(ModuleManager.BaseModule):
def _log(self, server, channel, line):
if self._enabled(server, channel):
with open(self._file(str(server), str(channel)), "a") as log:
- timestamp = utils.datetime.datetime_human(
+ timestamp = utils.datetime.format.datetime_human(
datetime.datetime.now())
log.write("%s %s\n" % (timestamp, line))
diff --git a/modules/coins.py b/modules/coins.py
index 823d77f4..aa897948 100644
--- a/modules/coins.py
+++ b/modules/coins.py
@@ -184,7 +184,7 @@ class Module(ModuleManager.BaseModule):
time_left = self.bot.cache.until_expiration(cache)
event["stderr"].write("%s: Please wait %s before redeeming" % (
event["user"].nickname,
- utils.datetime.to_pretty_time(math.ceil(time_left))))
+ utils.datetime.format.to_pretty_time(time_left)))
else:
event["stderr"].write(
"%s: You can only redeem coins when you have none" %
@@ -520,7 +520,7 @@ class Module(ModuleManager.BaseModule):
"""
until = self._until_next_6_hour()
event["stdout"].write("Next lottery is in: %s" %
- utils.datetime.to_pretty_time(until))
+ utils.datetime.format.to_pretty_time(until))
@utils.hook("received.command.lotterywinner")
def lottery_winner(self, event):
diff --git a/modules/fediverse/ap_server.py b/modules/fediverse/ap_server.py
index d9c644b5..e1b5cece 100644
--- a/modules/fediverse/ap_server.py
+++ b/modules/fediverse/ap_server.py
@@ -52,7 +52,7 @@ class Server(object):
activities.append([activity_id, content, timestamp])
return activities
def _make_activity(self, content):
- timestamp = utils.datetime.iso8601_format_now()
+ timestamp = utils.datetime.format.iso8601_now()
activity_id = self._random_id()
self.bot.set_setting("ap-activity-%s" % activity_id,
[content, timestamp])
diff --git a/modules/git_webhooks/github.py b/modules/git_webhooks/github.py
index 96dc26c3..a3f51c89 100644
--- a/modules/git_webhooks/github.py
+++ b/modules/git_webhooks/github.py
@@ -183,7 +183,7 @@ class GitHub(object):
return url
def _iso8601(self, s):
- return utils.datetime.iso8601_parse(s)
+ return utils.datetime.parse.iso8601(s)
def ping(self, data):
return ["Received new webhook"]
@@ -444,7 +444,8 @@ class GitHub(object):
completed_at = self._iso8601(data["check_run"]["completed_at"])
if completed_at > started_at:
seconds = (completed_at-started_at).total_seconds()
- duration = " in %s" % utils.datetime.to_pretty_time(seconds)
+ duration = " in %s" % utils.datetime.format.to_pretty_time(
+ seconds)
status = data["check_run"]["status"]
status_str = ""
diff --git a/modules/in.py b/modules/in.py
index 1ecac93b..81f9b93c 100644
--- a/modules/in.py
+++ b/modules/in.py
@@ -11,7 +11,7 @@ class Module(ModuleManager.BaseModule):
@utils.kwarg("help", "Set a reminder")
@utils.kwarg("usage", "<time> <message>")
def in_command(self, event):
- seconds = utils.datetime.from_pretty_time(event["args_split"][0])
+ seconds = utils.datetime.parse.from_pretty_time(event["args_split"][0])
message = " ".join(event["args_split"][1:])
if seconds:
if seconds <= SECONDS_MAX:
diff --git a/modules/ircv3_editmsg.py b/modules/ircv3_editmsg.py
index fd594cd7..a7b5b2b0 100644
--- a/modules/ircv3_editmsg.py
+++ b/modules/ircv3_editmsg.py
@@ -12,7 +12,7 @@ class Module(ModuleManager.BaseModule):
if line:
line.deleted = True
- timestamp = utils.datetime.datetime_human(line.timestamp,
+ timestamp = utils.datetime.format.datetime_human(line.timestamp,
timespec=utils.datetime.TimeSpec.MILLISECOND)
minimal = "{~NICK} deleted line from %s (%s)" % (
timestamp, line.message)
diff --git a/modules/messages.py b/modules/messages.py
index 246d08b0..f6c37530 100644
--- a/modules/messages.py
+++ b/modules/messages.py
@@ -16,7 +16,7 @@ class Module(ModuleManager.BaseModule):
for i, message in enumerate(message_list):
seconds = utils.datetime.seconds_since(message.line.timestamp)
messages.append("(%d/%d) %s ago %s" % (i+1, message_count,
- utils.datetime.to_pretty_time(seconds),
+ utils.datetime.format.to_pretty_time(seconds),
message.line.format()))
event["stdout"].write("%s: found: %s"
diff --git a/modules/seen.py b/modules/seen.py
index f4bfd4fd..780ea99e 100644
--- a/modules/seen.py
+++ b/modules/seen.py
@@ -35,8 +35,8 @@ class Module(ModuleManager.BaseModule):
seen_info = " (%s%s)" % (seen_info["action"],
utils.consts.RESET)
- since = utils.datetime.to_pretty_time(time.time()-seen_seconds,
- max_units=2)
+ since = utils.datetime.format.to_pretty_time(
+ time.time()-seen_seconds, max_units=2)
event["stdout"].write("%s was last seen %s ago%s" % (
event["args_split"][0], since, seen_info or ""))
else:
diff --git a/modules/stats.py b/modules/stats.py
index bcd05a17..d61312f7 100644
--- a/modules/stats.py
+++ b/modules/stats.py
@@ -7,7 +7,7 @@ HIDDEN_MODES = set(["s", "p"])
class Module(ModuleManager.BaseModule):
def _uptime(self):
- return utils.datetime.to_pretty_time(
+ return utils.datetime.format.to_pretty_time(
int(time.time()-self.bot.start_time))
@utils.hook("received.command.uptime")
diff --git a/modules/tell.py b/modules/tell.py
index 93aaba0c..da6e30b6 100644
--- a/modules/tell.py
+++ b/modules/tell.py
@@ -8,8 +8,9 @@ class Module(ModuleManager.BaseModule):
messages = event["channel"].get_user_setting(event["user"].get_id(),
"to", [])
for nickname, message, timestamp in messages:
- timestamp_parsed = utils.datetime.iso8601_parse(timestamp)
- timestamp_human = utils.datetime.datetime_human(timestamp_parsed)
+ timestamp_parsed = utils.datetime.parse.iso8601(timestamp)
+ timestamp_human = utils.datetime.format.datetime_human(
+ timestamp_parsed)
event["channel"].send_message("%s: <%s> %s (at %s UTC)" % (
event["user"].nickname, nickname, message, timestamp_human))
if messages:
@@ -36,7 +37,7 @@ class Module(ModuleManager.BaseModule):
messages.append([event["user"].nickname,
" ".join(event["args_split"][1:]),
- utils.datetime.iso8601_format_now()])
+ utils.datetime.format.iso8601_now()])
event["target"].set_user_setting(target_user.get_id(),
"to", messages)
event["stdout"].write("Message saved")
diff --git a/modules/title.py b/modules/title.py
index e45e015a..f70f4785 100644
--- a/modules/title.py
+++ b/modules/title.py
@@ -96,9 +96,9 @@ class Module(ModuleManager.BaseModule):
if first_details:
first_nickname, first_timestamp, _ = first_details
- timestamp_parsed = utils.datetime.iso8601_parse(
+ timestamp_parsed = utils.datetime.parse.iso8601(
first_timestamp)
- timestamp_human = utils.datetime.datetime_human(
+ timestamp_human = utils.datetime.format.datetime_human(
timestamp_parsed)
message = "%s (first posted by %s at %s)" % (title,
@@ -106,7 +106,7 @@ class Module(ModuleManager.BaseModule):
else:
event["target"].set_setting(setting,
[event["user"].nickname,
- utils.datetime.iso8601_format_now(), url])
+ utils.datetime.format.iso8601_now(), url])
event["stdout"].write(message)
if code == -2:
self.log.debug("Not showing title for %s, too similar", [url])
diff --git a/modules/tweets/format.py b/modules/tweets/format.py
index 8726ae2b..aab1c62d 100644
--- a/modules/tweets/format.py
+++ b/modules/tweets/format.py
@@ -3,7 +3,8 @@ from src import utils
def _timestamp(dt):
seconds_since = time.time()-dt.timestamp()
- timestamp = utils.datetime.to_pretty_time(seconds_since, max_units=2)
+ timestamp = utils.datetime.format.to_pretty_time(
+ seconds_since, max_units=2)
return "%s ago" % timestamp
def _normalise(tweet):
diff --git a/modules/user_time.py b/modules/user_time.py
index 48077d81..80090c29 100644
--- a/modules/user_time.py
+++ b/modules/user_time.py
@@ -52,7 +52,7 @@ class Module(ModuleManager.BaseModule):
if utc_offset > 0:
tz += "+"
tz += "%g" % utc_offset
- return "%s %s" % (utils.datetime.datetime_human(dt), tz)
+ return "%s %s" % (utils.datetime.format.datetime_human(dt), tz)
@utils.hook("received.command.time")
@utils.kwarg("help", "Get the time for you or someone else")
diff --git a/modules/words.py b/modules/words.py
index 703007ef..75fe3f64 100644
--- a/modules/words.py
+++ b/modules/words.py
@@ -81,8 +81,8 @@ class Module(ModuleManager.BaseModule):
since = ""
first_words = target.get_setting("first-words", None)
if not first_words == None:
- since = " since %s" % utils.datetime.date_human(
- utils.datetime.datetime_timestamp(first_words))
+ since = " since %s" % utils.datetime.format.date_human(
+ utils.datetime.timestamp(first_words))
event["stdout"].write("%s has used %d words (%d in %s)%s" % (
target.nickname, total, this_channel, event["target"].name, since))
diff --git a/modules/youtube.py b/modules/youtube.py
index 3e3481aa..f2c60885 100644
--- a/modules/youtube.py
+++ b/modules/youtube.py
@@ -44,9 +44,10 @@ class Module(ModuleManager.BaseModule):
statistics = item["statistics"]
content = item["contentDetails"]
- video_uploaded_at = utils.datetime.iso8601_parse(
+ video_uploaded_at = utils.datetime.parse.iso8601(
snippet["publishedAt"])
- video_uploaded_at = utils.datetime.date_human(video_uploaded_at)
+ video_uploaded_at = utils.datetime.format.date_human(
+ video_uploaded_at)
video_uploader = snippet["channelTitle"]
video_title = utils.irc.bold(snippet["title"])
diff --git a/src/LockFile.py b/src/LockFile.py
index 54ff6284..2765e87d 100644
--- a/src/LockFile.py
+++ b/src/LockFile.py
@@ -14,7 +14,7 @@ class LockFile(PollHook.PollHook):
with open(self._filename, "r") as lock_file:
timestamp_str = lock_file.read().strip().split(" ", 1)[0]
- timestamp = utils.datetime.iso8601_parse(timestamp_str)
+ timestamp = utils.datetime.parse.iso8601(timestamp_str)
if (now-timestamp).total_seconds() < EXPIRATION:
return False
@@ -24,7 +24,7 @@ class LockFile(PollHook.PollHook):
def lock(self):
with open(self._filename, "w") as lock_file:
last_lock = utils.datetime.utcnow()
- lock_file.write("%s" % utils.datetime.iso8601_format(last_lock))
+ lock_file.write("%s" % utils.datetime.format.iso8601(last_lock))
self._next_lock = last_lock+datetime.timedelta(
seconds=EXPIRATION/2)
diff --git a/src/Logging.py b/src/Logging.py
index 0f636587..ec8574bd 100644
--- a/src/Logging.py
+++ b/src/Logging.py
@@ -13,7 +13,7 @@ LEVELS = {
class BitBotFormatter(logging.Formatter):
def formatTime(self, record, datefmt=None):
datetime_obj = datetime.datetime.fromtimestamp(record.created)
- return utils.datetime.iso8601_format(datetime_obj,
+ return utils.datetime.format.iso8601(datetime_obj,
timespec=utils.datetime.TimeSpec.MILLISECOND)
class HookedHandler(logging.StreamHandler):
diff --git a/src/core_modules/format_activity.py b/src/core_modules/format_activity.py
index 8bffd64d..cad74db3 100644
--- a/src/core_modules/format_activity.py
+++ b/src/core_modules/format_activity.py
@@ -197,8 +197,8 @@ class Module(ModuleManager.BaseModule):
self._on_topic(event, event["setter"].nickname, "set",
event["channel"].topic)
- dt = utils.datetime.datetime_human(
- utils.datetime.datetime_timestamp(event["set_at"]))
+ dt = utils.datetime.format.datetime_human(
+ utils.datetime.timestamp(event["set_at"]))
minimal = "topic set at %s" % dt
line = "- %s" % minimal
diff --git a/src/core_modules/ircv3_server_time.py b/src/core_modules/ircv3_server_time.py
index 270d56d9..ebc19aad 100644
--- a/src/core_modules/ircv3_server_time.py
+++ b/src/core_modules/ircv3_server_time.py
@@ -21,5 +21,5 @@ class Module(ModuleManager.BaseModule):
def message(self, event):
server_time = self._get(event["line"].tags)
if not server_time == None:
- dt = utils.datetime.iso8601_parse(server_time)
+ dt = utils.datetime.parse.iso8601(server_time)
event["buffer_line"].timestamp = dt
diff --git a/src/core_modules/silence.py b/src/core_modules/silence.py
index 42990921..70dd3a4d 100644
--- a/src/core_modules/silence.py
+++ b/src/core_modules/silence.py
@@ -30,7 +30,7 @@ class Module(ModuleManager.BaseModule):
def silence(self, event):
duration = SILENCE_TIME
if event["args"] and event["args_split"][0].startswith("+"):
- duration = utils.datetime.from_pretty_time(
+ duration = utils.datetime.parse.from_pretty_time(
event["args_split"][0][1:])
if duration == None:
raise utils.EventError("Invalid duration provided")
diff --git a/src/utils/datetime/__init__.py b/src/utils/datetime/__init__.py
new file mode 100644
index 00000000..dbe546db
--- /dev/null
+++ b/src/utils/datetime/__init__.py
@@ -0,0 +1,2 @@
+from .common import *
+from . import format, parse
diff --git a/src/utils/datetime/common.py b/src/utils/datetime/common.py
new file mode 100644
index 00000000..7235fbab
--- /dev/null
+++ b/src/utils/datetime/common.py
@@ -0,0 +1,42 @@
+import datetime as _datetime
+import enum
+
+ISO8601_FORMAT_DT = "%Y-%m-%dT%H:%M:%S"
+ISO8601_FORMAT_TZ = "%z"
+
+TIME_HUMAN = "%H:%M:%S"
+DATE_HUMAN = "%Y-%m-%d"
+
+class TimeSpec(enum.Enum):
+ NORMAL = 1
+ MILLISECOND = 2
+
+TIME_SECOND = 1
+TIME_MINUTE = TIME_SECOND*60
+TIME_HOUR = TIME_MINUTE*60
+TIME_DAY = TIME_HOUR*24
+TIME_WEEK = TIME_DAY*7
+
+SECONDS_MINUTES = 60
+SECONDS_HOURS = SECONDS_MINUTES*60
+SECONDS_DAYS = SECONDS_HOURS*24
+SECONDS_WEEKS = SECONDS_DAYS*7
+
+UNIT_MINIMUM = 6
+UNIT_SECOND = 5
+UNIT_MINUTE = 4
+UNIT_HOUR = 3
+UNIT_DAY = 2
+UNIT_WEEK = 1
+UNIT_MONTH = 1
+UNIT_YEAR = 1
+
+def utcnow() -> _datetime.datetime:
+ return _datetime.datetime.utcnow().replace(tzinfo=_datetime.timezone.utc)
+
+def timestamp(seconds: float) -> _datetime.datetime:
+ return _datetime.datetime.fromtimestamp(seconds).replace(
+ tzinfo=_datetime.timezone.utc)
+
+def seconds_since(dt: _datetime.datetime) -> float:
+ return (utcnow()-dt).total_seconds()
diff --git a/src/utils/datetime.py b/src/utils/datetime/format.py
index 650893d1..feefde82 100644
--- a/src/utils/datetime.py
+++ b/src/utils/datetime/format.py
@@ -1,24 +1,9 @@
-import enum, re, typing
+import typing
import datetime as _datetime
-import dateutil.parser, dateutil.relativedelta
+import dateutil.relativedelta
+from .common import *
-ISO8601_FORMAT_DT = "%Y-%m-%dT%H:%M:%S"
-ISO8601_FORMAT_TZ = "%z"
-
-TIME_HUMAN = "%H:%M:%S"
-DATE_HUMAN = "%Y-%m-%d"
-
-class TimeSpec(enum.Enum):
- NORMAL = 1
- MILLISECOND = 2
-
-def utcnow() -> _datetime.datetime:
- return _datetime.datetime.utcnow().replace(tzinfo=_datetime.timezone.utc)
-def datetime_timestamp(seconds: float) -> _datetime.datetime:
- return _datetime.datetime.fromtimestamp(seconds).replace(
- tzinfo=_datetime.timezone.utc)
-
-def iso8601_format(dt: _datetime.datetime, timespec: TimeSpec=TimeSpec.NORMAL
+def iso8601(dt: _datetime.datetime, timespec: TimeSpec=TimeSpec.NORMAL
) -> str:
dt_format = dt.strftime(ISO8601_FORMAT_DT)
tz_format = dt.strftime(ISO8601_FORMAT_TZ)
@@ -29,10 +14,7 @@ def iso8601_format(dt: _datetime.datetime, timespec: TimeSpec=TimeSpec.NORMAL
return "%s%s%s" % (dt_format, ms_format, tz_format)
def iso8601_format_now(timespec: TimeSpec=TimeSpec.NORMAL) -> str:
- return iso8601_format(utcnow(), timespec)
-
-def iso8601_parse(s: str) -> _datetime.datetime:
- return dateutil.parser.parse(s)
+ return iso8601(utcnow(), timespec)
def datetime_human(dt: _datetime.datetime, timespec: TimeSpec=TimeSpec.NORMAL):
date = _datetime.datetime.strftime(dt, DATE_HUMAN)
@@ -43,15 +25,6 @@ def datetime_human(dt: _datetime.datetime, timespec: TimeSpec=TimeSpec.NORMAL):
def date_human(dt: _datetime.datetime, timespec: TimeSpec=TimeSpec.NORMAL):
return _datetime.datetime.strftime(dt, DATE_HUMAN)
-def seconds_since(dt: _datetime.datetime) -> float:
- return (utcnow()-dt).total_seconds()
-
-TIME_SECOND = 1
-TIME_MINUTE = TIME_SECOND*60
-TIME_HOUR = TIME_MINUTE*60
-TIME_DAY = TIME_HOUR*24
-TIME_WEEK = TIME_DAY*7
-
def time_unit(seconds: int) -> typing.Tuple[int, str]:
since = None
unit = None
@@ -75,37 +48,6 @@ def time_unit(seconds: int) -> typing.Tuple[int, str]:
unit = "%ss" % unit # pluralise the unit
return (since, unit)
-REGEX_PRETTYTIME = re.compile(
- r"(?:(\d+)w)?(?:(\d+)d)?(?:(\d+)h)?(?:(\d+)m)?(?:(\d+)s)?", re.I)
-
-SECONDS_MINUTES = 60
-SECONDS_HOURS = SECONDS_MINUTES*60
-SECONDS_DAYS = SECONDS_HOURS*24
-SECONDS_WEEKS = SECONDS_DAYS*7
-
-def from_pretty_time(pretty_time: str) -> typing.Optional[int]:
- seconds = 0
-
- match = re.match(REGEX_PRETTYTIME, pretty_time)
- if match:
- seconds += int(match.group(1) or 0)*SECONDS_WEEKS
- seconds += int(match.group(2) or 0)*SECONDS_DAYS
- seconds += int(match.group(3) or 0)*SECONDS_HOURS
- seconds += int(match.group(4) or 0)*SECONDS_MINUTES
- seconds += int(match.group(5) or 0)
-
- if seconds > 0:
- return seconds
- return None
-
-UNIT_MINIMUM = 6
-UNIT_SECOND = 5
-UNIT_MINUTE = 4
-UNIT_HOUR = 3
-UNIT_DAY = 2
-UNIT_WEEK = 1
-UNIT_MONTH = 1
-UNIT_YEAR = 1
def to_pretty_time(total_seconds: int, minimum_unit: int=UNIT_SECOND,
max_units: int=UNIT_MINIMUM) -> str:
if total_seconds == 0:
diff --git a/src/utils/datetime/parse.py b/src/utils/datetime/parse.py
new file mode 100644
index 00000000..8e372f8c
--- /dev/null
+++ b/src/utils/datetime/parse.py
@@ -0,0 +1,25 @@
+import re, typing
+import datetime as _datetime
+import dateutil.parser
+from .common import *
+
+def iso8601(s: str) -> _datetime.datetime:
+ return dateutil.parser.parse(s)
+
+REGEX_PRETTYTIME = re.compile(
+ r"(?:(\d+)w)?(?:(\d+)d)?(?:(\d+)h)?(?:(\d+)m)?(?:(\d+)s)?", re.I)
+
+def from_pretty_time(pretty_time: str) -> typing.Optional[int]:
+ seconds = 0
+
+ match = re.match(REGEX_PRETTYTIME, pretty_time)
+ if match:
+ seconds += int(match.group(1) or 0)*SECONDS_WEEKS
+ seconds += int(match.group(2) or 0)*SECONDS_DAYS
+ seconds += int(match.group(3) or 0)*SECONDS_HOURS
+ seconds += int(match.group(4) or 0)*SECONDS_MINUTES
+ seconds += int(match.group(5) or 0)
+
+ if seconds > 0:
+ return seconds
+ return None
diff --git a/src/utils/parse/time.py b/src/utils/parse/time.py
index 51094c2d..217b920a 100644
--- a/src/utils/parse/time.py
+++ b/src/utils/parse/time.py
@@ -2,7 +2,7 @@ from src.utils import datetime
def duration(s: str):
if s[0] == "+":
- duration = datetime.from_pretty_time(s[1:])
+ duration = datetime.parse.from_pretty_time(s[1:])
if not duration == None:
return duration
return None
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-06-11 13:10:39 +0000