From 1c0e6ebf9c890eefe16d627025b50d01f39b07d0 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Sat, 2 Dec 2023 09:09:40 -0800 Subject: [PATCH] Fixed bug in `gam print filelist select ` where `stripcrsfromname` was not being applied to files below the selected folder. --- docs/GamUpdates.md | 5 +++++ docs/How-to-Upgrade-from-Standard-GAM.md | 4 ++-- docs/Version-and-Help.md | 12 ++++++------ src/GamUpdate.txt | 5 +++++ src/gam/__init__.py | 12 +++++++----- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index c807c1e4..b4139018 100644 --- a/docs/GamUpdates.md +++ b/docs/GamUpdates.md @@ -10,6 +10,11 @@ Add the `-s` option to the end of the above commands to suppress creating the `g See [Downloads](https://github.com/taers232c/GAMADV-XTD3/wiki/Downloads) for Windows or other options, including manual installation +### 6.66.03 + +Fixed bug in `gam print filelist select ` where `stripcrsfromname` was not being +applied to files below the selected folder. + ### 6.66.02 Updated device commmands to handle the following error caused by an invalid query. diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index 93a9d86a..8f44abf8 100644 --- a/docs/How-to-Upgrade-from-Standard-GAM.md +++ b/docs/How-to-Upgrade-from-Standard-GAM.md @@ -334,7 +334,7 @@ writes the credentials into the file oauth2.txt. admin@server:/Users/admin/bin/gamadv-xtd3$ rm -f /Users/admin/GAMConfig/oauth2.txt admin@server:/Users/admin/bin/gamadv-xtd3$ ./gam version WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found -GAMADV-XTD3 6.66.02 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.66.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.10.8 64-bit final MacOS High Sierra 10.13.6 x86_64 @@ -1002,7 +1002,7 @@ writes the credentials into the file oauth2.txt. C:\GAMADV-XTD3>del C:\GAMConfig\oauth2.txt C:\GAMADV-XTD3>gam version WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found -GAMADV-XTD3 6.66.02 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.66.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.0 64-bit final Windows-10-10.0.17134 AMD64 diff --git a/docs/Version-and-Help.md b/docs/Version-and-Help.md index 98ad3aaf..aaee9021 100644 --- a/docs/Version-and-Help.md +++ b/docs/Version-and-Help.md @@ -4,7 +4,7 @@ Print the current version of Gam with details ``` gam version -GAMADV-XTD3 6.66.02 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.66.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.0 64-bit final MacOS Monterey 12.7 x86_64 @@ -16,7 +16,7 @@ Time: 2023-06-02T21:10:00-07:00 Print the current version of Gam with details and time offset information ``` gam version timeoffset -GAMADV-XTD3 6.66.02 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.66.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.0 64-bit final MacOS Monterey 12.7 x86_64 @@ -28,7 +28,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 ``` gam version extended -GAMADV-XTD3 6.66.02 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.66.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.0 64-bit final MacOS Monterey 12.7 x86_64 @@ -65,7 +65,7 @@ MacOS High Sierra 10.13.6 x86_64 Path: /Users/Admin/bin/gamadv-xtd3 Version Check: Current: 5.35.08 - Latest: 6.66.02 + Latest: 6.66.03 echo $? 1 ``` @@ -73,7 +73,7 @@ echo $? Print the current version number without details ``` gam version simple -6.66.02 +6.66.03 ``` In Linux/MacOS you can do: ``` @@ -83,7 +83,7 @@ echo $VER Print the current version of Gam and address of this Wiki ``` gam help -GAM 6.66.02 - https://github.com/taers232c/GAMADV-XTD3 +GAM 6.66.03 - https://github.com/taers232c/GAMADV-XTD3 Ross Scroggs Python 3.12.0 64-bit final MacOS Monterey 12.7 x86_64 diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index 3821abd4..d65617fb 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -2,6 +2,11 @@ Merged GAM-Team version +6.66.03 + +Fixed bug in `gam print filelist select ` where `stripcrsfromname` was not being +applied to files below the selected folder. + 6.66.02 Updated device commmands to handle the following error caused by an invalid query. diff --git a/src/gam/__init__.py b/src/gam/__init__.py index fbb126ac..89a3fe9e 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -52660,7 +52660,7 @@ def printFileList(users): if DLP.onlySharedDrives or getPermissionsForSharedDrives or DFF.showSharedDriveNames: _setSkipObjects(skipObjects, ['driveId'], DFF.fieldsList) - def _printFileInfo(drive, user, f_file): + def _printFileInfo(drive, user, f_file, cleanFileName): driveId = f_file.get('driveId') checkSharedDrivePermissions = getPermissionsForSharedDrives and driveId and 'permissions' not in f_file if (f_file.get('noDisplay', False) or @@ -52690,6 +52690,8 @@ def printFileList(users): pass row = {'Owner': user} fileInfo = f_file.copy() + if cleanFileName: + fileInfo['name'] = _stripControlCharsFromName(fileInfo['name']) if not pmselect and 'permissions' in fileInfo: fileInfo['permissions'] = DLP.GetFileMatchingPermission(fileInfo) if DFF.showSharedDriveNames and driveId: @@ -52768,7 +52770,7 @@ def printFileList(users): filesPrinted.add(childFileId) # Don't show My Drive/Shared Drive unless asked when parent is 'SharedDrives' if showParent or parentFileEntry['info']['id'] != SHARED_DRIVES: - _printFileInfo(drive, user, childEntry['info'].copy()) + _printFileInfo(drive, user, childEntry['info'].copy(), False) if childEntry['info']['mimeType'] == MIMETYPE_GA_FOLDER and (maxdepth == -1 or depth < maxdepth): _printChildDriveFolderContents(drive, childEntry['info'], user, i, count, depth+1) return @@ -52800,7 +52802,7 @@ def printFileList(users): fileTree.setdefault(childFileId, {'info': childEntryInfo}) if childFileId not in filesPrinted: filesPrinted.add(childFileId) - _printFileInfo(drive, user, childEntryInfo.copy()) + _printFileInfo(drive, user, childEntryInfo.copy(), stripCRsFromName) if childEntryInfo['mimeType'] == MIMETYPE_GA_FOLDER and (maxdepth == -1 or depth < maxdepth): _printChildDriveFolderContents(drive, childEntryInfo, user, i, count, depth+1) except (GAPI.invalidQuery, GAPI.invalid, GAPI.badRequest): @@ -53106,7 +53108,7 @@ def printFileList(users): for f_file in files: if stripCRsFromName: f_file['name'] = _stripControlCharsFromName(f_file['name']) - _printFileInfo(drive, user, f_file) + _printFileInfo(drive, user, f_file, False) if incrementalPrint: if countsOnly: if summary != FILECOUNT_SUMMARY_NONE: @@ -53173,7 +53175,7 @@ def printFileList(users): fileEntryInfo['mimeType'] != MIMETYPE_GA_FOLDER or noRecursion): if fileId not in filesPrinted: filesPrinted.add(fileId) - _printFileInfo(drive, user, fileEntryInfo.copy()) + _printFileInfo(drive, user, fileEntryInfo.copy(), False) if fileEntryInfo['mimeType'] == MIMETYPE_GA_FOLDER and not noRecursion: _printChildDriveFolderContents(drive, fileEntryInfo, user, i, count, 0) if GC.Values[GC.SHOW_GETTINGS] and not GC.Values[GC.SHOW_GETTINGS_GOT_NL]: