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

Fixed bug in redirect csv ... transpose where a CSV file with multiple rows was not properly transposed.

Browse Source
This commit is contained in:
Ross Scroggs
2025-05-12 14:33:14 -07:00
parent db74a6e22a
commit d2f048a773
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/GamUpdate.txt
View File

@@ -1,3 +1,7 @@
7.07.02
Fixed bug in `redirect csv ... transpose` where a CSV file with multiple rows was not properly transposed.
7.07.01 7.07.01
Fixed bug in `gam print|show chromepolicies` that caused a trap. Made additional Fixed bug in `gam print|show chromepolicies` that caused a trap. Made additional

21
src/gam/__init__.py
View File

@@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
""" """
__author__ = 'GAM Team <google-apps-manager@googlegroups.com>' __author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
__version__ = '7.07.01' __version__ = '7.07.02'
__license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)' __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
#pylint: disable=wrong-import-position #pylint: disable=wrong-import-position
@@ -8585,6 +8585,7 @@ class CSVPrintFile():
def writeCSVData(writer): def writeCSVData(writer):
try: try:
if not self.outputTranspose:
if GM.Globals[GM.CSVFILE][GM.REDIRECT_WRITE_HEADER]: if GM.Globals[GM.CSVFILE][GM.REDIRECT_WRITE_HEADER]:
writer.writerow(dict((item, item) for item in writer.fieldnames)) writer.writerow(dict((item, item) for item in writer.fieldnames))
if not self.sortHeaders: if not self.sortHeaders:
@@ -8592,6 +8593,8 @@ class CSVPrintFile():
else: else:
for row in sorted(self.rows, key=itemgetter(*self.sortHeaders)): for row in sorted(self.rows, key=itemgetter(*self.sortHeaders)):
writer.writerow(row) writer.writerow(row)
else:
writer.writerows(self.rows)
return True return True
except IOError as e: except IOError as e:
stderrErrorMsg(e) stderrErrorMsg(e)
@@ -9008,17 +9011,13 @@ class CSVPrintFile():
normalizeSortHeaders() normalizeSortHeaders()
if self.outputTranspose: if self.outputTranspose:
newRows = [] newRows = []
pivotKey = titlesList[0] newTitlesList = [i for i in range(len(self.rows)+1)]
newTitlesList = [pivotKey] for title in titlesList:
newTitlesSet = set(newTitlesList) i = 0
for title in titlesList[1:]: newRow = {i: title}
newRow = {pivotKey: title}
for row in self.rows: for row in self.rows:
pivotValue = row[pivotKey] i += 1
if pivotValue not in newTitlesSet: newRow[i] = row.get(title)
newTitlesSet.add(pivotValue)
newTitlesList.append(pivotValue)
newRow[pivotValue] = row.get(title)
newRows.append(newRow) newRows.append(newRow)
titlesList = newTitlesList titlesList = newTitlesList
self.rows = newRows self.rows = newRows