From e5e5db335d4364b12f5be9c8d71258d338821b20 Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Mon, 30 Mar 2020 18:31:35 -0700
Subject: [PATCH] Add updateevent documentation, fix bug (#1142)

* Add updateevent documentation

* Fix calendar bug

* updateevent doesn't use id|eventid
---
 src/GamCommands.txt  | 9 +++++++--
 src/gapi/calendar.py | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/GamCommands.txt b/src/GamCommands.txt
index 512fbd9d..0b17b14c 100644
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -1005,7 +1005,6 @@ The following attributes are equivalent:
 	guestscantinviteothers|
 	guestscantseeothers|
 	hangoutsmeet|
-	(id <String>)|
 	(location <String>)|
 	(noreminders| (reminder <Number> email|popup|sms))|
 	(optionalattendee <EmailAddress>)|
@@ -1019,6 +1018,11 @@ The following attributes are equivalent:
 	(timezone <Timezone>)|
 	(visibility default|public|prvate)
 
+<EventUpdateAttributes> ::=
+	<EventAttributes>|
+	(removeattendee <EmailAddress>)|
+	(replacedescription <RegularExpression> <String>)
+
 <EventSelectProperty:> ::=
 	(after <Time>)|
 	(before <Time>)|
@@ -1030,9 +1034,10 @@ The following attributes are equivalent:
 <EventDisplayProperty> ::=
 	(timezone <TimeZone>)
 
-gam calendar <CalendarItem> addevent <EventAttributes>+ [<EventNotificationAttribute>]
+gam calendar <CalendarItem> addevent [id <String>] <EventAttributes>+ [<EventNotificationAttribute>]
 gam calendar <CalendarItem> deleteevent id|eventid <EventID> [doit] [<EventNotificationAttribute>]
 gam calendar <CalendarItem> moveevent id|eventid <EventID> [doit] [<EventNotificationAttribute>]
+gam calendar <CalendarItem> updateevent <EventID> <EventUpdateAttributes>+ [<EventNotificationAttribute>]
 gam calendar <CalendarItem> wipe
 gam calendar <CalendarItem> printevents <EventSelectProperty>* <EventDisplayProperty>* [todrive]
 
diff --git a/src/gapi/calendar.py b/src/gapi/calendar.py
index 611dc219..f73551d3 100644
--- a/src/gapi/calendar.py
+++ b/src/gapi/calendar.py
@@ -370,7 +370,8 @@ def getEventAttributes(i, calendarId, cal, body, action):
         elif myarg == 'replacedescription' and action == 'update':
             search = sys.argv[i+1]
             replace = sys.argv[i+2]
-            body['description'] = re.sub(search, replace, body['description'])
+            if 'description' in body:
+                body['description'] = re.sub(search, replace, body['description'])
             i += 3
         elif myarg == 'start':
             if sys.argv[i+1].lower() == 'allday':