Merge pull request softScheck#53 from leifnel/master

Default to JSON output.

tplink_smartplug.py

@@ -72,6 +72,7 @@ def decrypt(string):
 # Parse commandline arguments
 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("-q", "--quiet", dest='quiet', action='store_true', help="Only show result")
 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("-j", "--json", metavar="<JSON string>", help="Full JSON string of command to send")
@@ -96,8 +97,14 @@ def decrypt(string):
 	data = sock_tcp.recv(2048)
 	sock_tcp.close()
 
-	print "Sent:     ", cmd
-	print "Received: ", decrypt(data[4:])
+	decrypted = decrypt(data[4:])
+
+	if args.quiet:
+		print decrypted
+	else:
+		print "Sent:     ", cmd
+		print "Received: ", decrypted
+
 except socket.error:
 	quit("Cound not connect to host " + ip + ":" + str(port))