gam7 7.10.1__py3-none-any.whl → 7.10.2__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.10.01'
+__version__ = '7.10.02'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -70133,6 +70133,7 @@ def _initMessageThreadParameters(entityType, doIt, maxToProcess):
           'query': '', 'queryTimes': {},
           'entityType': entityType, 'messageEntity': None, 'doIt': doIt, 'quick': True,
           'labelMatchPattern': None, 'senderMatchPattern': None,
+          'labelIds': [],
           'maxToProcess': maxToProcess, 'maxItems': 0, 'maxMessagesPerThread': 0,
           'maxToKeywords': [MESSAGES_MAX_TO_KEYWORDS[Act.Get()], 'maxtoprocess'],
           'listType': listType, 'fields': f'nextPageToken,{listType}(id)'}
@@ -70165,6 +70166,8 @@ def _getMessageSelectParameters(myarg, parameters):
     parameters['labelMatchPattern'] = getREPattern(re.IGNORECASE)
   elif myarg == 'sendermatchpattern':
     parameters['senderMatchPattern'] = getREPattern(re.IGNORECASE)
+  elif myarg == 'labelids':
+    parameters['labelIds'].extend(getEntityList(Cmd.OB_LABEL_ID_LIST))
   elif myarg == 'ids':
     parameters['messageEntity'] = getUserObjectEntity(Cmd.OB_MESSAGE_ID, parameters['entityType'])
   elif myarg == 'quick':
@@ -71809,7 +71812,8 @@ def printShowMessagesThreads(users, entityType):
         listResult = callGAPIpages(service, 'list', parameters['listType'],
                                    pageMessage=getPageMessageForWhom(), maxItems=parameters['maxItems'],
                                    throwReasons=GAPI.GMAIL_THROW_REASONS+GAPI.GMAIL_LIST_THROW_REASONS,
-                                   userId='me', q=parameters['query'], fields=parameters['fields'], includeSpamTrash=includeSpamTrash,
+                                   userId='me', q=parameters['query'], labelIds=parameters['labelIds'],
+                                   fields=parameters['fields'], includeSpamTrash=includeSpamTrash,
                                    maxResults=GC.Values[GC.MESSAGE_MAX_RESULTS])
         messageIds = [message['id'] for message in listResult]
       else:
@@ -72607,14 +72611,19 @@ def updateFormRequestUpdateMasks(ubody):
         break
 
 def _initPublishSettings():
-  return {'publishSettings': {'publishState': {'isPublished': False, 'isAcceptingResponses': False}},
-          'updateMask': ''}
+  return {'publishSettings': {'publishState': {}}, 'updateMask': ''}
 
 def _getPublishSettings(myarg, pbody):
   if myarg == 'ispublished':
-    pbody['publishSettings']['publishState']['isPublished'] = getBoolean()
+    bval = getBoolean()
+    pbody['publishSettings']['publishState']['isPublished'] = bval
+    if not bval:
+      pbody['publishSettings']['publishState']['isAcceptingResponses'] = bval
   elif myarg == 'isacceptingresponses':
-    pbody['publishSettings']['publishState']['isAcceptingResponses'] = getBoolean()
+    bval = getBoolean()
+    pbody['publishSettings']['publishState']['isAcceptingResponses'] = bval
+    if bval:
+      pbody['publishSettings']['publishState']['isPublished'] = bval
   else:
     return False
   pbody['updateMask'] = 'publishState'
@@ -72808,6 +72817,9 @@ def printShowForms(users):
         result = callGAPI(gform.forms(), 'get',
                           throwReasons=[GAPI.NOT_FOUND, GAPI.PERMISSION_DENIED],
                           formId=formId)
+        if 'publishSettings' in result and 'publishState' in result['publishSettings']:
+          result['publishSettings']['publishState'].setdefault('isPublished', False)
+          result['publishSettings']['publishState'].setdefault('isAcceptingResponses', False)
         if not csvPF:
           if not FJQC.formatJSON:
             printEntity([Ent.FORM, result['formId']], j, jcount)

{gam7-7.10.1.dist-info → gam7-7.10.2.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-gam/__init__.py,sha256=ejWiKhprah_kxm4KbtjLxPaSLTdyknQRiMiethG60dE,3531420
+gam/__init__.py,sha256=0tfJVNeH1l47v2sr8o2Pbji48zIKWeuOG3Tw71RedRs,3532028
 gam/__main__.py,sha256=amz0-959ph6zkZKqjaar4n60yho-T37w6qWI36qx0CA,1049
 gam/cacerts.pem,sha256=82Ak7btW_2XvocLUvAwPmpx8Chi0oqtZUG1gseLK_t4,50235
 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.10.1.dist-info/METADATA,sha256=SpdJAI-N7RK9Myvwyb_EIIW80pwaLDKWaugdHlU6Pis,2978
-gam7-7.10.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-gam7-7.10.1.dist-info/entry_points.txt,sha256=HVUM5J7dA8YwvJfG30jiLefR19ExMs387TWugWd9sf4,42
-gam7-7.10.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-gam7-7.10.1.dist-info/RECORD,,
+gam7-7.10.2.dist-info/METADATA,sha256=HWD4kRxt5a3KpGcPRUv3XlFABH_RP4OlazSgrReISEk,2978
+gam7-7.10.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+gam7-7.10.2.dist-info/entry_points.txt,sha256=HVUM5J7dA8YwvJfG30jiLefR19ExMs387TWugWd9sf4,42
+gam7-7.10.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+gam7-7.10.2.dist-info/RECORD,,