Merge pull request 'Added aliases for spelling metre/kilometre' (#18) from metre-patch into master

Reviewed-on: #18
Reviewed-by: AllfatherHatt <allfatherhatt@noreply.localhost>

fitnessCog/activities/climb.json

@@ -6,6 +6,8 @@
             "aliases": [
                 "meter",
                 "meters",
+                "metre",
+                "metres",
                 "m",
                 "m."
             ]
@@ -15,6 +17,8 @@
             "aliases": [
                 "kilometer",
                 "kilometers",
+                "kilometre",
+                "kilometres",
                 "km",
                 "km."
             ]

fitnessCog/activity_logger.py

@@ -1,80 +1,78 @@
-import json
 import csv
-import os
+import json
+from pathlib import Path
+from typing import Optional
 
 
-def activity_log_path(activity: str) -> str:
+def activity_log_path(activity: str, logs_dir: Optional[Path] = None) -> Path:
     """
-    Returns the path of the activity log file in .csv format
+    Returns the path of the activity log file in .csv format.
-    :param activity:
-    :return:
     """
-    filename = os.path.join("activity_logs", f"{activity}.csv")
+    logs_dir = logs_dir or (Path.cwd() / "activity_logs")
-    return filename
+    return logs_dir / f"{activity}.csv"
 
 
-def activity_units_path(activity: str) -> str:
+def activity_units_path(activity: str, units_dir: Optional[Path] = None) -> Path:
     """
-    Returns the path of the activity activities file in .json format
+    Returns the path of the activity units file in .json format.
-    :param activity:
-    :return:
     """
-    filename = os.path.join("activities", f"{activity}.json")
+    units_dir = units_dir or (Path.cwd() / "activities")
-    return filename
+    return units_dir / f"{activity}.json"
 
 
-def is_convertable(activity: str) -> bool:
+def is_convertable(activity: str, units_dir: Optional[Path] = None) -> bool:
-    """
+    filename = activity_units_path(activity, units_dir)
-    Returns True if the activity has multiple units that needed to be converted.
+    with filename.open("r", encoding="utf-8") as f:
-    i.e. distance may be sent in feet, but would require to be converted in meters.
+        raw_data = json.load(f)
-    :param activity:
+    return bool(raw_data.get("convertable"))
-    :return:
-    """
-    filename = activity_units_path(activity)
-    raw_data = json.load(open(filename))
-    return raw_data.get("convertable")
 
 
-
+def create_activity_log_file(
-def create_activity_log_file(activity: str) -> None:
+    activity: str,
-    """
+    *,
-    Creates the activity log file in .csv format
+    units_dir: Optional[Path] = None,
-    :param activity:
+    logs_dir: Optional[Path] = None,
-    :return:
+) -> None:
-    """
+    if not activity_units_path(activity, units_dir).exists():
-    if not os.path.exists(activity_units_path(activity)):
         raise ValueError(f"{activity} is not a valid activity")
-    if not os.path.exists("activity_logs"):
+
-        os.makedirs("activity_logs")
+    logs_dir = logs_dir or (Path.cwd() / "activity_logs")
-    filename = activity_log_path(activity)
+    logs_dir.mkdir(parents=True, exist_ok=True)
-    with open(filename, 'a') as f:
+
+    filename = activity_log_path(activity, logs_dir)
+    if filename.exists():
+        return  # don't re-add headers
+
+    with filename.open("w", newline="", encoding="utf-8") as f:
         writer = csv.writer(f)
         writer.writerow(["timestamp", "username", "value"])
 
 
-
+def convert_units(
-def convert_units(activity: str, value: int | float, unit: str) -> float:
+    activity: str,
-    """
+    value: int | float,
-    Returns the value of activity in a factor of 1, i.e. converting feet to meters
+    unit: str | None,
-    :param activity:
+    *,
-    :param value:
+    units_dir: Optional[Path] = None,
-    :param unit:
+) -> float:
-    :return:
+    filename = activity_units_path(activity, units_dir)
-    """
+    if not filename.exists():
-    filename = activity_units_path(activity)
-    if not os.path.exists(filename):
         raise ValueError(f"{activity} is not a valid activity")
 
     # Consider None unit value as factor of 1
     if unit is None:
-        return value
+        return float(value)
 
-    raw_data = json.load(open(filename))
+    with filename.open("r", encoding="utf-8") as f:
-    units_data = raw_data.get("units")
+        raw_data = json.load(f)
 
-    for unit_name, data in units_data.items():
+    units_data = raw_data.get("units") or {}
-        if unit in data["aliases"]:
+    unit_l = unit.lower()
-            return value * data["factor"]
+
+    for _, data in units_data.items():
+        aliases = [a.lower() for a in (data.get("aliases") or [])]
+        if unit_l in aliases:
+            return float(value) * float(data["factor"])
 
     raise ValueError(f"{unit} is not a valid unit")
 
@@ -84,36 +82,24 @@ def log_activity(
     username: str,
     activity: str,
     value: int | float,
-        unit: str | None
+    unit: str | None,
+    *,
+    units_dir: Optional[Path] = None,
+    logs_dir: Optional[Path] = None,
 ) -> None:
-    """
+    
-    Logs the activity in .csv file
+    if not isinstance(value, (int, float)) or value <= 0:
-    :param timestamp:
-    :param username:
-    :param activity:
-    :param value:
-    :param unit:
-    :return:
-    """
-    if value <= 0 or not isinstance(value, int | float):
         raise ValueError(f"{value} is not a valid value")
-    filename = activity_log_path(activity)
+
-    if not os.path.exists(filename):
+    filename = activity_log_path(activity, logs_dir)
-        create_activity_log_file(activity)
+    if not filename.exists():
-    if is_convertable(activity):
+        create_activity_log_file(activity, units_dir=units_dir, logs_dir=logs_dir)
-        converted_value = round(convert_units(activity, value, unit), 2)
+
+    if is_convertable(activity, units_dir):
+        converted_value = round(convert_units(activity, value, unit, units_dir=units_dir), 2)
     else:
-        converted_value = round(value, 2)
+        converted_value = round(float(value), 2)
-    with open(filename, 'a') as f:
+
+    with filename.open("a", newline="", encoding="utf-8") as f:
         writer = csv.writer(f)
         writer.writerow([timestamp, username, converted_value])
-
-
-if __name__ == "__main__":
-    log_activity(
-        timestamp=0,
-        username="test",
-        activity="climb",
-        value=1,
-        unit="m"
-    )

fitnessCog/fitness.py

@@ -1,78 +1,143 @@
 import os
-import discord
+from pathlib import Path
-from redbot.core import Config, commands
-from .activity_logger import log_activity, activity_log_path, activity_units_path
 
+import discord
+from redbot.core import commands
+from redbot.core.data_manager import cog_data_path
+
+from .activity_logger import log_activity
 
 
 class FitnessCog(commands.Cog):
     def __init__(self, bot):
         self.bot = bot
-        # Some hardcoded values, this probably should be changed with redbot config. IDK how to use it or what's in it.
+
         default_threads = "1457402451530350727,1328363409648910356"
-        self.threads_id = list(map(int, os.getenv("THREADS_ID", default_threads).split(",")))
+        threads_raw = os.getenv("THREADS_ID", default_threads)
+
+        self.threads_id: list[int] = []
+        for x in threads_raw.split(","):
+            x = x.strip()
+            if x.isdigit():
+                self.threads_id.append(int(x))
+
         self.confirm_reactions = os.getenv("CONFIRMATION_REACTIONS", "🐈💨")
 
+        # Units are shipped with the cog in: fitnessCog/activities/*.json
+        self.units_dir: Path = Path(__file__).parent / "activities"
+
+        # Logs are writable and belong in Red's data dir
+        self.logs_dir: Path = cog_data_path(self) / "activity_logs"
+        self.logs_dir.mkdir(parents=True, exist_ok=True)
+
     @commands.Cog.listener()
-    async def on_message(self, message):
+    async def on_message(self, message: discord.Message):
         if message.author.bot:
             return
         if message.channel.id not in self.threads_id:
             return
-        if not message.content.startswith("!"):
+
+        content = (message.content or "").strip()
+        if not content.startswith("!"):
             return
 
-        # region Fitness commands
+        cmdline = content[1:].strip().lower()
-        if message.content.startswith("!getunits"):
+        if not cmdline:
-            await self.get_units_file(message)
             return
-        if message.content.startswith("!getlog"):
-            await self.get_log_file(message)
-            return
-        # Make sure this one is past every other ! commands
-        await self.fitness_activity_log(message)
-        return
-        # endregion Fitness commands
 
-    # region Fitness commands functions
+        cmd, *rest = cmdline.split(" ", 1)
-    @staticmethod
+        arg = rest[0].strip() if rest else ""
-    async def get_units_file(message: discord.Message):
+
+        if cmd == "getunits":
+            await self.get_units_file(message, arg)
+            return
+
+        if cmd == "getlog":
+            await self.get_log_file(message, arg)
+            return
+
+        await self.log_fitness(message)
+
+    async def get_units_file(self, message: discord.Message, activity: str):
         try:
-            raw = message.content[1:].lower().strip().split(" ", 1)
+            if not activity:
-            filename = activity_units_path(raw[1])
+                await message.channel.send(
-            await message.channel.send(file=discord.File(fp=filename))
+                    "Usage: `!getunits <activity>` (example: `!getunits pushups`)"
+                )
+                return
+
+            activity = activity.lower().strip()
+            path = self.units_dir / f"{activity}.json"
+
+            if not path.exists():
+                await message.channel.send(f"No units JSON found for `{activity}`.")
+                return
+
+            await message.channel.send(file=discord.File(fp=str(path)))
+
         except Exception as e:
             await message.channel.send(str(e))
 
-    @staticmethod
+    async def get_log_file(self, message: discord.Message, activity: str):
-    async def get_log_file(message: discord.Message):
         try:
-            raw = message.content[1:].lower().strip().split(" ", 1)
+            if not activity:
-            filename = activity_log_path(raw[1])
+                await message.channel.send(
-            await message.channel.send(file=discord.File(fp=filename))
+                    "Usage: `!getlog <activity>` (example: `!getlog pushups`)"
+                )
+                return
+
+            activity = activity.lower().strip()
+            path = self.logs_dir / f"{activity}.csv"
+
+            if not path.exists():
+                await message.channel.send(f"No log CSV found for `{activity}`.")
+                return
+
+            await message.channel.send(file=discord.File(fp=str(path)))
+
         except Exception as e:
             await message.channel.send(str(e))
 
-    async def log_fitness(self, message):
+    async def log_fitness(self, message: discord.Message):
         try:
-            raw = message.content[1:].lower().strip().split(" ", 2)
+            parts = message.content[1:].strip().split()
+            if len(parts) < 2:
+                await message.reply(
+                    "Usage: `!<activity> <value> [unit]` (example: `!pushups 20` or `!run 5 km`)"
+                )
+                return
+
+            activity = parts[0]
+
+            try:
+                value = float(parts[1])
+            except ValueError:
+                await message.reply(
+                    "Invalid number. Usage: `!<activity> <value> [unit]` (example: `!run 5 km`)"
+                )
+                return
+
+            unit = parts[2] if len(parts) > 2 else "m"
 
             timestamp = int(message.created_at.timestamp())
             username = message.author.name
-            activity = raw[0]
-            value = float(raw[1])
-            unit = raw[2] if len(raw) > 2 else "m"
 
-            log_activity(timestamp, username, activity, value, unit)
+            log_activity(
+                timestamp,
+                username,
+                activity,
+                value,
+                unit,
+                units_dir=self.units_dir,
+                logs_dir=self.logs_dir,
+            )
 
             for r in self.confirm_reactions:
                 await message.add_reaction(r)
 
         except Exception as e:
             await message.reply(str(e))
-    # endregion Fitness commands functions
 
 
 def setup(bot):
     bot.add_cog(FitnessCog(bot))
-