deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-08 21:53:36 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Clean up input handling in doRequestOauth

Browse Source
This commit is contained in:
Ross Scroggs
2016-01-02 09:52:10 -08:00
parent 008a65329e
commit a7a3f2eef6
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/gam.py
View File

@ -8799,6 +8799,14 @@ def select_default_scopes(apis):
apis[api_name][u'use_scopes'] += scopes apis[api_name][u'use_scopes'] += scopes
return apis return apis
def getSelection():
while True:
selection = raw_input(u'Your selection: ')
if selection:
if selection.isdigit():
return int(selection)
print u'ERROR: please enter numbers only'
def doRequestOAuth(): def doRequestOAuth():
apis = API_VER_MAPPING.keys() apis = API_VER_MAPPING.keys()
all_apis = {} all_apis = {}
@ -8821,8 +8829,8 @@ def doRequestOAuth():
if GM_Globals[GM_GAMSCOPES_BY_API]: if GM_Globals[GM_GAMSCOPES_BY_API]:
for api in GM_Globals[GM_GAMSCOPES_BY_API]: for api in GM_Globals[GM_GAMSCOPES_BY_API]:
all_apis[api][u'use_scopes'] = GM_Globals[GM_GAMSCOPES_BY_API][api][u'use_scopes'] all_apis[api][u'use_scopes'] = GM_Globals[GM_GAMSCOPES_BY_API][api][u'use_scopes']
os.system([u'clear', u'cls'][GM_Globals[GM_WINDOWS]])
while True: while True:
os.system([u'clear', u'cls'][GM_Globals[GM_WINDOWS]])
print u'Select the APIs to use with GAM.' print u'Select the APIs to use with GAM.'
print print
for api in all_apis.values(): for api in all_apis.values():
@ -8838,8 +8846,8 @@ def doRequestOAuth():
print u' %s) Unselect all APIs' % (i+2) print u' %s) Unselect all APIs' % (i+2)
print u' %s) Continue' % (i+3) print u' %s) Continue' % (i+3)
print print
selection = int(raw_input(u'Your selection: ')) selection = getSelection()
if int(selection) == i+1: # defaults if selection == i+1: # defaults
all_apis = select_default_scopes(all_apis) all_apis = select_default_scopes(all_apis)
elif selection == i+2: # unselect all elif selection == i+2: # unselect all
for api in all_apis.keys(): for api in all_apis.keys():
@ -8865,8 +8873,8 @@ def doRequestOAuth():
else: else:
all_apis[api][u'use_scopes'] = all_apis[api][u'auth'][u'oauth2'][u'scopes'] all_apis[api][u'use_scopes'] = all_apis[api][u'auth'][u'oauth2'][u'scopes']
else: else:
os.system([u'clear', u'cls'][GM_Globals[GM_WINDOWS]])
while True: while True:
os.system([u'clear', u'cls'][GM_Globals[GM_WINDOWS]])
print print
x = 0 x = 0
for scope in all_apis[api][u'auth'][u'oauth2'][u'scopes'].keys(): for scope in all_apis[api][u'auth'][u'oauth2'][u'scopes'].keys():
@ -8881,12 +8889,7 @@ def doRequestOAuth():
print u' %s) Unselect all scopes' % (x+2) print u' %s) Unselect all scopes' % (x+2)
print u' %s) Back to all APIs' % (x+3) print u' %s) Back to all APIs' % (x+3)
print print
selection = raw_input(u'Your selection: ') selection = getSelection()
try:
selection = int(selection)
except:
print u'ERROR: please enter numbers only'
continue
num_scopes = len(all_apis[api][u'auth'][u'oauth2'][u'scopes'].keys()) num_scopes = len(all_apis[api][u'auth'][u'oauth2'][u'scopes'].keys())
if selection >= 0 and selection < num_scopes: if selection >= 0 and selection < num_scopes:
if all_apis[api][u'auth'][u'oauth2'][u'scopes'].keys()[selection] in all_apis[api][u'use_scopes']: if all_apis[api][u'auth'][u'oauth2'][u'scopes'].keys()[selection] in all_apis[api][u'use_scopes']:
@ -8906,8 +8909,6 @@ def doRequestOAuth():
all_apis[api][u'use_scopes'] = [] all_apis[api][u'use_scopes'] = []
elif selection == x+3: elif selection == x+3:
break break
os.system([u'clear', u'cls'][GM_Globals[GM_WINDOWS]])
os.system([u'clear', u'cls'][GM_Globals[GM_WINDOWS]])
print MESSAGE_PLEASE_AUTHORIZE_SERVIE_ACCOUNT.format(len(GM_Globals[GM_GAMSCOPES_LIST])) print MESSAGE_PLEASE_AUTHORIZE_SERVIE_ACCOUNT.format(len(GM_Globals[GM_GAMSCOPES_LIST]))
print print
print u','.join(GM_Globals[GM_GAMSCOPES_LIST]) print u','.join(GM_Globals[GM_GAMSCOPES_LIST])
@ -9282,7 +9283,7 @@ try:
elif sys.argv[1].lower() in [u'oauth', u'oauth2']: elif sys.argv[1].lower() in [u'oauth', u'oauth2']:
if sys.argv[2].lower() in [u'request', u'create']: if sys.argv[2].lower() in [u'request', u'create']:
doRequestOAuth() doRequestOAuth()
elif sys.argv[2].lower() == u'info': elif sys.argv[2].lower() in [u'info', u'verify']:
OAuthInfo() OAuthInfo()
elif sys.argv[2].lower() in [u'delete', u'revoke']: elif sys.argv[2].lower() in [u'delete', u'revoke']:
doDeleteOAuth() doDeleteOAuth()