Drug lookup added to listdose
listdose now supports filtering with drug Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
This commit is contained in:
parent
816ce22eca
commit
bcb385d3e8
41
plugin.py
41
plugin.py
@ -260,23 +260,33 @@ class Tripsit(callbacks.Plugin):
|
|||||||
else:
|
else:
|
||||||
irc.error(f'No doses saved for {nick}')
|
irc.error(f'No doses saved for {nick}')
|
||||||
|
|
||||||
@wrap(['positiveInt'])
|
@wrap([getopts({'drug': 'something'}), 'positiveInt'])
|
||||||
def listdose(self, irc, msg, args, history):
|
def listdose(self, irc, msg, args, opts, history):
|
||||||
"""<n>
|
"""[--drug <drug>] <n>
|
||||||
|
|
||||||
retrieves your <n> last logged doses
|
|
||||||
|
|
||||||
|
Retrieves your <n> last logged doses, optionally filtered by drug.
|
||||||
"""
|
"""
|
||||||
if history > 20:
|
if history > 20:
|
||||||
irc.error("you can't retrieve more than 20 doses")
|
irc.error("You can't retrieve more than 20 doses.")
|
||||||
return
|
return
|
||||||
|
|
||||||
|
opts = dict(opts)
|
||||||
|
drug_filter = opts.get('drug')
|
||||||
nick = msg.nick
|
nick = msg.nick
|
||||||
|
|
||||||
if nick in self.db:
|
if nick in self.db:
|
||||||
|
doses = self.db[nick]['doses']
|
||||||
|
if drug_filter:
|
||||||
|
doses = [dose for dose in doses if dose['drug'].lower() == drug_filter.lower()]
|
||||||
|
|
||||||
|
if len(doses) == 0:
|
||||||
|
irc.error(f"No doses found for drug '{drug_filter}'.")
|
||||||
|
return
|
||||||
|
|
||||||
try:
|
try:
|
||||||
rangecheck = self.db[nick]['doses'][-int(history)]
|
irc.reply(f"Your last {history} dose(s) are:", private=True)
|
||||||
irc.reply(f"Your last {history} doses logged are:", private=True)
|
for number in range(history, 0, -1):
|
||||||
for number in range(history,0,-1):
|
lastdose = doses[-number]
|
||||||
lastdose = self.db[nick]['doses'][-int(number)]
|
|
||||||
dose = lastdose['dose']
|
dose = lastdose['dose']
|
||||||
drug = lastdose['drug']
|
drug = lastdose['drug']
|
||||||
method = lastdose['method']
|
method = lastdose['method']
|
||||||
@ -286,17 +296,22 @@ 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()
|
||||||
|
|
||||||
if number == 1:
|
if number == 1:
|
||||||
number = "The"
|
number = "The"
|
||||||
else:
|
else:
|
||||||
number = num2words(number, to='ordinal')
|
number = num2words(number, to='ordinal')
|
||||||
re = utils.str.format("::> %i 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)
|
|
||||||
|
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
|
||||||
|
)
|
||||||
irc.reply(re, private=True)
|
irc.reply(re, private=True)
|
||||||
except IndexError:
|
except IndexError:
|
||||||
irc.error("You haven't logged that many doses")
|
irc.error("You haven't logged that many doses.")
|
||||||
return
|
return
|
||||||
else:
|
else:
|
||||||
irc.error(f'No doses saved for {nick}')
|
irc.error(f"No doses saved for {nick}.")
|
||||||
|
|
||||||
@wrap(["something"])
|
@wrap(["something"])
|
||||||
def grepdose(self, irc, msg, args, drug):
|
def grepdose(self, irc, msg, args, drug):
|
||||||
|
Loading…
Reference in New Issue
Block a user