gam7 7.7.5__py3-none-any.whl → 7.7.7__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.07.05'
+__version__ = '7.07.07'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -8565,7 +8565,7 @@ class CSVPrintFile():
     if not self.JSONtitlesSet:
       systemErrorExit(USAGE_ERROR_RC, Msg.NO_COLUMNS_SELECTED_WITH_CSV_OUTPUT_HEADER_FILTER.format(GC.CSV_OUTPUT_HEADER_FILTER, GC.CSV_OUTPUT_HEADER_DROP_FILTER))
 
-  def writeCSVfile(self, list_type):
+  def writeCSVfile(self, list_type, clearRowFilters=False):
 
     def todriveCSVErrorExit(entityValueList, errMsg):
       systemErrorExit(ACTION_FAILED_RC, formatKeyValueList(Ind.Spaces(),
@@ -8956,6 +8956,8 @@ class CSVPrintFile():
                                                       self.oneItemPerRow,
                                                       self.showPermissionsLast,
                                                       self.zeroBlankMimeTypeCounts)))
+      if clearRowFilters:
+        GM.Globals[GM.CSVFILE][GM.REDIRECT_QUEUE].put((GM.REDIRECT_QUEUE_CLEAR_ROW_FILTERS, clearRowFilters))
       GM.Globals[GM.CSVFILE][GM.REDIRECT_QUEUE].put((GM.REDIRECT_QUEUE_DATA, self.rows))
       return
     if self.zeroBlankMimeTypeCounts:
@@ -9582,6 +9584,7 @@ def CSVFileQueueHandler(mpQueue, mpQueueStdout, mpQueueStderr, csvPF, datetimeNo
   GM.Globals[GM.DATETIME_NOW] = datetimeNow
   GC.Values[GC.TIMEZONE] = tzinfo
   GC.Values[GC.OUTPUT_TIMEFORMAT] = output_timeformat
+  clearRowFilters = False
 #  if sys.platform.startswith('win'):
 #    signal.signal(signal.SIGINT, signal.SIG_IGN)
   if multiprocessing.get_start_method() == 'spawn':
@@ -9639,9 +9642,15 @@ def CSVFileQueueHandler(mpQueue, mpQueueStdout, mpQueueStderr, csvPF, datetimeNo
       csvPF.SetTimestampColumn(GC.Values[GC.CSV_OUTPUT_TIMESTAMP_COLUMN])
       csvPF.SetHeaderFilter(GC.Values[GC.CSV_OUTPUT_HEADER_FILTER])
       csvPF.SetHeaderDropFilter(GC.Values[GC.CSV_OUTPUT_HEADER_DROP_FILTER])
-      csvPF.SetRowFilter(GC.Values[GC.CSV_OUTPUT_ROW_FILTER], GC.Values[GC.CSV_OUTPUT_ROW_FILTER_MODE])
-      csvPF.SetRowDropFilter(GC.Values[GC.CSV_OUTPUT_ROW_DROP_FILTER], GC.Values[GC.CSV_OUTPUT_ROW_DROP_FILTER_MODE])
+      if not clearRowFilters:
+        csvPF.SetRowFilter(GC.Values[GC.CSV_OUTPUT_ROW_FILTER], GC.Values[GC.CSV_OUTPUT_ROW_FILTER_MODE])
+        csvPF.SetRowDropFilter(GC.Values[GC.CSV_OUTPUT_ROW_DROP_FILTER], GC.Values[GC.CSV_OUTPUT_ROW_DROP_FILTER_MODE])
+      else:
+        csvPF.SetRowFilter([], GC.Values[GC.CSV_OUTPUT_ROW_FILTER_MODE])
+        csvPF.SetRowDropFilter([], GC.Values[GC.CSV_OUTPUT_ROW_DROP_FILTER_MODE])
       csvPF.SetRowLimit(GC.Values[GC.CSV_OUTPUT_ROW_LIMIT])
+    elif dataType == GM.REDIRECT_QUEUE_CLEAR_ROW_FILTERS:
+      clearRowFilters = dataItem
     else: #GM.REDIRECT_QUEUE_EOF
       break
   csvPF.writeCSVfile(list_type)
@@ -14396,7 +14405,7 @@ def doReport():
           if addCSVData:
             row.update(addCSVData)
           csvPF.WriteRow(row)
-    csvPF.writeCSVfile(f'{report.capitalize()} Activity Report')
+    csvPF.writeCSVfile(f'{report.capitalize()} Activity Report', eventRowFilter)
 
 # Substitute for #user#, #email#, #usernamne#
 def _substituteForUser(field, user, userName):
@@ -38592,7 +38601,8 @@ def _getCalendarListEventsDisplayProperty(myarg, calendarEventEntity):
 
 def initCalendarEventEntity():
   return {'list': [], 'queries': [], 'kwargs': {}, 'dict': None,
-          'matches': [], 'maxinstances': -1, 'countsOnly': False, 'showDayOfWeek': False}
+          'matches': [], 'maxinstances': -1, 'showDayOfWeek': False,
+          'countsOnly': False, 'eventRowFilter': False, 'countsOnlyTitles': []}
 
 def getCalendarEventEntity():
   calendarEventEntity = initCalendarEventEntity()
@@ -39637,11 +39647,25 @@ def _printShowCalendarEvents(origUser, user, origCal, calIds, count, calendarEve
         elif GC.Values[GC.CSV_OUTPUT_USERS_AUDIT] and user:
           csvPF.WriteRowNoFilter({'calendarId': calId, 'primaryEmail': user, 'id': ''})
       else:
+        if calendarEventEntity['eventRowFilter']:
+          jcount = 0
+          for event in events:
+            if calendarEventEntity['showDayOfWeek']:
+              _getEventDaysOfWeek(event)
+            row = {'calendarId': calId, 'id': event['id']}
+            if user:
+              row['primaryEmail'] = user
+            flattenJSON(event, flattened=row, timeObjects=EVENT_TIME_OBJECTS)
+            if csvPF.CheckRowTitles(row):
+              jcount += 1
         row = {'calendarId': calId}
         if user:
           row['primaryEmail'] = user
         row['events'] = jcount
-        csvPF.WriteRow(row)
+        if not calendarEventEntity['eventRowFilter']:
+          csvPF.WriteRow(row)
+        else:
+          csvPF.WriteRowNoFilter(row)
 
 EVENT_FIELDS_CHOICE_MAP = {
   'anyonecanaddself': 'anyoneCanAddSelf',
@@ -39879,13 +39903,17 @@ def _getCalendarPrintShowEventOptions(calendarEventEntity, entityType):
       calendarEventEntity['countsOnly'] = True
     elif myarg == 'showdayofweek':
       calendarEventEntity['showDayOfWeek'] = True
+    elif myarg == 'eventrowfilter':
+      calendarEventEntity['eventRowFilter'] = True
     else:
       FJQC.GetFormatJSONQuoteChar(myarg, True)
-  if calendarEventEntity['countsOnly']:
+  if calendarEventEntity['countsOnly'] and not calendarEventEntity['eventRowFilter']:
     fieldsList = ['id']
   if csvPF:
     if calendarEventEntity['countsOnly']:
+      csvPF.RemoveTitles(['id'])
       csvPF.AddTitles(['events'])
+      calendarEventEntity['countsOnlyTitles'] = csvPF.titlesList[:]
     elif not FJQC.formatJSON and not fieldsList:
       csvPF.AddSortTitles(EVENT_PRINT_ORDER)
   _addEventEntitySelectFields(calendarEventEntity, fieldsList)
@@ -39893,17 +39921,24 @@ def _getCalendarPrintShowEventOptions(calendarEventEntity, entityType):
 
 # gam calendars <CalendarEntity> print events <EventEntity> <EventDisplayProperties>*
 #	[fields <EventFieldNameList>] [showdayofweek]
-#	[countsonly] [formatjson [quotechar <Character>]] [todrive <ToDriveAttribute>*]
+#	[countsonly [eventrowfilter]]
+#	[formatjson [quotechar <Character>]] [todrive <ToDriveAttribute>*]
 # gam calendars <CalendarEntity> show events <EventEntity> <EventDisplayProperties>*
 #	[fields <EventFieldNameList>] [showdayofweek]
-#	[countsonly] [formatjson]
+#	[countsonly]
+#	[formatjson]
 def doCalendarsPrintShowEvents(calIds):
   calendarEventEntity = getCalendarEventEntity()
   csvPF, FJQC, fieldsList = _getCalendarPrintShowEventOptions(calendarEventEntity, Ent.CALENDAR)
   _printShowCalendarEvents(None, None, None, calIds, len(calIds), calendarEventEntity,
                            csvPF, FJQC, fieldsList)
   if csvPF:
-    csvPF.writeCSVfile('Calendar Events')
+    if calendarEventEntity['countsOnly'] and calendarEventEntity['eventRowFilter']:
+      csvPF.SetRowFilter([], GC.Values[GC.CSV_OUTPUT_ROW_FILTER_MODE])
+      csvPF.SetTitles(calendarEventEntity['countsOnlyTitles'])
+      csvPF.writeCSVfile('Calendar Events', True)
+    else:
+      csvPF.writeCSVfile('Calendar Events')
 
 # <CalendarSettings> ::==
 #	[description <String>] [location <String>] [summary <String>] [timezone <TimeZone>]
@@ -51371,10 +51406,12 @@ def infoCalendarEvents(users):
 
 # gam <UserTypeEntity> print events <UserCalendarEntity> <EventEntity> <EventDisplayProperties>*
 #	[fields <EventFieldNameList>] [showdayofweek]
-#	[countsonly] [formatjson [quotechar <Character>]] [todrive <ToDriveAttribute>*]
+#	[countsonly [eventrowfilter]]
+#	[formatjson [quotechar <Character>]] [todrive <ToDriveAttribute>*]
 # gam <UserTypeEntity> show events <UserCalendarEntity> <EventEntity> <EventDisplayProperties>*
 #	[fields <EventFieldNameList>] [showdayofweek]
-#	[countsonly] [formatjson]
+#	[countsonly]]
+#	[formatjson]
 def printShowCalendarEvents(users):
   calendarEntity = getUserCalendarEntity()
   calendarEventEntity = getCalendarEventEntity()
@@ -51392,7 +51429,12 @@ def printShowCalendarEvents(users):
                              csvPF, FJQC, fieldsList)
     Ind.Decrement()
   if csvPF:
-    csvPF.writeCSVfile('Calendar Events')
+    if calendarEventEntity['countsOnly'] and calendarEventEntity['eventRowFilter']:
+      csvPF.SetRowFilter([], GC.Values[GC.CSV_OUTPUT_ROW_FILTER_MODE])
+      csvPF.SetTitles(calendarEventEntity['countsOnlyTitles'])
+      csvPF.writeCSVfile('Calendar Events', True)
+    else:
+      csvPF.writeCSVfile('Calendar Events')
 
 def getStatusEventDateTime(dateType, dateList):
   if dateType == 'timerange':

gam/gamlib/glglobals.py

@@ -207,6 +207,7 @@ REDIRECT_WRITE_HEADER = 'rdwh'
 REDIRECT_MULTIPROCESS = 'rdmp'
 REDIRECT_QUEUE = 'rdq'
 REDIRECT_QUEUE_NAME = 'name'
+REDIRECT_QUEUE_CLEAR_ROW_FILTERS = 'clearRowFilters'
 REDIRECT_QUEUE_TODRIVE = 'todrive'
 REDIRECT_QUEUE_CSVPF = 'csvpf'
 REDIRECT_QUEUE_DATA = 'rows'

{gam7-7.7.5.dist-info → gam7-7.7.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gam7
-Version: 7.7.5
+Version: 7.7.7
 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.7.5.dist-info → gam7-7.7.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-gam/__init__.py,sha256=g4Igp-HrQ97iJlBTNMDPYVPPAiGoAlKhWY08A1VILL4,3499561
+gam/__init__.py,sha256=NCaIed9ZmaOuNYWhMsJQM3jHOtwv8uolUJ74rojEs4o,3501521
 gam/__main__.py,sha256=amz0-959ph6zkZKqjaar4n60yho-T37w6qWI36qx0CA,1049
 gam/cacerts.pem,sha256=82Ak7btW_2XvocLUvAwPmpx8Chi0oqtZUG1gseLK_t4,50235
 gam/cbcm-v1.1beta1.json,sha256=xO5XloCQQULmPbFBx5bckdqmbLFQ7sJ2TImhE1ysDIY,19439
@@ -29,7 +29,7 @@ gam/gamlib/glclargs.py,sha256=2pb0bdmWbTM5WrNVlMP-d-pe8f5oY3XuF50m02v8ynk,42199
 gam/gamlib/glentity.py,sha256=fqWUlxQqPKlfFrkuPjCK2lZhhFBIZboCuO0qCxuEwqA,33691
 gam/gamlib/glgapi.py,sha256=n3J-kLsMC6pZ89r9i2hZIxCH73T1_WiwJyYVGfyhRsM,39349
 gam/gamlib/glgdata.py,sha256=weRppttWm6uRyqtBoGPKoHiNZ2h28nhfUV4J_mbCszY,2707
-gam/gamlib/glglobals.py,sha256=Y73xM1RNhIbtcqnMv1gcZF3wDWOeLWW-7SvoQyWw6tA,9659
+gam/gamlib/glglobals.py,sha256=xGfSHiDpF-FSA6jorBtzy981OVBGTHCUy_HTsmbIiwE,9712
 gam/gamlib/glindent.py,sha256=RfBa2LDfLIqPLL5vMfC689TCVmqn8xf-qulSzkiatrc,1228
 gam/gamlib/glmsgs.py,sha256=3wqw8Hq-l2n_TGkf7xhjQS9W6Xz5Ic2ErgsW3h-7qNM,33465
 gam/gamlib/glskus.py,sha256=xJ1E2BZ_CGHN6I19c9i8DApb5bT5VT-hGyMEmQ5hSRY,15241
@@ -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.7.5.dist-info/METADATA,sha256=C2Xs6CLuI69B-ABkkWX_KFESSbXeL7kmspqft-O_4_c,2969
-gam7-7.7.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-gam7-7.7.5.dist-info/entry_points.txt,sha256=HVUM5J7dA8YwvJfG30jiLefR19ExMs387TWugWd9sf4,42
-gam7-7.7.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-gam7-7.7.5.dist-info/RECORD,,
+gam7-7.7.7.dist-info/METADATA,sha256=cHrWG8vJlWd0Mu7T-71RWMxmlC6u0OxZVeJZw7-WCKk,2969
+gam7-7.7.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+gam7-7.7.7.dist-info/entry_points.txt,sha256=HVUM5J7dA8YwvJfG30jiLefR19ExMs387TWugWd9sf4,42
+gam7-7.7.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+gam7-7.7.7.dist-info/RECORD,,