From 5bec99eac980e7e5dc1d2d00d429e82ac1571ebc Mon Sep 17 00:00:00 2001 From: Rhet Turnbull Date: Fri, 27 Dec 2019 07:26:13 -0800 Subject: [PATCH] Added shared to json and str, updated __repr__ --- osxphotos/photoinfo.py | 6 +++--- osxphotos/photosdb.py | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/osxphotos/photoinfo.py b/osxphotos/photoinfo.py index 7164c1e8..e77bc073 100644 --- a/osxphotos/photoinfo.py +++ b/osxphotos/photoinfo.py @@ -472,8 +472,7 @@ class PhotoInfo: return self._info["latitude"] def __repr__(self): - # TODO: update to use __class__ and __name__ - return f"osxphotos.PhotoInfo(db={self._db}, uuid='{self._uuid}', info={self._info})" + return f"osxphotos.{self.__class__.__name__}(db={self._db}, uuid='{self._uuid}', info={self._info})" def __str__(self): info = { @@ -495,12 +494,12 @@ class PhotoInfo: "latitude": self._latitude, "longitude": self._longitude, "path_edited": self.path_edited, + "shared": self.shared, } return yaml.dump(info, sort_keys=False) def json(self): """ return JSON representation """ - # TODO: Add additional details here pic = { "uuid": self.uuid, "filename": self.filename, @@ -520,6 +519,7 @@ class PhotoInfo: "latitude": self._latitude, "longitude": self._longitude, "path_edited": self.path_edited, + "shared": self.shared, } return json.dumps(pic) diff --git a/osxphotos/photosdb.py b/osxphotos/photosdb.py index a0909653..d56b4c42 100644 --- a/osxphotos/photosdb.py +++ b/osxphotos/photosdb.py @@ -1118,5 +1118,4 @@ class PhotosDB: return photoinfo def __repr__(self): - # TODO: update to use __class__ and __name__ - return f"osxphotos.PhotosDB(dbfile='{self.db_path}')" + return f"osxphotos.{self.__class__.__name__}(dbfile='{self.db_path}')"