Skip to content

Commit e08de92

Browse files
authored
simplify all metadata fetch call, use * to get all fields (#104)
1 parent 6f12d4b commit e08de92

File tree

2 files changed

+12
-20
lines changed

2 files changed

+12
-20
lines changed

pydrive2/files.py

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -209,25 +209,6 @@ def __init__(self, auth=None, metadata=None, uploaded=False):
209209
self.UpdateMetadata(metadata)
210210
elif metadata:
211211
self.update(metadata)
212-
self._ALL_FIELDS = (
213-
"alternateLink,appDataContents,"
214-
"canComment,canReadRevisions,capabilities"
215-
"copyable,createdDate,defaultOpenWithLink,description,"
216-
"downloadUrl,editable,embedLink,etag,explicitlyTrashed,"
217-
"exportLinks,fileExtension,fileSize,folderColorRgb,"
218-
"fullFileExtension,hasAugmentedPermissions,"
219-
"headRevisionId,iconLink,id,"
220-
"imageMediaMetadata,indexableText,isAppAuthorized,kind,"
221-
"labels,lastModifyingUser,lastModifyingUserName,"
222-
"lastViewedByMeDate,markedViewedByMeDate,md5Checksum,"
223-
"mimeType,modifiedByMeDate,modifiedDate,openWithLinks,"
224-
"originalFilename,ownedByMe,ownerNames,owners,parents,"
225-
"permissions,properties,quotaBytesUsed,selfLink,shareable,"
226-
"shared,sharedWithMeDate,sharingUser,spaces,teamDriveId,"
227-
"thumbnail,thumbnailLink,title,trashedDate,trashingUser"
228-
"userPermission,version,videoMediaMetadata,webContentLink,"
229-
"webViewLink,writersCanShare"
230-
)
231212
self.has_bom = True
232213

233214
def __getitem__(self, key):
@@ -449,7 +430,7 @@ def FetchMetadata(self, fields=None, fetch_all=False):
449430
file_id = self.metadata.get("id") or self.get("id")
450431

451432
if fetch_all:
452-
fields = self._ALL_FIELDS
433+
fields = "*"
453434

454435
if file_id:
455436
try:

pydrive2/test/test_file.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,17 @@ def test_Files_FetchMetadata_Fields(self):
451451
self.assertTrue("permissions" in file1)
452452
pydrive_retry(file1.Delete)
453453

454+
def test_Files_FetchAllMetadata_Fields(self):
455+
drive = GoogleDrive(self.ga)
456+
file1 = drive.CreateFile()
457+
pydrive_retry(file1.Upload)
458+
459+
pydrive_retry(file1.FetchMetadata, fetch_all=True)
460+
self.assertTrue("hasThumbnail" in file1)
461+
self.assertTrue("thumbnailVersion" in file1)
462+
self.assertTrue("permissions" in file1)
463+
pydrive_retry(file1.Delete)
464+
454465
def test_Files_Insert_Permission(self):
455466
drive = GoogleDrive(self.ga)
456467
file1 = drive.CreateFile()

0 commit comments

Comments
 (0)