wayfinderak/ASB_submission_bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Guid Class

Browse Source
This commit is contained in:
Dustin Pianalto 2018-05-10 17:23:09 -08:00
parent 9ba68474e7
commit 3491d3966c
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
exts/imports/guid.py
View File

@ -33,11 +33,11 @@ class Guid:
guid = s.pack(args[0], args[1], args[2], *args[3]) guid = s.pack(args[0], args[1], args[2], *args[3])
self.guid = s.unpack(guid) self.guid = s.unpack(guid)
elif len(args) == 2 and all(isinstance(arg, int) for arg in args): elif len(args) == 2 and all(isinstance(arg, int) for arg in args):
if all((self.bytes_needed(arg) <= 32) for arg in args): if all((self.bytes_needed(arg) <= 4) for arg in args):
int1, int2 = (args[0] << 32), (args[1] & 0xFFFFFFFF) int1, int2 = (args[0] << 32), (args[1] & 0xFFFFFFFF)
id_int = int1 | int2 id_int = int1 | int2
b = pack('Q8x', id_int) b = pack('Q8x', id_int)
elif all((self.bytes_needed(arg) <= 64) for arg in args): elif all((self.bytes_needed(arg) <= 8) for arg in args):
b = pack('QQ', args[0], args[1]) b = pack('QQ', args[0], args[1])
else: else:
raise TypeError('Arguments don\'t match any allowed configuration') raise TypeError('Arguments don\'t match any allowed configuration')
@ -48,7 +48,7 @@ class Guid:
) )
self.guid = s.unpack(guid) self.guid = s.unpack(guid)
elif len(args) == 1 and isinstance(args[0], int): elif len(args) == 1 and isinstance(args[0], int):
if self.bytes_needed(args[0]) <= 64: if self.bytes_needed(args[0]) <= 8:
b = pack('Q8x', args[0]) b = pack('Q8x', args[0])
else: else:
first = (args[0] >> 64) & MAXINT64 first = (args[0] >> 64) & MAXINT64

2
exts/imports/process_files.py
View File

@ -47,8 +47,6 @@ def rename_section(cfg, sec, sec_new):
def get_server_guid(server_file): def get_server_guid(server_file):
server_file = server_file.encode() server_file = server_file.encode()
# p = s.pack((int.from_bytes(hash.encode(), byteorder='little') >> 64) & max_int,
# int.from_bytes(hash.encode(), byteorder='little') & max_int)