Skip to content

add len(MediaIoReadable) #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 31, 2020
Merged

add len(MediaIoReadable) #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7a822e
add len(MediaIoReadable)
casperdcl May 30, 2020
c04a9c7
test buffer len
casperdcl May 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion pydrive2/files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ def __init__(
self.downloader = MediaIoBaseDownload(
self._fd, request, chunksize=chunksize
)
self.size = None
self._pre_buffer = False
if pre_buffer:
self.read()
Expand All @@ -157,7 +158,8 @@ def read(self):
if self.done:
return None
try:
_, self.done = self.downloader.next_chunk()
status, self.done = self.downloader.next_chunk()
self.size = status.total_size
except errors.HttpError as error:
raise ApiRequestError(error)
return self._fd.read()
Expand All @@ -172,6 +174,9 @@ def __iter__(self):
break
yield chunk

def __len__(self):
return self.size


class GoogleDriveFile(ApiAttributeMixin, ApiResource):
"""Google Drive File instance.
Expand Down
2 changes: 2 additions & 0 deletions pydrive2/test/test_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,11 @@ def test_11_Files_Get_Content_Buffer(self):

buffer1 = pydrive_retry(file1.GetContentIOBuffer)
self.assertEqual(file1.metadata["title"], filename)
self.assertEqual(len(buffer1), len(content))
self.assertEqual(b"".join(iter(buffer1)).decode("ascii"), content)

buffer2 = pydrive_retry(file1.GetContentIOBuffer, encoding="ascii")
self.assertEqual(len(buffer2), len(content))
self.assertEqual("".join(iter(buffer2)), content)

self.DeleteUploadedFiles(drive, [file1["id"]])
Expand Down