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

Additional key checking for photo version build-up (#163)

Browse source
This commit is contained in:
Chad Johnson 2020-03-20 18:38:02 -05:00 committed by GitHub
parent 0fefc5cff1
commit 6e25f8ce39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.rst
View file

@ -275,5 +275,5 @@ Information about each version can be accessed through the ``versions`` property
To download a specific version of the photo asset, pass the version to ``download()``: To download a specific version of the photo asset, pass the version to ``download()``:
>>> download = photo.download('thumb') >>> download = photo.download('thumb')
>>> with open(photo.versions['thumb'].filename, 'wb') as thumb_file: >>> with open(photo.versions['thumb']['filename'], 'wb') as thumb_file:
thumb_file.write(download.raw.read()) thumb_file.write(download.raw.read())

40
pyicloud/services/photos.py
View file

@ -483,16 +483,38 @@ class PhotoAsset(object):
typed_version_lookup = self.PHOTO_VERSION_LOOKUP typed_version_lookup = self.PHOTO_VERSION_LOOKUP
for key, prefix in typed_version_lookup.items(): for key, prefix in typed_version_lookup.items():
if '%sWidth' % prefix in self._master_record['fields']: if '%sRes' % prefix in self._master_record['fields']:
f = self._master_record['fields'] f = self._master_record['fields']
self._versions[key] = { version = {'filename': self.filename}
'width': f['%sWidth' % prefix]['value'],
'height': f['%sHeight' % prefix]['value'], width_entry = f.get('%sWidth' % prefix)
'size': f['%sRes' % prefix]['value']['size'], if width_entry:
'type': f['%sFileType' % prefix]['value'], version['width'] = width_entry['value']
'url': f['%sRes' % prefix]['value']['downloadURL'], else:
'filename': self.filename, version['width'] = None
}
height_entry = f.get('%sHeight' % prefix)
if height_entry:
version['height'] = height_entry['value']
else:
version['height'] = None
size_entry = f.get('%sRes' % prefix)
if size_entry:
version['size'] = size_entry['value']['size']
version['url'] = size_entry['value']['downloadURL']
else:
version['size'] = None
version['url'] = None
type_entry = f.get('%sFileType' % prefix)
if type_entry:
version['type'] = type_entry['value']
else:
version['type'] = None
self._versions[key] = version
return self._versions return self._versions
def download(self, version='original', **kwargs): def download(self, version='original', **kwargs):