deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-08 05:33:34 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

gam report logins works, few small fixes

Browse Source
This commit is contained in:
Jay Lee
2014-07-05 11:35:40 -04:00
parent 10d6a0d454
commit 4656e0857f
1 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
gam.py
View File

@ -201,7 +201,7 @@ def doGAMCheckForUpdates():
def commonAppsObjInit(appsObj): def commonAppsObjInit(appsObj):
#Identify GAM to Google's Servers #Identify GAM to Google's Servers
appsObj.source = u'Dito GAM %s / %s / Python %s.%s.%s %s / %s %s /' % (__version__, __author__, appsObj.source = u'Dito GAM %s - http://git.io/gam / %s / Python %s.%s.%s %s / %s %s /' % (__version__, __author__,
sys.version_info[0], sys.version_info[1], sys.version_info[2], sys.version_info[3], sys.version_info[0], sys.version_info[1], sys.version_info[2], sys.version_info[3],
platform.platform(), platform.machine()) platform.platform(), platform.machine())
#Show debugging output if debug.gam exists #Show debugging output if debug.gam exists
@ -819,33 +819,36 @@ def showReport():
for app in auth_apps: # put apps at bottom for app in auth_apps: # put apps at bottom
cust_attributes.append(app) cust_attributes.append(app)
output_csv(csv_list=cust_attributes, titles=titles, list_type=u'Customer Report - %s' % try_date, todrive=to_drive) output_csv(csv_list=cust_attributes, titles=titles, list_type=u'Customer Report - %s' % try_date, todrive=to_drive)
elif report in [u'doc', u'docs', u'login', u'admin', u'drive']: elif report in [u'doc', u'docs', u'login', u'logins', u'admin', u'drive']:
if report == u'doc': if report == u'doc':
report = u'docs' report = u'docs'
elif report == u'logins':
report = u'login'
page_message = u'Got %%num_items%% items\n' page_message = u'Got %%num_items%% items\n'
activities = callGAPIpages(service=rep.activities(), function=u'list', page_message=page_message, applicationName=report, userKey=userKey, customerId=customerId, actorIpAddress=actorIpAddress, startTime=startTime, endTime=endTime, eventName=eventName, filters=filters) activities = callGAPIpages(service=rep.activities(), function=u'list', page_message=page_message, applicationName=report, userKey=userKey, customerId=customerId, actorIpAddress=actorIpAddress, startTime=startTime, endTime=endTime, eventName=eventName, filters=filters)
attrs = [] if len(activities) > 0:
titles = [] attrs = []
for activity in activities: titles = []
events = activity[u'events'] for activity in activities:
del activity[u'events'] events = activity[u'events']
activity_row = flatten_json(activity) del activity[u'events']
for event in events: activity_row = flatten_json(activity)
row = flatten_json(event) for event in events:
row.update(activity_row) row = flatten_json(event)
for item in row.keys(): row.update(activity_row)
if item not in titles: for item in row.keys():
titles.append(item) if item not in titles:
attrs.append(row) titles.append(item)
header = {} attrs.append(row)
titles.remove(u'name') header = {}
titles = sorted(titles) titles.remove(u'name')
titles.insert(0, u'name') titles = sorted(titles)
for title in titles: titles.insert(0, u'name')
header[title] = title for title in titles:
attrs.insert(0, header) header[title] = title
cap_report = u'%s%s' % (report[0].upper(), report[1:]) attrs.insert(0, header)
output_csv(attrs, titles, u'%s Activity Report' % cap_report, to_drive) cap_report = u'%s%s' % (report[0].upper(), report[1:])
output_csv(attrs, titles, u'%s Activity Report' % cap_report, to_drive)
def doDelegates(users): def doDelegates(users):
emailsettings = getEmailSettingsObject() emailsettings = getEmailSettingsObject()