Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cosmetic fixes.

This commit is contained in:
Daniel DiPaolo 2003-10-24 06:11:16 +00:00
parent 051928efa5
commit c1ee1b8c10
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
plugins/MoobotFactoids.py
View File

@ -129,7 +129,7 @@ class MoobotFactoids(callbacks.PrivmsgCommandAndRegexp):
'replaceFactoid', 'addFactoid'] 'replaceFactoid', 'addFactoid']
def __init__(self): def __init__(self):
callbacks.PrivmsgCommandAndRegexp.__init__(self) callbacks.PrivmsgCommandAndRegexp.__init__(self)
self.makeDB(dbfilename) self.makeDb(dbfilename)
# Set up the "reply when not command" behavior # Set up the "reply when not command" behavior
Misc = Owner.loadPluginModule('Misc') Misc = Owner.loadPluginModule('Misc')
# Gotta make sure we restore this when we unload # Gotta make sure we restore this when we unload
@ -138,7 +138,7 @@ class MoobotFactoids(callbacks.PrivmsgCommandAndRegexp):
conf.replyWhenNotCommand = True conf.replyWhenNotCommand = True
Misc.replyWhenNotCommand = self._checkFactoids Misc.replyWhenNotCommand = self._checkFactoids
def makeDB(self, filename): def makeDb(self, filename):
"""create MoobotFactoids database and tables""" """create MoobotFactoids database and tables"""
if os.path.exists(filename): if os.path.exists(filename):
self.db = sqlite.connect(filename) self.db = sqlite.connect(filename)
@ -252,7 +252,7 @@ class MoobotFactoids(callbacks.PrivmsgCommandAndRegexp):
# Check and make sure it's not in the DB already # Check and make sure it's not in the DB already
cursor.execute("""SELECT * FROM factoids WHERE key LIKE %s""", key) cursor.execute("""SELECT * FROM factoids WHERE key LIKE %s""", key)
if cursor.rowcount != 0: if cursor.rowcount != 0:
irc.error(msg, "Factoid '%s' already exists." % key) irc.error(msg, "Factoid %r already exists." % key)
return return
# Otherwise, # Otherwise,
cursor.execute("""INSERT INTO factoids VALUES cursor.execute("""INSERT INTO factoids VALUES
@ -276,18 +276,18 @@ class MoobotFactoids(callbacks.PrivmsgCommandAndRegexp):
cursor.execute("""SELECT locked_at, fact FROM factoids cursor.execute("""SELECT locked_at, fact FROM factoids
WHERE key LIKE %s""", key) WHERE key LIKE %s""", key)
if cursor.rowcount == 0: if cursor.rowcount == 0:
irc.error(msg, "Factoid '%s' not found." % key) irc.error(msg, "Factoid %r not found." % key)
return return
# No dice if it's locked, no matter who it is # No dice if it's locked, no matter who it is
(locked_at, fact) = cursor.fetchone() (locked_at, fact) = cursor.fetchone()
if locked_at is not None: if locked_at is not None:
irc.error(msg, "Factoid '%s' is locked." % key) irc.error(msg, "Factoid %r is locked." % key)
return return
# It's fair game if we get to here # It's fair game if we get to here
try: try:
r = utils.perlReToReplacer(regexp) r = utils.perlReToReplacer(regexp)
except ValueError, e: except ValueError, e:
irc.error(msg, "Invalid regexp: %s" % regexp) irc.error(msg, "Invalid regexp: %r" % regexp)
return return
new_fact = r(fact) new_fact = r(fact)
cursor.execute("""UPDATE factoids cursor.execute("""UPDATE factoids
@ -311,12 +311,12 @@ class MoobotFactoids(callbacks.PrivmsgCommandAndRegexp):
cursor.execute("""SELECT locked_at, fact FROM factoids cursor.execute("""SELECT locked_at, fact FROM factoids
WHERE key LIKE %s""", key) WHERE key LIKE %s""", key)
if cursor.rowcount == 0: if cursor.rowcount == 0:
irc.error(msg, "Factoid '%s' not found." % key) irc.error(msg, "Factoid %r not found." % key)
return return
# No dice if it's locked, no matter who it is # No dice if it's locked, no matter who it is
(locked_at, fact) = cursor.fetchone() (locked_at, fact) = cursor.fetchone()
if locked_at is not None: if locked_at is not None:
irc.error(msg, "Factoid '%s' is locked." % key) irc.error(msg, "Factoid %r is locked." % key)
return return
# It's fair game if we get to here # It's fair game if we get to here
new_fact = "%s, or %s" % (fact, new_text) new_fact = "%s, or %s" % (fact, new_text)
@ -341,12 +341,12 @@ class MoobotFactoids(callbacks.PrivmsgCommandAndRegexp):
cursor.execute("""SELECT locked_at, fact FROM factoids cursor.execute("""SELECT locked_at, fact FROM factoids
WHERE key LIKE %s""", key) WHERE key LIKE %s""", key)
if cursor.rowcount == 0: if cursor.rowcount == 0:
irc.error(msg, "Factoid '%s' not found." % key) irc.error(msg, "Factoid %r not found." % key)
return return
# No dice if it's locked, no matter who it is # No dice if it's locked, no matter who it is
(locked_at, _) = cursor.fetchone() (locked_at, _) = cursor.fetchone()
if locked_at is not None: if locked_at is not None:
irc.error(msg, "Factoid '%s' is locked." % key) irc.error(msg, "Factoid %r is locked." % key)
return return
# It's fair game if we get to here # It's fair game if we get to here
cursor.execute("""UPDATE factoids cursor.execute("""UPDATE factoids
@ -370,7 +370,7 @@ class MoobotFactoids(callbacks.PrivmsgCommandAndRegexp):
cursor = self.db.cursor() cursor = self.db.cursor()
cursor.execute("""SELECT fact FROM factoids WHERE key LIKE %s""", key) cursor.execute("""SELECT fact FROM factoids WHERE key LIKE %s""", key)
if cursor.rowcount == 0: if cursor.rowcount == 0:
irc.error(msg, "No such factoid: %s" % key) irc.error(msg, "No such factoid: %r" % key)
return return
else: else:
fact = cursor.fetchone()[0] fact = cursor.fetchone()[0]
@ -391,7 +391,7 @@ class MoobotFactoids(callbacks.PrivmsgCommandAndRegexp):
requested_count, locked_by, locked_at FROM requested_count, locked_by, locked_at FROM
factoids WHERE key LIKE %s""", key) factoids WHERE key LIKE %s""", key)
if cursor.rowcount == 0: if cursor.rowcount == 0:
irc.error(msg, "No such factoid: %s" % key) irc.error(msg, "No such factoid: %r" % key)
return return
(created_by, created_at, modified_by, modified_at, last_requested_by, (created_by, created_at, modified_by, modified_at, last_requested_by,
last_requested_at, requested_count, locked_by, last_requested_at, requested_count, locked_by,
@ -436,17 +436,17 @@ class MoobotFactoids(callbacks.PrivmsgCommandAndRegexp):
cursor.execute("""SELECT created_by, locked_by FROM factoids cursor.execute("""SELECT created_by, locked_by FROM factoids
WHERE key LIKE %s""", key) WHERE key LIKE %s""", key)
if cursor.rowcount == 0: if cursor.rowcount == 0:
irc.error(msg, "No such factoid: %s" % key) irc.error(msg, "No such factoid: %r" % key)
return return
(created_by, locked_by) = cursor.fetchone() (created_by, locked_by) = cursor.fetchone()
# Don't perform redundant operations # Don't perform redundant operations
if lock: if lock:
if locked_by is not None: if locked_by is not None:
irc.error(msg, "Factoid '%s' is already locked." % key) irc.error(msg, "Factoid %r is already locked." % key)
return return
else: else:
if locked_by is None: if locked_by is None:
irc.error(msg, "Factoid '%s' is not locked." % key) irc.error(msg, "Factoid '%r is not locked." % key)
return return
# Can only lock/unlock own factoids # Can only lock/unlock own factoids
if not (ircdb.checkCapability(id, 'admin') or created_by == id): if not (ircdb.checkCapability(id, 'admin') or created_by == id):
@ -494,17 +494,17 @@ class MoobotFactoids(callbacks.PrivmsgCommandAndRegexp):
try: try:
id = ircdb.users.getUserId(author) id = ircdb.users.getUserId(author)
except KeyError: except KeyError:
irc.error(msg, "No such user: %s" % author) irc.error(msg, "No such user: %r" % author)
return return
cursor = self.db.cursor() cursor = self.db.cursor()
cursor.execute("""SELECT key FROM factoids cursor.execute("""SELECT key FROM factoids
WHERE created_by = %s WHERE created_by = %s
ORDER BY key""", id) ORDER BY key""", id)
if cursor.rowcount == 0: if cursor.rowcount == 0:
irc.reply(msg, "No factoids by %s found." % author) irc.reply(msg, "No factoids by %r found." % author)
return return
keys = [repr(tup[0]) for tup in cursor.fetchall()] keys = [repr(tup[0]) for tup in cursor.fetchall()]
s = "Author search for %s (%d found): %s" % \ s = "Author search for %r (%d found): %s" % \
(author, len(keys), utils.commaAndify(keys)) (author, len(keys), utils.commaAndify(keys))
irc.reply(msg, s) irc.reply(msg, s)
@ -564,7 +564,7 @@ class MoobotFactoids(callbacks.PrivmsgCommandAndRegexp):
cursor.execute("""SELECT key, locked_at FROM factoids cursor.execute("""SELECT key, locked_at FROM factoids
WHERE key LIKE %s""", key) WHERE key LIKE %s""", key)
if cursor.rowcount == 0: if cursor.rowcount == 0:
irc.error(msg, "No such factoid: %s" % key) irc.error(msg, "No such factoid: %r" % key)
return return
(_, locked_at) = cursor.fetchone() (_, locked_at) = cursor.fetchone()
if locked_at is not None: if locked_at is not None: