deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-04 12:51:36 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Clean up SKU handling (#432)

Browse Source
This commit is contained in:
Ross Scroggs
2017-02-18 13:57:42 -08:00
committed by Jay Lee
parent 0d7028416a
commit 3c3b7527a1
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gam.py
View File

@@ -4351,14 +4351,10 @@ def getImap(users):
print u'User: {0}, IMAP Enabled: {1} ({2}/{3})'.format(user, enabled, i, count) print u'User: {0}, IMAP Enabled: {1} ({2}/{3})'.format(user, enabled, i, count)
def getProductAndSKU(sku): def getProductAndSKU(sku):
product = None
l_sku = sku.lower().replace(u'-', u'').replace(u' ', u'') l_sku = sku.lower().replace(u'-', u'').replace(u' ', u'')
for a_sku, sku_values in SKUS.items(): for a_sku, sku_values in SKUS.items():
if l_sku == a_sku.lower().replace(u'-', u'') or l_sku in sku_values[u'aliases']: if l_sku == a_sku.lower().replace(u'-', u'') or l_sku in sku_values[u'aliases'] or l_sku == sku_values[u'displayName'].lower().replace(u' ', u''):
sku = a_sku return (sku_values[u'product'], a_sku)
product = sku_values[u'product']
break
if not product:
try: try:
product = re.search(u'^([A-Z,a-z]*-[A-Z,a-z]*)', sku).group(1) product = re.search(u'^([A-Z,a-z]*-[A-Z,a-z]*)', sku).group(1)
except AttributeError: except AttributeError:
@@ -8786,7 +8782,7 @@ def doPrintUsers():
for u_license in licenses: for u_license in licenses:
if u_license[u'userId'].lower() == user[u'primaryEmail'].lower(): if u_license[u'userId'].lower() == user[u'primaryEmail'].lower():
user_licenses.append(u_license[u'skuId']) user_licenses.append(u_license[u'skuId'])
user.update(Licenses=u' '.join(user_licenses)) user.update(Licenses=u','.join(user_licenses))
writeCSVfile(csvRows, titles, u'Users', todrive) writeCSVfile(csvRows, titles, u'Users', todrive)
GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP = { GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP = {