deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 12:21:35 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Fixed bug in gam <UserTypeEntity> print users ... license ... formatjson that caused a trap.

Browse Source
This commit is contained in:
Ross Scroggs
2024-08-11 20:19:59 -07:00
parent 9dab94bd7b
commit 93a6e4d835
5 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/GamUpdates.md
View File

@@ -10,6 +10,10 @@ Add the `-s` option to the end of the above commands to suppress creating the `g
See [Downloads-Installs](https://github.com/taers232c/GAMADV-XTD3/wiki/Downloads-Installs) for Windows or other options, including manual installation See [Downloads-Installs](https://github.com/taers232c/GAMADV-XTD3/wiki/Downloads-Installs) for Windows or other options, including manual installation
### 6.79.13
Fixed bug in `gam <UserTypeEntity> print users ... license ... formatjson` that caused a trap.
### 6.79.12 ### 6.79.12
Fixed bug in `gam user admin@domain.com print chatspaces asadmin` that caused the following error: Fixed bug in `gam user admin@domain.com print chatspaces asadmin` that caused the following error:

4
docs/How-to-Upgrade-from-Standard-GAM.md
View File

@@ -251,7 +251,7 @@ writes the credentials into the file oauth2.txt.
admin@server:/Users/admin$ rm -f /Users/admin/GAMConfig/oauth2.txt admin@server:/Users/admin$ rm -f /Users/admin/GAMConfig/oauth2.txt
admin@server:/Users/admin$ gam version admin@server:/Users/admin$ gam version
WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found
GAMADV-XTD3 6.79.12 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource GAMADV-XTD3 6.79.13 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
Ross Scroggs <ross.scroggs@gmail.com> Ross Scroggs <ross.scroggs@gmail.com>
Python 3.12.4 64-bit final Python 3.12.4 64-bit final
MacOS Sonoma 14.5 x86_64 MacOS Sonoma 14.5 x86_64
@@ -923,7 +923,7 @@ writes the credentials into the file oauth2.txt.
C:\>del C:\GAMConfig\oauth2.txt C:\>del C:\GAMConfig\oauth2.txt
C:\>gam version C:\>gam version
WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found
GAMADV-XTD3 6.79.12 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource GAMADV-XTD3 6.79.13 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
Ross Scroggs <ross.scroggs@gmail.com> Ross Scroggs <ross.scroggs@gmail.com>
Python 3.12.4 64-bit final Python 3.12.4 64-bit final
Windows-10-10.0.17134 AMD64 Windows-10-10.0.17134 AMD64

12
docs/Version-and-Help.md
View File

@@ -3,7 +3,7 @@
Print the current version of Gam with details Print the current version of Gam with details
``` ```
gam version gam version
GAMADV-XTD3 6.79.12 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource GAMADV-XTD3 6.79.13 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
Ross Scroggs <ross.scroggs@gmail.com> Ross Scroggs <ross.scroggs@gmail.com>
Python 3.12.4 64-bit final Python 3.12.4 64-bit final
MacOS Sonoma 14.5 x86_64 MacOS Sonoma 14.5 x86_64
@@ -15,7 +15,7 @@ Time: 2023-06-02T21:10:00-07:00
Print the current version of Gam with details and time offset information Print the current version of Gam with details and time offset information
``` ```
gam version timeoffset gam version timeoffset
GAMADV-XTD3 6.79.12 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource GAMADV-XTD3 6.79.13 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
Ross Scroggs <ross.scroggs@gmail.com> Ross Scroggs <ross.scroggs@gmail.com>
Python 3.12.4 64-bit final Python 3.12.4 64-bit final
MacOS Sonoma 14.5 x86_64 MacOS Sonoma 14.5 x86_64
@@ -27,7 +27,7 @@ Your system time differs from www.googleapis.com by less than 1 second
Print the current version of Gam with extended details and SSL information Print the current version of Gam with extended details and SSL information
``` ```
gam version extended gam version extended
GAMADV-XTD3 6.79.12 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource GAMADV-XTD3 6.79.13 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
Ross Scroggs <ross.scroggs@gmail.com> Ross Scroggs <ross.scroggs@gmail.com>
Python 3.12.4 64-bit final Python 3.12.4 64-bit final
MacOS Sonoma 14.5 x86_64 MacOS Sonoma 14.5 x86_64
@@ -64,7 +64,7 @@ MacOS High Sierra 10.13.6 x86_64
Path: /Users/Admin/bin/gamadv-xtd3 Path: /Users/Admin/bin/gamadv-xtd3
Version Check: Version Check:
Current: 5.35.08 Current: 5.35.08
Latest: 6.79.12 Latest: 6.79.13
echo $? echo $?
1 1
``` ```
@@ -72,7 +72,7 @@ echo $?
Print the current version number without details Print the current version number without details
``` ```
gam version simple gam version simple
6.79.12 6.79.13
``` ```
In Linux/MacOS you can do: In Linux/MacOS you can do:
``` ```
@@ -82,7 +82,7 @@ echo $VER
Print the current version of Gam and address of this Wiki Print the current version of Gam and address of this Wiki
``` ```
gam help gam help
GAM 6.79.12 - https://github.com/taers232c/GAMADV-XTD3 GAM 6.79.13 - https://github.com/taers232c/GAMADV-XTD3
Ross Scroggs <ross.scroggs@gmail.com> Ross Scroggs <ross.scroggs@gmail.com>
Python 3.12.4 64-bit final Python 3.12.4 64-bit final
MacOS Sonoma 14.5 x86_64 MacOS Sonoma 14.5 x86_64

4
src/GamUpdate.txt
View File

@@ -2,6 +2,10 @@
Merged GAM-Team version Merged GAM-Team version
6.79.13
Fixed bug in `gam <UserTypeEntity> print users ... license ... formatjson` that caused a trap.
6.79.12 6.79.12
Fixed bug in `gam user admin@domain.com print chatspaces asadmin` that caused the following error: Fixed bug in `gam user admin@domain.com print chatspaces asadmin` that caused the following error:

38
src/gam/__init__.py
View File

@@ -44131,23 +44131,27 @@ def doPrintUsers(entityList=None):
for userEntity in entityList: for userEntity in entityList:
_updateDomainCounts(normalizeEmailAddressOrUID(userEntity)) _updateDomainCounts(normalizeEmailAddressOrUID(userEntity))
if not printOptions['countOnly']: if not printOptions['countOnly']:
if printOptions['sortHeaders']: if not FJQC.formatJSON:
sortTitles = ['primaryEmail'] if printOptions['sortHeaders']:
if printOptions['scalarsFirst']: sortTitles = ['primaryEmail']
sortTitles.extend([f'name{GC.Values[GC.CSV_OUTPUT_SUBFIELD_DELIMITER]}{field}' for field in USER_NAME_PROPERTY_PRINT_ORDER]+sorted(USER_LANGUAGE_PROPERTY_PRINT_ORDER+USER_SCALAR_PROPERTY_PRINT_ORDER)) if printOptions['scalarsFirst']:
csvPF.SetSortTitles(sortTitles) sortTitles.extend([f'name{GC.Values[GC.CSV_OUTPUT_SUBFIELD_DELIMITER]}{field}' for field in USER_NAME_PROPERTY_PRINT_ORDER]+sorted(USER_LANGUAGE_PROPERTY_PRINT_ORDER+USER_SCALAR_PROPERTY_PRINT_ORDER))
csvPF.SortTitles() csvPF.SetSortTitles(sortTitles)
csvPF.SetSortTitles([]) csvPF.SortTitles()
if sortRows and orderBy: csvPF.SetSortTitles([])
orderBy = 'primaryEmail' if orderBy == 'email' else f'name.{orderBy}' if printOptions['getGroupFeed']:
csvPF.SortRows(orderBy, reverse=sortOrder == 'DESCENDING') if not printOptions['groupsInColumns']:
if printOptions['getGroupFeed']: csvPF.MoveTitlesToEnd(['GroupsCount', 'Groups'])
if not printOptions['groupsInColumns']: else:
csvPF.MoveTitlesToEnd(['GroupsCount', 'Groups']) csvPF.MoveTitlesToEnd(['Groups']+[f'Groups{GC.Values[GC.CSV_OUTPUT_SUBFIELD_DELIMITER]}{j}' for j in range(printOptions['maxGroups'])])
else: if printOptions['getLicenseFeed'] or printOptions['getLicenseFeedByUser']:
csvPF.MoveTitlesToEnd(['Groups']+[f'Groups{GC.Values[GC.CSV_OUTPUT_SUBFIELD_DELIMITER]}{j}' for j in range(printOptions['maxGroups'])]) csvPF.MoveTitlesToEnd(licenseTitles)
if printOptions['getLicenseFeed'] or printOptions['getLicenseFeedByUser']: if sortRows and orderBy:
csvPF.MoveTitlesToEnd(licenseTitles) orderBy = 'primaryEmail' if orderBy == 'email' else f'name.{orderBy}'
csvPF.SortRows(orderBy, reverse=sortOrder == 'DESCENDING')
else:
if sortRows and orderBy == 'email':
csvPF.SortRows('primaryEmail', reverse=sortOrder == 'DESCENDING')
elif not FJQC.formatJSON: elif not FJQC.formatJSON:
for domain, count in sorted(iter(domainCounts.items())): for domain, count in sorted(iter(domainCounts.items())):
csvPF.WriteRowNoFilter({'domain': domain, 'count': count}) csvPF.WriteRowNoFilter({'domain': domain, 'count': count})