deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-06 05:41:36 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/jay0lee/GAM

Browse Source
This commit is contained in:
Jay Lee
2019-07-11 09:55:41 -04:00
parent 6383aa594a 54eb59c27b
commit fa52d9e89e
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/GamCommands.txt
View File

@@ -1092,7 +1092,7 @@ gam create resource <ResourceID> <Name> <ResourceAttributes>*
gam update resource <ResourceID> <ResourceAttributes>* gam update resource <ResourceID> <ResourceAttributes>*
gam delete resource <ResourceID> gam delete resource <ResourceID>
gam info resource <ResourceID> gam info resource <ResourceID>
gam print resources [todrive] [allfields] <ResourceFieldName>* gam print resources [todrive] [allfields] <ResourceFieldName>* [query <String>]
gam create schema|schemas <SchemaName> <SchemaFieldDefinition>+ gam create schema|schemas <SchemaName> <SchemaFieldDefinition>+
gam update schema <SchemaName> <SchemaFieldDefinition>* (deletefield <FieldName>)* gam update schema <SchemaName> <SchemaFieldDefinition>* (deletefield <FieldName>)*
@@ -1176,7 +1176,7 @@ gam create vaultexport|export matter <MatterItem> [name <name>] corpus <drive|ma
[terms <terms>] [start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>] [timezone <TimeZone>] [terms <terms>] [start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>] [timezone <TimeZone>]
[excludedrafts <Boolean>] [format mbox|pst] [showconfidentialmodecontent <Boolean>] [excludedrafts <Boolean>] [format mbox|pst] [showconfidentialmodecontent <Boolean>]
[includerooms] [includerooms]
[driveversiondate <Date>|<Time>] [includeteamdrives] [includeaccessinfo <Boolean>] [driveversiondate <Date>|<Time>] [includeshareddrives|includeteamdrives] [includeaccessinfo <Boolean>]
[region any|europe|us] [region any|europe|us]
gam delete export <MatterItem> <ExportItem> gam delete export <MatterItem> <ExportItem>
gam info export <MatterItem> <ExportItem> gam info export <MatterItem> <ExportItem>

18
src/gam.py
View File

@@ -2000,7 +2000,7 @@ def getCourseAttribute(myarg, value, body, croom, function):
systemErrorExit(2, '%s is not a valid argument to "gam %s course"' % (myarg, function)) systemErrorExit(2, '%s is not a valid argument to "gam %s course"' % (myarg, function))
def _getCourseStates(croom, value, courseStates): def _getCourseStates(croom, value, courseStates):
validStates = _getValidCourseStates(croom) validStates = _getEnumValuesMinusUnspecified(croom._rootDesc['schemas']['Course']['properties']['courseState']['enum'])
for state in value.replace(',', ' ').split(): for state in value.replace(',', ' ').split():
courseStates.append(_getValidatedState(state, validStates)) courseStates.append(_getValidatedState(state, validStates))
@@ -8231,10 +8231,12 @@ VAULT_SEARCH_METHODS_MAP = {
'ou': 'ORG_UNIT', 'ou': 'ORG_UNIT',
'room': 'ROOM', 'room': 'ROOM',
'rooms': 'ROOM', 'rooms': 'ROOM',
'teamdrive': 'TEAM_DRIVE', 'shareddrive': 'SHARED_DRIVE',
'teamdrives': 'TEAM_DRIVE', 'shareddrives': 'SHARED_DRIVE',
'teamdrive': 'SHARED_DRIVE',
'teamdrives': 'SHARED_DRIVE',
} }
VAULT_SEARCH_METHODS_LIST = ['accounts', 'orgunit', 'teamdrives', 'rooms', 'everyone'] VAULT_SEARCH_METHODS_LIST = ['accounts', 'orgunit', 'shareddrives', 'rooms', 'everyone']
def doCreateVaultExport(): def doCreateVaultExport():
v = buildGAPIObject('vault') v = buildGAPIObject('vault')
@@ -8271,8 +8273,8 @@ def doCreateVaultExport():
elif searchMethod == 'ORG_UNIT': elif searchMethod == 'ORG_UNIT':
body['query']['orgUnitInfo'] = {'orgUnitId': getOrgUnitId(sys.argv[i+1])[1]} body['query']['orgUnitInfo'] = {'orgUnitId': getOrgUnitId(sys.argv[i+1])[1]}
i += 2 i += 2
elif searchMethod == 'TEAM_DRIVE': elif searchMethod == 'SHARED_DRIVE':
body['query']['teamDriveInfo'] = {'teamDriveIds': sys.argv[i+1].split(',')} body['query']['sharedDriveInfo'] = {'sharedDriveIds': sys.argv[i+1].split(',')}
i += 2 i += 2
elif searchMethod == 'ROOM': elif searchMethod == 'ROOM':
body['query']['hangoutsChatInfo'] = {'roomId': sys.argv[i+1].split(',')} body['query']['hangoutsChatInfo'] = {'roomId': sys.argv[i+1].split(',')}
@@ -8302,8 +8304,8 @@ def doCreateVaultExport():
elif myarg in ['driveversiondate']: elif myarg in ['driveversiondate']:
body['query'].setdefault('driveOptions', {})['versionDate'] = getDateZeroTimeOrFullTime(sys.argv[i+1]) body['query'].setdefault('driveOptions', {})['versionDate'] = getDateZeroTimeOrFullTime(sys.argv[i+1])
i += 2 i += 2
elif myarg in ['includeteamdrives']: elif myarg in ['includeshareddrives', 'includeteamdrives']:
body['query'].setdefault('driveOptions', {})['includeTeamDrives'] = getBoolean(sys.argv[i+1], myarg) body['query'].setdefault('driveOptions', {})['includeSharedDrives'] = getBoolean(sys.argv[i+1], myarg)
i += 2 i += 2
elif myarg in ['includerooms']: elif myarg in ['includerooms']:
body['query']['hangoutsChatOptions'] = {'includeRooms': getBoolean(sys.argv[i+1], myarg)} body['query']['hangoutsChatOptions'] = {'includeRooms': getBoolean(sys.argv[i+1], myarg)}