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

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

Browse Source
This commit is contained in:
Jay Lee
2020-03-30 16:01:19 -04:00
parent 13fa01c4e2 d3dfcc3248
commit 7ff7c71b4e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gapi/directory/cros.py
View File

@@ -421,7 +421,7 @@ def doPrintCrosActivity():
utils.formatMilliSeconds(active_time) utils.formatMilliSeconds(active_time)
newrow['activeTimeRanges.minutes'] = \ newrow['activeTimeRanges.minutes'] = \
activeTimeRange['activeTime']//60000 activeTimeRange['activeTime']//60000
csvRows.append(new_row) csvRows.append(newrow)
if selectRecentUsers: if selectRecentUsers:
recentUsers = cros.get('recentUsers', []) recentUsers = cros.get('recentUsers', [])
lenRU = len(recentUsers) lenRU = len(recentUsers)
@@ -444,11 +444,11 @@ def doPrintCrosActivity():
lenDF = len(deviceFiles) lenDF = len(deviceFiles)
num_ranges = min(lenDF, listLimit or lenDF) num_ranges = min(lenDF, listLimit or lenDF)
for deviceFile in deviceFiles[:num_ranges]: for deviceFile in deviceFiles[:num_ranges]:
new_row = row.copy() newrow = row.copy()
new_row['deviceFiles.type'] = deviceFile['type'] newrow['deviceFiles.type'] = deviceFile['type']
create_time = deviceFile['createTime'] create_time = deviceFile['createTime']
new_row['deviceFiles.createTime'] = create_time newrow['deviceFiles.createTime'] = create_time
csvRows.append(new_row) csvRows.append(newrow)
display.write_csv_file(csvRows, titles, 'CrOS Activity', todrive) display.write_csv_file(csvRows, titles, 'CrOS Activity', todrive)