From 2c8b4ba157c082e298f71c45f5f8c8b50ff7e97f Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 25 Apr 2014 12:12:18 +0200 Subject: add ^ --- titlebot/titlebot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/titlebot/titlebot.py b/titlebot/titlebot.py index d04789c..f85e69f 100644 --- a/titlebot/titlebot.py +++ b/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 e957c40e5ad65c3088454ef0463d7ae42452196b Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 25 Apr 2014 12:52:05 +0200 Subject: reaktor getconf: allow default_value --- IRC/getconf.py | 7 +++++-- IRC/ircasy.py | 5 +---- IRC/reaktor.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/IRC/getconf.py b/IRC/getconf.py index f9cd440..168c908 100644 --- a/IRC/getconf.py +++ b/IRC/getconf.py @@ -9,14 +9,17 @@ import os def make_getconf(filename): - def getconf(prop): + def getconf(prop, default_value=None): prop_split = prop.split('.') string = '' config = load_config(filename) #imp.reload(config) tmp = config.__dict__ for pr in prop_split: - tmp = tmp[pr] + if pr in tmp: + tmp = tmp[pr] + else: + return default_value return tmp return getconf diff --git a/IRC/ircasy.py b/IRC/ircasy.py index 259ea98..9a7f44f 100644 --- a/IRC/ircasy.py +++ b/IRC/ircasy.py @@ -114,10 +114,7 @@ class asybot(asychat): self.on_kick(prefix, command, params, rest) elif command == 'JOIN': - try: - self.on_join(prefix, command, params, rest) - except: - pass + self.on_join(prefix, command, params, rest) elif command == '433': # ERR_NICKNAMEINUSE, retry with another name diff --git a/IRC/reaktor.py b/IRC/reaktor.py index b53ef65..54091c5 100755 --- a/IRC/reaktor.py +++ b/IRC/reaktor.py @@ -36,7 +36,7 @@ class Reaktor(asybot): return False def on_join(self, prefix, command, params, rest): - for command in getconf('on_join'): + for command in getconf('on_join', []): self.execute_command(command, None, prefix, params) def on_privmsg(self, prefix, command, params, rest): -- cgit v1.2.3 From 31bf2d4d296347eece924dcfa690390f9a72deaf Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 25 Apr 2014 12:58:24 +0200 Subject: reaktor config: use expanduser instead of environ --- config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.py b/config.py index 0a01c5c..4ca6d37 100644 --- a/config.py +++ b/config.py @@ -1,11 +1,11 @@ -from os import environ +from os.path import expanduser debug = True # CAVEAT name should not contains regex magic name = 'crabmanner' -workdir = environ['HOME'] + '/state' +workdir = expanduser('~') + '/state' irc_alarm_timeout = 300 irc_hammer_interval = 10 -- cgit v1.2.3 From 89cc9517383f7e01e7d2f3bd4781048d3c1139fb Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 25 Apr 2014 13:08:46 +0200 Subject: reaktor: name must not be able to kill patterns --- config.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/config.py b/config.py index 4ca6d37..48406bf 100644 --- a/config.py +++ b/config.py @@ -1,8 +1,8 @@ from os.path import expanduser +import re debug = True -# CAVEAT name should not contains regex magic name = 'crabmanner' workdir = expanduser('~') + '/state' @@ -19,10 +19,14 @@ irc_channels = [ ] admin_file='admin.lst' auth_file='auth.lst' + +# name_re is used, so name cannot kill our patterns below +name_re = re.escape(name) + def default_command(cmd): return { 'capname': cmd, - 'pattern': '^(?:' + name + '|\\*):\\s*' + cmd + '\\s*(?:\\s+(?P.*))?$', + 'pattern': '^(?:' + name_re + '|\\*):\\s*' + cmd + '\\s*(?:\\s+(?P.*))?$', 'argv': [ 'commands/' + cmd ] } public_commands = [ @@ -34,15 +38,15 @@ public_commands = [ default_command('nocommand'), { 'capname': 'tell', - 'pattern': '^' + name + ':\\s*' + 'tell' + '\\s*(?:\\s+(?P.*))?$', + 'pattern': '^' + name_re + ':\\s*' + 'tell' + '\\s*(?:\\s+(?P.*))?$', 'argv': [ 'commands/tell-on_privmsg' ], 'env': { 'state_file': workdir + '/tell.txt' } }, # command not found - { 'pattern': '^(?:' + name + '|\\*):.*', + { 'pattern': '^(?:' + name_re + '|\\*):.*', 'argv': [ 'commands/respond','You are made of stupid!'] }, # "highlight" - { 'pattern': '.*\\b' + name + '\\b.*', + { 'pattern': '.*\\b' + name_re + '\\b.*', 'argv': [ 'commands/say', 'I\'m famous' ] }, # identify via direct connect { 'capname': 'identify', -- cgit v1.2.3 From bf00ab1a5449bb0bf554b49fbd5da6e882a44b2e Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 25 Apr 2014 13:19:50 +0200 Subject: reaktor config: unify ^(|*): --- config.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/config.py b/config.py index 48406bf..9054034 100644 --- a/config.py +++ b/config.py @@ -20,13 +20,14 @@ irc_channels = [ admin_file='admin.lst' auth_file='auth.lst' -# name_re is used, so name cannot kill our patterns below -name_re = re.escape(name) +# me is used, so name cannot kill our patterns below +me = '\\b' + re.escape(name) + '\\b' +me_or_us = '(?:' + me + '|\\*)' def default_command(cmd): return { 'capname': cmd, - 'pattern': '^(?:' + name_re + '|\\*):\\s*' + cmd + '\\s*(?:\\s+(?P.*))?$', + 'pattern': '^' + me_or_us + ':\\s*' + cmd + '\\s*(?:\\s+(?P.*))?$', 'argv': [ 'commands/' + cmd ] } public_commands = [ @@ -38,19 +39,19 @@ public_commands = [ default_command('nocommand'), { 'capname': 'tell', - 'pattern': '^' + name_re + ':\\s*' + 'tell' + '\\s*(?:\\s+(?P.*))?$', + 'pattern': '^' + me_or_us + ':\\s*' + 'tell' + '\\s*(?:\\s+(?P.*))?$', 'argv': [ 'commands/tell-on_privmsg' ], 'env': { 'state_file': workdir + '/tell.txt' } }, # command not found - { 'pattern': '^(?:' + name_re + '|\\*):.*', + { 'pattern': '^' + me_or_us + ':.*', 'argv': [ 'commands/respond','You are made of stupid!'] }, # "highlight" - { 'pattern': '.*\\b' + name_re + '\\b.*', + { 'pattern': '.*' + me + '.*', 'argv': [ 'commands/say', 'I\'m famous' ] }, # 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 97e2b11759fe3066b3d12bb9d47c981959c3cde8 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 25 Apr 2014 13:34:04 +0200 Subject: reaktor: move config_filename to config --- IRC/reaktor.py | 1 - config.py | 14 ++++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/IRC/reaktor.py b/IRC/reaktor.py index 54091c5..bfd08d9 100755 --- a/IRC/reaktor.py +++ b/IRC/reaktor.py @@ -81,7 +81,6 @@ class Reaktor(asybot): target.append(env['_from']) log.debug('target:' +str(target)) - env['config_filename'] = os.path.abspath(self.config) start = time() try: p = popen(myargv, bufsize=1, stdout=PIPE, stderr=PIPE, env=env, cwd=cwd) diff --git a/config.py b/config.py index 9054034..7f3f9c4 100644 --- a/config.py +++ b/config.py @@ -1,4 +1,4 @@ -from os.path import expanduser +from os.path import abspath, expanduser import re debug = True @@ -20,18 +20,24 @@ irc_channels = [ admin_file='admin.lst' auth_file='auth.lst' +config_filename = abspath(__file__) + # me is used, so name cannot kill our patterns below me = '\\b' + re.escape(name) + '\\b' me_or_us = '(?:' + me + '|\\*)' -def default_command(cmd): +def default_command(cmd, env={}): return { 'capname': cmd, 'pattern': '^' + me_or_us + ':\\s*' + cmd + '\\s*(?:\\s+(?P.*))?$', - 'argv': [ 'commands/' + cmd ] } + 'argv': [ 'commands/' + cmd ], + 'env': env + } public_commands = [ - default_command('caps'), + default_command('caps', env={ + 'config_filename': config_filename + }), default_command('hello'), default_command('badcommand'), default_command('rev'), -- cgit v1.2.3 From b73babb4bfcacedc067a512e85913c77c574d859 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 25 Apr 2014 13:42:45 +0200 Subject: reaktor config: tell is a default_command --- config.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/config.py b/config.py index 7f3f9c4..5ea991b 100644 --- a/config.py +++ b/config.py @@ -26,10 +26,11 @@ config_filename = abspath(__file__) me = '\\b' + re.escape(name) + '\\b' me_or_us = '(?:' + me + '|\\*)' -def default_command(cmd, env={}): +def default_command(cap, cmd=None, env={}): + if cmd == None: cmd=cap return { - 'capname': cmd, - 'pattern': '^' + me_or_us + ':\\s*' + cmd + '\\s*(?:\\s+(?P.*))?$', + 'capname': cap, + 'pattern': '^' + me_or_us + ':\\s*' + cap + '\\s*(?:\\s+(?P.*))?$', 'argv': [ 'commands/' + cmd ], 'env': env } @@ -43,12 +44,9 @@ public_commands = [ default_command('rev'), default_command('uptime'), default_command('nocommand'), - { - 'capname': 'tell', - 'pattern': '^' + me_or_us + ':\\s*' + 'tell' + '\\s*(?:\\s+(?P.*))?$', - 'argv': [ 'commands/tell-on_privmsg' ], - 'env': { 'state_file': workdir + '/tell.txt' } - }, + default_command('tell', cmd='tell-on_privmsg', env={ + 'state_file': workdir + '/tell.txt' + }), # command not found { 'pattern': '^' + me_or_us + ':.*', 'argv': [ 'commands/respond','You are made of stupid!'] }, -- cgit v1.2.3 From 83afbcf53ad2af9b7ee82c69f501068fb9b7b8f4 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 25 Apr 2014 13:43:08 +0200 Subject: reaktor config: identify needs config_filename --- config.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config.py b/config.py index 5ea991b..eba1f09 100644 --- a/config.py +++ b/config.py @@ -56,7 +56,11 @@ public_commands = [ # identify via direct connect { 'capname': 'identify', 'pattern': '^identify' + '\\s*(?:\\s+(?P.*))?$', - 'argv' : [ 'commands/identify' ]} + 'argv' : [ 'commands/identify' ], + 'env': { + 'config_filename': config_filename + } + } ] commands = [ default_command('reload') -- cgit v1.2.3 From d720bcab3a35330962211980dfeedf5f2016522e Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 25 Apr 2014 13:48:34 +0200 Subject: reaktor config: introduce simple_command --- config.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/config.py b/config.py index eba1f09..90f33d3 100644 --- a/config.py +++ b/config.py @@ -35,6 +35,15 @@ def default_command(cap, cmd=None, env={}): 'env': env } +def simple_command(cap, cmd=None, env={}): + if cmd == None: cmd=cap + return { + 'capname': cap, + 'pattern': '^' + cap + '\\s*(?:\\s+(?P.*))?$', + 'argv' : [ 'commands/' + cmd ], + 'env': env + } + public_commands = [ default_command('caps', env={ 'config_filename': config_filename @@ -54,13 +63,9 @@ public_commands = [ { 'pattern': '.*' + me + '.*', 'argv': [ 'commands/say', 'I\'m famous' ] }, # identify via direct connect - { 'capname': 'identify', - 'pattern': '^identify' + '\\s*(?:\\s+(?P.*))?$', - 'argv' : [ 'commands/identify' ], - 'env': { - 'config_filename': config_filename - } - } + simple_command('identify', env={ + 'config_filename': config_filename + }) ] commands = [ default_command('reload') -- cgit v1.2.3 From 1e80665ab64bbcd783188c1c87afa5e81c126694 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 25 Apr 2014 13:49:11 +0200 Subject: reaktor commands caps: fix typo --- commands/caps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/caps b/commands/caps index d024557..b5d6642 100755 --- a/commands/caps +++ b/commands/caps @@ -10,4 +10,4 @@ def load_config(filename): config = load_config(os.environ['config_filename']) print('Private: '+' '.join(filter(None,[ x.get('capname',None) for x in config.commands]))) -print('Public: '+' '.join(filter(None,[ x.get('capname',None) for x in config.public_commands]))) +print('Public: '+' '.join(filter(None,[ x.get('capname',None) for x in config.public_commands]))) -- cgit v1.2.3 From db86e80a6cb4bf3e5c5b435202323783c445f6d1 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 25 Apr 2014 14:18:25 +0200 Subject: fix {} in default_command function --- config.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/config.py b/config.py index 7f3f9c4..5858532 100644 --- a/config.py +++ b/config.py @@ -17,8 +17,8 @@ irc_restart_timeout = 5 irc_channels = [ '#krebs' ] -admin_file='admin.lst' -auth_file='auth.lst' +admin_file=workdir+'/admin.lst' +auth_file=workdir+'/auth.lst' config_filename = abspath(__file__) @@ -26,7 +26,8 @@ config_filename = abspath(__file__) me = '\\b' + re.escape(name) + '\\b' me_or_us = '(?:' + me + '|\\*)' -def default_command(cmd, env={}): +def default_command(cmd, env=None): + if not env: env = {} return { 'capname': cmd, 'pattern': '^' + me_or_us + ':\\s*' + cmd + '\\s*(?:\\s+(?P.*))?$', -- cgit v1.2.3 From 871e2f164a81e33e82cb64ddf1447ba98f0e75aa Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 25 Apr 2014 14:18:37 +0200 Subject: update titlebot config --- titlebot/titlebot.py | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/titlebot/titlebot.py b/titlebot/titlebot.py index 396b9b5..b5195d5 100644 --- a/titlebot/titlebot.py +++ b/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 aafb675679b0db733e391bb64f5f3ce0aef4a741 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 25 Apr 2014 15:22:51 +0200 Subject: add fallback for non existing directory --- IRC/reaktor.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/IRC/reaktor.py b/IRC/reaktor.py index bfd08d9..ec306e7 100755 --- a/IRC/reaktor.py +++ b/IRC/reaktor.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os from ircasy import asybot from asyncore import loop @@ -69,6 +69,9 @@ class Reaktor(asybot): log.info("cannot parse args!") cwd = getconf('workdir') + if not os.access(cwd,os.W_OK): + log.error("Workdir '%s' is not Writable! Falling back to root dir"%cwd) + cwd = "/" env = command.get('env', {}) env['_prefix'] = prefix -- cgit v1.2.3 From 8284fc3b99e4647098e5a97c237dd77dcd68fb65 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 25 Apr 2014 15:54:08 +0200 Subject: make exceptions more clear --- titlebot/commands/undo | 10 +++++++--- titlebot/commands/up | 18 ++++++++++++------ titlebot/titlebot.py | 2 +- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/titlebot/commands/undo b/titlebot/commands/undo index bebd57a..a66de67 100755 --- a/titlebot/commands/undo +++ b/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/titlebot/commands/up b/titlebot/commands/up index c9de122..0a48bdb 100755 --- a/titlebot/commands/up +++ b/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/titlebot/titlebot.py b/titlebot/titlebot.py index 05ff612..6a3b2f7 100644 --- a/titlebot/titlebot.py +++ b/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 c35e62e336afdcfc0123ff29ec99266a29a6e812 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 25 Apr 2014 16:34:34 +0200 Subject: add highest for titlebot --- titlebot/commands/highest | 22 ++++++++++++++++++++++ titlebot/commands/list | 4 ++-- titlebot/titlebot.py | 1 + 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100755 titlebot/commands/highest diff --git a/titlebot/commands/highest b/titlebot/commands/highest new file mode 100755 index 0000000..5ac9ba9 --- /dev/null +++ b/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/titlebot/commands/list b/titlebot/commands/list index 3a29919..cee4b8a 100755 --- a/titlebot/commands/list +++ b/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/titlebot/titlebot.py b/titlebot/titlebot.py index 6a3b2f7..c1eac3b 100644 --- a/titlebot/titlebot.py +++ b/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 8ba1237707cf9da18344d2725e5d867f93dcd3c3 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 --- titlebot/commands/highest | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/titlebot/commands/highest b/titlebot/commands/highest index 5ac9ba9..d0408ac 100755 --- a/titlebot/commands/highest +++ b/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