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

Changed database stuff

Browse Source
This commit is contained in:
NEMESIS13cz
2015-10-30 17:06:59 +01:00
parent 35fd76c7a8
commit 629a938b3e
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
iptracker.py
View File

@@ -5,6 +5,7 @@ from java.util import UUID as UUID
from helpers import * from helpers import *
from org.bukkit import * from org.bukkit import *
from traceback import format_exc as trace from traceback import format_exc as trace
from iptracker_secrets import *
iptrack_permission = "utils.iptrack" iptrack_permission = "utils.iptrack"
@@ -16,13 +17,13 @@ def on_player_join(event):
uuid = uid(player) uuid = uid(player)
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 ips FROM iptrack_uuidtoips WHERE uuid = ?", (uuid, )) curs.execute("SELECT ips FROM uuid2ips WHERE uuid = ?", (uuid, ))
results = curs.fetchall() results = curs.fetchall()
if len(results) == 0: if len(results) == 0:
ips = [] ips = []
else: else:
ips = json.loads(results[0][0]) ips = json.loads(results[0][0])
curs.execute("SELECT uuids FROM iptrack_iptouuids WHERE ip = ?", (ip, )) curs.execute("SELECT uuids FROM ip2uuids WHERE ip = ?", (ip, ))
results = curs.fetchall() results = curs.fetchall()
if len(results) == 0: if len(results) == 0:
uuids = [] uuids = []
@@ -33,15 +34,15 @@ def on_player_join(event):
if ip not in ips: if ip not in ips:
ips.append(ip) ips.append(ip)
if new_ip_entry: if new_ip_entry:
curs.execute("INSERT INTO iptrack_uuidtoips VALUES (?,?)", (uuid, json.dumps(ips), )) curs.execute("INSERT INTO uuid2ips VALUES (?,?)", (uuid, json.dumps(ips), ))
else: else:
curs.execute("UPDATE iptrack_uuidtoips SET ips = ? WHERE uuid = ?", (uuid, json.dumps(ips), )) curs.execute("UPDATE uuid2ips SET ips = ? WHERE uuid = ?", (uuid, json.dumps(ips), ))
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 iptrack_iptouuids VALUES (?,?)", (ip, json.dumps(uuids), )) curs.execute("INSERT INTO ip2uuids VALUES (?,?)", (ip, json.dumps(uuids), ))
else: else:
curs.execute("UPDATE iptrack_iptouuids SET uuids = ? WHERE uuid = ?", (ip, json.dumps(uuids), )) curs.execute("UPDATE ip2uuids SET uuids = ? WHERE uuid = ?", (ip, json.dumps(uuids), ))
conn.commit() conn.commit()
curs.close() curs.close()
conn.close() conn.close()
@@ -56,7 +57,7 @@ def on_getinfo_command(sender, args):
if isIP(args[0]): if isIP(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 iptrack_iptouuids WHERE ip = ?", (args[0], )) curs.execute("SELECT uuids FROM ip2uuids WHERE ip = ?", (args[0], ))
results = curs.fetchall() results = curs.fetchall()
curs.close() curs.close()
conn.close() conn.close()
@@ -76,7 +77,7 @@ def on_getinfo_command(sender, args):
uuid = target.getUniqueId() uuid = target.getUniqueId()
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 ips FROM iptrack_uuidtoips WHERE uuid = ?", (uuid.toString(), )) curs.execute("SELECT ips FROM uuid2ips WHERE uuid = ?", (uuid.toString(), ))
results = curs.fetchall() results = curs.fetchall()
curs.close() curs.close()
conn.close() conn.close()