diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index 2f7cab38..1a524dbe 100644 --- a/docs/GamUpdates.md +++ b/docs/GamUpdates.md @@ -10,6 +10,15 @@ Add the `-s` option to the end of the above commands to suppress creating the `g See [Downloads](https://github.com/taers232c/GAMADV-XTD3/wiki/Downloads) for Windows or other options, including manual installation +### 6.71.17 + +Added `depth` column to output of `gam print diskusage ` that can +be used to filter the depth of the folders displayed. Depth `-1` is the top level folder, depth `0` +are its immediate children, depth `2` are the children of depth `1` and so forth. +``` +gam config csv_output_row_filter "depth:count<1" user organizer@domain.com print diskusage teamdriveid +``` + ### 6.71.16 Updated `gam create|update sendas ... replyto ` diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index 586cf031..2ad23ad5 100644 --- a/docs/How-to-Upgrade-from-Standard-GAM.md +++ b/docs/How-to-Upgrade-from-Standard-GAM.md @@ -334,7 +334,7 @@ writes the credentials into the file oauth2.txt. admin@server:/Users/admin/bin/gamadv-xtd3$ rm -f /Users/admin/GAMConfig/oauth2.txt admin@server:/Users/admin/bin/gamadv-xtd3$ ./gam version WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found -GAMADV-XTD3 6.71.16 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.17 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 @@ -1006,7 +1006,7 @@ writes the credentials into the file oauth2.txt. C:\GAMADV-XTD3>del C:\GAMConfig\oauth2.txt C:\GAMADV-XTD3>gam version WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found -GAMADV-XTD3 6.71.16 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.17 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final Windows-10-10.0.17134 AMD64 diff --git a/docs/Version-and-Help.md b/docs/Version-and-Help.md index c97b63e9..3d1513aa 100644 --- a/docs/Version-and-Help.md +++ b/docs/Version-and-Help.md @@ -3,7 +3,7 @@ Print the current version of Gam with details ``` gam version -GAMADV-XTD3 6.71.16 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.17 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 @@ -15,7 +15,7 @@ Time: 2023-06-02T21:10:00-07:00 Print the current version of Gam with details and time offset information ``` gam version timeoffset -GAMADV-XTD3 6.71.16 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.17 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 @@ -27,7 +27,7 @@ Your system time differs from www.googleapis.com by less than 1 second Print the current version of Gam with extended details and SSL information ``` gam version extended -GAMADV-XTD3 6.71.16 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.17 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 @@ -64,7 +64,7 @@ MacOS High Sierra 10.13.6 x86_64 Path: /Users/Admin/bin/gamadv-xtd3 Version Check: Current: 5.35.08 - Latest: 6.71.16 + Latest: 6.71.17 echo $? 1 ``` @@ -72,7 +72,7 @@ echo $? Print the current version number without details ``` gam version simple -6.71.16 +6.71.17 ``` In Linux/MacOS you can do: ``` @@ -82,7 +82,7 @@ echo $VER Print the current version of Gam and address of this Wiki ``` gam help -GAM 6.71.16 - https://github.com/taers232c/GAMADV-XTD3 +GAM 6.71.17 - https://github.com/taers232c/GAMADV-XTD3 Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index ba972e6e..d520afb8 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -2,6 +2,15 @@ Merged GAM-Team version +6.71.17 + +Added `depth` column to output of `gam print diskusage ` that can +be used to filter the depth of the folders displayed. Depth `-1` is the top level folder, depth `0` +are its immediate children, depth `2` are the children of depth `1` and so forth. +``` +gam config csv_output_row_filter "depth:count<1" user organizer@domain.com print diskusage teamdriveid +``` + 6.71.16 Updated `gam create|update sendas ... replyto ` diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 468058b4..bc15eb8d 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -54318,7 +54318,8 @@ DISKUSAGE_SHOW_CHOICES = {'all', 'summary', 'summaryandtrash'} # (addcsvdata )* # [noprogress] [show all|summary|summaryandtrash] def printDiskUsage(users): - def _getChildDriveFolderInfo(drive, fileEntry, user, i, count): + def _getChildDriveFolderInfo(drive, fileEntry, user, i, count, depth): + fileEntry['depth'] = depth q = WITH_PARENTS.format(fileEntry['id']) try: children = callGAPIpages(drive.files(), 'list', 'files', @@ -54358,7 +54359,7 @@ def printDiskUsage(users): childEntryInfo['path'] = fileEntry['path']+pathDelimiter+childEntryInfo['name'] childEntryInfo.pop(sizeField, None) foldersList.append(childEntryInfo) - _getChildDriveFolderInfo(drive, childEntryInfo, user, i, count) + _getChildDriveFolderInfo(drive, childEntryInfo, user, i, count, depth+1) fileEntry['totalFileCount'] += childEntryInfo['totalFileCount'] fileEntry['totalFileSize'] += childEntryInfo['totalFileSize'] fileEntry['totalFolderCount'] += childEntryInfo['totalFolderCount'] @@ -54380,7 +54381,7 @@ def printDiskUsage(users): csvPF = CSVPrintFile(['User', 'Owner', 'id', 'name', 'ownedByMe', 'trashed', 'explicitlyTrashed', 'directFileCount', 'directFileSize', 'directFolderCount', - 'totalFileCount', 'totalFileSize', 'totalFolderCount', 'path']) + 'totalFileCount', 'totalFileSize', 'totalFolderCount', 'depth', 'path']) excludeTrashed = stripCRsFromName = False includeOwner = True orderBy = 'folder,name' @@ -54481,7 +54482,7 @@ def printDiskUsage(users): topFolder.update(zeroFolderInfo) topFolder.pop(sizeField, None) foldersList.append(topFolder) - _getChildDriveFolderInfo(drive, topFolder, user, i, count) + _getChildDriveFolderInfo(drive, topFolder, user, i, count, -1) except GAPI.fileNotFound: entityActionFailedWarning([Ent.USER, user, Ent.DRIVE_FOLDER, fileId], Msg.NOT_FOUND, j, jcount) continue @@ -54506,6 +54507,7 @@ def printDiskUsage(users): trashFolder['explicitlyTrashed'] = trashFolder['directFileCount']+trashFolder['directFolderCount'] > 0 if addCSVData: trashFolder.update(addCSVData) + trashFolder['depth'] = -1 csvPF.WriteRow(trashFolder) csvPF.writeCSVfile('Drive Disk Usage')