From 100df45d468c30158eba28dcdc7e50ea75f85f62 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Wed, 5 Jun 2024 12:22:48 -0700 Subject: [PATCH] Retry errors when getting file labels --- docs/Chrome-Installed-Apps.md | 13 ++++++------- docs/GamUpdates.md | 9 +++++++++ docs/How-to-Upgrade-from-Standard-GAM.md | 4 ++-- docs/Version-and-Help.md | 12 ++++++------ src/GamUpdate.txt | 9 +++++++++ src/gam/__init__.py | 4 ++++ 6 files changed, 36 insertions(+), 15 deletions(-) diff --git a/docs/Chrome-Installed-Apps.md b/docs/Chrome-Installed-Apps.md index 3fb29106..dfd9f1a8 100644 --- a/docs/Chrome-Installed-Apps.md +++ b/docs/Chrome-Installed-Apps.md @@ -1,12 +1,11 @@ # Chrome Installed Apps Counts -- [Chrome Policies](#chrome-policies) - - [API documentation](#api-documentation) - - [Definitions](#definitions) - - [Quoting rules](#quoting-rules) - - [Display Chrome installed app details](#display-chrome-installed-app-details) - - [Display Chrome installed apps counts](#display-chrome-installed-apps-counts) - - [Display Chrome devices with a specific installed application](#display-chrome-devices-with-a-specific-installed-application) +- [API documentation](#api-documentation) +- [Definitions](#definitions) +- [Quoting rules](#quoting-rules) +- [Display Chrome installed app details](#display-chrome-installed-app-details) +- [Display Chrome installed apps counts](#display-chrome-installed-apps-counts) +- [Display Chrome devices with a specific installed application](#display-chrome-devices-with-a-specific-installed-application) ## API documentation diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index 5f785dd6..d9d83b60 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.76.13 + +Updated `gam show fileinfo ... showlabels` and `gam print filelist ... showlabels` +to retry these errors that occur when trying to get the drive labels for a file/folder. +``` +ERROR: 500: unknownError - Unknown Error. +ERROR: 503: serviceNotAvailable - The service is currently unavailable. +``` + ### 6.76.12 Fixed bug in `gam print|show chatspaces` that caused the following error: diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index 40832fa3..f11a0387 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.76.12 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.76.13 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.3 64-bit final MacOS Sonoma 14.4.1 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.76.12 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.76.13 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.3 64-bit final Windows-10-10.0.17134 AMD64 diff --git a/docs/Version-and-Help.md b/docs/Version-and-Help.md index 01478685..aa137f66 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.76.12 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.76.13 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.3 64-bit final MacOS Sonoma 14.4.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.76.12 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.76.13 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.3 64-bit final MacOS Sonoma 14.4.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.76.12 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.76.13 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.3 64-bit final MacOS Sonoma 14.4.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.76.12 + Latest: 6.76.13 echo $? 1 ``` @@ -72,7 +72,7 @@ echo $? Print the current version number without details ``` gam version simple -6.76.12 +6.76.13 ``` 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.76.12 - https://github.com/taers232c/GAMADV-XTD3 +GAM 6.76.13 - https://github.com/taers232c/GAMADV-XTD3 Ross Scroggs Python 3.12.3 64-bit final MacOS Sonoma 14.4.1 x86_64 diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index 96060b1a..a229a43a 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -15,6 +15,15 @@ gam delete|remove chatmember asadmin gam print|show chatmembers|asadmin ``` +6.76.13 + +Updated `gam show fileinfo ... showlabels` and `gam print filelist ... showlabels` +to retry these errors that occur when trying to get the drive labels for a file/folder. +``` +ERROR: 500: unknownError - Unknown Error. +ERROR: 503: serviceNotAvailable - The service is currently unavailable. +``` + 6.76.12 Fixed bug in `gam print|show chatspaces` that caused the following error: diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 59e098ab..63efa81a 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -52445,6 +52445,7 @@ def showFileInfo(users): if showLabels is not None: labels = callGAPIitems(drive.files(), 'listLabels', 'labels', throwReasons=GAPI.DRIVE_GET_THROW_REASONS, + retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS+[GAPI.UNKNOWN_ERROR], fileId=fileId) _formatFileDriveLabels(showLabels, labels, result, False, ' ') if not FJQC.formatJSON: @@ -53948,6 +53949,7 @@ def printFileList(users): if showLabels is not None: labels = callGAPIitems(drive.files(), 'listLabels', 'labels', throwReasons=GAPI.DRIVE_GET_THROW_REASONS, + retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS+[GAPI.UNKNOWN_ERROR], fileId=childFileId) _formatFileDriveLabels(showLabels, labels, childEntryInfo, True, delimiter) if filepath: @@ -54259,6 +54261,7 @@ def printFileList(users): for f_file in files: labels = callGAPIitems(drive.files(), 'listLabels', 'labels', throwReasons=GAPI.DRIVE_GET_THROW_REASONS, + retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS+[GAPI.UNKNOWN_ERROR], fileId=f_file['id']) _formatFileDriveLabels(showLabels, labels, f_file, True, delimiter) if not incrementalPrint: @@ -54315,6 +54318,7 @@ def printFileList(users): if showLabels is not None: labels = callGAPIitems(drive.files(), 'listLabels', 'labels', throwReasons=GAPI.DRIVE_GET_THROW_REASONS, + retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS+[GAPI.UNKNOWN_ERROR], fileId=fileId) _formatFileDriveLabels(showLabels, labels, fileEntryInfo, True, delimiter) if filepath: