Merge pull request 'Improve listdose output format' (#16) from enhance/listdose_format into master

Reviewed-on: #16

plugin.py

@@ -110,7 +110,7 @@ class Tripsit(callbacks.Plugin):
             if nick in self.db:
                 self.db[nick]['timezone'] = timezone
             else:
-                self.db[nick] = {'timezone': timezone}
+                self.db[nick] = {'timezone': timezone }
             irc.replySuccess()
         except pytz.UnknownTimeZoneError:
             irc.error(_('Unknown timezone'), Raise=True)
@@ -150,7 +150,7 @@ class Tripsit(callbacks.Plugin):
                 dose_td = datetime.timedelta(hours=int(ago[0:2]), minutes=int(ago[2:4]))
                 dose_td_s = dose_td.total_seconds()
                 time = time - dose_td
-            doseLog = {'time': time, 'dose': dose, 'drug': name, 'method': method}
+            doseLog = {'time': time, 'dose': dose, 'drug': name, 'method': method }
             doses = self.db[nick].get('doses')
             if doses:
                 doses.append(doseLog)
@@ -167,7 +167,7 @@ class Tripsit(callbacks.Plugin):
                 dose_td = datetime.timedelta(hours=int(ago[0:2]), minutes=int(ago[2:4]))
                 dose_td_s = dose_td.total_seconds()
                 time = time - dose_td
-            doseLog = {'time': time, 'dose': dose, 'drug': name, 'method': method}
+            doseLog = {'time': time, 'dose': dose, 'drug': name, 'method': method }
             doses = [doseLog]
             self.db[nick] = {'timezone': timezone, 'doses': doses}
 
@@ -179,9 +179,9 @@ class Tripsit(callbacks.Plugin):
             re = utils.str.format("You dosed %s of %s at %s, %s ; %T ago", dose, drug_and_method, time.strftime("%c"), timezone, dose_td.total_seconds())
             if onset is not None:
                 re += utils.str.format(". You should have/will start feeling effects %s from/after dosing", onset)
-#        re=":-( This is currently not available, sorry. Exception ID T0T4LLYFCK3D."
         irc.reply(re)
 
+
     @wrap([optional('positiveInt')])
     def undose(self, irc, msg, args, entry):
         """<n>
@@ -248,8 +248,8 @@ class Tripsit(callbacks.Plugin):
             dose_time = lastdose['time']
             timezone = self.db[nick]['timezone']
             tz = pytz.timezone(str(timezone))
-            time = datetime.datetime.now(tz = tz)
-            since_dose= time - dose_time
+            time = datetime.datetime.now(tz=tz)
+            since_dose = time - dose_time
             since_dose_seconds = since_dose.total_seconds()
             if history:
                 history = num2words(history, to='ordinal')
@@ -260,22 +260,34 @@ class Tripsit(callbacks.Plugin):
         else:
             irc.error(f'No doses saved for {nick}')
 
-    @wrap(['positiveInt'])
-    def listdose(self, irc, msg, args, history):
-        """<n>
+    @wrap([getopts({'drug': 'something'}), 'positiveInt'])
+    def listdose(self, irc, msg, args, opts, history):
+        """[--drug <drug>] <n>
 
-        retrieves your <n> last logged doses
+        Retrieves your <n> last logged doses, optionally filtered by drug.
         """
         if history > 20:
-            irc.error("you can't retrieve more than 20 doses")
+            irc.error("You can't retrieve more than 20 doses.")
             return
+
+        opts = dict(opts)
+        drug_filter = opts.get('drug')
         nick = msg.nick
+
         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
+            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:
-                rangecheck = self.db[nick]['doses'][-int(history)]
-                irc.reply(f"Your last {history} doses logged are:", private=True)
-                for number in range(history, 0, -1):
-                    lastdose = self.db[nick]['doses'][-int(number)]
+                for number in range(0, history):
+                    lastdose = doses[-(number + 1)]
                     dose = lastdose['dose']
                     drug = lastdose['drug']
                     method = lastdose['method']
@@ -285,17 +297,45 @@ class Tripsit(callbacks.Plugin):
                     time = datetime.datetime.now(tz=tz)
                     since_dose = time - dose_time
                     since_dose_seconds = since_dose.total_seconds()
-                    if number == 1:
-                        number = "The"
-                    else:
-                        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)
+                    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"
+                    number_str = "The" if number == 0 else num2words(number + 1, to='ordinal')
+                    re = utils.str.format(
+                        "✧ %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:
-                irc.error("You haven't logged that many doses")
+                irc.error("You haven't logged that many doses.")
                 return
         else:
-            irc.error(f'No doses saved for {nick}')
+            irc.error(f"No doses saved for {nick}.")
+
+    @wrap(["something"])
+    def grepdose(self, irc, msg, args, drug):
+        """<drug>
+
+        pulls most recent dose for drug
+        """
+        nick = msg.nick
+        if nick in self.db:
+            doselogs = self.db[nick]['doses']
+            found = False
+            for doselog in reversed(doselogs):
+                if doselog['drug'] == drug:
+                    timezone = self.db[nick]['timezone']
+                    tz = pytz.timezone(str(timezone))
+                    now = datetime.datetime.now(tz=tz)
+                    since_dose = now - doselog['time']
+                    re = utils.str.format("You last dosed %s of %s via %s at %s %s, %T ago", doselog["dose"], doselog["drug"], doselog["method"], doselog["time"].strftime("%c"), timezone, since_dose.total_seconds())
+                    irc.reply(re)
+                    found = True
+                    break
+            if not found:
+                irc.error(f"No doses saved for {drug}")
+        else:
+            irc.error(f"No doses saved for {nick}")
 
     @wrap(["something"])
     def amountdosed(self, irc, msg, args, drug):
@@ -310,7 +350,7 @@ class Tripsit(callbacks.Plugin):
             doselogs = self.db[nick]['doses']
             for doselog in doselogs:
                 if doselog["drug"] == drug:
-                    for i, c in enumerate(doselog["dose"]):
+                    for i,c in enumerate(doselog["dose"]):
                         if not c.isdigit():
                             break 
                     num += int(doselog["dose"][:i])