gam7 7.5.6__py3-none-any.whl → 7.5.8__py3-none-any.whl

gam/__init__.py

@@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
 """
 
 __author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
-__version__ = '7.05.06'
+__version__ = '7.05.08'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -13429,8 +13429,8 @@ def doReportUsage():
       break
     except GAPI.invalidInput as e:
       systemErrorExit(GOOGLE_API_ERROR_RC, str(e))
-    except GAPI.forbidden:
-      accessErrorExit(None)
+    except GAPI.forbidden as e:
+      accessErrorExit(None, str(e))
   if startUseDate:
     reportName = f'{report.capitalize()} Usage Report - {startUseDate}:{endUseDate}'
   else:
@@ -14027,8 +14027,8 @@ def doReport():
             printErrorMessage(BAD_REQUEST_RC, Msg.BAD_REQUEST)
             exitUserLoop = True
           break
-        except GAPI.forbidden:
-          accessErrorExit(None)
+        except GAPI.forbidden as e:
+          accessErrorExit(None, str(e))
         startDateTime += oneDay
       if exitUserLoop:
         break
@@ -14108,8 +14108,8 @@ def doReport():
         continue
       except GAPI.invalidInput as e:
         systemErrorExit(GOOGLE_API_ERROR_RC, str(e))
-      except GAPI.forbidden:
-        accessErrorExit(None)
+      except GAPI.forbidden as e:
+        accessErrorExit(None, str(e))
       startDateTime += oneDay
     csvPF.writeCSVfile(f'Customer Report - {tryDate}')
   else: # activityReports
@@ -38938,6 +38938,22 @@ def _setEventRecurrenceTimeZone(cal, calId, body, parameters, i, count):
       body['end']['timeZone'] = timeZone
   return True
 
+def _getEventDaysOfWeek(event):
+  for attr in ['start', 'end']:
+    if attr in event:
+      if 'date' in event[attr]:
+        try:
+          dateTime = datetime.datetime.strptime(event[attr]['date'], YYYYMMDD_FORMAT)
+          event[attr]['dayOfWeek'] = calendarlib.day_abbr[dateTime.weekday()]
+        except ValueError:
+          pass
+      elif 'dateTime' in event[attr]:
+        try:
+          dateTime, _ = iso8601.parse_date(event[attr]['dateTime'])
+          event[attr]['dayOfWeek'] = calendarlib.day_abbr[dateTime.weekday()]
+        except (iso8601.ParseError, OverflowError):
+          pass
+
 def _createCalendarEvents(user, origCal, function, calIds, count, body, parameters):
   if parameters['attendees']:
     body['attendees'] = parameters.pop('attendees')
@@ -39573,6 +39589,8 @@ def _getCalendarInfoEventOptions(calendarEventEntity):
     myarg = getArgument()
     if myarg == 'fields':
       _getEventFields(fieldsList)
+    elif myarg == 'showdayofweek':
+      calendarEventEntity['showDayOfWeek'] = True
     else:
       FJQC.GetFormatJSON(myarg)
   _addEventEntitySelectFields(calendarEventEntity, fieldsList)
@@ -39596,6 +39614,8 @@ def _infoCalendarEvents(origUser, user, origCal, calIds, count, calendarEventEnt
                          throwReasons=GAPI.CALENDAR_THROW_REASONS+[GAPI.NOT_FOUND, GAPI.DELETED, GAPI.FORBIDDEN],
                          calendarId=calId, eventId=eventId, fields=fields)
         if calendarEventEntity['maxinstances'] == -1 or 'recurrence' not in event:
+          if calendarEventEntity['showDayOfWeek']:
+            _getEventDaysOfWeek(event)
           _showCalendarEvent(user, calId, Ent.EVENT, event, j, jcount, FJQC)
         else:
           instances = callGAPIpages(cal.events(), 'instances', 'items',
@@ -39609,6 +39629,8 @@ def _infoCalendarEvents(origUser, user, origCal, calIds, count, calendarEventEnt
           l = 0
           for instance in instances:
             l += 1
+            if calendarEventEntity['showDayOfWeek']:
+              _getEventDaysOfWeek(instance)
             _showCalendarEvent(user, calId, Ent.INSTANCE, instance, l, lcount, FJQC)
           Ind.Decrement()
       except (GAPI.notFound, GAPI.deleted) as e:
@@ -39662,22 +39684,6 @@ def _getCalendarPrintShowEventOptions(calendarEventEntity, entityType):
   _addEventEntitySelectFields(calendarEventEntity, fieldsList)
   return (csvPF, FJQC, fieldsList)
 
-def _getEventDaysOfWeek(event):
-  for attr in ['start', 'end']:
-    if attr in event:
-      if 'date' in event[attr]:
-        try:
-          dateTime = datetime.datetime.strptime(event[attr]['date'], YYYYMMDD_FORMAT)
-          event[attr]['dayOfWeek'] = calendarlib.day_abbr[dateTime.weekday()]
-        except ValueError:
-          pass
-      elif 'dateTime' in event[attr]:
-        try:
-          dateTime, _ = iso8601.parse_date(event[attr]['dateTime'])
-          event[attr]['dayOfWeek'] = calendarlib.day_abbr[dateTime.weekday()]
-        except (iso8601.ParseError, OverflowError):
-          pass
-
 # gam calendars <CalendarEntity> print events <EventEntity> <EventDisplayProperties>*
 #	[fields <EventFieldNameList>] [showdayofweek]
 #	[countsonly] [formatjson [quotechar <Character>]] [todrive <ToDriveAttribute>*]

{gam7-7.5.6.dist-info → gam7-7.5.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gam7
-Version: 7.5.6
+Version: 7.5.8
 Summary: CLI tool to manage Google Workspace
 Project-URL: Homepage, https://github.com/GAM-team/GAM
 Project-URL: Issues, https://github.com/GAM-team/GAM/issues

{gam7-7.5.6.dist-info → gam7-7.5.8.dist-info}/RECORD

@@ -1,4 +1,4 @@
-gam/__init__.py,sha256=HxexuPBo1px2pTTWPdn9KgwFeVn67OnUyjRV4ZJ5hGM,3480840
+gam/__init__.py,sha256=RNpYcn6A_Egf8De41Ed9anpHZ2Sebw9yC6_kgeHyCqI,3481151
 gam/__main__.py,sha256=amz0-959ph6zkZKqjaar4n60yho-T37w6qWI36qx0CA,1049
 gam/cacerts.pem,sha256=nJuWha0xm5dHw_5ptGphwRoO-r36Ccpqiww9pCEDbSc,67484
 gam/cbcm-v1.1beta1.json,sha256=xO5XloCQQULmPbFBx5bckdqmbLFQ7sJ2TImhE1ysDIY,19439
@@ -65,8 +65,8 @@ gam/googleapiclient/discovery_cache/base.py,sha256=yCDPtxnbNN-p5_9fzBacC6P3wcUPl
 gam/googleapiclient/discovery_cache/file_cache.py,sha256=sim3Mg4HgRYo3vX75jvcKy_aV568EvIrtBfvfbw-044,4774
 gam/iso8601/__init__.py,sha256=Z2PsYbXgAH5a5xzUvgczCboPzqWpm65kRcIngCnhViU,1218
 gam/iso8601/iso8601.py,sha256=Li2FHZ4sBTWuthuQhyCvmvj0j6At8JbGzkSv2fc2RHU,4384
-gam7-7.5.6.dist-info/METADATA,sha256=cHzFHjZxU9IFIaAvKcC3zZ_t21l483LDnx9Ls2ko59Y,2888
-gam7-7.5.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-gam7-7.5.6.dist-info/entry_points.txt,sha256=HVUM5J7dA8YwvJfG30jiLefR19ExMs387TWugWd9sf4,42
-gam7-7.5.6.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-gam7-7.5.6.dist-info/RECORD,,
+gam7-7.5.8.dist-info/METADATA,sha256=-OkLrGYNkIVLlvYWhfcghqK3u_u2TWhEfgO1kg3YWHs,2888
+gam7-7.5.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+gam7-7.5.8.dist-info/entry_points.txt,sha256=HVUM5J7dA8YwvJfG30jiLefR19ExMs387TWugWd9sf4,42
+gam7-7.5.8.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+gam7-7.5.8.dist-info/RECORD,,