3
0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-24 03:29:28 +01:00

nefarious: define access_sort() as a static method

This commit is contained in:
James Lu 2016-07-05 00:42:17 -07:00
parent f8ca65cabc
commit ed6293e54a

View File

@ -74,6 +74,22 @@ class P10Protocol(IRCS2SProtocol):
def _send(self, source, text): def _send(self, source, text):
self.irc.send("%s %s" % (source, text)) self.irc.send("%s %s" % (source, text))
@staticmethod
def access_sort(key):
"""
Sorts (prefixmode, UID) keys based on the prefix modes given.
"""
prefixes, user = key
# Add the prefixes given for each userpair, giving each one a set value. This ensures
# that 'ohv' > 'oh' > 'ov' > 'o' > 'hv' > 'h' > 'v' > ''
accesses = {'o': 100, 'h': 10, 'v': 1}
num = 0
for prefix in prefixes:
num += accesses.get(prefix, 0)
return num
@staticmethod @staticmethod
def decode_p10_ip(ip): def decode_p10_ip(ip):
"""Decodes a P10 IP.""" """Decodes a P10 IP."""
@ -500,19 +516,7 @@ class P10Protocol(IRCS2SProtocol):
# This is annoying because we have to sort our users by access before sending... # This is annoying because we have to sort our users by access before sending...
# Joins should look like: A0AAB,A0AAC,ABAAA:v,ABAAB:o,ABAAD,ACAAA:ov # Joins should look like: A0AAB,A0AAC,ABAAA:v,ABAAB:o,ABAAD,ACAAA:ov
# XXX: there HAS to be a better way of doing this users = sorted(users, key=self.access_sort)
def access_sort(key):
prefixes, user = key
# Add the prefixes given for each userpair, giving each one a set value. This ensures
# that 'ohv' > 'oh' > 'ov' > 'o' > 'hv' > 'h' > 'v' > ''
accesses = {'o': 100, 'h': 10, 'v': 1}
num = 0
for prefix in prefixes:
num += accesses.get(prefix, 0)
return num
users = sorted(users, key=access_sort)
last_prefixes = '' last_prefixes = ''
for userpair in users: for userpair in users: