deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-05 13:21:35 +00:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Escape ' and \ in drive file parent names (#749)

Browse Source
This commit is contained in:
Ross Scroggs
2018-07-04 10:30:17 -07:00
committed by Jay Lee
parent 5a1ab0c168
commit 419bd01818
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gam.py
View File

@@ -4375,6 +4375,19 @@ def doEmptyDriveTrash(users):
print u'Emptying Drive trash for %s' % user print u'Emptying Drive trash for %s' % user
callGAPI(drive.files(), u'emptyTrash') callGAPI(drive.files(), u'emptyTrash')
def escapeDriveFileName(filename):
if filename.find(u"'") == -1 and filename.find(u'\\') == -1:
return filename
encfilename = u''
for c in filename:
if c == u"'":
encfilename += u"\\'"
elif c == u'\\':
encfilename += u'\\\\'
else:
encfilename += c
return encfilename
def initializeDriveFileAttributes(): def initializeDriveFileAttributes():
return ({}, {DFA_LOCALFILEPATH: None, DFA_LOCALFILENAME: None, DFA_LOCALMIMETYPE: None, DFA_CONVERT: None, DFA_OCR: None, DFA_OCRLANGUAGE: None, DFA_PARENTQUERY: None}) return ({}, {DFA_LOCALFILEPATH: None, DFA_LOCALFILENAME: None, DFA_LOCALMIMETYPE: None, DFA_CONVERT: None, DFA_OCR: None, DFA_OCRLANGUAGE: None, DFA_PARENTQUERY: None})
@@ -4426,10 +4439,10 @@ def getDriveFileAttribute(i, body, parameters, myarg, update=False):
body[u'parents'].append({u'id': sys.argv[i+1]}) body[u'parents'].append({u'id': sys.argv[i+1]})
i += 2 i += 2
elif myarg == u'parentname': elif myarg == u'parentname':
parameters[DFA_PARENTQUERY] = u"'me' in owners and mimeType = '%s' and title = '%s'" % (MIMETYPE_GA_FOLDER, sys.argv[i+1]) parameters[DFA_PARENTQUERY] = u"'me' in owners and mimeType = '%s' and title = '%s'" % (MIMETYPE_GA_FOLDER, escapeDriveFileName(sys.argv[i+1]))
i += 2 i += 2
elif myarg in [u'anyownerparentname']: elif myarg in [u'anyownerparentname']:
parameters[DFA_PARENTQUERY] = u"mimeType = '%s' and title = '%s'" % (MIMETYPE_GA_FOLDER, sys.argv[i+1]) parameters[DFA_PARENTQUERY] = u"mimeType = '%s' and title = '%s'" % (MIMETYPE_GA_FOLDER, escapeDriveFileName(sys.argv[i+1]))
i += 2 i += 2
elif myarg == u'writerscantshare': elif myarg == u'writerscantshare':
body[u'writersCanShare'] = False body[u'writersCanShare'] = False