diff --git a/osxphotos/_version.py b/osxphotos/_version.py index eb41159a..3a6191a9 100644 --- a/osxphotos/_version.py +++ b/osxphotos/_version.py @@ -1,3 +1,3 @@ """ version info """ -__version__ = "0.42.22" +__version__ = "0.42.23" diff --git a/osxphotos/photoinfo/photoinfo.py b/osxphotos/photoinfo/photoinfo.py index aae59685..09a0c19e 100644 --- a/osxphotos/photoinfo/photoinfo.py +++ b/osxphotos/photoinfo/photoinfo.py @@ -838,7 +838,7 @@ class PhotoInfo: def _path_derivatives_4(self): """ Return paths to all derivative (preview) files for Photos <= 4""" - modelid = self._info["masterModelID"] + modelid = self._info["modelID"] if modelid is None: return [] folder_id, file_id = _get_resource_loc(modelid) diff --git a/tests/test_10_12_6.py b/tests/test_10_12_6.py index 7c8eab24..91055efe 100644 --- a/tests/test_10_12_6.py +++ b/tests/test_10_12_6.py @@ -30,6 +30,8 @@ KEYWORDS_DICT = { PERSONS_DICT = {"Katie": 3, "Suzy": 2, "Maria": 1, _UNKNOWN_PERSON: 1} ALBUM_DICT = {"Pumpkin Farm": 3, "AlbumInFolder": 1} +UUID_DICT = {"derivatives": "FPm+ICxpQV+LPBKR22UepA"} + def test_init(): import osxphotos @@ -162,3 +164,19 @@ def test_keyword_not_in_album(): photos3 = [p for p in photos2 if p not in photos1] assert len(photos3) == 1 assert photos3[0].uuid == "Pj99JmYjQkeezdY2OFuSaw" + + +def test_path_derivatives(): + # test path_derivatives + import osxphotos + + photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB) + + photos = photosdb.photos(uuid=[UUID_DICT["derivatives"]]) + p = photos[0] + derivs = [ + "/resources/proxies/derivatives/00/00/9/UNADJUSTEDRAW_thumb_9.jpg", + "/resources/proxies/derivatives/00/00/9/UNADJUSTEDRAW_mini_9.jpg", + ] + for i, p in enumerate(p.path_derivatives): + assert p.endswith(derivs[i])