forked/osxphotos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug fix for issue #172

Browse Source
This commit is contained in:
Rhet Turnbull
2020-06-21 08:42:19 -07:00
parent 538bac7ade
commit 1ebf995833
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osxphotos/_version.py
View File

@@ -1,3 +1,3 @@
""" version info """ """ version info """
__version__ = "0.29.25" __version__ = "0.29.26"

28
osxphotos/placeinfo.py
View File

@@ -503,7 +503,6 @@ class PlaceInfo5(PlaceInfo):
""" revgeoloc_bplist: a binary plist blob containing """ revgeoloc_bplist: a binary plist blob containing
a serialized PLRevGeoLocationInfo object """ a serialized PLRevGeoLocationInfo object """
self._bplist = revgeoloc_bplist self._bplist = revgeoloc_bplist
# todo: check for None?
self._plrevgeoloc = archiver.unarchive(revgeoloc_bplist) self._plrevgeoloc = archiver.unarchive(revgeoloc_bplist)
self._process_place_info() self._process_place_info()
@@ -535,16 +534,21 @@ class PlaceInfo5(PlaceInfo):
@property @property
def address(self): def address(self):
addr = self._plrevgeoloc.postalAddress addr = self._plrevgeoloc.postalAddress
return PostalAddress( if addr is not None:
street=addr._street, postal_address = PostalAddress(
sub_locality=addr._subLocality, street=addr._street,
city=addr._city, sub_locality=addr._subLocality,
sub_administrative_area=addr._subAdministrativeArea, city=addr._city,
state_province=addr._state, sub_administrative_area=addr._subAdministrativeArea,
postal_code=addr._postalCode, state_province=addr._state,
country=addr._country, postal_code=addr._postalCode,
iso_country_code=addr._ISOCountryCode, country=addr._country,
) iso_country_code=addr._ISOCountryCode,
)
else:
postal_address = None
return postal_address
def _process_place_info(self): def _process_place_info(self):
""" Process sortedPlaceInfos to set self._name and self._names """ """ Process sortedPlaceInfos to set self._name and self._names """
@@ -632,5 +636,5 @@ class PlaceInfo5(PlaceInfo):
"country_code": self.country_code, "country_code": self.country_code,
"ishome": self.ishome, "ishome": self.ishome,
"address_str": self.address_str, "address_str": self.address_str,
"address": self.address._asdict(), "address": self.address._asdict() if self.address is not None else None,
} }