removed camelcase, added more coding style to readme
This commit is contained in:
54
reports.py
54
reports.py
@@ -13,18 +13,21 @@ try:
|
||||
except Exception, e:
|
||||
error("Failed to load reports: %s" % e)
|
||||
|
||||
def printHelp(sender):
|
||||
|
||||
def print_help(sender):
|
||||
msg(sender, " &2/report <text> &eReport something")
|
||||
msg(sender, " &2/rp list &eList unresolved reports (id, player, text)")
|
||||
msg(sender, " &2/rp tp <id> &eTeleport to report's location & show details")
|
||||
msg(sender, " &2/rp del <id> &eResolve a report")
|
||||
|
||||
def printList(sender):
|
||||
|
||||
def print_list(sender):
|
||||
msg(sender, "&a" + str(len(reports)) + " reports:")
|
||||
for i, report in enumerate(reports):
|
||||
msg(sender, "&8[&e" + str(i) + " &c" + report["time"] + "&8] &3" + report["player"] + "&f: &a" + report["msg"])
|
||||
|
||||
def tp(sender, rep_id):
|
||||
|
||||
def tp_report(sender, rep_id):
|
||||
if rep_id >= len(reports) or rep_id < 0:
|
||||
msg(sender, "&cReport &3#" + str(rep_id) + "&c does not exist!")
|
||||
return True
|
||||
@@ -34,19 +37,20 @@ def tp(sender, rep_id):
|
||||
msg(sender, "&aTeleported to report #%s" % rep_id )
|
||||
|
||||
|
||||
def deleteReport(sender, rep_id):
|
||||
def delete_report(sender, rep_id):
|
||||
if len(reports) > rep_id >= 0:
|
||||
report = reports[rep_id]
|
||||
reports.pop(rep_id)
|
||||
saveReports()
|
||||
save_reports()
|
||||
msg(sender, "&aReport #%s deleted." % rep_id)
|
||||
reporter = server.getOfflinePlayer(report["player"])
|
||||
plugHeader(reporter, "Report")
|
||||
plugin_header(reporter, "Report")
|
||||
msg(reporter, "&aReport '&e%s&a' was resolved by %s." % (report["msg"], sender.getName()))
|
||||
else:
|
||||
msg(sender, "&cThat report does not exist!")
|
||||
|
||||
def saveReports():
|
||||
|
||||
def save_reports():
|
||||
try:
|
||||
reports_file = open(reports_filename, "w")
|
||||
reports_file.write(json.dumps(reports))
|
||||
@@ -54,13 +58,14 @@ def saveReports():
|
||||
except Exception, e:
|
||||
error("Failed to write reports: " + str(e))
|
||||
|
||||
|
||||
@hook.command("rp")
|
||||
def onRpCommand(sender, args):
|
||||
def on_rp_command(sender, args):
|
||||
if sender.hasPermission("utils.rp"):
|
||||
plugHeader(sender, "Reports")
|
||||
plugin_header(sender, "Reports")
|
||||
if len(args) > 0:
|
||||
if args[0] == "list":
|
||||
printList(sender)
|
||||
print_list(sender)
|
||||
else:
|
||||
if not checkargs(sender, args, 2, 2):
|
||||
return True
|
||||
@@ -68,27 +73,28 @@ def onRpCommand(sender, args):
|
||||
repid = int(args[1])
|
||||
except ValueError:
|
||||
msg(sender, "&cDoesn't look like &3" + args[1] + "&c is a valid number!")
|
||||
printHelp(sender)
|
||||
print_help(sender)
|
||||
return True
|
||||
if args[0] == "tp":
|
||||
if not isPlayer(sender):
|
||||
if not is_player(sender):
|
||||
msg(sender, "&conly players can do this")
|
||||
return True
|
||||
tp(sender, repid)
|
||||
tp_report(sender, repid)
|
||||
elif args[0] == "del":
|
||||
deleteReport(sender, repid)
|
||||
delete_report(sender, repid)
|
||||
else:
|
||||
printHelp(sender)
|
||||
print_help(sender)
|
||||
else:
|
||||
printHelp(sender)
|
||||
print_help(sender)
|
||||
else:
|
||||
noperm(sender)
|
||||
return True
|
||||
|
||||
|
||||
@hook.command("report")
|
||||
def onReportCommand(sender, args):
|
||||
plugHeader(sender, "Report")
|
||||
if not isPlayer(sender):
|
||||
def on_report_command(sender, args):
|
||||
plugin_header(sender, "Report")
|
||||
if not is_player(sender):
|
||||
msg(sender, "&conly players can do this")
|
||||
return True
|
||||
if not checkargs(sender, args, 1, -1):
|
||||
@@ -108,12 +114,13 @@ def onReportCommand(sender, args):
|
||||
"time": time.strftime(time_format)
|
||||
}
|
||||
reports.append(report)
|
||||
saveReports()
|
||||
save_reports()
|
||||
broadcast("utils.rp", "&aReport #" + str(len(reports) -1) + ": " + reporter + "&f: " + text)
|
||||
msg(sender, "&aReported \"&e" + text + "&a\"")
|
||||
return True
|
||||
|
||||
def checkForReports(): # needs 2 args for unknown reason
|
||||
|
||||
def reports_reminder(): # needs 2 args for unknown reason
|
||||
while True:
|
||||
for i in range(0, check_delay*2):
|
||||
time.sleep(0.5) # check every 0.5 seconds if we should kill the thread
|
||||
@@ -124,9 +131,10 @@ def checkForReports(): # needs 2 args for unknown reason
|
||||
broadcast("utils.rp", "&2--=[ Reports ]=--")
|
||||
broadcast("utils.rp", "&aThere are %s pending reports!" % len(reports))
|
||||
|
||||
def stopChecking():
|
||||
|
||||
def stop_reporting():
|
||||
global check_reports
|
||||
log("Ending reports reminder thread")
|
||||
check_reports = False
|
||||
|
||||
thread.start_new_thread(checkForReports, ())
|
||||
thread.start_new_thread(reports_reminder, ())
|
||||
|
||||
Reference in New Issue
Block a user