From a3b814f758cb8e3769f8e70942b352ed8fcbe702 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Sun, 3 Mar 2024 14:18:17 -0800 Subject: [PATCH] Improved the performance of `gam print filelist` when `showmimetype` and `filepath|fullpath` are both specified. --- docs/GamUpdates.md | 5 +++++ docs/How-to-Upgrade-from-Standard-GAM.md | 4 ++-- docs/Version-and-Help.md | 12 ++++++------ src/GamUpdate.txt | 5 +++++ src/gam/__init__.py | 5 +++-- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index 1604be79..34a4bd02 100644 --- a/docs/GamUpdates.md +++ b/docs/GamUpdates.md @@ -10,6 +10,11 @@ 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.09 + +Improved the performance of `gam print filelist` when `showmimetype` and `filepath|fullpath` +are both specified. + ### 6.71.08 Added option `oneitemperrow` to 'gam print admins|adminroles` to have each of a diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index 86f0ea98..f4c82ff1 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.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.09 - 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.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.09 - 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 9b76d491..a7842a66 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.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.09 - 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.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.09 - 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.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.09 - 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.08 + Latest: 6.71.09 echo $? 1 ``` @@ -72,7 +72,7 @@ echo $? Print the current version number without details ``` gam version simple -6.71.08 +6.71.09 ``` 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.08 - https://github.com/taers232c/GAMADV-XTD3 +GAM 6.71.09 - 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 918ef08c..d6573ba9 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -2,6 +2,11 @@ Merged GAM-Team version +6.71.09 + +Improved the performance of `gam print filelist` when `showmimetype` and `filepath|fullpath` +are both specified. + 6.71.08 Added option `oneitemperrow` to 'gam print admins|adminroles` to have each of a diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 8bf7484a..545ece73 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -53624,7 +53624,8 @@ def printFileList(users): DLP.GetFileIdEntity() if not fileIdEntity['shareddrive']: cleanFileIDsList(fileIdEntity, [ROOT, ORPHANS]) - noSelect = False + if maxdepth != -1: + noSelect = False elif not fileIdEntity: fileIdEntity = DLP.GetFileIdEntity() elif not buildTree: @@ -53634,7 +53635,7 @@ def printFileList(users): and not fileIdEntity['shareddrivefilequery'] and _simpleFileIdEntityList(fileIdEntity['list'])) incrementalPrint = buildTree and (not filepath) and noSelect and not DLP.locationSet and not showParent - if incrementalPrint: + if buildTree and noSelect and not DLP.locationSet and not showParent: DLP.AddMimeTypeToQuery() if buildTree: if not fileIdEntity.get('shareddrive'):