Set content picks default title/mime if file is created for the first time

pydrive2/files.py

@@ -1,4 +1,5 @@
 import io
+import os
 import mimetypes
 import json
 
@@ -235,30 +236,35 @@ def SetContentString(self, content, encoding="utf-8"):
         """Set content of this file to be a string.
 
         Creates io.BytesIO instance of utf-8 encoded string.
-        Sets mimeType to be 'text/plain' if not specified.
+        Sets mimeType to be 'text/plain' if not specified and file id is not
+        set (means that we are uploading this file for the first time).
 
         :param encoding: The encoding to use when setting the content of this file.
         :type encoding: str
         :param content: content of the file in string.
         :type content: str
         """
         self.content = io.BytesIO(content.encode(encoding))
-        if self.get("mimeType") is None:
+        if self.get("mimeType") is None and self.get("id") is None:
             self["mimeType"] = "text/plain"
 
     def SetContentFile(self, filename):
         """Set content of this file from a file.
 
         Opens the file specified by this method.
         Will be read, uploaded, and closed by Upload() method.
-        Sets metadata 'title' and 'mimeType' automatically if not specified.
+        Sets metadata 'title' and 'mimeType' automatically if not specified and
+        the file is uploaded for the first time (id is not set).
 
         :param filename: name of the file to be uploaded.
         :type filename: str.
         """
         self.content = open(filename, "rb")
-        if self.get("mimeType") is None:
-            self["mimeType"] = mimetypes.guess_type(filename)[0]
+        if self.get("id") is None:
+            if self.get("title") is None:
+                self["title"] = os.path.basename(filename)
+            if self.get("mimeType") is None:
+                self["mimeType"] = mimetypes.guess_type(filename)[0]
 
     def GetContentString(
         self, mimetype=None, encoding="utf-8", remove_bom=False

pydrive2/test/test_file.py

@@ -129,13 +129,13 @@ def test_Files_Insert_Content_Unicode_String(self):
     def test_Files_Insert_Content_File(self):
         drive = GoogleDrive(self.ga)
         file1 = drive.CreateFile()
-        filename = self.getTempFile("filecontent")
-        file1["title"] = filename
         contentFile = self.getTempFile("actual_content", "some string")
         file1.SetContentFile(contentFile)
         pydrive_retry(file1.Upload)  # Files.insert
 
-        self.assertEqual(file1.metadata["title"], filename)
+        self.assertEqual(
+            file1.metadata["title"], os.path.basename(contentFile)
+        )
         pydrive_retry(
             file1.FetchContent
         )  # Force download and double check content.