Merge pull request CloudBotIRC#162 from linuxdaemon/gonzobot+sqlalchemy-queries

Switch most DB queries to SQLAlchemy syntax

Author: edwardslabs

plugins/history.py

@@ -3,7 +3,7 @@
 import time
 from collections import deque
 
-from sqlalchemy import Table, Column, String, PrimaryKeyConstraint, Float
+from sqlalchemy import Table, Column, String, PrimaryKeyConstraint, Float, select
 
 from cloudbot import hook
 from cloudbot.event import EventType
@@ -27,11 +27,19 @@ def track_seen(event, db):
     :type db: sqlalchemy.orm.Session
     """
     # keep private messages private
+    now = time.time()
     if event.chan[:1] == "#" and not re.findall('^s/.*/.*/$', event.content.lower()):
-        db.execute(
-            "insert or replace into seen_user(name, time, quote, chan, host) values(:name,:time,:quote,:chan,:host)",
-            {'name': event.nick.lower(), 'time': time.time(), 'quote': event.content, 'chan': event.chan,
-             'host': event.mask})
+        res = db.execute(
+            table.update().values(time=now, quote=event.content, host=str(event.mask))
+                .where(table.c.name == event.nick.lower()).where(table.c.chan == event.chan)
+        )
+        if res.rowcount == 0:
+            db.execute(
+                table.insert().values(
+                    name=event.nick.lower(), time=now, quote=event.content, chan=event.chan, host=str(event.mask)
+                )
+            )
+
         db.commit()
 
 
@@ -98,18 +106,13 @@ def seen(text, nick, chan, db, event, is_nick_valid):
     if not is_nick_valid(text):
         return "I can't look up that name, its impossible to use!"
 
-    if '_' in text:
-        text = text.replace("_", "/_")
-
-    last_seen = db.execute("SELECT name, time, quote FROM seen_user WHERE name LIKE :name ESCAPE '/' AND chan = :chan",
-                           {'name': text, 'chan': chan}).fetchone()
-
-    text = text.replace("/", "")
+    last_seen = db.execute(
+        select([table.c.name, table.c.time, table.c.quote])
+            .where(table.c.name == text.lower()).where(table.c.chan == chan)
+    ).fetchone()
 
     if last_seen:
         reltime = timeformat.time_since(last_seen[1])
-        if last_seen[0] != text.lower():  # for glob matching
-            text = last_seen[0]
         if last_seen[2][0:1] == "\x01":
             return '{} was last seen {} ago: * {} {}'.format(text, reltime, text, last_seen[2][8:-1])
         else:

plugins/horoscope.py

@@ -2,7 +2,7 @@
 
 import requests
 from bs4 import BeautifulSoup
-from sqlalchemy import Table, String, Column
+from sqlalchemy import Table, String, Column, select
 
 from cloudbot import hook
 from cloudbot.util import database
@@ -15,6 +15,22 @@
 )
 
 
+def get_sign(db, nick):
+    row = db.execute(select([table.c.sign]).where(table.c.nick == nick.lower())).fetchone()
+    if not row:
+        return None
+
+    return row[0]
+
+
+def set_sign(db, nick, sign):
+    res = db.execute(table.update().values(sign=sign.lower()).where(table.c.nick == nick.lower()))
+    if res.rowcount == 0:
+        db.execute(table.insert().values(nick=nick.lower(), sign=sign.lower()))
+
+    db.commit()
+
+
 @hook.command(autohelp=False)
 def horoscope(text, db, bot, nick, notice, notice_doc, reply, message):
     """[sign] - get your horoscope"""
@@ -43,11 +59,11 @@ def horoscope(text, db, bot, nick, notice, notice_doc, reply, message):
         sign = text.strip().lower()
 
     if not sign:
-        sign = db.execute("SELECT sign FROM horoscope WHERE "
-                          "nick=lower(:nick)", {'nick': nick}).fetchone()
+        sign = get_sign(db, nick)
         if not sign:
             notice_doc()
             return
+
         sign = sign[0].strip().lower()
 
     if sign not in signs:
@@ -70,11 +86,9 @@ def horoscope(text, db, bot, nick, notice, notice_doc, reply, message):
     soup = BeautifulSoup(request.text)
 
     horoscope_text = soup.find("div", class_="horoscope-content").find("p").text
-    result = "\x02{}\x02 {}".format(text, horoscope_text)
+    result = "\x02{}\x02 {}".format(sign, horoscope_text)
 
     if text and not dontsave:
-        db.execute("insert or replace into horoscope(nick, sign) values (:nick, :sign)",
-                   {'nick': nick.lower(), 'sign': sign})
-        db.commit()
+        set_sign(db, nick, sign)
 
     message(result)

plugins/karma.py

@@ -3,7 +3,7 @@
 from collections import defaultdict
 
 import sqlalchemy
-from sqlalchemy import Table, String, Column, Integer, PrimaryKeyConstraint
+from sqlalchemy import Table, String, Column, Integer, PrimaryKeyConstraint, select, and_
 
 from cloudbot import hook
 from cloudbot.util import database
@@ -29,28 +29,28 @@ def remove_non_channel_points(db):
     db.commit()
 
 
-@hook.command("pp", "addpoint")
-def addpoint(text, nick, chan, db):
-    """<thing> - adds a point to the <thing>"""
+def update_score(nick, chan, thing, score, db):
     if nick.casefold() == chan.casefold():
         # This is a PM, don't set points in a PM
         return
 
-    text = text.strip()
-    karma = db.execute("select score from karma where name = :name and chan = :chan and thing = :thing",
-                       {'name': nick, 'chan': chan, 'thing': text.lower()}).fetchone()
+    thing = thing.strip()
+    clause = and_(karma_table.c.name == nick, karma_table.c.chan == chan, karma_table.c.thing == thing.lower())
+    karma = db.execute(select([karma_table.c.score]).where(clause)).fetchone()
     if karma:
-        score = int(karma[0])
-        score += 1
-        db.execute("insert or replace into karma(name, chan, thing, score) values (:name, :chan, :thing, :score)",
-                   {'name': nick, 'chan': chan, 'thing': text.lower(), 'score': score})
-        db.commit()
-        # return "{} is now worth {} in {}'s eyes.".format(text, score, nick)
+        score += int(karma[0])
+        query = karma_table.update().values(score=score).where(clause)
     else:
-        db.execute("insert or replace into karma(name, chan, thing, score) values (:name, :chan, :thing, :score)",
-                   {'name': nick, 'chan': chan, 'thing': text.lower(), 'score': 1})
-        db.commit()
-        # return "{} is now worth 1 in {}'s eyes.".format(text, nick)
+        query = karma_table.insert().values(name=nick, chan=chan, thing=thing.lower(), score=score)
+
+    db.execute(query)
+    db.commit()
+
+
+@hook.command("pp", "addpoint")
+def addpoint(text, nick, chan, db):
+    """<thing> - adds a point to the <thing>"""
+    update_score(nick, chan, text, 1, db)
 
 
 @hook.regex(karmaplus_re)
@@ -59,56 +59,41 @@ def re_addpt(match, nick, chan, db, notice):
     thing = match.group().split('++')[0]
     if thing:
         addpoint(thing, nick, chan, db)
-        # return out
     else:
         notice(pluspts(nick, chan, db))
 
 
 @hook.command("mm", "rmpoint")
 def rmpoint(text, nick, chan, db):
     """<thing> - subtracts a point from the <thing>"""
-    if nick.casefold() == chan.casefold():
-        # This is a PM, don't set points in a PM
-        return
-
-    text = text.strip()
-    karma = db.execute("select score from karma where name = :name and chan = :chan and thing = :thing",
-                       {'name': nick, 'chan': chan, 'thing': text.lower()}).fetchone()
-    if karma:
-        score = int(karma[0])
-        score -= 1
-        db.execute("insert or replace into karma(name, chan, thing, score) values (:name, :chan, :thing, :score)",
-                   {'name': nick, 'chan': chan, 'thing': text.lower(), 'score': score})
-        db.commit()
-        # return "{} is now worth {} in {}'s eyes.".format(text, score, nick)
-    else:
-        db.execute("insert or replace into karma(name, chan, thing, score) values (:name, :chan, :thing, :score)",
-                   {'name': nick, 'chan': chan, 'thing': text.lower(), 'score': -1})
-        db.commit()
-        # return "{} is now worth -1 in {}'s eyes.".format(text, nick)
+    update_score(nick, chan, text, -1, db)
 
 
 @hook.command("pluspts", autohelp=False)
 def pluspts(nick, chan, db):
     """- prints the things you have liked and their scores"""
     output = ""
-    likes = db.execute(
-        "select thing, score from karma where name = :name and chan = :chan and score >= 0 order by score desc",
-        {'name': nick, 'chan': chan}).fetchall()
+    clause = and_(karma_table.c.name == nick, karma_table.c.chan == chan, karma_table.c.score >= 0)
+    query = select([karma_table.c.thing, karma_table.c.score]).where(clause).order_by(karma_table.c.score.desc())
+    likes = db.execute(query).fetchall()
+
     for like in likes:
-        output = output + str(like[0]) + " has " + str(like[1]) + " points "
+        output += "{} has {} points ".format(like[0], like[1])
+
     return output
 
 
 @hook.command("minuspts", autohelp=False)
 def minuspts(nick, chan, db):
     """- prints the things you have disliked and their scores"""
     output = ""
-    likes = db.execute(
-        "select thing, score from karma where name = :name and chan = :chan and score <= 0 order by score",
-        {'name': nick, 'chan': chan}).fetchall()
+    clause = and_(karma_table.c.name == nick, karma_table.c.chan == chan, karma_table.c.score <= 0)
+    query = select([karma_table.c.thing, karma_table.c.score]).where(clause).order_by(karma_table.c.score)
+    likes = db.execute(query).fetchall()
+
     for like in likes:
-        output = output + str(like[0]) + " has " + str(like[1]) + " points "
+        output += "{} has {} points ".format(like[0], like[1])
+
     return output
 
 
@@ -118,7 +103,6 @@ def re_rmpt(match, nick, chan, db, notice):
     thing = match.group().split('--')[0]
     if thing:
         rmpoint(thing, nick, chan, db)
-        # return out
     else:
         notice(minuspts(nick, chan, db))
 
@@ -128,13 +112,15 @@ def points(text, chan, db):
     """<thing> - will print the total points for <thing> in the channel."""
     score = 0
     thing = ""
-    if text.endswith("-global") or text.endswith(" global"):
+    if text.endswith(("-global", " global")):
         thing = text[:-7].strip()
-        karma = db.execute("select score from karma where thing = :thing", {'thing': thing.lower()}).fetchall()
+        query = select([karma_table.c.score]).where(karma_table.c.thing == thing.lower())
     else:
         text = text.strip()
-        karma = db.execute("select score from karma where thing = :thing and chan = :chan",
-                           {'thing': text.lower(), 'chan': chan}).fetchall()
+        query = select([karma_table.c.score]).where(karma_table.c.thing == thing.lower()).where(
+            karma_table.c.chan == chan)
+
+    karma = db.execute(query).fetchall()
     if karma:
         pos = 0
         neg = 0
@@ -157,11 +143,14 @@ def pointstop(text, chan, db):
     """- prints the top 10 things with the highest points in the channel. To see the top 10 items in all of the channels the bot sits in use .topten global."""
     points = defaultdict(int)
     if text == "global" or text == "-global":
-        items = db.execute("select thing, score from karma").fetchall()
+        items = db.execute(select([karma_table.c.thing, karma_table.c.score])).fetchall()
         out = "The top {} favorite things in all channels are: "
     else:
-        items = db.execute("select thing, score from karma where chan = :chan", {'chan': chan}).fetchall()
+        items = db.execute(
+            select([karma_table.c.thing, karma_table.c.score]).where(karma_table.c.chan == chan)
+        ).fetchall()
         out = "The top {} favorite things in {} are: "
+
     if items:
         for item in items:
             thing = item[0]
@@ -184,10 +173,12 @@ def pointsbottom(text, chan, db):
     """- prints the top 10 things with the lowest points in the channel. To see the bottom 10 items in all of the channels the bot sits in use .bottomten global."""
     points = defaultdict(int)
     if text == "global" or text == "-global":
-        items = db.execute("select thing, score from karma").fetchall()
+        items = db.execute(select([karma_table.c.thing, karma_table.c.score])).fetchall()
         out = "The {} most hated things in all channels are: "
     else:
-        items = db.execute("select thing, score from karma where chan = :chan", {'chan': chan}).fetchall()
+        items = db.execute(
+            select([karma_table.c.thing, karma_table.c.score]).where(karma_table.c.chan == chan)
+        ).fetchall()
         out = "The {} most hated things in {} are: "
     if items:
         for item in items:

plugins/librefm.py

@@ -123,8 +123,10 @@ def librefm(text, nick, db, notice):
     out += ending
 
     if text and not dontsave:
-        db.execute("insert or replace into librefm(nick, acc) values (:nick, :account)",
-                   {'nick': nick.lower(), 'account': user})
+        res = db.execute(table.update().values(acc=user).where(table.c.nick == nick.lower()))
+        if res.rowcount <= 0:
+            db.execute(table.insert().values(nick=nick.lower(), acc=user))
+
         db.commit()
         load_cache(db)
     return out