Support multiple drinks when requesting db

Drinks are separated by `;`.

diff --git a/cbdb.py b/cbdb.py
index b6b6922b8763d473898c58f4bb64c6bf14eba337..9cf9f7ca878c44a3e9553521af63c063fcd8eb58 100644 (file)
--- a/cbdb.py
+++ b/cbdb.py
@@ -75,15 +75,22 @@ class Db:
             flavor = kwargs["flavor"]
             dtf = kwargs["dtf"]
             dtt = kwargs["dtt"]
+        flavors = flavor.split(";")
         que = """
             SELECT count(*), users.name FROM coffees
             INNER JOIN users ON coffees.id = users.id
-            WHERE flavor = '{}'
+        """
+        for f in flavors:
+            if f is flavors[0]:
+                que += "WHERE flavor = '{}'".format(f)
+            else:
+                que += "OR flavor = '{}'".format(f)
+        que += """
             AND coffees.time BETWEEN
                 datetime('{}', 'localtime') AND
                 datetime('{}', 'localtime')
             GROUP BY coffees.id
-        """.format(flavor, dtf, dtt)
+        """.format(dtf, dtt)
         drunk = []
         for (cnt, un) in self.cur.execute(que):
             drunk.append((un, cnt))