LimnoriaPlugins/TripSit
6
0
Fork 0
Code Issues 5 Pull Requests 1 Projects Releases Wiki Activity

Improve listdose formatting

Browse Source 
Cleanup formatting for listdose. Make it so that most recent dose appears first.

Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
This commit is contained in:
Pratyush Desai 2024-12-09 23:25:30 +05:30
parent bcb385d3e8
commit 1cfc200bf8
Signed by: pratyush
GPG Key ID: DBA5BB7505946FAD
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
plugin.py
View File

@ -260,6 +260,8 @@ class Tripsit(callbacks.Plugin):
else:
irc.error(f'No doses saved for {nick}')
@wrap([getopts({'drug': 'something'}), 'positiveInt'])
def listdose(self, irc, msg, args, opts, history):
"""[--drug <drug>] <n>
@ -276,6 +278,8 @@ class Tripsit(callbacks.Plugin):
if nick in self.db:
doses = self.db[nick]['doses']
# Apply the drug filter if present
if drug_filter:
doses = [dose for dose in doses if dose['drug'].lower() == drug_filter.lower()]
@ -283,10 +287,16 @@ class Tripsit(callbacks.Plugin):
irc.error(f"No doses found for drug '{drug_filter}'.")
return
# Change the reply message based on whether a drug filter is applied
if drug_filter:
irc.reply(f"Here are your last {history} dose(s) for drug '{drug_filter}':", private=True)
else:
irc.reply(f"Here are your last {history} dose(s):", private=True)
try:
irc.reply(f"Your last {history} dose(s) are:", private=True)
for number in range(history, 0, -1):
lastdose = doses[-number]
# Loop through the most recent doses first
for number in range(0, history):
lastdose = doses[-(number + 1)] # Errors when number out of range. Try Catch?
dose = lastdose['dose']
drug = lastdose['drug']
method = lastdose['method']
@ -297,14 +307,17 @@ class Tripsit(callbacks.Plugin):
since_dose = time - dose_time
since_dose_seconds = since_dose.total_seconds()
if number == 1:
number = "The"
else:
number = num2words(number, to='ordinal')
# Format the timedelta
hours, remainder = divmod(since_dose_seconds, 3600)
minutes, seconds = divmod(remainder, 60)
timedelta_str = f"{int(hours)} hours, {int(minutes)} minutes" if hours > 0 else f"{int(minutes)} minutes, {int(seconds)} seconds"
# Use ordinal for the first dose
number_str = "The" if number == 0 else num2words(number + 1, to='ordinal')
re = utils.str.format(
"::> %s last dose: Amount: %s of \x02%s\x0F via %s | datetime: %s %s | timedelta %T",
number, dose, drug, method, dose_time.strftime("%c"), timezone, since_dose_seconds
"✧ %s last dose: \x02Amount:\x0F %s of \x02%s\x0F \x02via\x0F %s | \x02Datetime:\x0F %s %s | \x02Time Since Last Dose:\x0F %s",
number_str, dose, drug, method, dose_time.strftime("%Y-%m-%d %H:%M:%S"), timezone, timedelta_str
)
irc.reply(re, private=True)
except IndexError: