X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?p=irc.git;a=blobdiff_plain;f=commands.py;h=19f8c4b6327f9c577c6792fd91370603cd0d1c5a;hp=b63836af7d08425c522c0876b0e34464915500b8;hb=61e45f545d8207514f70e0f8c0a27128f97e6967;hpb=e9b587ab8c0e11fb72178616431175e0930c8856 diff --git a/commands.py b/commands.py old mode 100644 new mode 100755 index b63836a..19f8c4b --- a/commands.py +++ b/commands.py @@ -1,5 +1,5 @@ # Part of Acrobat. -import string, cPickle, random, urllib, sys, time, re, os, twitter +import string, cPickle, random, urllib, sys, time, re, os, twitter, subprocess, datetime from irclib import irc_lower, nm_to_n # query karma @@ -84,6 +84,7 @@ def troutq(bot, cmd, nick, conn, public, cfg): return me = bot.connection.get_nickname() trout_msg = random.choice(fishlist) + fishpond.last=trout_msg # The bot won't trout or flirt with itself; if irc_lower(me) == irc_lower(target): target = nick @@ -154,9 +155,9 @@ def unitq(bot, cmd, nick, conn, public): conn.notice(nick, "syntax: units arg1 as arg2") return if args[1]=='?': - sin,sout=os.popen2(["units","--verbose",args[0]],"r") + sin,sout=os.popen4(["units","--verbose","--",args[0]],"r") else: - sin,sout=os.popen2(["units","--verbose",args[0],args[1]],"r") + sin,sout=os.popen4(["units","--verbose","--",args[0],args[1]],"r") sin.close() res=sout.readlines() #popen2 doesn't clean up the child properly. Do this by hand @@ -187,24 +188,6 @@ def reloadq(bot, cmd, nick, conn, public): bot.automsg(public,nick, "Configuration can only be reloaded by my owner, by /msg.") -# lose the game and/or install a new trigger word -def gameq(bot, cmd, nick, conn, public, game): - #only install a new trigger if it's not too short. - if len(' '.join(cmd.split()[1:]))>2: - game.trigger=' '.join(cmd.split()[1:]) - if (time.time()> game.grace): - if not public: - if irc_lower(nick) == irc_lower(bot.owner): - conn.action(bot.channel,"loses the game!") - else: - conn.privmsg(bot.channel,nick+" just lost the game!") - else: - if not public: - conn.notice(nick, "It's a grace period!") - game.grace=time.time()+60*20 #20 minutes' grace - game.losetime=time.time()+random.randrange(game.minlose,game.maxlose) - conn.notice(bot.owner, str(game.losetime-time.time())+" "+game.trigger) - # quit irc def quitq(bot, cmd, nick, conn, public): if irc_lower(nick) == irc_lower(bot.owner): @@ -232,6 +215,9 @@ def googleq(bot, cmd, nick, conn, public): # Look up the definition of something using google def defineq(bot, cmd, nick, conn, public): + #this doesn't work any more + bot.automsg(public,nick,"'define' is broken because google are bastards :(") + return cmdrest = string.join(cmd.split()[1:]) targ = ("http://www.google.co.uk/search?q=define%%3A%s&ie=utf-8&oe=utf-8" % urllib.quote_plus(cmdrest)) @@ -257,6 +243,94 @@ def defineq(bot, cmd, nick, conn, public): except IOError: # if the connection times out. This blocks. :( bot.automsg(public,nick,"The web's broken. Waah!") +# Look up a currency conversion via xe.com +def currencyq(bot, cmd, nick, conn, public): + args = ' '.join(cmd.split()[1:]).split(' as ') + if len(args) != 2 or len(args[0]) != 3 or len(args[1]) != 3: + conn.notice(nick, "syntax: currency arg1 as arg2") + return + targ = ("http://www.xe.com/ucc/convert.cgi?From=%s&To=%s" % (args[0], args[1])) + try: + currencypage = urllib.urlopen(targ).read() + match = re.search(r"(1 %s = [\d\.]+ %s)" % (args[0],args[1]),currencypage,re.MULTILINE) + if match == None: + bot.automsg(public,nick,"Dear Chief Secretary, there is no money.") + else: + conversion = match.group(1); + conversion = conversion.replace(' ',' '); + bot.automsg(public,nick,conversion + " (from xe.com)") + except IOError: # if the connection times out. This blocks. :( + bot.automsg(public,nick,"The web's broken. Waah!") + + +### extract the commit message and timestamp for commit +def __getcommitinfo(commit): + cmd=["git","log","-n","1","--pretty=format:%ct|%s",commit] + x=subprocess.Popen(cmd, + stdout=subprocess.PIPE,stderr=subprocess.PIPE) + out,err=x.communicate() + + if len(err): + return(err) + + ts,mes=out.split('|') + when=datetime.date.fromtimestamp(float(ts)) + return mes.strip(), when + +###Return an array of commit messages and timestamps for lines in db that match what +def __getcommits(db,keys,what): + ans=[] + for k in keys: + if what in k: + ret=__getcommitinfo(db[k]) + if len(ret)==1: #error message + return ["Error message from git blame: %s" % ret] + else: + ans.append( (k,ret[0],ret[1]) ) + return ans + +###search all three databases for what +def __getall(tdb,tdbk,fdb,fdbk,sdb,sdbk,what): + if what.strip()=="": + return [] + tans=__getcommits(tdb,tdbk,what) + fans=__getcommits(fdb,fdbk,what) + sans=__getcommits(sdb,sdbk,what) + return tans+fans+sans + +def blameq(bot,cmd,nick,conn,public,fish,tdb,tdbk,fdb,fdbk,sdb,sdbk): + clist=cmd.split() + if len(clist) < 2: + bot.automsg(public,nick,"Who or what do you want to blame?") + return + cwhat=' '.join(clist[2:]) + if clist[1]=="#last": + ans=__getall(tdb,tdbk,fdb,fdbk,sdb,sdbk,fish.last) + elif clist[1]=="#trouts" or clist[1]=="#trout": + ans=__getcommits(tdb,tdbk,cwhat) + elif clist[1]=="#flirts" or clist[1]=="#flirt": + ans=__getcommits(fdb,fdbk,cwhat) + elif clist[1]=="#slashes" or clist[1]=="#slash": + ans=__getcommits(sdb,sdbk,cwhat) + else: + cwhat=' '.join(clist[1:]) + ans=__getall(tdb,tdbk,fdb,fdbk,sdb,sdbk,cwhat) + if len(ans)==0: + bot.automsg(public,nick,"No match found") + elif len(ans)==1: + if len(ans[0])==1: + bot.automsg(public,nick,ans[0]) + else: + bot.automsg(public,nick,"Modified %s: %s" % (ans[0][2].isoformat(),ans[0][1])) + elif len(ans)>4: + bot.automsg(public,nick,"I found %d matches, which is too many. Please be more specific!" % (len(ans)) ) + else: + for a in ans: + if len(a)==1: + bot.automsg(public,nick,a) + else: + bot.automsg(public,nick,"'%s' modified on %s: %s" % (a[0],a[2].isoformat(),a[1])) + ### say to msg/channel def sayq(bot, cmd, nick, conn, public): if irc_lower(nick) == irc_lower(bot.owner): @@ -431,6 +505,7 @@ def getTweet(urlstring,twitapi): tweeter_screen = status.user.screen_name.encode('UTF-8', 'replace') tweeter_name = status.user.name.encode('UTF-8', 'replace') tweetText = status.text.encode('UTF-8', 'replace') + tweetText = tweetText.replace('\n',' ') stringout = "tweet by %s (%s): %s" %(tweeter_screen,tweeter_name,tweetText) except twitter.TwitterError: terror = sys.exc_info()