Redstoner/redstoner-utils
Archived
0
Fork 0
Code Issues 6 Pull Requests Wiki Activity

iptracker v1.1.0 updating to helpers v2.0.0 functions; fixing bugs in data management and command execution

Browse Source
This commit is contained in:
BuildTools
2016-01-09 16:43:19 +01:00
parent cbc77de826
commit 3a2d1193ca
1 changed files with 108 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
iptracker.py Normal file → Executable file
View File

@@ -9,6 +9,7 @@ from iptracker_secrets import *
iptrack_permission = "utils.iptrack" iptrack_permission = "utils.iptrack"
iptrack_version = "1.1.0"
@hook.event("player.PlayerJoinEvent", "low") @hook.event("player.PlayerJoinEvent", "low")
@@ -42,13 +43,13 @@ def on_player_join_thread(event):
if new_ip_entry: if new_ip_entry:
curs.execute("INSERT INTO uuid2ips VALUES (?,?)", (uuid, json.dumps(ips), )) curs.execute("INSERT INTO uuid2ips VALUES (?,?)", (uuid, json.dumps(ips), ))
else: else:
curs.execute("UPDATE uuid2ips SET ips = ? WHERE uuid = ?", (uuid, json.dumps(ips), )) curs.execute("UPDATE uuid2ips SET ips = ? WHERE uuid = ?", (json.dumps(ips), uuid, ))
if uuid not in uuids: if uuid not in uuids:
uuids.append(uuid) uuids.append(uuid)
if new_uuid_entry: if new_uuid_entry:
curs.execute("INSERT INTO ip2uuids VALUES (?,?)", (ip, json.dumps(uuids), )) curs.execute("INSERT INTO ip2uuids VALUES (?,?)", (ip, json.dumps(uuids), ))
else: else:
curs.execute("UPDATE ip2uuids SET uuids = ? WHERE uuid = ?", (ip, json.dumps(uuids), )) curs.execute("UPDATE ip2uuids SET uuids = ? WHERE ip = ?", (json.dumps(uuids), ip, ))
conn.commit() conn.commit()
curs.close() curs.close()
conn.close() conn.close()
@@ -56,7 +57,7 @@ def on_player_join_thread(event):
@hook.command("getinfo") @hook.command("getinfo")
def on_getinfo_command(sender, args): def on_getinfo_command(sender, args):
t = threading.Thread(target=on_player_join_thread, args=(sender, args)) t = threading.Thread(target=on_getinfo_command_thread, args=(sender, args))
t.daemon = True t.daemon = True
t.start() t.start()
@@ -65,7 +66,7 @@ def on_getinfo_command_thread(sender, args):
if not checkargs(sender, args, 1, 1): if not checkargs(sender, args, 1, 1):
return False return False
else: else:
if isIP(args[0]): if is_ip(args[0]):
conn = zxJDBC.connect(mysql_database, mysql_user, mysql_pass, "com.mysql.jdbc.Driver") conn = zxJDBC.connect(mysql_database, mysql_user, mysql_pass, "com.mysql.jdbc.Driver")
curs = conn.cursor() curs = conn.cursor()
curs.execute("SELECT uuids FROM ip2uuids WHERE ip = ?", (args[0], )) curs.execute("SELECT uuids FROM ip2uuids WHERE ip = ?", (args[0], ))