From a1238c63978e8555670040180ad87e023c1cf8e8 Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Tue, 26 Nov 2024 13:09:44 -0800
Subject: [PATCH] Added option `positivecountsonly` to `gam <UserTypeEntity>
 print|show filecomments`

---
 src/GamCommands.txt |  5 +++--
 src/GamUpdate.txt   | 16 ++++++++++++++++
 src/gam/__init__.py | 27 ++++++++++++++++-----------
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/src/GamCommands.txt b/src/GamCommands.txt
index a0d05041..7e993549 100644
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -1059,6 +1059,7 @@ Specify a collection of items by directly specifying them; the item type is dete
         all_shortcuts |
         all_3p_shortcuts |
         all_items |
+        my_commentable_items |
         my_docs |
         my_files |
         my_folders |
@@ -6779,12 +6780,12 @@ gam print ownership <DriveFileID>|(drivefilename <DriveFileName>) [todrive <ToDr
 gam <UserTypeEntity> show filecomments <DriveFileEntity>
         [showdeleted] [start <Date>|<Time>]
         [fields <CommentsFieldNameList>] [showphotolinks]
-        [countsonly]
+        [countsonly|positivecountsonly]
         [formatjson]
 gam <UserTypeEntity> print filecomments <DriveFileEntity> [todrive <ToDriveAttribute>*]
         [showdeleted] [start <Date>|<Time>]
         [fields <CommentsFieldNameList>] [showphotolinks]
-        [countsonly]
+        [countsonly|positivecountsonly]
         (addcsvdata <FieldName> <String>)*
         [formatjson [quotechar <Character>]]
 
diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt
index 480c3403..e40fd921 100644
--- a/src/GamUpdate.txt
+++ b/src/GamUpdate.txt
@@ -1,3 +1,19 @@
+7.01.02
+
+Added option `positivecountsonly` to `gam <UserTypeEntity> print|show filecomments` that causes
+GAM to display the number of comments and replies only for files that have comments.
+
+Added `my_commentable_items` to `<DriveFileQueryShortcut>` that can be used with
+`gam <UserTypeEntity> print|show filecomments my_commentable_items` to speed up processing.
+
+Updated code that uses the Domain Shared Contacts API with an HTTPS proxy to avoid a trap:
+```
+Traceback (most recent call last):
+...
+File "atom/http.py", line 250, in _prepare_connection
+AttributeError: module 'ssl' has no attribute 'wrap_socket'
+```
+
 7.01.01
 
 Fixed bug in `gam <UserTypeEntity> print|show filetree` where no error message was generated
diff --git a/src/gam/__init__.py b/src/gam/__init__.py
index bfb6a1ed..07c13d17 100755
--- a/src/gam/__init__.py
+++ b/src/gam/__init__.py
@@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
 """
 
 __author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
-__version__ = '7.01.01'
+__version__ = '7.01.02'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -51946,6 +51946,7 @@ QUERY_SHORTCUTS_MAP = {
   'allshortcuts': f"mimeType = '{MIMETYPE_GA_SHORTCUT}'",
   'all3pshortcuts': f"mimeType = '{MIMETYPE_GA_3P_SHORTCUT}'",
   'allitems': 'allitems',
+  'mycommentableitems': ME_IN_OWNERS_AND+f"(mimeType = '{MIMETYPE_GA_DOCUMENT}' or mimeType = '{MIMETYPE_GA_SPREADSHEET}' or mimeType = '{MIMETYPE_GA_PRESENTATION}')",
   'mydocs': ME_IN_OWNERS_AND+f"mimeType = '{MIMETYPE_GA_DOCUMENT}'",
   'myfiles': ME_IN_OWNERS_AND+f"mimeType != '{MIMETYPE_GA_FOLDER}'",
   'myfolders': ME_IN_OWNERS_AND+f"mimeType = '{MIMETYPE_GA_FOLDER}'",
@@ -56233,14 +56234,14 @@ def _showComment(comment, stripPhotoLinks, timeObjects, i=0, count=0, FJQC=None)
   Ind.Decrement()
 
 # gam <UserTypeEntity> show filecomments <DriveFileEntity>
-#	[showdeleted] [start <Date>|<Time>] [countsonly]
+#	[showdeleted] [start <Date>|<Time>] [countsonly|positivecountsonly]
 #	[fields <CommentsFieldNameList>] [showphotolinks]
 #	[countsonly]
 #	[formatjson]
 # gam <UserTypeEntity> print filecomments <DriveFileEntity> [todrive <ToDriveAttribute>*]
 #	[showdeleted] [start <Date>|<Time>]
 #	[fields <CommentsFieldNameList>] [showphotolinks]
-#	[countsonly]
+#	[countsonly|positivecountsonly]
 #	(addcsvdata <FieldName> <String>)*
 #	[formatjson [quotechar <Character>]]
 def printShowFileComments(users):
@@ -56265,7 +56266,7 @@ def printShowFileComments(users):
   FJQC = FormatJSONQuoteChar(csvPF)
   fieldsList = []
   fileIdEntity = getDriveFileEntity()
-  countsOnly = False
+  countsOnly = positiveCountsOnly = False
   stripPhotoLinks = True
   kwargs = {}
   addCSVData = {}
@@ -56286,6 +56287,8 @@ def printShowFileComments(users):
       addCSVData[k] = getString(Cmd.OB_STRING, minLen=0)
     elif myarg == 'countsonly':
       countsOnly = True
+    elif myarg == 'positivecountsonly':
+      countsOnly = positiveCountsOnly = True
     else:
       FJQC.GetFormatJSONQuoteChar(myarg)
   if csvPF:
@@ -56339,7 +56342,8 @@ def printShowFileComments(users):
           numReplies += len(comment['replies'])
       if not csvPF:
         if countsOnly:
-          printKeyValueList([Ent.Singular(Ent.DRIVE_FILE_ID), fileId, 'comments', kcount, 'replies', numReplies])
+          if not positiveCountsOnly or kcount > 0:
+            printKeyValueList([Ent.Singular(Ent.DRIVE_FILE_ID), fileId, 'comments', kcount, 'replies', numReplies])
         else:
           if not FJQC.formatJSON:
             entityPerformActionNumItems([Ent.DRIVE_FILE_ID, fileId], kcount, Ent.DRIVE_FILE_COMMENT, j, jcount)
@@ -56351,12 +56355,13 @@ def printShowFileComments(users):
               _showComment(comment, stripPhotoLinks, timeObjects, k, kcount, FJQC)
         Ind.Decrement()
       elif countsOnly:
-        row = {'User': user, 'fileId': fileId}
-        if addCSVData:
-          row.update(addCSVData)
-        row['comments'] = kcount
-        row['replies'] = numReplies
-        csvPF.WriteRowTitles(row)
+        if not positiveCountsOnly or kcount > 0:
+          row = {'User': user, 'fileId': fileId}
+          if addCSVData:
+            row.update(addCSVData)
+          row['comments'] = kcount
+          row['replies'] = numReplies
+          csvPF.WriteRowTitles(row)
       elif comments:
         baserow = {'User': user, 'fileId': fileId}
         if addCSVData: