deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-06-28 09:51:36 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Cleanup (#974)

Browse Source 
* Cleanup

parent is not valid with use project

* Cleanup

* Cleanup

* Code fix
This commit is contained in:
Ross Scroggs
2019-07-16 14:42:42 -07:00
committed by Jay Lee
parent 193e42cf22
commit 10bc47402c
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/GamCommands.txt
View File

@@ -815,7 +815,7 @@ Each user (~primaryEmail, e.g. foo@bar.com) would have their work address update
gam create project [<EmailAddress>] [<ProjectID>]
gam create project [admin <EmailAddress>] [project <ProjectID>] [parent <String>]
gam use project [<EmailAddress>] [<ProjectID>]
gam use project [admin <EmailAddress>] [project <ProjectID>] [parent <String>]
gam use project [admin <EmailAddress>] [project <ProjectID>]
gam update project [<EmailAddress>] [gam|<ProjectID>|(filter <String>)]
gam delete project [<EmailAddress>] [gam|<ProjectID>|(filter <String>)]
gam show projects [<EmailAddress>] [all|gam|<ProjectID>|(filter <String>)]

29
src/gam.py
View File

@@ -109,8 +109,8 @@ google_auth_httplib2.AuthorizedHttp.request = _request_with_user_agent(
def _createHttpObj(cache=None, override_min_tls=None, override_max_tls=None):
tls_minimum_version = override_min_tls if override_min_tls else GC_Values[GC_TLS_MIN_VERSION]
tls_maximum_version = override_max_tls if override_max_tls else GC_Values[GC_TLS_MAX_VERSION]
return httplib2.Http(ca_certs=GC_Values[GC_CA_FILE], tls_maximum_version=tls_maximum_version, tls_minimum_version=tls_minimum_version,
cache=cache)
return httplib2.Http(ca_certs=GC_Values[GC_CA_FILE], tls_maximum_version=tls_maximum_version, tls_minimum_version=tls_minimum_version,
cache=cache)
def showUsage():
doGAMVersion(checkForArgs=False)
@@ -4693,7 +4693,6 @@ def deleteDriveFile(users):
print('No files to %s for %s' % (function, user))
j = 0
batch_size = 10
del_me_count = len(file_ids)
dbatch = drive.new_batch_http_request(callback=drive_del_result)
method = getattr(drive.files(), function)
for fileId in file_ids:
@@ -7845,15 +7844,15 @@ def _getLoginHintProjectId(createCmd):
myarg = sys.argv[i].lower().replace('_', '')
if myarg == 'admin':
login_hint = sys.argv[i+1]
i +=2
i += 2
elif myarg == 'project':
projectId = sys.argv[i+1]
i +=2
elif myarg == 'parent':
i += 2
elif createCmd and myarg == 'parent':
parent = sys.argv[i+1]
i +=2
i += 2
else:
systemErrorExit(3, "%s is not a valid argument, expected admin, project or parent" % myarg)
systemErrorExit(3, '%s is not a valid argument for "gam %s project", expected one of: admin, project%s' % (myarg, ['use', 'create'][createCmd], ['', ' or parent'][createCmd]))
login_hint = _getValidateLoginHint(login_hint)
if projectId:
if not PROJECTID_PATTERN.match(projectId):
@@ -7892,13 +7891,13 @@ def convertGCPFolderNameToID(parent, crm2):
# crm2.folders() is broken requiring pageToken, etc in body, not URL.
# for now just use callGAPI and if user has that many folders they'll
# just need to be specific.
body = {'pageSize': 1000, 'query': 'displayName="%s"' % parent}
folders = callGAPI(crm2.folders(), 'search', body=body)
if not 'folders' in folders or len(folders['folders']) == 0:
folders = callGAPIitems(crm2.folders(), 'search', items='folders',
body={'pageSize': 1000, 'query': 'displayName="%s"' % parent})
if not folders:
systemErrorExit(1, 'ERROR: No folder found matching displayName=%s' % parent)
elif len(folders['folders']) > 1:
if len(folders) > 1:
print('Multiple matches:')
for folder in folders['folders']:
for folder in folders:
print(' Name: %s ID: %s' % (folder['name'], folder['displayName']))
systemErrorExit(2, 'ERROR: Multiple matching folders, please specify one.')
return folders['folders'][0]['name']
@@ -8023,7 +8022,7 @@ and accept the Terms of Service (ToS). As soon as you've accepted the ToS popup,
def doUseProject():
_checkForExistingProjectFiles()
_, httpObj, _, projectId = _getLoginHintProjectId(False)
_, httpObj, _, projectId, _ = _getLoginHintProjectId(False)
_createClientSecretsOauth2service(httpObj, projectId)
def doUpdateProjects():
@@ -8064,7 +8063,7 @@ def doPrintShowProjects(csvFormat):
todrive = True
i += 1
else:
systemErrorExit(2, '%s is not a valid argument for "gam %s projects"' % (myarg, ['show', 'print'][csvFormat]))
systemErrorExit(3, '%s is not a valid argument for "gam %s projects"' % (myarg, ['show', 'print'][csvFormat]))
if not csvFormat:
count = len(projects)
print('User: {0}, Show {1} Projects'.format(login_hint, count))