From 5ad28c053ba7ae606e44a1b22179c646a047e7a2 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Fri, 3 Jul 2026 08:45:29 -0400 Subject: [PATCH] fix init .gam config dir --- .DS_Store | Bin 0 -> 8196 bytes src/.DS_Store | Bin 6148 -> 8196 bytes src/gam/cmd/chromepolicies.py | 2 +- src/gam/cmd/cros.py | 2 +- src/gam/cmd/gmail/messages.py | 2 +- src/gam/cmd/gmail/settings.py | 2 +- src/gam/cmd/gmail/signature.py | 8 ++++---- src/gam/cmd/notes.py | 4 ++-- src/gam/cmd/reports.py | 4 ++-- src/gam/util/config.py | 3 ++- 10 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..697640df45ae9aadd4db6915ee12a185fdd697f9 GIT binary patch literal 8196 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 delta 124 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{MGjdEU6q~50$jCG?VE1GL8J5ZX0#_#sihtYK zpv$_Lor6P=8K?>f1h|2OD@en}!tczJ`DH8>K*Ed+3`|g(1w;cmAfrLHF>H?KnZpbK DD}EAn diff --git a/src/gam/cmd/chromepolicies.py b/src/gam/cmd/chromepolicies.py index 3cf9ab2a..20499490 100644 --- a/src/gam/cmd/chromepolicies.py +++ b/src/gam/cmd/chromepolicies.py @@ -646,7 +646,7 @@ def doUpdateChromePolicy(): elif vtype == 'TYPE_LIST': value = value.split(',') if value else [] elif vtype == 'TYPE_STRING' and convertCRsNLs: - value = _getMain().unescapeCRsNLs(value) + value = _getMain().un_getMain().escapeCRsNLs(value) if myarg == 'chrome.users.chromebrowserupdates' and casedField == 'targetVersionPrefixSetting': mg = CHROME_TARGET_VERSION_CHANNEL_MINUS_PATTERN.match(value) if mg: diff --git a/src/gam/cmd/cros.py b/src/gam/cmd/cros.py index 186a1840..097b36b4 100644 --- a/src/gam/cmd/cros.py +++ b/src/gam/cmd/cros.py @@ -1103,7 +1103,7 @@ def doPrintCrOSDevices(entityList=None): csvPF.WriteRowNoFilter(row) return if 'notes' in cros: - cros['notes'] = escapeCRsNLs(cros['notes']) + cros['notes'] = _getMain().escapeCRsNLs(cros['notes']) if addCSVData: cros.update(addCSVData) for cpuStatusReport in cros.get('cpuStatusReports', []): diff --git a/src/gam/cmd/gmail/messages.py b/src/gam/cmd/gmail/messages.py index d3c4d430..5f244d94 100644 --- a/src/gam/cmd/gmail/messages.py +++ b/src/gam/cmd/gmail/messages.py @@ -1419,7 +1419,7 @@ def printShowMessagesThreads(users, entityType): if not convertCRNL: row['Body'] = _getMessageBody(result['payload']) else: - row['Body'] = escapeCRsNLs(_getMessageBody(result['payload'])) + row['Body'] = _getMain().escapeCRsNLs(_getMessageBody(result['payload'])) if show_attachments: attachments = [] _getAttachments(result['id'], result['payload'], attachmentNamePattern, attachments) diff --git a/src/gam/cmd/gmail/settings.py b/src/gam/cmd/gmail/settings.py index 93bd6c9c..b0e71800 100644 --- a/src/gam/cmd/gmail/settings.py +++ b/src/gam/cmd/gmail/settings.py @@ -465,7 +465,7 @@ SMTPMSA_DISPLAY_FIELDS = ['host', 'port', 'securityMode'] def _showSendAs(result, j, jcount, sigReplyFormat, verifyOnly=False): if sigReplyFormat == SIG_REPLY_TEMPLATE: - _getMain().writeStdout(f"{escapeCRsNLs(result.get('signature', 'None'))}\n") + _getMain().writeStdout(f"{_getMain().escapeCRsNLs(result.get('signature', 'None'))}\n") return if result['displayName']: _getMain().printEntity([Ent.SENDAS_ADDRESS, f'{result["displayName"]} <{result["sendAsEmail"]}>'], j, jcount) diff --git a/src/gam/cmd/gmail/signature.py b/src/gam/cmd/gmail/signature.py index 13c5c287..b1d460e0 100644 --- a/src/gam/cmd/gmail/signature.py +++ b/src/gam/cmd/gmail/signature.py @@ -116,9 +116,9 @@ def _showVacation(user, i, count, result, showDisabled, sigReplyFormat): Ind.Decrement() else: # SIG_REPLY_COMPACT if result.get('responseBodyPlainText'): - _getMain().printKeyValueList(['Message', escapeCRsNLs(result['responseBodyPlainText'])]) + _getMain().printKeyValueList(['Message', _getMain().escapeCRsNLs(result['responseBodyPlainText'])]) elif result.get('responseBodyHtml'): - _getMain().printKeyValueList(['Message', escapeCRsNLs(result['responseBodyHtml'])]) + _getMain().printKeyValueList(['Message', _getMain().escapeCRsNLs(result['responseBodyHtml'])]) else: _getMain().printKeyValueList(['Message', 'None']) Ind.Decrement() @@ -222,11 +222,11 @@ def printShowVacation(users): row['subject'] = result.get('responseSubject', 'None') if result.get('responseBodyPlainText'): row['html'] = False - row['message'] = escapeCRsNLs(result['responseBodyPlainText']) + row['message'] = _getMain().escapeCRsNLs(result['responseBodyPlainText']) elif result.get('responseBodyHtml'): row['html'] = True if sigReplyFormat == SIG_REPLY_HTML: - row['message'] = escapeCRsNLs(result['responseBodyHtml']) + row['message'] = _getMain().escapeCRsNLs(result['responseBodyHtml']) else: row['message'] = result['responseBodyHtml'].replace('\r', '').replace('\n', '') else: diff --git a/src/gam/cmd/notes.py b/src/gam/cmd/notes.py index ba8b4edf..fefa5924 100644 --- a/src/gam/cmd/notes.py +++ b/src/gam/cmd/notes.py @@ -139,7 +139,7 @@ def _showNote(note, j=0, jcount=0, FJQC=None, compact=False): _getMain().printKeyValueList([Ind.MultiLineText(body['text']['text'])]) Ind.Decrement() else: - _getMain().printKeyValueList(['text', escapeCRsNLs(body['text']['text'])]) + _getMain().printKeyValueList(['text', _getMain().escapeCRsNLs(body['text']['text'])]) elif 'list' in body and 'listItems' in body['list']: _showNoteListItems(body['list']['listItems']) Ind.Decrement() @@ -153,7 +153,7 @@ def createNote(users): def fixTextItem(item): if 'text' in item: if item['text']: - item['text'] = unescapeCRsNLs(item['text']) + item['text'] = un_getMain().escapeCRsNLs(item['text']) return if missingTextValue: item['text'] = missingTextValue diff --git a/src/gam/cmd/reports.py b/src/gam/cmd/reports.py index c54ae127..b56babfd 100644 --- a/src/gam/cmd/reports.py +++ b/src/gam/cmd/reports.py @@ -778,7 +778,7 @@ def doReport(): if noAuthorizedApps: continue for app in item['msgValue']: - appName = f'App: {escapeCRsNLs(app["client_name"])}' + appName = f'App: {_getMain().escapeCRsNLs(app["client_name"])}' for key in ['num_users', 'client_id']: title = f'{appName}{GC.Values[GC.CSV_OUTPUT_SUBFIELD_DELIMITER]}{key}' csvPF.AddTitles(title) @@ -851,7 +851,7 @@ def doReport(): app.update(addCSVData) for an_item in subitem: if an_item == 'client_name': - app['name'] = f'App: {escapeCRsNLs(subitem[an_item])}' + app['name'] = f'App: {_getMain().escapeCRsNLs(subitem[an_item])}' elif an_item == 'num_users': app['value'] = f'{subitem[an_item]} users' elif an_item == 'client_id': diff --git a/src/gam/util/config.py b/src/gam/util/config.py index ec72053b..cdccbe78 100644 --- a/src/gam/util/config.py +++ b/src/gam/util/config.py @@ -19,7 +19,8 @@ import time import httplib2 import arrow -from gamlib import glaction as Act +from gamlib import glaction +Act = glaction.GamAction() from gamlib import glapi as API from gamlib import glcfg as GC from gamlib import glentity as Ent