Skip to content

fix(upload/272): don't magically set filename on set file content #273

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
Apr 10, 2023
Merged

fix(upload/272): don't magically set filename on set file content #273

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
7aed046
fix(upload/272): don't magically set filename on set file content
shcheklein Apr 7, 2023
e7a42ae
fix(272/update): add test
shcheklein Apr 9, 2023
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
2 changes: 0 additions & 2 deletions pydrive2/files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,6 @@ def SetContentFile(self, filename):
:type filename: str.
"""
self.content = open(filename, "rb")
if self.get("title") is None:
self["title"] = filename
if self.get("mimeType") is None:
self["mimeType"] = mimetypes.guess_type(filename)[0]

Expand Down
20 changes: 20 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 @@ -264,6 +264,26 @@ def test_Files_Update_File(self):

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

def test_Files_Update_File_Keeps_Filename(self):
# Tests https://github.com/iterative/PyDrive2/issues/272
drive = GoogleDrive(self.ga)
file1 = drive.CreateFile()
filename = self.getTempFile("preupdatetestfile")
contentFile = self.getTempFile("actual_content", "some string")
contentFile2 = self.getTempFile("actual_content_2", "some string")

file1["title"] = filename
file1.SetContentFile(contentFile)
pydrive_retry(file1.Upload) # Files.insert
self.assertEqual(file1.metadata["title"], filename)

same_file = drive.CreateFile({"id": file1["id"]})
same_file.SetContentFile(contentFile2)
pydrive_retry(same_file.Upload) # Files.update
self.assertEqual(same_file.metadata["title"], filename)

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

def test_Files_Update_By_Id(self):
drive = GoogleDrive(self.ga)
file1 = drive.CreateFile()
Expand Down