diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index 82d31aa5..c87118bc 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.77.04 + +Fixed bug in `gam report users ... range ` where an extraneous API call +was made if a date was reached where no API data was available. + ### 6.77.03 Thanks to jay, added the following Colab License SKUs: diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index 9e84675d..8c04cf78 100644 --- a/docs/How-to-Upgrade-from-Standard-GAM.md +++ b/docs/How-to-Upgrade-from-Standard-GAM.md @@ -335,7 +335,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.77.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.77.04 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.4 64-bit final MacOS Sonoma 14.5 x86_64 @@ -1009,7 +1009,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.77.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.77.04 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.4 64-bit final Windows-10-10.0.17134 AMD64 diff --git a/docs/Users-Drive-Cleanup.md b/docs/Users-Drive-Cleanup.md index 8b8dab68..63249c87 100644 --- a/docs/Users-Drive-Cleanup.md +++ b/docs/Users-Drive-Cleanup.md @@ -39,7 +39,7 @@ gam delete emptydrivefolders [] [pathdelimiter ] ``` -By default, empty folders on My Drive are deleted. Use `select ` +By default, empty folders on My Drive are deleted(purged). Use `select ` to select a Shared Drive or an alternate starting point folder on My Drive or a Shared Drive. By default, folder path components are separated by `/`; use `pathdelimiter ` to use `` as the separator. diff --git a/docs/Version-and-Help.md b/docs/Version-and-Help.md index 96c4622e..6b82dc6e 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.77.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.77.04 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.4 64-bit final MacOS Sonoma 14.5 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.77.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.77.04 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.4 64-bit final MacOS Sonoma 14.5 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.77.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.77.04 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.4 64-bit final MacOS Sonoma 14.5 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.77.03 + Latest: 6.77.04 echo $? 1 ``` @@ -72,7 +72,7 @@ echo $? Print the current version number without details ``` gam version simple -6.77.03 +6.77.04 ``` 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.77.03 - https://github.com/taers232c/GAMADV-XTD3 +GAM 6.77.04 - https://github.com/taers232c/GAMADV-XTD3 Ross Scroggs Python 3.12.4 64-bit final MacOS Sonoma 14.5 x86_64 diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index 358e6de5..243cadb2 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -13,6 +13,11 @@ where `date` is the earliest date for which report data was requested. Merged GAM-Team version +6.77.04 + +Fixed bug in `gam report users ... range ` where an extraneous API call +was made if a date was reached where no API data was available. + 6.77.03 Thanks to jay, added the following Colab License SKUs: diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 4e350110..fa135618 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -13833,6 +13833,8 @@ def doReport(): if not status: break except GAPI.invalid as e: + if userCustomerRange: + break numDateChanges += 1 tryDate = _adjustTryDate(str(e), numDateChanges, limitDateChanges, tryDate) if not tryDate: @@ -13915,6 +13917,8 @@ def doReport(): if not status: break except GAPI.invalid as e: + if userCustomerRange: + break numDateChanges += 1 tryDate = _adjustTryDate(str(e), numDateChanges, limitDateChanges, tryDate) if not tryDate: