GopherProxy

	Consistent --help on commands - toot - Unnamed repository; edit this file 'desc…
	Log
	Files
	Refs
	LICENSE
	---
	commit 9b861ec9ccebd219b308651548eb100894248647
	parent 8285abb04e97ca6a2fa1b741c4a2cc38671f300c
	Author: Ivan Habunek <[email protected]>
	Date: Sat, 15 Apr 2017 12:12:33 +0200

	Consistent --help on commands

	Diffstat:
	toot/console.py \| 29 ++++++++++++++++++++++++-----

	1 file changed, 24 insertions(+), 5 deletions(-)
	---
	diff --git a/toot/console.py b/toot/console.py
	@@ -83,6 +83,9 @@ def print_usage():
	print(" toot post <msg> - toot a new post to your timeline")
	print(" toot timeline - shows your public timeline")
	print("")
	+ print("To get help for each command run:")
	+ print(" toot <command> --help")
	+ print("")
	print("https://github.com/ihabunek/toot")


	@@ -119,7 +122,6 @@ def parse_timeline(item):
	time = datetime.strptime(item['created_at'], "%Y-%m-%dT%H:%M:%S.%fZ")

	return {
	- # "username": item['account']['username'],
	"name": name,
	"text": text,
	"time": time,
	@@ -161,6 +163,9 @@ def cmd_post_status(app, user):


	def cmd_auth(app, user):
	+ parser = OptionParser(usage='%prog auth')
	+ parser.parse_args()
	+
	if app and user:
	print("You are logged in to " + green(app.base_url))
	print("Username: " + green(user.username))
	@@ -170,20 +175,34 @@ def cmd_auth(app, user):
	print("You are not logged in")


	+def cmd_login():
	+ parser = OptionParser(usage='%prog login')
	+ parser.parse_args()
	+
	+ app = create_app_interactive()
	+ user = login_interactive(app)
	+
	+ return app, user
	+
	+
	def cmd_logout(app, user):
	+ parser = OptionParser(usage='%prog logout')
	+ parser.parse_args()
	+
	os.unlink(CONFIG_APP_FILE)
	os.unlink(CONFIG_USER_FILE)
	print("You are now logged out")


	def cmd_upload(app, user):
	+ parser = OptionParser(usage='%prog upload <path_to_media>')
	+ parser.parse_args()
	+
	if len(sys.argv) < 3:
	print_error("No status text given")
	return

	- path = sys.argv[2]
	-
	- response = do_upload(path)
	+ response = do_upload(sys.argv[2])

	print("\nSuccessfully uploaded media ID {}, type '{}'".format(
	yellow(response['id']), yellow(response['type'])))
	@@ -207,7 +226,7 @@ def run_command(command):

	# Commands which can run when not logged in
	if command == 'login':
	- return login_interactive(create_app_interactive())
	+ return cmd_login()

	if command == 'auth':
	return cmd_auth(app, user)