move all datetime-related code from utils/__init__ to utils.datetime

4 files changed, 134 insertions, 131 deletions

diff --git a/src/LockFile.py b/src/LockFile.py
index 4bb07726..309e8e87 100644
--- a/src/LockFile.py
+++ b/src/LockFile.py
@@ -9,12 +9,12 @@ class LockFile(PollHook.PollHook):
         self._next_lock = None
 
     def available(self):
-        now = utils.datetime_utcnow()
+        now = utils.datetime.datetime_utcnow()
         if os.path.exists(self._filename):
             with open(self._filename, "r") as lock_file:
                 timestamp_str = lock_file.read().strip().split(" ", 1)[0]
 
-            timestamp = utils.iso8601_parse(timestamp_str)
+            timestamp = utils.datetime.iso8601_parse(timestamp_str)
 
             if (now-timestamp).total_seconds() < EXPIRATION:
                 return False
@@ -23,13 +23,14 @@ 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.iso8601_format(last_lock))
+            last_lock = utils.datetime.datetime_utcnow()
+            lock_file.write("%s" % utils.datetime.iso8601_format(last_lock))
             self._next_lock = last_lock+datetime.timedelta(
                 seconds=EXPIRATION/2)
 
     def next(self):
-        return max(0, (self._next_lock-utils.datetime_utcnow()).total_seconds())
+        return max(0,
+            (self._next_lock-utils.datetime.datetime_utcnow()).total_seconds())
     def call(self):
         self.lock()
 
diff --git a/src/Logging.py b/src/Logging.py
index edb1687d..61b90402 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.iso8601_format(datetime_obj, milliseconds=True)
+        return utils.datetime.iso8601_format(datetime_obj, milliseconds=True)
 
 class HookedHandler(logging.StreamHandler):
     def __init__(self, func: typing.Callable[[int, str], None]):
diff --git a/src/utils/__init__.py b/src/utils/__init__.py
index b7b581e2..294b9083 100644
--- a/src/utils/__init__.py
+++ b/src/utils/__init__.py
@@ -1,6 +1,6 @@
-import contextlib, datetime, decimal, enum, io, ipaddress, multiprocessing
+import contextlib, decimal, enum, io, ipaddress, multiprocessing
 import queue, re, signal, threading, typing
-from . import cli, consts, decorators, irc, http, parse, security
+from . import cli, consts, datetime, decorators, irc, http, parse, security
 
 from .decorators import export, hook, kwarg
 from .settings import (BoolSetting, FunctionSetting, IntRangeSetting,
@@ -10,129 +10,6 @@ class Direction(enum.Enum):
     Send = 0
     Recv = 1
 
-ISO8601_PARSE = "%Y-%m-%dT%H:%M:%S%z"
-ISO8601_PARSE_MICROSECONDS = "%Y-%m-%dT%H:%M:%S.%f%z"
-
-ISO8601_FORMAT_DT = "%Y-%m-%dT%H:%M:%S"
-ISO8601_FORMAT_TZ = "%z"
-
-
-DATETIME_HUMAN = "%Y/%m/%d %H:%M:%S"
-DATE_HUMAN = "%Y-%m-%d"
-
-def datetime_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, milliseconds: bool=False) -> str:
-    dt_format = dt.strftime(ISO8601_FORMAT_DT)
-    tz_format = dt.strftime(ISO8601_FORMAT_TZ)
-
-    ms_format = ""
-    if milliseconds:
-        ms_format = ".%s" % str(int(dt.microsecond/1000)).zfill(3)
-
-    return "%s%s%s" % (dt_format, ms_format, tz_format)
-def iso8601_format_now(milliseconds: bool=False) -> str:
-    return iso8601_format(datetime_utcnow(), milliseconds=milliseconds)
-def iso8601_parse(s: str, microseconds: bool=False) -> datetime.datetime:
-    fmt = ISO8601_PARSE_MICROSECONDS if microseconds else ISO8601_PARSE
-    return datetime.datetime.strptime(s, fmt)
-
-def datetime_human(dt: datetime.datetime):
-    return datetime.datetime.strftime(dt, DATETIME_HUMAN)
-def date_human(dt: datetime.datetime):
-    return datetime.datetime.strftime(dt, DATE_HUMAN)
-
-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
-    if seconds >= TIME_WEEK:
-        since = seconds/TIME_WEEK
-        unit = "week"
-    elif seconds >= TIME_DAY:
-        since = seconds/TIME_DAY
-        unit = "day"
-    elif seconds >= TIME_HOUR:
-        since = seconds/TIME_HOUR
-        unit = "hour"
-    elif seconds >= TIME_MINUTE:
-        since = seconds/TIME_MINUTE
-        unit = "minute"
-    else:
-        since = seconds
-        unit = "second"
-    since = int(since)
-    if since > 1:
-        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
-def to_pretty_time(total_seconds: int, minimum_unit: int=UNIT_SECOND,
-        max_units: int=UNIT_MINIMUM) -> str:
-    if total_seconds == 0:
-        return "0s"
-
-    minutes, seconds = divmod(total_seconds, 60)
-    hours, minutes = divmod(minutes, 60)
-    days, hours = divmod(hours, 24)
-    weeks, days = divmod(days, 7)
-    out = []
-
-    units = 0
-    if weeks and minimum_unit >= UNIT_WEEK and units < max_units:
-        out.append("%dw" % weeks)
-        units += 1
-    if days and minimum_unit >= UNIT_DAY and units < max_units:
-        out.append("%dd" % days)
-        units += 1
-    if hours and minimum_unit >= UNIT_HOUR and units < max_units:
-        out.append("%dh" % hours)
-        units += 1
-    if minutes and minimum_unit >= UNIT_MINUTE and units < max_units:
-        out.append("%dm" % minutes)
-        units += 1
-    if seconds and minimum_unit >= UNIT_SECOND and units < max_units:
-        out.append("%ds" % seconds)
-        units += 1
-    return " ".join(out)
-
 def prevent_highlight(nickname: str) -> str:
     return nickname[0]+"\u200c"+nickname[1:]
 
diff --git a/src/utils/datetime.py b/src/utils/datetime.py
new file mode 100644
index 00000000..0fac2bb3
--- /dev/null
+++ b/src/utils/datetime.py
@@ -0,0 +1,125 @@
+import re, typing
+import datetime as _datetime
+
+ISO8601_PARSE = "%Y-%m-%dT%H:%M:%S%z"
+ISO8601_PARSE_MICROSECONDS = "%Y-%m-%dT%H:%M:%S.%f%z"
+
+ISO8601_FORMAT_DT = "%Y-%m-%dT%H:%M:%S"
+ISO8601_FORMAT_TZ = "%z"
+
+DATETIME_HUMAN = "%Y/%m/%d %H:%M:%S"
+DATE_HUMAN = "%Y-%m-%d"
+
+def datetime_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, milliseconds: bool=False) -> str:
+    dt_format = dt.strftime(ISO8601_FORMAT_DT)
+    tz_format = dt.strftime(ISO8601_FORMAT_TZ)
+
+    ms_format = ""
+    if milliseconds:
+        ms_format = ".%s" % str(int(dt.microsecond/1000)).zfill(3)
+
+    return "%s%s%s" % (dt_format, ms_format, tz_format)
+def iso8601_format_now(milliseconds: bool=False) -> str:
+    return iso8601_format(datetime_utcnow(), milliseconds=milliseconds)
+def iso8601_parse(s: str, microseconds: bool=False) -> _datetime.datetime:
+    fmt = ISO8601_PARSE_MICROSECONDS if microseconds else ISO8601_PARSE
+    return _datetime.datetime.strptime(s, fmt)
+
+def datetime_human(dt: _datetime.datetime):
+    return _datetime.datetime.strftime(dt, DATETIME_HUMAN)
+def date_human(dt: _datetime.datetime):
+    return _datetime.datetime.strftime(dt, DATE_HUMAN)
+
+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
+    if seconds >= TIME_WEEK:
+        since = seconds/TIME_WEEK
+        unit = "week"
+    elif seconds >= TIME_DAY:
+        since = seconds/TIME_DAY
+        unit = "day"
+    elif seconds >= TIME_HOUR:
+        since = seconds/TIME_HOUR
+        unit = "hour"
+    elif seconds >= TIME_MINUTE:
+        since = seconds/TIME_MINUTE
+        unit = "minute"
+    else:
+        since = seconds
+        unit = "second"
+    since = int(since)
+    if since > 1:
+        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
+def to_pretty_time(total_seconds: int, minimum_unit: int=UNIT_SECOND,
+        max_units: int=UNIT_MINIMUM) -> str:
+    if total_seconds == 0:
+        return "0s"
+
+    minutes, seconds = divmod(total_seconds, 60)
+    hours, minutes = divmod(minutes, 60)
+    days, hours = divmod(hours, 24)
+    weeks, days = divmod(days, 7)
+    out = []
+
+    units = 0
+    if weeks and minimum_unit >= UNIT_WEEK and units < max_units:
+        out.append("%dw" % weeks)
+        units += 1
+    if days and minimum_unit >= UNIT_DAY and units < max_units:
+        out.append("%dd" % days)
+        units += 1
+    if hours and minimum_unit >= UNIT_HOUR and units < max_units:
+        out.append("%dh" % hours)
+        units += 1
+    if minutes and minimum_unit >= UNIT_MINUTE and units < max_units:
+        out.append("%dm" % minutes)
+        units += 1
+    if seconds and minimum_unit >= UNIT_SECOND and units < max_units:
+        out.append("%ds" % seconds)
+        units += 1
+    return " ".join(out)
+