Refactor calculate function and move it to main.py; remove misc.py and update tests

discord_reminder_bot/main.py

@@ -18,12 +18,14 @@ from apscheduler.events import EVENT_JOB_ERROR, EVENT_JOB_MISSED, JobExecutionEv
 from apscheduler.job import Job
 from apscheduler.jobstores.sqlalchemy import SQLAlchemyJobStore
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
+from apscheduler.triggers.cron import CronTrigger
+from apscheduler.triggers.date import DateTrigger
+from apscheduler.triggers.interval import IntervalTrigger
 from discord.abc import PrivateChannel
 from discord_webhook import DiscordWebhook
 from dotenv import load_dotenv
 from loguru import logger
 
-from discord_reminder_bot.misc import calculate
 from discord_reminder_bot.parser import parse_time
 
 if TYPE_CHECKING:
@@ -44,6 +46,35 @@ sentry_sdk.init(
 )
 
 
+def calculate(job: Job) -> str:
+    """Calculate the time left for a job.
+
+    Args:
+        job: The job to calculate the time for.
+
+    Returns:
+        str: The time left for the job.
+    """
+    trigger_time = None
+    if isinstance(job.trigger, DateTrigger | IntervalTrigger):
+        trigger_time = job.next_run_time or None
+
+    elif isinstance(job.trigger, CronTrigger):
+        if not job.next_run_time:
+            logger.debug(f"No next run time found for '{job.id}', probably paused? {job.__getstate__()}")
+            return "Paused"
+
+        trigger_time = job.trigger.get_next_fire_time(None, datetime.datetime.now(tz=job._scheduler.timezone))  # noqa: SLF001
+
+    logger.debug(f"{type(job.trigger)=}, {trigger_time=}")
+
+    if not trigger_time:
+        logger.debug("No trigger time found")
+        return "Paused"
+
+    return f"<t:{int(trigger_time.timestamp())}:R>"
+
+
 @lru_cache(maxsize=1)
 def get_scheduler() -> AsyncIOScheduler:
     """Return the scheduler instance.

discord_reminder_bot/misc.py

@@ -1,67 +0,0 @@
-from __future__ import annotations
-
-import datetime
-from typing import TYPE_CHECKING
-
-from apscheduler.triggers.cron import CronTrigger
-from apscheduler.triggers.date import DateTrigger
-from apscheduler.triggers.interval import IntervalTrigger
-from loguru import logger
-
-if TYPE_CHECKING:
-    from apscheduler.job import Job
-
-
-def calculate(job: Job) -> str:
-    """Calculate the time left for a job.
-
-    Args:
-        job: The job to calculate the time for.
-
-    Returns:
-        str: The time left for the job.
-    """
-    trigger_time = None
-    if isinstance(job.trigger, DateTrigger | IntervalTrigger):
-        trigger_time = job.next_run_time or None
-
-    elif isinstance(job.trigger, CronTrigger):
-        if not job.next_run_time:
-            logger.debug("No next run time found so probably paused?")
-            return "Paused"
-
-        trigger_time = job.trigger.get_next_fire_time(None, datetime.datetime.now(tz=job._scheduler.timezone))  # noqa: SLF001
-
-    logger.debug(f"{type(job.trigger)=}, {trigger_time=}")
-
-    if not trigger_time:
-        logger.debug("No trigger time found")
-        return "Paused"
-
-    return f"<t:{int(trigger_time.timestamp())}:R>"
-
-
-def get_human_time(time: datetime.timedelta) -> str:
-    """Convert timedelta to human-readable format.
-
-    Args:
-        time: The timedelta to convert.
-
-    Returns:
-        str: The human-readable time.
-    """
-    days, seconds = divmod(time.total_seconds(), 86400)
-    hours, seconds = divmod(seconds, 3600)
-    minutes, seconds = divmod(seconds, 60)
-
-    time_str: str = ""
-    if days:
-        time_str += f"{int(days)}d"
-    if hours:
-        time_str += f"{int(hours)}h"
-    if minutes:
-        time_str += f"{int(minutes)}m"
-    if seconds:
-        time_str += f"{int(seconds)}s"
-
-    return time_str