cleanup: fix whitespace, fix style

This commit is contained in:
urlbot
2015-02-09 03:46:17 +01:00
parent 67f2c42585
commit 51e3c26101

View File

@@ -23,9 +23,9 @@ joblist = []
plugins = {p : [] for p in ptypes} plugins = {p : [] for p in ptypes}
def pluginfunction(name, desc, plugin_type, ratelimit_class = RATE_GLOBAL, enabled = True): def pluginfunction(name, desc, plugin_type, ratelimit_class = RATE_GLOBAL, enabled = True):
""" A decorator to make a plugin out of a function """ ''' A decorator to make a plugin out of a function '''
if plugin_type not in ptypes: if plugin_type not in ptypes:
raise TypeError("Illegal plugin_type: %s" % plugin_type) raise TypeError('Illegal plugin_type: %s' % plugin_type)
def decorate(f): def decorate(f):
f.is_plugin = True f.is_plugin = True
@@ -40,7 +40,7 @@ def pluginfunction(name, desc, plugin_type, ratelimit_class = RATE_GLOBAL, enabl
def register_event(t, callback, args): def register_event(t, callback, args):
joblist.append((t, callback, args)) joblist.append((t, callback, args))
@pluginfunction("mental_ill", "parse mental illness", ptypes_PARSE, ratelimit_class = RATE_NO_SILENCE | RATE_GLOBAL) @pluginfunction('mental_ill', 'parse mental illness', ptypes_PARSE, ratelimit_class = RATE_NO_SILENCE | RATE_GLOBAL)
def parse_mental_ill(**args): def parse_mental_ill(**args):
min_ill = 3 min_ill = 3
c = 0 c = 0
@@ -62,7 +62,7 @@ def parse_mental_ill(**args):
'msg': '''Multiple exclamation/question marks are a sure sign of mental disease, with %s as a living example.''' % args['reply_user'] 'msg': '''Multiple exclamation/question marks are a sure sign of mental disease, with %s as a living example.''' % args['reply_user']
} }
@pluginfunction("debbug", "parse Debian bug numbers", ptypes_PARSE, ratelimit_class = RATE_NO_SILENCE | RATE_GLOBAL) @pluginfunction('debbug', 'parse Debian bug numbers', ptypes_PARSE, ratelimit_class = RATE_NO_SILENCE | RATE_GLOBAL)
def parse_debbug(**args): def parse_debbug(**args):
bugs = re.findall(r'#(\d{4,})', args['data']) bugs = re.findall(r'#(\d{4,})', args['data'])
if not bugs: if not bugs:
@@ -83,7 +83,7 @@ def parse_debbug(**args):
'msg': title 'msg': title
} }
@pluginfunction("cve", "parse a CVE handle", ptypes_PARSE, ratelimit_class = RATE_NO_SILENCE | RATE_GLOBAL) @pluginfunction('cve', 'parse a CVE handle', ptypes_PARSE, ratelimit_class = RATE_NO_SILENCE | RATE_GLOBAL)
def parse_cve(**args): def parse_cve(**args):
cves = re.findall(r'(CVE-\d\d\d\d-\d+)', args['data'].upper()) cves = re.findall(r'(CVE-\d\d\d\d-\d+)', args['data'].upper())
if not cves: if not cves:
@@ -94,7 +94,7 @@ def parse_cve(**args):
'msg': 'https://security-tracker.debian.org/tracker/%s' % cves[0] 'msg': 'https://security-tracker.debian.org/tracker/%s' % cves[0]
} }
@pluginfunction("skynet", "parse skynet", ptypes_PARSE) @pluginfunction('skynet', 'parse skynet', ptypes_PARSE)
def parse_skynet(**args): def parse_skynet(**args):
if 'skynet' in args['data'].lower(): if 'skynet' in args['data'].lower():
logger('plugin', 'sent skynet reply') logger('plugin', 'sent skynet reply')
@@ -103,7 +103,7 @@ def parse_skynet(**args):
} }
@pluginfunction('latex', r'reacts on \LaTeX', ptypes_PARSE) @pluginfunction('latex', r'reacts on \LaTeX', ptypes_PARSE)
def parse_skynet(**args): def parse_latex(**args):
if r'\LaTeX' in args['data']: if r'\LaTeX' in args['data']:
return { return {
'msg': '''LaTeX is way too complex for me, I'm happy with fmt(1)''' 'msg': '''LaTeX is way too complex for me, I'm happy with fmt(1)'''
@@ -132,7 +132,7 @@ def data_parse_other(msg_obj):
ratelimit_touch(RATE_CHAT) ratelimit_touch(RATE_CHAT)
send_reply(ret['msg'], msg_obj) send_reply(ret['msg'], msg_obj)
@pluginfunction("help", "print help for a command or all known commands", ptypes_COMMAND) @pluginfunction('help', 'print help for a command or all known commands', ptypes_COMMAND)
def command_help(argv, **args): def command_help(argv, **args):
command = argv[0] command = argv[0]
what = argv[1] if len(argv) > 1 else None what = argv[1] if len(argv) > 1 else None
@@ -164,7 +164,7 @@ def command_help(argv,**args):
) )
} }
@pluginfunction("version", "prints version", ptypes_COMMAND) @pluginfunction('version', 'prints version', ptypes_COMMAND)
def command_version(argv, **args): def command_version(argv, **args):
if 'version' != argv[0]: if 'version' != argv[0]:
return return
@@ -174,7 +174,7 @@ def command_version(argv,**args):
'msg': args['reply_user'] + (''': I'm running ''' + VERSION) 'msg': args['reply_user'] + (''': I'm running ''' + VERSION)
} }
@pluginfunction("klammer", "prints an anoying paper clip aka. Karl Klammer", ptypes_COMMAND) @pluginfunction('klammer', 'prints an anoying paper clip aka. Karl Klammer', ptypes_COMMAND)
def command_klammer(argv, **args): def command_klammer(argv, **args):
if 'klammer' != argv[0]: if 'klammer' != argv[0]:
return return
@@ -192,7 +192,7 @@ def command_klammer(argv,**args):
) )
} }
@pluginfunction("unikot", "prints an unicode string", ptypes_COMMAND) @pluginfunction('unikot', 'prints an unicode string', ptypes_COMMAND)
def command_unicode(argv, **args): def command_unicode(argv, **args):
if 'unikot' != argv[0]: if 'unikot' != argv[0]:
return return
@@ -207,7 +207,7 @@ def command_unicode(argv,**args):
) )
} }
@pluginfunction("source", "prints git URL", ptypes_COMMAND) @pluginfunction('source', 'prints git URL', ptypes_COMMAND)
def command_source(argv, **args): def command_source(argv, **args):
if not argv[0] in ('source', 'src'): if not argv[0] in ('source', 'src'):
return return
@@ -217,7 +217,7 @@ def command_source(argv,**args):
'msg': 'My source code can be found at %s' % conf('src-url') 'msg': 'My source code can be found at %s' % conf('src-url')
} }
@pluginfunction("dice", "rolls a dice, optional N times", ptypes_COMMAND, ratelimit_class = RATE_INTERACTIVE) @pluginfunction('dice', 'rolls a dice, optional N times', ptypes_COMMAND, ratelimit_class = RATE_INTERACTIVE)
def command_dice(argv, **args): def command_dice(argv, **args):
if 'dice' != argv[0]: if 'dice' != argv[0]:
return return
@@ -259,7 +259,7 @@ def command_dice(argv, **args):
'msg': msg 'msg': msg
} }
@pluginfunction("uptime", "prints uptime", ptypes_COMMAND) @pluginfunction('uptime', 'prints uptime', ptypes_COMMAND)
def command_uptime(argv, **args): def command_uptime(argv, **args):
if 'uptime' != argv[0]: if 'uptime' != argv[0]:
return return
@@ -278,7 +278,7 @@ def command_uptime(argv, **args):
'msg': args['reply_user'] + (''': happily serving for %d second%s, %d request%s so far.''' % (u, plural_uptime, conf('request_counter'), plural_request)) 'msg': args['reply_user'] + (''': happily serving for %d second%s, %d request%s so far.''' % (u, plural_uptime, conf('request_counter'), plural_request))
} }
@pluginfunction("ping", "sends pong", ptypes_COMMAND, ratelimit_class = RATE_INTERACTIVE) @pluginfunction('ping', 'sends pong', ptypes_COMMAND, ratelimit_class = RATE_INTERACTIVE)
def command_ping(argv, **args): def command_ping(argv, **args):
if 'ping' != argv[0]: if 'ping' != argv[0]:
return return
@@ -298,7 +298,7 @@ def command_ping(argv, **args):
'msg': msg 'msg': msg
} }
@pluginfunction("info", "prints info message", ptypes_COMMAND) @pluginfunction('info', 'prints info message', ptypes_COMMAND)
def command_info(argv, **args): def command_info(argv, **args):
if 'info' != argv[0]: if 'info' != argv[0]:
return return
@@ -308,7 +308,7 @@ def command_info(argv,**args):
'msg': args['reply_user'] + (''': I'm a bot, my job is to extract <title> tags from posted URLs. In case I'm annoying or for further questions, please talk to my master %s. I'm rate limited and shouldn't post more than %d messages per %d seconds. To make me exit immediately, highlight me with 'hangup' in the message (emergency only, please). For other commands, highlight me with 'help'.''' % (conf('bot_owner'), conf('hist_max_count'), conf('hist_max_time'))) 'msg': args['reply_user'] + (''': I'm a bot, my job is to extract <title> tags from posted URLs. In case I'm annoying or for further questions, please talk to my master %s. I'm rate limited and shouldn't post more than %d messages per %d seconds. To make me exit immediately, highlight me with 'hangup' in the message (emergency only, please). For other commands, highlight me with 'help'.''' % (conf('bot_owner'), conf('hist_max_count'), conf('hist_max_time')))
} }
@pluginfunction("teatimer", 'sets a tea timer to $1 or currently %d seconds' % conf('tea_steep_time'), ptypes_COMMAND) @pluginfunction('teatimer', 'sets a tea timer to $1 or currently %d seconds' % conf('tea_steep_time'), ptypes_COMMAND)
def command_teatimer(argv, **args): def command_teatimer(argv, **args):
if 'teatimer' != argv[0]: if 'teatimer' != argv[0]:
return return
@@ -344,7 +344,7 @@ def command_teatimer(argv,**args):
) )
} }
@pluginfunction("decode", "prints the long description of an unicode character", ptypes_COMMAND) @pluginfunction('decode', 'prints the long description of an unicode character', ptypes_COMMAND)
def command_decode(argv, **args): def command_decode(argv, **args):
if 'decode' != argv[0]: if 'decode' != argv[0]:
return return
@@ -370,7 +370,7 @@ def command_decode(argv,**args):
'msg': args['reply_user'] + ': %s (%s) is called "%s"' % (char, char_esc, uni_name) 'msg': args['reply_user'] + ': %s (%s) is called "%s"' % (char, char_esc, uni_name)
} }
@pluginfunction("show-blacklist", "show the current URL blacklist, optionally filtered", ptypes_COMMAND) @pluginfunction('show-blacklist', 'show the current URL blacklist, optionally filtered', ptypes_COMMAND)
def command_show_blacklist(argv, **args): def command_show_blacklist(argv, **args):
if 'show-blacklist' != argv[0]: if 'show-blacklist' != argv[0]:
return return
@@ -408,7 +408,7 @@ def usersetting_get(argv,args):
) )
} }
@pluginfunction("set", "modify a user setting", ptypes_COMMAND) @pluginfunction('set', 'modify a user setting', ptypes_COMMAND)
def command_usersetting(argv, **args): def command_usersetting(argv, **args):
if 'set' != argv[0]: if 'set' != argv[0]:
return return
@@ -453,7 +453,7 @@ def command_usersetting(argv,**args):
# display value written to db # display value written to db
return usersetting_get(argv, args) return usersetting_get(argv, args)
@pluginfunction("cake", "displays a cake ASCII art", ptypes_COMMAND) @pluginfunction('cake', 'displays a cake ASCII art', ptypes_COMMAND)
def command_cake(argv, **args): def command_cake(argv, **args):
if 'cake' != argv[0]: if 'cake' != argv[0]:
return return
@@ -477,7 +477,7 @@ def command_cake(argv, **args):
'msg': args['reply_user'] + ': %s' % (random.sample(cakes,1)[0]) 'msg': args['reply_user'] + ': %s' % (random.sample(cakes,1)[0])
} }
@pluginfunction("remember", "remembers something", ptypes_COMMAND) @pluginfunction('remember', 'remembers something', ptypes_COMMAND)
def command_remember(argv, **args): def command_remember(argv, **args):
if 'remember' != argv[0]: if 'remember' != argv[0]:
return return
@@ -489,7 +489,6 @@ def command_remember(argv,**args):
'msg': args['reply_user'] + ': invalid message' 'msg': args['reply_user'] + ': invalid message'
} }
print(args['data'])
to_remember = ' '.join(args['data'].split()[2:]) # this is a little dirty. A little lot to_remember = ' '.join(args['data'].split()[2:]) # this is a little dirty. A little lot
set_conf('data_remember', to_remember) set_conf('data_remember', to_remember)
@@ -497,7 +496,7 @@ def command_remember(argv,**args):
'msg': args['reply_user'] + ': remembering ' + to_remember 'msg': args['reply_user'] + ': remembering ' + to_remember
} }
@pluginfunction("recall", "recalls something previously 'remember'ed", ptypes_COMMAND) @pluginfunction('recall', "recalls something previously 'remember'ed", ptypes_COMMAND)
def command_recall(argv, **args): def command_recall(argv, **args):
if 'recall' != argv[0]: if 'recall' != argv[0]:
return return
@@ -509,7 +508,7 @@ def command_recall(argv,**args):
} }
#TODO: send a hint if someone types plugin as command #TODO: send a hint if someone types plugin as command
@pluginfunction("plugin", "disable' or 'enable' plugins", ptypes_COMMAND) @pluginfunction('plugin', "'disable' or 'enable' plugins", ptypes_COMMAND)
def command_plugin_activation(argv, **args): def command_plugin_activation(argv, **args):
command = argv[0] command = argv[0]
plugin = argv[1] if len(argv) > 1 else None plugin = argv[1] if len(argv) > 1 else None
@@ -542,7 +541,7 @@ def command_plugin_activation(argv,**args):
'msg': args['reply_user'] + ': unknown plugin %s' % plugin 'msg': args['reply_user'] + ': unknown plugin %s' % plugin
} }
@pluginfunction("wp-en", "crawl the english Wikipedia", ptypes_COMMAND) @pluginfunction('wp-en', 'crawl the english Wikipedia', ptypes_COMMAND)
def command_wp_en(argv, **args): def command_wp_en(argv, **args):
if 'wp-en' != argv[0]: if 'wp-en' != argv[0]:
return return
@@ -550,51 +549,65 @@ def command_wp_en(argv,**args):
if argv[0]: if argv[0]:
argv[0] = 'wp' argv[0] = 'wp'
return command_wp(argv, lang="en", **args) return command_wp(argv, lang='en', **args)
@pluginfunction("wp", "crawl the german Wikipedia", ptypes_COMMAND) @pluginfunction('wp', 'crawl the german Wikipedia', ptypes_COMMAND)
def command_wp(argv,lang="de",**args): def command_wp(argv, lang='de', **args):
if 'wp' != argv[0]: if 'wp' != argv[0]:
return return
logger('plugin', 'wp plugin called') logger('plugin', 'wp plugin called')
query = " ".join(argv[1:]) query = ' '.join(argv[1:])
if query == "": if query == '':
return { return {
'msg': args['reply_user'] + ": You must enter a query" 'msg': args['reply_user'] + ': no query given'
} }
api = { "action" : "query", "prop" : "extracts", "explaintext": "" , "redirects": "", api = {
"exsentences" : 2, "continue" : "", "format" : "json", "titles" : query } 'action': 'query',
apiurl = "https://%s.wikipedia.org/w/api.php?%s" % (lang, urllib.parse.urlencode(api)) 'prop': 'extracts',
'explaintext': '',
'redirects': '',
'exsentences': 2,
'continue': '',
'format': 'json',
'titles': query
}
apiurl = 'https://%s.wikipedia.org/w/api.php?%s' % (
lang, urllib.parse.urlencode(api)
)
try: try:
response = urllib.request.urlopen(apiurl) response = urllib.request.urlopen(apiurl)
buf = response.read(BUFSIZ) buf = response.read(BUFSIZ)
j = json.loads(buf.decode("unicode_escape")) j = json.loads(buf.decode('unicode_escape'))
page = next(iter(j['query']['pages'].values())) page = next(iter(j['query']['pages'].values()))
short = page.get("extract", None) short = page.get('extract', None)
linktitle = page.get("title", query).replace(" ","_") linktitle = page.get('title', query).replace(' ', '_')
link = 'https://%s.wikipedia.org/wiki/%s' % (lang, linktitle) link = 'https://%s.wikipedia.org/wiki/%s' % (lang, linktitle)
except Exception as e: except Exception as e:
logger('plugin', 'wp(%s) failed: %s, %s' % (query, e, traceback.format_exc())) logger('plugin', 'wp(%s) failed: %s, %s' % (query, e, traceback.format_exc()))
return { return {
'msg': args['reply_user'] + ": something failed: %s" % e 'msg': args['reply_user'] + ': something failed: %s' % e
} }
if short is not None: if short is not None:
return { return {
'msg': args['reply_user'] + ': %s (<%s>)' % ( 'msg': args['reply_user'] + ': %s (<%s>)' % (
short if short.strip() else "(nix)", link short if short.strip() else '(nix)', link
) )
} }
elif "missing" in page: elif 'missing' in page:
return { 'msg': 'Article "%s" not found' % page.get("title", query) } return {
'msg': 'Article "%s" not found' % page.get('title', query)
}
else: else:
return { 'msg': "Something seems wrong with the json" } return {
'msg': 'json data seem to be broken'
}
#def command_dummy(args): #def command_dummy(args):
# if 'register' == args: # if 'register' == args:
@@ -654,7 +667,6 @@ def data_parse_commands(msg_obj):
argv = words[1:] argv = words[1:]
) )
if None != ret: if None != ret:
if 'msg' in list(ret.keys()): if 'msg' in list(ret.keys()):
ratelimit_touch(RATE_CHAT) ratelimit_touch(RATE_CHAT)
@@ -709,18 +721,24 @@ if debug_enabled():
logger('info', 'debugging enabled') logger('info', 'debugging enabled')
def register(func_type): def register(func_type):
""" '''
Register plugins. Register plugins.
Arguments: Arguments:
func_type -- plugin functions with this type (ptypes) will be loaded func_type -- plugin functions with this type (ptypes) will be loaded
""" '''
functions = [f for n,f in globals().items() if type(f) == types.FunctionType functions = [
f for ignored, f in globals().items()
if
type(f) == types.FunctionType
and f.__dict__.get('is_plugin', False) and f.__dict__.get('is_plugin', False)
and f.plugin_type == func_type] and f.plugin_type == func_type
]
logger('info', 'auto registering plugins: %s' % (", ".join(f.plugin_name for f in functions))) logger('info', 'auto registering plugins: %s' % (', '.join(
f.plugin_name for f in functions
)))
for f in functions: for f in functions:
register_plugin(f, func_type) register_plugin(f, func_type)