From 56de31fe812d338ed49d2cfbb4c5dad9761bedf0 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 25 Apr 2014 12:12:18 +0200 Subject: add ^ --- Reaktor/titlebot/titlebot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Reaktor/titlebot') diff --git a/Reaktor/titlebot/titlebot.py b/Reaktor/titlebot/titlebot.py index d04789c3..f85e69f2 100644 --- a/Reaktor/titlebot/titlebot.py +++ b/Reaktor/titlebot/titlebot.py @@ -36,7 +36,7 @@ def default_command(cmd): def dot_command(cmd): return { 'capname': cmd, - 'pattern': '\\.' + cmd + '\\s*(?:\\s+(?P.*))?$', + 'pattern': '^\\.' + cmd + '\\s*(?:\\s+(?P.*))?$', 'argv': [ 'titlebot/commands/' + cmd ] } public_commands = [ -- cgit v1.2.3 From 3560697a49050d74b04a537a994b34e1e4a4c807 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 25 Apr 2014 14:18:37 +0200 Subject: update titlebot config --- Reaktor/titlebot/titlebot.py | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) (limited to 'Reaktor/titlebot') diff --git a/Reaktor/titlebot/titlebot.py b/Reaktor/titlebot/titlebot.py index 396b9b58..b5195d53 100644 --- a/Reaktor/titlebot/titlebot.py +++ b/Reaktor/titlebot/titlebot.py @@ -1,6 +1,6 @@ -from os import environ,mkdir +from os import environ,mkdir,abspath -debug = False +debug = True # CAVEAT name should not contains regex magic name = 'bgt_titlebot' @@ -21,18 +21,27 @@ irc_restart_timeout = 5 irc_channels = [ '#binaergewitter' ] +admin_file=workdir+'/admin.lst' +auth_file=workdir+'/auth.lst' + +config_filename = abspath(__file__) -admin_file=workdir+'/'+'admin.lst' try: with open(admin_file,"x"): pass except: pass -auth_file=workdir+'/'+'auth.lst' -def default_command(cmd): +# me is used, so name cannot kill our patterns below +me = '\\b' + re.escape(name) + '\\b' +me_or_us = '(?:' + me + '|\\*)' + +def default_command(cmd, env=None): + if not env: env = {} return { 'capname': cmd, - 'pattern': '^(?:' + name + '|\\*):\\s*' + cmd + '\\s*(?:\\s+(?P.*))?$', - 'argv': [ 'commands/' + cmd ] } + 'pattern': '^' + me_or_us + ':\\s*' + cmd + '\\s*(?:\\s+(?P.*))?$', + 'argv': [ 'commands/' + cmd ], + 'env': env + } def titlebot_cmd(cmd): return { 'capname': cmd, @@ -40,7 +49,9 @@ def titlebot_cmd(cmd): 'argv': [ 'titlebot/commands/' + cmd ] } public_commands = [ - default_command('caps'), + default_command('caps', env={ + 'config_filename': config_filename + }), default_command('hello'), default_command('badcommand'), default_command('rev'), @@ -54,7 +65,7 @@ public_commands = [ titlebot_cmd('down'), # identify via direct connect { 'capname': 'identify', - 'pattern': '^identify' + '\\s*(?:\\s+(?P.*))?$', + 'pattern': '^identify' + '\\s*(?:\\s+(?P.*))?$', 'argv' : [ 'commands/identify' ]} ] commands = [ -- cgit v1.2.3 From 2d646912b01c3e9399c19347b524ebbe00f44a04 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 25 Apr 2014 15:54:08 +0200 Subject: make exceptions more clear --- Reaktor/titlebot/commands/undo | 10 +++++++--- Reaktor/titlebot/commands/up | 18 ++++++++++++------ Reaktor/titlebot/titlebot.py | 2 +- 3 files changed, 20 insertions(+), 10 deletions(-) (limited to 'Reaktor/titlebot') diff --git a/Reaktor/titlebot/commands/undo b/Reaktor/titlebot/commands/undo index bebd57a3..a66de67f 100755 --- a/Reaktor/titlebot/commands/undo +++ b/Reaktor/titlebot/commands/undo @@ -16,12 +16,16 @@ except: undos vote of one or more entries based on .list""") sys.exit(1) voter = environ['_prefix'] +voter_name = environ['_from'] for vote in votes: try: vote = int(vote) - del(db[vote]['votes'][voter] ) - print("undid vote by %s for #%d" %(environ['_from'],vote)) + if not voter in db[vote]['votes']: + print("%s, you never voted for '%s'!"%(voter_name,db[vote]['title'])) + else: + del(db[vote]['votes'][voter] ) + print("%s undid vote for '%s'" %(voter_name,db[vote]['title'] )) except: - print("undo voting for #%s failed" %vote) + print("%s undo voting for #%d failed" %(voter_name,vote)) poll.save_db(f,db) diff --git a/Reaktor/titlebot/commands/up b/Reaktor/titlebot/commands/up index c9de1223..0a48bdb0 100755 --- a/Reaktor/titlebot/commands/up +++ b/Reaktor/titlebot/commands/up @@ -9,19 +9,25 @@ import poll f = 'suggestions.json' db = poll.load_db(f) votes = [] -try: - votes = sys.argv[1:] -except: +votes = sys.argv[1:] +if not votes: print("""usage: up number (...) upvotes one or more entries based on .list""") sys.exit(1) voter = environ['_prefix'] +voter_name =environ['_from'] for vote in votes: try: vote = int(vote) - db[vote]['votes'][voter] = 1 + if vote < 0: + raise Exception() + if voter in db[vote]['votes']: + print("%s, you already have voted for '%s'"%(voter_name,db[vote]['title']) ) + else: + db[vote]['votes'][voter] = 1 + print("%s voted for '%s'"%(voter_name,db[vote]['title'])) except: - print("voting for #%s failed" %vote) -print("Thanks for your votes %s"%environ['_from']) + print("%s, voting for #%s failed" %(voter_name,vote)) + poll.save_db(f,db) diff --git a/Reaktor/titlebot/titlebot.py b/Reaktor/titlebot/titlebot.py index 05ff612e..6a3b2f79 100644 --- a/Reaktor/titlebot/titlebot.py +++ b/Reaktor/titlebot/titlebot.py @@ -1,6 +1,6 @@ from os import environ,mkdir from os.path import abspath, expanduser - +import re debug = False # CAVEAT name should not contains regex magic -- cgit v1.2.3 From da5b4578c07838d7c8c5c1c923ea03895e19a0da Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 25 Apr 2014 16:34:34 +0200 Subject: add highest for titlebot --- Reaktor/titlebot/commands/highest | 22 ++++++++++++++++++++++ Reaktor/titlebot/commands/list | 4 ++-- Reaktor/titlebot/titlebot.py | 1 + 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100755 Reaktor/titlebot/commands/highest (limited to 'Reaktor/titlebot') diff --git a/Reaktor/titlebot/commands/highest b/Reaktor/titlebot/commands/highest new file mode 100755 index 00000000..5ac9ba99 --- /dev/null +++ b/Reaktor/titlebot/commands/highest @@ -0,0 +1,22 @@ +#!/usr/bin/env python3 +import json +from os import environ +import sys +import os +import poll + +f = 'suggestions.json' +title=" ".join(sys.argv[1:]) +db = poll.load_db(f) +limit = int(sys.argv[1]) if len(sys.argv) > 1 else 1 +num = 1 +# stolen from http://stackoverflow.com/questions/9647202/ordinal-numbers-replacement +suffixes = ["th", "st", "nd", "rd", ] + ["th"] * 16 + +for entry in poll.sort_by_votes(db): + suffixed_num = str(num) + suffixes[num % 100] + print("%s: '%s' (%d votes)" % + (suffixed_num,entry['title'],sum(entry['votes'].values()))) + num = num + 1 + if num > limit: + sys.exit(0) diff --git a/Reaktor/titlebot/commands/list b/Reaktor/titlebot/commands/list index 3a29919a..cee4b8a8 100755 --- a/Reaktor/titlebot/commands/list +++ b/Reaktor/titlebot/commands/list @@ -17,11 +17,11 @@ if len(sys.argv) > 1 and ("-h" in sys.argv[1] or "usage" == sys.argv[1]): if len(sys.argv) > 1 and ("votes" in sys.argv[1]): use = poll.sort_by_votes(db) elif len(sys.argv) > 1 and ("age" in sys.argv[1]) or len(sys.argv) == 1: - pass + use = db else: print("unknown sorting method") sys.exit(1) -for entry in poll.sort_by_votes(db): +for entry in use: print("#%d %s (votes: %d)" % (db.index(entry),entry['title'],sum(entry['votes'].values()))) diff --git a/Reaktor/titlebot/titlebot.py b/Reaktor/titlebot/titlebot.py index 6a3b2f79..c1eac3b0 100644 --- a/Reaktor/titlebot/titlebot.py +++ b/Reaktor/titlebot/titlebot.py @@ -60,6 +60,7 @@ public_commands = [ default_command('nocommand'), titlebot_cmd('list'), titlebot_cmd('help'), + titlebot_cmd('highest'), titlebot_cmd('up'), titlebot_cmd('new'), titlebot_cmd('undo'), -- cgit v1.2.3 From 11a8e061d7b96df22c4793cbbd79cb8dba686513 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 25 Apr 2014 16:57:32 +0200 Subject: fix ranking in highest watch out for same ranking of things --- Reaktor/titlebot/commands/highest | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'Reaktor/titlebot') diff --git a/Reaktor/titlebot/commands/highest b/Reaktor/titlebot/commands/highest index 5ac9ba99..d0408ac0 100755 --- a/Reaktor/titlebot/commands/highest +++ b/Reaktor/titlebot/commands/highest @@ -8,15 +8,23 @@ import poll f = 'suggestions.json' title=" ".join(sys.argv[1:]) db = poll.load_db(f) +# only print the last N values (default 1) limit = int(sys.argv[1]) if len(sys.argv) > 1 else 1 -num = 1 +num = 0 +last_vote = 9001 # stolen from http://stackoverflow.com/questions/9647202/ordinal-numbers-replacement suffixes = ["th", "st", "nd", "rd", ] + ["th"] * 16 for entry in poll.sort_by_votes(db): + # if two entries have the same number of upvotes, do not increment the rank + current_vote = sum(entry['votes'].values()) + if current_vote < last_vote: + num = num + 1 + last_vote = current_vote + # exit if we are above the limit + if num > limit: + sys.exit(0) + suffixed_num = str(num) + suffixes[num % 100] print("%s: '%s' (%d votes)" % (suffixed_num,entry['title'],sum(entry['votes'].values()))) - num = num + 1 - if num > limit: - sys.exit(0) -- cgit v1.2.3