From f1ade92e9804e49330e8175dc831e91049f248b5 Mon Sep 17 00:00:00 2001 From: Rhet Turnbull Date: Thu, 12 Mar 2020 20:11:59 -0700 Subject: [PATCH] Added media type specials to json and string output, closes #68 --- osxphotos/__main__.py | 14 ++++++++++++++ osxphotos/photoinfo.py | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/osxphotos/__main__.py b/osxphotos/__main__.py index 7b2dad2b..e790ad33 100644 --- a/osxphotos/__main__.py +++ b/osxphotos/__main__.py @@ -1019,6 +1019,13 @@ def print_photo_info(photos, json=False): "iscloudasset", "incloud", "date_modified", + "portrait", + "screenshot", + "slow_mo", + "time_lapse", + "hdr", + "selfie", + "panorama", ] ) for p in photos: @@ -1053,6 +1060,13 @@ def print_photo_info(photos, json=False): p.iscloudasset, p.incloud, date_modified_iso, + p.portrait, + p.screenshot, + p.slow_mo, + p.time_lapse, + p.hdr, + p.selfie, + p.panorama, ] ) for row in dump: diff --git a/osxphotos/photoinfo.py b/osxphotos/photoinfo.py index c2a9d61d..8192d1ed 100644 --- a/osxphotos/photoinfo.py +++ b/osxphotos/photoinfo.py @@ -882,6 +882,13 @@ class PhotoInfo: "iscloudasset": self.iscloudasset, "incloud": self.incloud, "date_modified": date_modified_iso, + "portrait": self.portrait, + "screenshot": self.screenshot, + "slow_mo": self.slow_mo, + "time_lapse": self.time_lapse, + "hdr": self.hdr, + "selfie": self.selfie, + "panorama": self.panorama, } return yaml.dump(info, sort_keys=False) @@ -921,6 +928,13 @@ class PhotoInfo: "iscloudasset": self.iscloudasset, "incloud": self.incloud, "date_modified": date_modified_iso, + "portrait": self.portrait, + "screenshot": self.screenshot, + "slow_mo": self.slow_mo, + "time_lapse": self.time_lapse, + "hdr": self.hdr, + "selfie": self.selfie, + "panorama": self.panorama, } return json.dumps(pic)