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

Compare commits

merge into: LimnoriaPlugins:feat/web
Branches Tags
LimnoriaPlugins:master
LimnoriaPlugins:feat/web
LimnoriaPlugins:enhance/listdose_formatting
LimnoriaPlugins:cleanup
LimnoriaPlugins:timeformatting
...
pull from: LimnoriaPlugins:master
Branches Tags
LimnoriaPlugins:feat/web
LimnoriaPlugins:master
LimnoriaPlugins:enhance/listdose_formatting
LimnoriaPlugins:cleanup
LimnoriaPlugins:timeformatting

2 Commits
feat/web ... master

Author SHA1 Message Date
Pratyush Desai
bf26c3c63c Merge pull request 'Improve listdose output format' (#16) from enhance/listdose_format into master 
Reviewed-on: #16
 2024-12-15 13:12:18 +01:00
Pratyush Desai
d28f2032cd
Improve listdose output format 
Sort output with most recent first. And improve reply string

Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
 2024-12-10 23:35:08 +05:30
1 changed files with 12 additions and 13 deletions
Show Stats Expand all files Collapse all files

25
plugin.py
View File

@ -278,15 +278,16 @@ class Tripsit(callbacks.Plugin):
doses = self.db[nick]['doses'] doses = self.db[nick]['doses']
if drug_filter: if drug_filter:
doses = [dose for dose in doses if dose['drug'].lower() == drug_filter.lower()] doses = [dose for dose in doses if dose['drug'].lower() == drug_filter.lower()]
if len(doses) == 0: if len(doses) == 0:
irc.error(f"No doses found for drug '{drug_filter}'.") irc.error(f"No doses found for drug '{drug_filter}'.")
return return
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: try:
irc.reply(f"Your last {history} dose(s) are:", private=True) for number in range(0, history):
for number in range(history, 0, -1): lastdose = doses[-(number + 1)]
lastdose = doses[-number]
dose = lastdose['dose'] dose = lastdose['dose']
drug = lastdose['drug'] drug = lastdose['drug']
method = lastdose['method'] method = lastdose['method']
@ -296,15 +297,13 @@ class Tripsit(callbacks.Plugin):
time = datetime.datetime.now(tz=tz) time = datetime.datetime.now(tz=tz)
since_dose = time - dose_time since_dose = time - dose_time
since_dose_seconds = since_dose.total_seconds() since_dose_seconds = since_dose.total_seconds()
hours, remainder = divmod(since_dose_seconds, 3600)
if number == 1: minutes, seconds = divmod(remainder, 60)
number = "The" timedelta_str = f"{int(hours)} hours, {int(minutes)} minutes" if hours > 0 else f"{int(minutes)} minutes, {int(seconds)} seconds"
else: number_str = "The" if number == 0 else num2words(number + 1, to='ordinal')
number = num2words(number, to='ordinal')
re = utils.str.format( re = utils.str.format(
"::> %s last dose: Amount: %s of \x02%s\x0F via %s | datetime: %s %s | timedelta %T", "✧ %s last dose: \x02Amount:\x0F %s of \x02%s\x0F \x02via\x0F %s | \x02Datetime:\x0F %s %s | \x02Time Since Last Dose:\x0F %s",
number, dose, drug, method, dose_time.strftime("%c"), timezone, since_dose_seconds number_str, dose, drug, method, dose_time.strftime("%Y-%m-%d %H:%M:%S"), timezone, timedelta_str
) )
irc.reply(re, private=True) irc.reply(re, private=True)
except IndexError: except IndexError: