deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-06-29 18:31:38 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jay Lee
2020-05-14 09:39:58 -04:00
parent b68b773b95 6132c03893
commit b42dfb2021
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@@ -5,8 +5,8 @@ dist: xenial
env: env:
global: global:
- BUILD_PYTHON_VERSION=3.8.2 - BUILD_PYTHON_VERSION=3.8.3
- MIN_PYTHON_VERSION=3.8.2 - MIN_PYTHON_VERSION=3.8.3
- BUILD_OPENSSL_VERSION=1.1.1g - BUILD_OPENSSL_VERSION=1.1.1g
- MIN_OPENSSL_VERSION=1.1.1g - MIN_OPENSSL_VERSION=1.1.1g
- PATCHELF_VERSION=0.10 - PATCHELF_VERSION=0.10

15
src/gam/__init__.py
View File

@@ -3835,6 +3835,7 @@ DRIVEFILE_ACL_ROLES_MAP = {
def addDriveFileACL(users): def addDriveFileACL(users):
fileId = sys.argv[5] fileId = sys.argv[5]
body = {'type': sys.argv[6].lower()} body = {'type': sys.argv[6].lower()}
ubody = {}
sendNotificationEmail = False sendNotificationEmail = False
emailMessage = None emailMessage = None
transferOwnership = None transferOwnership = None
@@ -3868,6 +3869,7 @@ def addDriveFileACL(users):
if body['role'] == 'owner': if body['role'] == 'owner':
sendNotificationEmail = True sendNotificationEmail = True
transferOwnership = True transferOwnership = True
ubody['role'] = body['role']
i += 2 i += 2
elif myarg == 'sendemail': elif myarg == 'sendemail':
sendNotificationEmail = True sendNotificationEmail = True
@@ -3877,7 +3879,7 @@ def addDriveFileACL(users):
emailMessage = sys.argv[i + 1] emailMessage = sys.argv[i + 1]
i += 2 i += 2
elif myarg == 'expires': elif myarg == 'expires':
body['expirationTime'] = utils.get_time_or_delta_from_now( ubody['expirationTime'] = utils.get_time_or_delta_from_now(
sys.argv[i + 1]) sys.argv[i + 1])
i += 2 i += 2
elif myarg == 'asadmin': elif myarg == 'asadmin':
@@ -3900,6 +3902,17 @@ def addDriveFileACL(users):
supportsAllDrives=True, supportsAllDrives=True,
transferOwnership=transferOwnership, transferOwnership=transferOwnership,
useDomainAdminAccess=useDomainAdminAccess) useDomainAdminAccess=useDomainAdminAccess)
if 'expirationTime' in ubody:
result = gapi.call(drive.permissions(),
'update',
fields='*',
fileId=fileId,
permissionId=result['id'],
removeExpiration=False,
transferOwnership=False,
body=ubody,
supportsAllDrives=True,
useDomainAdminAccess=useDomainAdminAccess)
printPermission(result) printPermission(result)