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

Update encoding so Python REs with \ can be processed (#918)

Browse Source 
* Update encoding so Python REs with \ can be processed

Fix bug in printShowDelegates

* uid:ResourceId can't be downshifted

* Appease pylint, fix print formatting

* Fix row filter count matching

* Fix indentation
This commit is contained in:
Ross Scroggs
2019-05-09 07:34:12 -07:00
committed by Jay Lee
parent 657ce1cbbf
commit 0cffb8202d
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gam.py
View File

@@ -649,7 +649,7 @@ def SetGlobalVariables():
if not value: if not value:
return rowFilters return rowFilters
try: try:
for column, filterStr in iter(json.loads(value).items()): for column, filterStr in iter(json.loads(value.encode('unicode-escape').decode(UTF8)).items()):
mg = ROW_FILTER_COMP_PATTERN.match(filterStr) mg = ROW_FILTER_COMP_PATTERN.match(filterStr)
if mg: if mg:
if mg.group(1) in ['date', 'time']: if mg.group(1) in ['date', 'time']:
@@ -890,7 +890,7 @@ def waitOnFailure(n, retries, errMsg):
def checkGAPIError(e, soft_errors=False, silent_errors=False, retryOnHttpError=False, service=None): def checkGAPIError(e, soft_errors=False, silent_errors=False, retryOnHttpError=False, service=None):
try: try:
error = json.loads(e.content.decode('utf-8')) error = json.loads(e.content.decode(UTF8))
except ValueError: except ValueError:
eContent = e.content.decode(UTF8) if isinstance(e.content, bytes) else e.content eContent = e.content.decode(UTF8) if isinstance(e.content, bytes) else e.content
if (e.resp['status'] == '503') and (eContent == 'Quota exceeded for the current request'): if (e.resp['status'] == '503') and (eContent == 'Quota exceeded for the current request'):
@@ -1330,7 +1330,7 @@ def buildGAPIObject(api):
# Convert UID to email address # Convert UID to email address
def convertUIDtoEmailAddress(emailAddressOrUID, cd=None, email_types=['user']): def convertUIDtoEmailAddress(emailAddressOrUID, cd=None, email_types=['user']):
if type(email_types) is str: if isinstance(email_types, str):
email_types = email_types.split(',') email_types = email_types.split(',')
normalizedEmailAddressOrUID = normalizeEmailAddressOrUID(emailAddressOrUID) normalizedEmailAddressOrUID = normalizeEmailAddressOrUID(emailAddressOrUID)
if normalizedEmailAddressOrUID.find('@') > 0: if normalizedEmailAddressOrUID.find('@') > 0:
@@ -1422,8 +1422,7 @@ def buildActivityGAPIObject(user):
return (userEmail, buildGAPIServiceObject('appsactivity', userEmail)) return (userEmail, buildGAPIServiceObject('appsactivity', userEmail))
def normalizeCalendarId(calname, checkPrimary=False): def normalizeCalendarId(calname, checkPrimary=False):
calname = calname.lower() if checkPrimary and calname.lower() == 'primary':
if checkPrimary and calname == 'primary':
return calname return calname
if not GC_Values[GC_DOMAIN]: if not GC_Values[GC_DOMAIN]:
GC_Values[GC_DOMAIN] = _getValueFromOAuth('hd') GC_Values[GC_DOMAIN] = _getValueFromOAuth('hd')
@@ -1847,7 +1846,7 @@ def printShowDelegates(users, csvFormat):
print('%s,%s,%s' % (user, delegateAddress, status)) print('%s,%s,%s' % (user, delegateAddress, status))
else: else:
print(utils.convertUTF8("Delegator: %s\n Status: %s\n Delegate Email: %s\n" % (user, status, delegateAddress))) print(utils.convertUTF8("Delegator: %s\n Status: %s\n Delegate Email: %s\n" % (user, status, delegateAddress)))
if not csvStyle and delegates['delegates']: if not csvFormat and not csvStyle and delegates['delegates']:
print('Total %s delegates' % len(delegates['delegates'])) print('Total %s delegates' % len(delegates['delegates']))
if csvFormat: if csvFormat:
writeCSVfile(csvRows, titles, 'Delegates', todrive) writeCSVfile(csvRows, titles, 'Delegates', todrive)
@@ -5278,7 +5277,7 @@ def getLanguage(users):
soft_errors=True, soft_errors=True,
userId='me') userId='me')
if result: if result:
print('User: {0}, Language: {1} ({2}/{3})'.format(user, result['displayLanguage']), i, count) print('User: {0}, Language: {1} ({2}/{3})'.format(user, result['displayLanguage'], i, count))
def getImap(users): def getImap(users):
i = 0 i = 0
@@ -10841,7 +10840,11 @@ def writeCSVfile(csvRows, titles, list_type, todrive):
return rowDate == filterDate return rowDate == filterDate
def rowCountFilterMatch(rowCount, op, filterCount): def rowCountFilterMatch(rowCount, op, filterCount):
if not isinstance(rowCount, int): if isinstance(rowCount, str):
if not rowCount.isdigit():
return False
rowCount = int(rowCount)
elif not isinstance(rowCount, int):
return False return False
if op == '<': if op == '<':
return rowCount < filterCount return rowCount < filterCount
@@ -10876,7 +10879,7 @@ def writeCSVfile(csvRows, titles, list_type, todrive):
elif filterVal[0] in ['date', 'time']: elif filterVal[0] in ['date', 'time']:
csvRows = [row for row in csvRows if rowDateTimeFilterMatch(filterVal[0] == 'date', row.get(column, ''), filterVal[1], filterVal[2])] csvRows = [row for row in csvRows if rowDateTimeFilterMatch(filterVal[0] == 'date', row.get(column, ''), filterVal[1], filterVal[2])]
elif filterVal[0] == 'count': elif filterVal[0] == 'count':
csvRows = [row for row in csvRows if rowCountFilterMatch(row.get(column, ''), filterVal[1], filterVal[2])] csvRows = [row for row in csvRows if rowCountFilterMatch(row.get(column, 0), filterVal[1], filterVal[2])]
else: #boolean else: #boolean
csvRows = [row for row in csvRows if rowBooleanFilterMatch(row.get(column, False), filterVal[1])] csvRows = [row for row in csvRows if rowBooleanFilterMatch(row.get(column, False), filterVal[1])]
if GC_Values[GC_CSV_HEADER_FILTER]: if GC_Values[GC_CSV_HEADER_FILTER]: