simono41/pyicloud
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow zero-sized files on Drive (#294)

Browse source 
The webinterface to drive claims, that zero sized files are not supported on Drive.

Uploading one seems to work however with the only caveat that no receipt is returned. Handle this case by only adding receipt if available to the `_update_contentws()` call.

Drive-By: Add a `get_app_data()` call to the Drive module. This seems to be a replacement for ubiquity.
This commit is contained in:
Andreas Thienemann 2020-08-11 16:07:57 +02:00 committed by GitHub
parent d87ab69a4a
commit 0401299dbb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
pyicloud/services/drive.py
View file

@ -56,6 +56,13 @@ class DriveService(object):
url = response.json()["data_token"]["url"] url = response.json()["data_token"]["url"]
return self.session.get(url, params=self.params, **kwargs) return self.session.get(url, params=self.params, **kwargs)
def get_app_data(self):
"""Returns the app library (previously ubiquity)."""
request = self.session.get(
self._service_root + "/retrieveAppLibraries", params=self.params
)
return request.json()["items"]
def _get_upload_contentws_url(self, file_object): def _get_upload_contentws_url(self, file_object):
"""Get the contentWS endpoint URL to add a new file.""" """Get the contentWS endpoint URL to add a new file."""
content_type = mimetypes.guess_type(file_object.name)[0] content_type = mimetypes.guess_type(file_object.name)[0]
@ -89,36 +96,36 @@ class DriveService(object):
return (request.json()[0]["document_id"], request.json()[0]["url"]) return (request.json()[0]["document_id"], request.json()[0]["url"])
def _update_contentws(self, folder_id, sf_info, document_id, file_object): def _update_contentws(self, folder_id, sf_info, document_id, file_object):
data = {
"data": {
"signature": sf_info["fileChecksum"],
"wrapping_key": sf_info["wrappingKey"],
"reference_signature": sf_info["referenceChecksum"],
"size": sf_info["size"],
},
"command": "add_file",
"create_short_guid": True,
"document_id": document_id,
"path": {"starting_document_id": folder_id, "path": file_object.name,},
"allow_conflict": True,
"file_flags": {
"is_writable": True,
"is_executable": False,
"is_hidden": False,
},
"mtime": int(time.time()),
"btime": int(time.time()),
}
# Add the receipt if we have one. Will be absent for 0-sized files
if sf_info.get("receipt"):
data["data"].update({"receipt": sf_info["receipt"]})
request = self.session.post( request = self.session.post(
self._document_root + "/ws/com.apple.CloudDocs/update/documents", self._document_root + "/ws/com.apple.CloudDocs/update/documents",
params=self.params, params=self.params,
headers={"Content-Type": "text/plain"}, headers={"Content-Type": "text/plain"},
data=json.dumps( data=json.dumps(data),
{
"data": {
"signature": sf_info["fileChecksum"],
"wrapping_key": sf_info["wrappingKey"],
"reference_signature": sf_info["referenceChecksum"],
"receipt": sf_info["receipt"],
"size": sf_info["size"],
},
"command": "add_file",
"create_short_guid": True,
"document_id": document_id,
"path": {
"starting_document_id": folder_id,
"path": file_object.name,
},
"allow_conflict": True,
"file_flags": {
"is_writable": True,
"is_executable": False,
"is_hidden": False,
},
"mtime": int(time.time()),
"btime": int(time.time()),
}
),
) )
if not request.ok: if not request.ok:
return None return None