gam7 7.13.0__py3-none-any.whl → 7.13.1__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.13.00'
+__version__ = '7.13.01'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -13641,7 +13641,7 @@ REPORT_ACTIVITIES_TIME_OBJECTS = {'time'}
 #	[(user all|<UserItem>)|(orgunit|org|ou <OrgUnitPath> [showorgunit])|(select <UserTypeEntity>)]
 #	[([start <Time>] [end <Time>])|(range <Time> <Time>)|
 #	 yesterday|today|thismonth|(previousmonths <Integer>)]
-#	[filtertime.* <Time>] [filter|filters <String>]
+#	[filter <String> (filtertime<String> <Time>)*]
 #	[event|events <EventNameList>] [ip <String>]
 #	[groupidfilter <String>]
 #	[maxactivities <Number>] [maxevents <Number>] [maxresults <Number>]
@@ -13653,7 +13653,7 @@ REPORT_ACTIVITIES_TIME_OBJECTS = {'time'}
 #	[(date <Date>)|(range <Date> <Date>)|
 #	 yesterday|today|thismonth|(previousmonths <Integer>)]
 #	[nodatechange | (fulldatarequired all|<UserServiceNameList>)]
-#	[filtertime.* <Time>] [filter|filters <String>]
+#	[filter <String> (filtertime<String> <Time>)*]
 #	[(fields|parameters <String>)|(services <UserServiceNameList>)]
 #	[aggregatebydate|aggregatebyuser [Boolean]]
 #	[maxresults <Number>]
@@ -25491,7 +25491,7 @@ def doUpdateBrowsers():
       checkEntityAFDNEorAccessErrorExit(None, Ent.CHROME_BROWSER, deviceId, i, count)
 
 def _getChromeProfileName():
-  profileName = getString(Cmd.OB_CHROMEPROFILE_ID)
+  profileName = getString(Cmd.OB_CHROMEPROFILE_NAME)
   if not profileName.startswith('customers'):
     customerId = _getCustomerId()
     profileName = f'customers/{customerId}/profiles/{profileName}'
@@ -25598,12 +25598,12 @@ CHROMEPROFILE_ORDERBY_CHOICE_MAP = {
   }
 
 # gam show chromeprofiles
-#	[filtertime.* <Time>] [filter <String>]
+#	[filter <String> (filtertime<String> <Time>)*]
 #	[orderby <ChromeProfileOrderByFieldName> [ascending|descending]]
 #	<ChromeProfileFieldName>* [fields <ChromeProfileFieldNameList>]
 #	[formatjson]
 # gam print chromeprofiles [todrive <ToDriveAttribute>*]
-#	[filtertime.* <Time>] [filter <String>]
+#	[filter <String> (filtertime<String> <Time>)*]
 #	[orderby <ChromeProfileOrderByFieldName> [ascending|descending]]
 #	<ChromeProfileFieldName>* [fields <ChromeProfileFieldNameList>]
 #	[formatjson [quotechar <Character>]]
@@ -25641,7 +25641,7 @@ def doPrintShowChromeProfiles():
       sortHeaders = True
     else:
       FJQC.GetFormatJSONQuoteChar(myarg, True)
-  if filterTimes and filter is not None:
+  if filterTimes and cbfilter is not None:
     for filterTimeName, filterTimeValue in iter(filterTimes.items()):
       cbfilter = cbfilter.replace(f'#{filterTimeName}#', filterTimeValue)
   fields = getItemFieldsFromFieldsList('chromeBrowserProfiles', fieldsList)
@@ -25676,6 +25676,55 @@ def doPrintShowChromeProfiles():
       csvPF.SetSortTitles(['name', 'profileId'])
     csvPF.writeCSVfile('Chrome Profiles')
 
+def _getChromeProfileNameList():
+  if not Cmd.PeekArgumentPresent(['select', 'filter', 'filters']):
+    return getString(Cmd.OB_CHROMEPROFILE_NAME_LIST).replace(',', ' ').split()
+  return []
+
+def _initChromeProfileNameParameters():
+  cm = buildGAPIObject(API.CHROMEMANAGEMENT)
+  return (cm, {'profileNameList': _getChromeProfileNameList(), 'customerId': _getCustomerId(),
+               'cbfilter': None, 'filterTimes': {},
+               'OBY': OrderBy(CHROMEPROFILE_ORDERBY_CHOICE_MAP)})
+
+def _getChromeProfileNameParameters(myarg, parameters):
+  if not parameters['cbfilter'] and myarg == 'select':
+    parameters['profileNameList'].extend(getEntityList(Cmd.OB_CHROMEPROFILE_NAME_LIST))
+  elif not parameters['profileNameList'] and myarg == 'orderby':
+    parameters['OBY'].GetChoice()
+  elif not parameters['profileNameList'] and myarg.startswith('filtertime'):
+    parameters['filterTimes'][myarg] = getTimeOrDeltaFromNow()
+  elif not parameters['profileNameList'] and myarg in {'filter', 'filters'}:
+    parameters['cbfilter'] = getString(Cmd.OB_STRING)
+  else:
+    return False
+  return True
+
+def _getChromeProfileNameEntityForCommand(cm, parameters):
+  if parameters['cbfilter'] is None:
+    customerId = parameters['customerId']
+    for i, profileName in enumerate(parameters['profileNameList']):
+      if not profileName.startswith('customers'):
+        parameters['profileNameList'][i] = f'customers/{customerId}/profiles/{profileName}'
+    return
+  if parameters['filterTimes']:
+    for filterTimeName, filterTimeValue in iter(parameters['filterTimes'].items()):
+      parameters['cbfilter'] = parameters['cbfilter'].replace(f'#{filterTimeName}#', filterTimeValue)
+  printGettingAllAccountEntities(Ent.CHROME_PROFILE, parameters['cbfilter'])
+  pageMessage = getPageMessage()
+  try:
+    feed = yieldGAPIpages(cm.customers().profiles(), 'list', 'chromeBrowserProfiles',
+                          pageMessage=pageMessage,
+                          throwReasons=[GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED],
+                          parent=f'customers/{parameters["customerId"]}', pageSize=200,
+                          filter=parameters['cbfilter'], orderBy=parameters['OBY'].orderBy,
+                          fields='nextPageToken,chromeBrowserProfiles(name)')
+    for profiles in feed:
+      for profile in profiles:
+        parameters['profileNameList'].append(profile['name'])
+  except (GAPI.invalidArgument, GAPI.permissionDenied) as e:
+    entityActionFailedExit([Ent.CHROME_PROFILE, parameters['cbfilter']], str(e))
+
 CHROMEPROFILECOMMAND_TIME_OBJECTS = {
   'clientExecutionTime',
   'issueTime',
@@ -25691,12 +25740,11 @@ def _showChromeProfileCommand(profcmd, FJQC, i=0, count=0):
   showJSON(None, profcmd, timeObjects=CHROMEPROFILECOMMAND_TIME_OBJECTS)
   Ind.Decrement()
 
-# gam create chromeprofilecommand <ChromeProfileName>
+# gam create chromeprofilecommand <ChromeProfileNameEntity>
 #	[clearcache [<Boolean>]] [clearcookies [<Boolean>]]
 #	[formatjson]
 def doCreateChromeProfileCommand():
-  cm = buildGAPIObject(API.CHROMEMANAGEMENT)
-  profileName = _getChromeProfileName()
+  cm, parameters = _initChromeProfileNameParameters()
   body = {'commandType': 'clearBrowsingData', 'payload': {}}
   FJQC = FormatJSONQuoteChar()
   while Cmd.ArgumentsRemaining():
@@ -25707,13 +25755,20 @@ def doCreateChromeProfileCommand():
       body['payload']['clearCookies'] = getBoolean()
     else:
       FJQC.GetFormatJSON(myarg)
-  try:
-    profcmd = callGAPI(cm.customers().profiles().commands(), 'create',
-                       throwReasons=[GAPI.INVALID_ARGUMENT, GAPI.NOT_FOUND, GAPI.PERMISSION_DENIED],
-                       parent=profileName, body=body)
-    _showChromeProfileCommand(profcmd, FJQC)
-  except (GAPI.invalidArgument, GAPI.notFound, GAPI.permissionDenied) as e:
-    entityActionFailedExit([Ent.CHROME_PROFILE_COMMAND, profileName], str(e))
+  _getChromeProfileNameEntityForCommand(cm, parameters)
+  count = len(parameters['profileNameList'])
+  i = 0
+  for profileName in parameters['profileNameList']:
+    i +=1
+    try:
+      profcmd = callGAPI(cm.customers().profiles().commands(), 'create',
+                         throwReasons=[GAPI.INVALID_ARGUMENT, GAPI.NOT_FOUND, GAPI.PERMISSION_DENIED],
+                         parent=profileName, body=body)
+      _showChromeProfileCommand(profcmd, FJQC)
+    except (GAPI.notFound) as e:
+      entityActionFailedWarning([Ent.CHROME_PROFILE_COMMAND, profileName], str(e), i, count)
+    except (GAPI.invalidArgument, GAPI.permissionDenied) as e:
+      entityActionFailedExit([Ent.CHROME_PROFILE_COMMAND, profileName], str(e))
 
 # gam info chromeprofilecommand <ChromeProfileCommandName>
 #	[formatjson]
@@ -25732,9 +25787,9 @@ def doInfoChromeProfileCommand():
   except (GAPI.invalidArgument, GAPI.notFound, GAPI.permissionDenied) as e:
     entityActionFailedExit([Ent.CHROME_PROFILE, profileCommandName], str(e))
 
-# gam show chromeprofilecommands <ChromeProfileName>
+# gam show chromeprofilecommands <ChromeProfileNameEntity>
 #	[formatjson]
-# gam print chromeprofilecommands <ChromeProfileName> [todrive <ToDriveAttribute>*]
+# gam print chromeprofilecommands <ChromeProfilNameEntity> [todrive <ToDriveAttribute>*]
 #	[formatjson [quotechar <Character>]]
 def doPrintShowChromeProfileCommands():
   def _printProfileCommand(profcmd):
@@ -25746,28 +25801,31 @@ def doPrintShowChromeProfileCommands():
                               'JSON': json.dumps(cleanJSON(profcmd, timeObjects=CHROMEPROFILECOMMAND_TIME_OBJECTS),
                                                  ensure_ascii=False, sort_keys=True)})
 
-  cm = buildGAPIObject(API.CHROMEMANAGEMENT)
   csvPF = CSVPrintFile(['name']) if Act.csvFormat() else None
   FJQC = FormatJSONQuoteChar(csvPF)
-  profileName = _getChromeProfileName()
+  cm, parameters = _initChromeProfileNameParameters()
   while Cmd.ArgumentsRemaining():
     myarg = getArgument()
     if csvPF and myarg == 'todrive':
       csvPF.GetTodriveParameters()
+    elif _getChromeProfileNameParameters(myarg, parameters):
+      pass
     else:
       FJQC.GetFormatJSONQuoteChar(myarg, True)
-  printGettingEntityItemForWhom(Ent.CHROME_PROFILE_COMMAND, profileName)
-  pageMessage = getPageMessage()
-  try:
-    feed = yieldGAPIpages(cm.customers().profiles().commands(), 'list', 'chromeBrowserProfileCommands',
-                          pageMessage=pageMessage,
-                          throwReasons=[GAPI.NOT_FOUND, GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED],
-                          parent=profileName, pageSize=100)
-    for profcmds in feed:
+  _getChromeProfileNameEntityForCommand(cm, parameters)
+  count = len(parameters['profileNameList'])
+  i = 0
+  for profileName in parameters['profileNameList']:
+    i +=1
+    printGettingEntityItemForWhom(Ent.CHROME_PROFILE_COMMAND, profileName, i, count)
+    pageMessage = getPageMessage()
+    try:
+      profcmds = callGAPIpages(cm.customers().profiles().commands(), 'list', 'chromeBrowserProfileCommands',
+                               pageMessage=pageMessage,
+                               throwReasons=[GAPI.NOT_FOUND, GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED],
+                               parent=profileName, pageSize=100)
       if not csvPF:
         jcount = len(profcmds)
-        if not FJQC.formatJSON:
-          performActionNumItems(jcount, Ent.CHROME_PROFILE_COMMAND)
         Ind.Increment()
         j = 0
         for profcmd in profcmds:
@@ -25777,8 +25835,10 @@ def doPrintShowChromeProfileCommands():
       else:
         for profcmd in profcmds:
           _printProfileCommand(profcmd)
-  except (GAPI.notFound, GAPI.invalidArgument, GAPI.permissionDenied) as e:
-    entityActionFailedExit([Ent.CHROME_PROFILE, profileName], str(e))
+    except (GAPI.notFound) as e:
+      entityActionFailedWarning([Ent.CHROME_PROFILE, profileName], str(e), i, count)
+    except (GAPI.invalidArgument, GAPI.permissionDenied) as e:
+      entityActionFailedExit([Ent.CHROME_PROFILE, profileName], str(e))
   if csvPF:
     csvPF.writeCSVfile('Chrome Profile Commands')
 
@@ -73375,11 +73435,11 @@ def printShowForms(users):
 FORM_RESPONSE_TIME_OBJECTS = {'createTime', 'lastSubmittedTime'}
 
 # gam <UserTypeEntity> print formresponses <DriveFileEntity> [todrive <ToDriveAttribute>*]
-#	[filtertime.* <Time>] [filter <String>]
+#	[filter <String> (filtertime<String> <Time>)*]
 #	(addcsvdata <FieldName> <String>)*
 #	[countsonly|(formatjson [quotechar <Character>])]
 # gam <UserTypeEntity> show formresponses <DriveFileEntity>
-#	[filtertime.* <Time>] [filter <String>]
+#	[filter <String> (filtertime<String> <Time>)*]
 #	[countsonly|formatjson]
 def printShowFormResponses(users):
   csvPF = CSVPrintFile(['User', 'formId', 'responseId', 'createTime', 'lastSubmittedTime', 'respondentEmail', 'totalScore'],
@@ -73405,7 +73465,7 @@ def printShowFormResponses(users):
       addCSVData[k] = getString(Cmd.OB_STRING, minLen=0)
     else:
       FJQC.GetFormatJSONQuoteChar(myarg, True)
-  if filterTimes and filter is not None:
+  if filterTimes and frfilter is not None:
     for filterTimeName, filterTimeValue in iter(filterTimes.items()):
       frfilter = frfilter.replace(f'#{filterTimeName}#', filterTimeValue)
   if csvPF:

gam/gamlib/glclargs.py

@@ -857,7 +857,8 @@ class GamCLArgs():
   OB_CHAT_SPACE = 'ChatSpace'
   OB_CHAT_SPACE_LIST = 'ChatSpaceList'
   OB_CHAT_THREAD = 'ChatThread'
-  OB_CHROMEPROFILE_ID = 'ChromeProfileId'
+  OB_CHROMEPROFILE_NAME = 'ChromeProfileName'
+  OB_CHROMEPROFILE_NAME_LIST = 'ChromeProfileNameList'
   OB_CHROME_VERSION = 'ChromeVersion'
   OB_CIDR_NETMASK = 'CIDRnetmask'
   OB_CIGROUP_ALIAS_LIST = "CIGroupAliasList"

{gam7-7.13.0.dist-info → gam7-7.13.1.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-gam/__init__.py,sha256=j4MR3j0E4GnHkHRn-nuBoZMBfGY_t-doW7R7QS-mB1g,3558531
+gam/__init__.py,sha256=r5Az9Y4d5SKaZbY6rgvDWjVBdjzJjWdGDBcaiK7BcMg,3561613
 gam/__main__.py,sha256=amz0-959ph6zkZKqjaar4n60yho-T37w6qWI36qx0CA,1049
 gam/cacerts.pem,sha256=82Ak7btW_2XvocLUvAwPmpx8Chi0oqtZUG1gseLK_t4,50235
 gam/cbcm-v1.1beta1.json,sha256=xO5XloCQQULmPbFBx5bckdqmbLFQ7sJ2TImhE1ysDIY,19439
@@ -25,7 +25,7 @@ gam/gamlib/__init__.py,sha256=z5mF-y0j8pm-YNFBaiuxB4M_GAUPG-cXWwrhYwrVReM,679
 gam/gamlib/glaction.py,sha256=1Il_HrChVnPkzZwiZs5au4mFQVtq4K1Z42uIuR6qdnI,9419
 gam/gamlib/glapi.py,sha256=27NW2etvdNK4jfR699eqFzhV4gPotijXIQeX-wxCvHA,35319
 gam/gamlib/glcfg.py,sha256=bNTckxzIM_HruxO2DfYsDbEgqOIz1RX6CbU6XOQQQyg,28296
-gam/gamlib/glclargs.py,sha256=lp91zvalLQE-SCCbH9jipUMaeJMryGzeXPzpivQnoDs,42817
+gam/gamlib/glclargs.py,sha256=cx3WfZSG42fGSFs_wdV6d4IlCmBMEfYo_Dyah7-BX7M,42876
 gam/gamlib/glentity.py,sha256=zQ64Q5MVDnJwgUTxNapO5s-KC8yfr1fS4GxXu7uGPT0,33877
 gam/gamlib/glgapi.py,sha256=sJMWCyVd_2MP3rF2z-zqFwWEdUu6kceRA7e42u4kVv8,40181
 gam/gamlib/glgdata.py,sha256=weRppttWm6uRyqtBoGPKoHiNZ2h28nhfUV4J_mbCszY,2707
@@ -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.13.0.dist-info/METADATA,sha256=JLzO0wMY7JZKQG8JaqFM0iMih-LGczIRTG7fZEEqqm4,2978
-gam7-7.13.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-gam7-7.13.0.dist-info/entry_points.txt,sha256=HVUM5J7dA8YwvJfG30jiLefR19ExMs387TWugWd9sf4,42
-gam7-7.13.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-gam7-7.13.0.dist-info/RECORD,,
+gam7-7.13.1.dist-info/METADATA,sha256=544u73Ic8iTC10G_Koa_wIzTSrgfyG-1aWbqBR981Yk,2978
+gam7-7.13.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+gam7-7.13.1.dist-info/entry_points.txt,sha256=HVUM5J7dA8YwvJfG30jiLefR19ExMs387TWugWd9sf4,42
+gam7-7.13.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+gam7-7.13.1.dist-info/RECORD,,