nikdoof/dropbot
1
0
Fork 0
mirror of https://github.com/nikdoof/dropbot.git synced 2025-12-18 12:19:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sort output

Browse Source
This commit is contained in:
Andrew Williams
2014-08-27 09:19:08 +01:00
parent 8ecfe1ae22
commit e2ffc356a8
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dropbot/bot.py
View File

@@ -481,7 +481,7 @@ class DropBot(ClientXMPP):
return '!id <character name>'
char_name = ' '.join(args)
result = EVEAPIConnection().eve.CharacterID(names=char_name)
result = EVEAPIConnection().eve.CharacterID(names=char_name.strip())
if len(result.characters) == 0:
return 'Unknown character {}'.format(char_name)
char_name = result.characters[0].name
@@ -490,6 +490,7 @@ class DropBot(ClientXMPP):
headers, res = ZKillboard().characterID(char_id).kills().pastSeconds(60 * 60 * 24 * 7).get()
from collections import defaultdict, Counter
from operator import itemgetter
kill_types = defaultdict(int)
ship_types = defaultdict(int)
@@ -512,6 +513,6 @@ class DropBot(ClientXMPP):
len(res),
intcomma(sum_value),
', '.join(set([self.map.node[int(x['solarSystemID'])]['name'] for x in res])),
', '.join(set(['{} ({})'.format(self.types[unicode(x)], y) for x, y in Counter(ship_types).most_common(5)])),
', '.join(set([x for x, y in Counter(alli_assoc).most_common(5) if x.strip() != '']))
', '.join(set(['{} ({})'.format(self.types[unicode(x)], y) for x, y in sorted(Counter(ship_types).most_common(5), key=itemgetter(0))])),
', '.join(set([x for x, y in sorted(Counter(alli_assoc).most_common(5), key=itemgetter(0)) if x.strip() != '']))
)