ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

PEP-8, tweaks to .time and a new library (soon to be expanded)

Browse source
This commit is contained in:
Luke Rogers 2012-04-21 02:35:35 +12:00
parent e959c27d66
commit a9927eca90
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
plugins/time.py
View file

@ -2,6 +2,7 @@
from util import hook from util import hook
from util import http from util import http
from util.formatting import capitalize_first
api_url = 'http://api.wolframalpha.com/v2/query?format=plaintext' api_url = 'http://api.wolframalpha.com/v2/query?format=plaintext'
@ -11,7 +12,7 @@ def time_command(inp, bot=None):
".time <area> -- Gets the time in <area>" ".time <area> -- Gets the time in <area>"
query = "current time in %s" % inp query = "current time in %s" % inp
api_key = bot.config.get("api_keys", {}).get("wolframalpha", None) api_key = bot.config.get("api_keys", {}).get("wolframalpha", None)
if not api_key: if not api_key:
return "error: no wolfram alpha api key set" return "error: no wolfram alpha api key set"
@ -20,20 +21,20 @@ def time_command(inp, bot=None):
time = " ".join(request.xpath("//pod[@title='Result']/subpod/plain" \ time = " ".join(request.xpath("//pod[@title='Result']/subpod/plain" \
"text/text()")) "text/text()"))
time = time.replace(" | ", ", ") time = time.replace(" | ", ", ")
# nice place name for UNIX time # nice place name for UNIX time
if inp.lower() == "unix": if inp.lower() == "unix":
place = "Unix Epoch" place = "Unix Epoch"
else: else:
place = " ".join(request.xpath("//pod[@title='Input interpretation']/" \ place = capitalize_first(" ".join(request.xpath("//pod[@title='Input" \
"subpod/plaintext/text()"))[16:].title() " interpretation']/subpod/plaintext/text()"))[16:])
if time: if time:
# if wolfram alpha had to guess a place, then show the place it chose # if wolfram alpha had to guess a place, then show the place it chose
#if request.xpath("//assumptions"): #if request.xpath("//assumptions"):
# return "%s - \x02%s\x02" % (time, place) # return "%s - \x02%s\x02" % (time, place)
#else: #else:
# return time # return time
return "%s - \x02%s\x02" % (time, place) return "%s - \x02%s\x02" % (time, place)
else: else:
return "Could not get the time for '%s'" % inp return "Could not get the time for '%s'" % inp

7
plugins/util/formatting.py Executable file
View file

@ -0,0 +1,7 @@
""" formatting.py - handy functions for formatting text """
def capitalize_first(line):
""" capitalises the first letter of words
(keeps other letters intact)
"""
return ' '.join([s[0].upper() + s[1:] for s in line.split(' ')])