deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-09 22:23:35 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Code cleanup (#775)

Browse Source
This commit is contained in:
Ross Scroggs
2018-08-03 12:22:38 -07:00
committed by Jay Lee
parent 9a27f19e2e
commit a82a33996c
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gam.py
View File

@ -7592,7 +7592,7 @@ def doCreateVaultExport():
def doGetVaultExport(): def doGetVaultExport():
v = buildGAPIObject(u'vault') v = buildGAPIObject(u'vault')
matterId = getMatterItem(v, sys.argv[3]) matterId = getMatterItem(v, sys.argv[3])
exportId = sys.argv[4] exportId = convertExportNameToID(v, sys.argv[4], matterId)
export = callGAPI(v.matters().exports(), u'get', matterId=matterId, exportId=exportId) export = callGAPI(v.matters().exports(), u'get', matterId=matterId, exportId=exportId)
print_json(None, export) print_json(None, export)
@ -7602,7 +7602,7 @@ def doDownloadVaultExport():
v = buildGAPIObject(u'vault') v = buildGAPIObject(u'vault')
s = buildGAPIObject(u'storage') s = buildGAPIObject(u'storage')
matterId = getMatterItem(v, sys.argv[3]) matterId = getMatterItem(v, sys.argv[3])
exportId = sys.argv[4] exportId = convertExportNameToID(v, sys.argv[4], matterId)
targetFolder = GC_Values[GC_DRIVE_DIR] targetFolder = GC_Values[GC_DRIVE_DIR]
export = callGAPI(v.matters().exports(), u'get', matterId=matterId, exportId=exportId) export = callGAPI(v.matters().exports(), u'get', matterId=matterId, exportId=exportId)
for s_file in export[u'cloudStorageSink']['files']: for s_file in export[u'cloudStorageSink']['files']:
@ -7734,8 +7734,6 @@ def doDeleteVaultHold():
if myarg == u'matter': if myarg == u'matter':
matterId = getMatterItem(v, sys.argv[i+1]) matterId = getMatterItem(v, sys.argv[i+1])
holdId = convertHoldNameToID(v, hold, matterId) holdId = convertHoldNameToID(v, hold, matterId)
if not holdId:
systemErrorExit(4, 'could not find hold %s in matter %s' % (sys.argv[3], matterId))
i += 2 i += 2
else: else:
systemErrorExit(3, '%s is not a valid argument to "gam delete hold"' % myarg) systemErrorExit(3, '%s is not a valid argument to "gam delete hold"' % myarg)
@ -7754,8 +7752,6 @@ def doGetVaultHoldInfo():
if myarg == u'matter': if myarg == u'matter':
matterId = getMatterItem(v, sys.argv[i+1]) matterId = getMatterItem(v, sys.argv[i+1])
holdId = convertHoldNameToID(v, hold, matterId) holdId = convertHoldNameToID(v, hold, matterId)
if not holdId:
systemErrorExit(4, 'could not find hold %s in matter %s' % (hold, matterId))
i += 2 i += 2
else: else:
systemErrorExit(3, '%s is not a valid argument for "gam info hold"' % myarg) systemErrorExit(3, '%s is not a valid argument for "gam info hold"' % myarg)
@ -7773,6 +7769,16 @@ def doGetVaultHoldInfo():
results[u'orgUnit'][u'orgUnitPath'] = doGetOrgInfo(results[u'orgUnit'][u'orgUnitId'], return_attrib=u'orgUnitPath') results[u'orgUnit'][u'orgUnitPath'] = doGetOrgInfo(results[u'orgUnit'][u'orgUnitId'], return_attrib=u'orgUnitPath')
print_json(None, results) print_json(None, results)
def convertExportNameToID(v, nameOrID, matterId):
nameOrID = nameOrID.lower()
if nameOrID[:4] == u'uid:':
return nameOrID[4:]
exports = callGAPIpages(v.matters().exports(), u'list', u'exports', matterId=matterId, fields=u'exports(id,name),nextPageToken')
for export in exports:
if export[u'name'].lower() == nameOrID:
return export[u'id']
systemErrorExit(4, 'could not find export name %s in matter %s' % (nameOrID, matterId))
def convertHoldNameToID(v, nameOrID, matterId): def convertHoldNameToID(v, nameOrID, matterId):
nameOrID = nameOrID.lower() nameOrID = nameOrID.lower()
if nameOrID[:4] == u'uid:': if nameOrID[:4] == u'uid:':
@ -7781,7 +7787,7 @@ def convertHoldNameToID(v, nameOrID, matterId):
for hold in holds: for hold in holds:
if hold[u'name'].lower() == nameOrID: if hold[u'name'].lower() == nameOrID:
return hold[u'holdId'] return hold[u'holdId']
return None systemErrorExit(4, 'could not find hold name %s in matter %s' % (nameOrID, matterId))
def convertMatterNameToID(v, nameOrID): def convertMatterNameToID(v, nameOrID):
nameOrID = nameOrID.lower() nameOrID = nameOrID.lower()
@ -7815,8 +7821,6 @@ def doUpdateVaultHold():
if myarg == u'matter': if myarg == u'matter':
matterId = getMatterItem(v, sys.argv[i+1]) matterId = getMatterItem(v, sys.argv[i+1])
holdId = convertHoldNameToID(v, hold, matterId) holdId = convertHoldNameToID(v, hold, matterId)
if not holdId:
systemErrorExit(4, 'could not find hold %s in matter %s' % (hold, matterId))
i += 2 i += 2
elif myarg == u'query': elif myarg == u'query':
query = sys.argv[i+1] query = sys.argv[i+1]