From 0e0d45322e7e053405230d0604d40b72098b6e37 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Sun, 1 Oct 2023 11:47:41 -0700 Subject: [PATCH] Updated `gam calendars move events` to handle the following error: ``` ERROR: 400: badRequest - Bad Request --- docs/GamUpdates.md | 8 ++++++++ docs/How-to-Upgrade-from-Standard-GAM.md | 4 ++-- docs/Version-and-Help.md | 12 ++++++------ src/GamUpdate.txt | 8 ++++++++ src/gam/__init__.py | 7 +++++-- 5 files changed, 29 insertions(+), 10 deletions(-) diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index 0dd8945f..a0023709 100644 --- a/docs/GamUpdates.md +++ b/docs/GamUpdates.md @@ -10,6 +10,14 @@ 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.64.04 + +Updated `gam calendars move events` and `gam move events ` +to handle the following error: +``` +ERROR: 400: badRequest - Bad Request +``` + ### 6.64.03 Updated `gam get drivefile` to allow downloading Jamboard files; they must be downloaded with `format pdf`. diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index 8ab38fbe..55a2ba31 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.64.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.64.04 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.10.8 64-bit final MacOS High Sierra 10.13.6 x86_64 @@ -984,7 +984,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.64.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.64.04 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.11.5 64-bit final Windows-10-10.0.17134 AMD64 diff --git a/docs/Version-and-Help.md b/docs/Version-and-Help.md index fda916fb..94dc4413 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.64.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.64.04 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.11.5 64-bit final MacOS Monterey 12.6.6 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.64.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.64.04 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.11.5 64-bit final MacOS Monterey 12.6.6 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.64.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.64.04 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.11.5 64-bit final MacOS Monterey 12.6.6 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.64.03 + Latest: 6.64.04 echo $? 1 ``` @@ -72,7 +72,7 @@ echo $? Print the current version number without details ``` gam version simple -6.64.03 +6.64.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.64.03 - https://github.com/taers232c/GAMADV-XTD3 +GAM 6.64.04 - https://github.com/taers232c/GAMADV-XTD3 Ross Scroggs Python 3.11.5 64-bit final MacOS Monterey 12.6.6 x86_64 diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index 9ceac30d..6ad05dd8 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -2,6 +2,14 @@ Merged GAM-Team version +6.64.04 + +Updated `gam calendars move events` and `gam move events ` +to handle the following error: +``` +ERROR: 400: badRequest - Bad Request +``` + 6.64.03 Updated `gam get drivefile` to allow downloading Jamboard files; they must be downloaded with `format pdf`. diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 44ea9bd6..25dd025f 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -8909,6 +8909,7 @@ MACOS_CODENAMES = { 11: 'Big Sur', 12: 'Monterey', 13: 'Ventura', + 14: 'Sonoma', } def getOSPlatform(): @@ -35994,7 +35995,8 @@ def _moveCalendarEvents(origUser, user, origCal, calIds, count, calendarEventEnt kvListEventNewCal = kvListEvent+[Ent.CALENDAR, newCalId] try: callGAPI(cal.events(), 'move', - throwReasons=GAPI.CALENDAR_THROW_REASONS+[GAPI.NOT_FOUND, GAPI.FORBIDDEN, GAPI.REQUIRED_ACCESS_LEVEL, GAPI.INVALID, + throwReasons=GAPI.CALENDAR_THROW_REASONS+[GAPI.NOT_FOUND, GAPI.FORBIDDEN, GAPI.REQUIRED_ACCESS_LEVEL, + GAPI.INVALID, GAPI.BAD_REQUEST, GAPI.CANNOT_CHANGE_ORGANIZER, GAPI.CANNOT_CHANGE_ORGANIZER_OF_INSTANCE], calendarId=calId, eventId=eventId, destination=newCalId, sendUpdates=parameters['sendUpdates'], fields='') entityModifierNewValueActionPerformed(kvListEvent, Act.MODIFIER_TO, f'{Ent.Singular(Ent.CALENDAR)}: {newCalId}', j, jcount) @@ -36009,7 +36011,8 @@ def _moveCalendarEvents(origUser, user, origCal, calIds, count, calendarEventEnt except GAPI.requiredAccessLevel: # Correct "You need to have reader access to this calendar." to "Writer access required to both calendars." entityActionFailedWarning(kvListEventNewCal, Msg.WRITER_ACCESS_REQUIRED_TO_BOTH_CALENDARS, j, jcount) - except (GAPI.forbidden, GAPI.invalid, GAPI.cannotChangeOrganizer, GAPI.cannotChangeOrganizerOfInstance) as e: + except (GAPI.forbidden, GAPI.invalid, GAPI.badRequest, + GAPI.cannotChangeOrganizer, GAPI.cannotChangeOrganizerOfInstance) as e: entityActionFailedWarning(kvListEventNewCal, str(e), j, jcount) except (GAPI.serviceNotAvailable, GAPI.authError): entityServiceNotApplicableWarning(Ent.CALENDAR, calId, i, count)