2
0
mirror of https://github.com/softScheck/tplink-smartplug synced 2026-01-11 23:38:46 +01:00

Added -q for terse output, not command. Output is then only json, makes for easy parsing.

This commit is contained in:
Leif Neland
2018-12-04 09:01:18 +01:00
parent 8289401ddd
commit 0070bb27a1

View File

@@ -72,7 +72,7 @@ def decrypt(string):
# Parse commandline arguments # Parse commandline arguments
parser = argparse.ArgumentParser(description="TP-Link Wi-Fi Smart Plug Client v" + str(version)) parser = argparse.ArgumentParser(description="TP-Link Wi-Fi Smart Plug Client v" + str(version))
parser.add_argument("-t", "--target", metavar="<hostname>", required=True, help="Target hostname or IP address", type=validHostname) parser.add_argument("-t", "--target", metavar="<hostname>", required=True, help="Target hostname or IP address", type=validHostname)
parser.add_argument("-v", "--verbose", dest='verbose', action='store_true', help="Display verbose output") parser.add_argument("-q", "--quiet", dest='quiet', action='store_true', help="Only show result")
group = parser.add_mutually_exclusive_group(required=True) group = parser.add_mutually_exclusive_group(required=True)
group.add_argument("-c", "--command", metavar="<command>", help="Preset command to send. Choices are: "+", ".join(commands), choices=commands) group.add_argument("-c", "--command", metavar="<command>", help="Preset command to send. Choices are: "+", ".join(commands), choices=commands)
group.add_argument("-j", "--json", metavar="<JSON string>", help="Full JSON string of command to send") group.add_argument("-j", "--json", metavar="<JSON string>", help="Full JSON string of command to send")
@@ -99,11 +99,11 @@ try:
decrypted = decrypt(data[4:]) decrypted = decrypt(data[4:])
if args.verbose: if args.quiet:
print decrypted
else:
print "Sent: ", cmd print "Sent: ", cmd
print "Received: ", decrypted print "Received: ", decrypted
else:
print decrypted
except socket.error: except socket.error:
quit("Cound not connect to host " + ip + ":" + str(port)) quit("Cound not connect to host " + ip + ":" + str(port))