diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index 34a4bd02..a8db42d0 100644 --- a/docs/GamUpdates.md +++ b/docs/GamUpdates.md @@ -10,6 +10,16 @@ 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.71.10 + +Reverted change made in 6.71.09 to `gam print filelist` when `showmimetype` and `filepath|fullpath` +were both specified. The change improved the performance when `showmimetype` selected a small number of files; +the information for just those files was downloaded and then additional API calls were made to construct the file paths. +However, if a large number of files were selected, the additional APIs calls decreased performance. + +Added option `mimetypeinquery` can be used when you expect the query to return a small number of files +relative to the total number of files. + ### 6.71.09 Improved the performance of `gam print filelist` when `showmimetype` and `filepath|fullpath` diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index f4c82ff1..40083c95 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.71.09 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.10 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 @@ -1006,7 +1006,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.71.09 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.10 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final Windows-10-10.0.17134 AMD64 diff --git a/docs/Users-Drive-Files-Display.md b/docs/Users-Drive-Files-Display.md index 66fcc963..7ff33fd4 100644 --- a/docs/Users-Drive-Files-Display.md +++ b/docs/Users-Drive-Files-Display.md @@ -999,7 +999,7 @@ gam print|show filelist [todrive *] [select [selectsubquery ] [(norecursion [])|(depth )] [showparent]] [anyowner|(showownedby any|me|others)] - [showmimetype [not] ] + [showmimetype [not] ] [mimetypeinquery []] [sizefield quotabytesused|size] [minimumfilesize ] [maximumfilesize ] [filenamematchpattern ] * [] [] [pmfilter] [oneitemperrow] diff --git a/docs/Version-and-Help.md b/docs/Version-and-Help.md index a7842a66..529af719 100644 --- a/docs/Version-and-Help.md +++ b/docs/Version-and-Help.md @@ -3,7 +3,7 @@ Print the current version of Gam with details ``` gam version -GAMADV-XTD3 6.71.09 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.10 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 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 ``` gam version timeoffset -GAMADV-XTD3 6.71.09 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.10 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 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 ``` gam version extended -GAMADV-XTD3 6.71.09 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.10 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 @@ -64,7 +64,7 @@ MacOS High Sierra 10.13.6 x86_64 Path: /Users/Admin/bin/gamadv-xtd3 Version Check: Current: 5.35.08 - Latest: 6.71.09 + Latest: 6.71.10 echo $? 1 ``` @@ -72,7 +72,7 @@ echo $? Print the current version number without details ``` gam version simple -6.71.09 +6.71.10 ``` In Linux/MacOS you can do: ``` @@ -82,7 +82,7 @@ echo $VER Print the current version of Gam and address of this Wiki ``` gam help -GAM 6.71.09 - https://github.com/taers232c/GAMADV-XTD3 +GAM 6.71.10 - https://github.com/taers232c/GAMADV-XTD3 Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 diff --git a/src/GamCommands.txt b/src/GamCommands.txt index 7a4242b6..014cdfc3 100644 --- a/src/GamCommands.txt +++ b/src/GamCommands.txt @@ -6751,7 +6751,7 @@ gam print filelist [todrive *] [select [selectsubquery ] [(norecursion [])|(depth )] [showparent]] [anyowner|(showownedby any|me|others)] - [showmimetype [not] ] + [showmimetype [not] ] [mimetypeinquery []] [sizefield quotabytesused|size] [minimumfilesize ] [maximumfilesize ] [filenamematchpattern ] * [] [] [pmfilter] [oneitemperrow] diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index d6573ba9..7362287e 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -2,6 +2,16 @@ Merged GAM-Team version +6.71.10 + +Reverted change made in 6.71.09 to `gam print filelist` when `showmimetype` and `filepath|fullpath` +were both specified. The change improved the performance when `showmimetype` selected a small number of files; +the information for just those files was downloaded and then additional API calls were made to construct the file paths. +However, if a large number of files were selected, the additional APIs calls decreased performance. + +Added option `mimetypeinquery` can be used when you expect the query to return a small number of files +relative to the total number of files. + 6.71.09 Improved the performance of `gam print filelist` when `showmimetype` and `filepath|fullpath` diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 545ece73..89ae22f7 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -53264,7 +53264,7 @@ SIZE_FIELD_CHOICE_MAP = { # [select [selectsubquery ] # [(norecursion [])|(depth )] [showparent]] # [anyowner|(showownedby any|me|others)] -# [showmimetype [not] ] +# [showmimetype [not] ] [mimetypeinquery []] # [sizefield quotabytesused|size] [minimumfilesize ] [maximumfilesize ] # [filenamematchpattern ] # * [] [] [pmfilter] [oneitemperrow] @@ -53501,7 +53501,7 @@ def printFileList(users): csvPF = CSVPrintFile('Owner', indexedTitles=DRIVE_INDEXED_TITLES) FJQC = FormatJSONQuoteChar(csvPF) addPathsToJSON = countsRowFilter = buildTree = countsOnly = filepath = fullpath = getPermissionsForSharedDrives = \ - noRecursion = oneItemPerRow = stripCRsFromName = \ + mimeTypeInQuery = noRecursion = oneItemPerRow = stripCRsFromName = \ showParentsIdsAsList = showDepth = showParent = showSize = showMimeTypeSize = showSource = False sizeField = 'quotaBytesUsed' pathDelimiter = '/' @@ -53541,6 +53541,8 @@ def printFileList(users): selectSubQuery = getString(Cmd.OB_QUERY, minLen=0) elif myarg == 'norecursion': noRecursion = getBoolean() + elif myarg == 'mimetypeinquery': + mimeTypeInQuery = getBoolean() elif myarg == 'depth': maxdepth = getInteger(minVal=-1) elif myarg == 'showdepth': @@ -53635,7 +53637,7 @@ def printFileList(users): and not fileIdEntity['shareddrivefilequery'] and _simpleFileIdEntityList(fileIdEntity['list'])) incrementalPrint = buildTree and (not filepath) and noSelect and not DLP.locationSet and not showParent - if buildTree and noSelect and not DLP.locationSet and not showParent: + if buildTree and ((not filepath) or mimeTypeInQuery) and noSelect and not DLP.locationSet and not showParent: DLP.AddMimeTypeToQuery() if buildTree: if not fileIdEntity.get('shareddrive'):