diff --git a/docs/Calendars-Events.md b/docs/Calendars-Events.md index 26292f25..a3e00e57 100644 --- a/docs/Calendars-Events.md +++ b/docs/Calendars-Events.md @@ -185,6 +185,7 @@ Client access works when accessing Resource calendars. (matchfield location )| (matchfield organizeremail )| (matchfield organizername )| + (matchfield organizerself )| (matchfield status )| (matchfield summary )| (matchfield transparency )| diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index a0023709..61605559 100644 --- a/docs/GamUpdates.md +++ b/docs/GamUpdates.md @@ -10,6 +10,21 @@ 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.05 + +Added `matchfield organizerself ` to `` to simplify selecting events +where the user in the following commands is/is not the organizer of the event. +``` +gam update events [] +gam delete events [] +gam purge events [] +gam move events [] +gam info events [] +gam show events [] +gam print events [] +gam update calattendees +``` + ### 6.64.04 Updated `gam calendars move events` and `gam move events ` diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index 55a2ba31..cc8634df 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.04 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.64.05 - 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.04 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.64.05 - 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/Users-Calendars-Events.md b/docs/Users-Calendars-Events.md index f1004f2b..f6a37404 100644 --- a/docs/Users-Calendars-Events.md +++ b/docs/Users-Calendars-Events.md @@ -250,6 +250,7 @@ (matchfield location )| (matchfield organizeremail )| (matchfield organizername )| + (matchfield organizerself )| (matchfield status )| (matchfield summary )| (matchfield transparency )| diff --git a/docs/Version-and-Help.md b/docs/Version-and-Help.md index 94dc4413..f94aaca0 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.04 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.64.05 - 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.04 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.64.05 - 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.04 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.64.05 - 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.04 + Latest: 6.64.05 echo $? 1 ``` @@ -72,7 +72,7 @@ echo $? Print the current version number without details ``` gam version simple -6.64.04 +6.64.05 ``` 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.04 - https://github.com/taers232c/GAMADV-XTD3 +GAM 6.64.05 - 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/GamCommands.txt b/src/GamCommands.txt index 2dbfb7ed..cbc0df5a 100644 --- a/src/GamCommands.txt +++ b/src/GamCommands.txt @@ -1575,6 +1575,7 @@ gam calendar printacl [todrive *] (matchfield location )| (matchfield organizeremail )| (matchfield organizername )| + (matchfield organizerself )| (matchfield status )| (matchfield summary )| (matchfield transparency )| @@ -5655,7 +5656,7 @@ gam show events [] ] [showdayofweek] [countsonly] [formatjson] -gam print events [] * +gam print events [] * [fields ] [showdayofweek] [countsonly] [formatjson [quotechar ]] [todrive *] diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index 6ad05dd8..e22ba60b 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -1,3 +1,18 @@ +6.64.05 + +Added `matchfield organizerself ` to `` to simplify selecting events +where the user in the following commands is/is not the organizer of the event. +``` +gam update events [] +gam delete events [] +gam purge events [] +gam move events [] +gam info events [] +gam show events [] +gam print events [] +gam update calattendees +``` + 7.00.00 Merged GAM-Team version diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 25dd025f..5b37f1e2 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -35178,8 +35178,10 @@ LIST_EVENTS_MATCH_FIELDS = { 'creatoremail': ['creator', 'email'], 'organizername': ['organizer', 'displayName'], 'organizeremail': ['organizer', 'email'], + 'organizerself': ['organizer', 'self'], 'organisername': ['organizer', 'displayName'], 'organiseremail': ['organizer', 'email'], + 'organiserself': ['organizer', 'self'], 'status': ['status'], 'transparency': ['transparency'], 'visibility': ['visibility'], @@ -35233,7 +35235,9 @@ def getCalendarEventEntity(): calendarEventEntity['queries'].append(getString(Cmd.OB_QUERY)) elif myarg == 'matchfield': matchField = getChoice(LIST_EVENTS_MATCH_FIELDS, mapChoice=True) - if matchField[0] != 'attendees' or matchField[1] == 'match': + if matchField[0] == 'organizer' and matchField[1] == 'self': + calendarEventEntity['matches'].append((matchField, getBoolean())) + elif matchField[0] != 'attendees' or matchField[1] == 'match': calendarEventEntity['matches'].append((matchField, getREPattern(re.IGNORECASE))) elif matchField[1] == 'email': calendarEventEntity['matches'].append((matchField, getNormalizedEmailAddressEntity())) @@ -35519,6 +35523,8 @@ def _eventMatches(event, match): eventAttr = eventAttr.get(attr, '') if not eventAttr: break + if match[0][0] == 'organizer' and match[0][1] == 'self': + return bool(eventAttr) == match[1] if match[0][0] != 'hangoutLink': return match[1].search(eventAttr) is not None # vkj-przn-nvg or vkjprznnvg