From 5a696366fa37fc6eafebb64fa154eee7624819a7 Mon Sep 17 00:00:00 2001 From: Rhet Turnbull Date: Sat, 23 Jan 2021 09:17:13 -0800 Subject: [PATCH] Fix for issue #348 --- osxphotos/__main__.py | 8 +++++++- osxphotos/_version.py | 2 +- tests/search_info_test_data_10_15_7.json | 2 +- tests/sidecars/15uNd7%8RguTEgNPKHfTWw.xmp | 2 +- .../15uNd7%8RguTEgNPKHfTWw_albums_as_keywords.xmp | 2 +- tests/sidecars/15uNd7%8RguTEgNPKHfTWw_ext.xmp | 2 +- .../sidecars/15uNd7%8RguTEgNPKHfTWw_keyword_template.xmp | 2 +- .../15uNd7%8RguTEgNPKHfTWw_persons_as_keywords.xmp | 2 +- tests/sidecars/3Jn73XpSQQCluzRBMWRsMA.xmp | 2 +- .../3Jn73XpSQQCluzRBMWRsMA_albums_as_keywords.xmp | 2 +- tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_ext.xmp | 2 +- .../sidecars/3Jn73XpSQQCluzRBMWRsMA_keyword_template.xmp | 2 +- .../3Jn73XpSQQCluzRBMWRsMA_persons_as_keywords.xmp | 2 +- tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4.xmp | 2 +- ...23D-8DB8-4D4C-92BE-9BBBA308AAC4_albums_as_keywords.xmp | 2 +- .../sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_ext.xmp | 2 +- ...1423D-8DB8-4D4C-92BE-9BBBA308AAC4_keyword_template.xmp | 2 +- ...3D-8DB8-4D4C-92BE-9BBBA308AAC4_persons_as_keywords.xmp | 2 +- tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ.xmp | 2 +- .../6bxcNnzRQKGnK4uPrCJ9UQ_albums_as_keywords.xmp | 2 +- tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_ext.xmp | 2 +- .../sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_keyword_template.xmp | 2 +- .../6bxcNnzRQKGnK4uPrCJ9UQ_persons_as_keywords.xmp | 2 +- tests/sidecars/8SOE9s0XQVGsuq4ONohTng.xmp | 2 +- .../8SOE9s0XQVGsuq4ONohTng_albums_as_keywords.xmp | 2 +- tests/sidecars/8SOE9s0XQVGsuq4ONohTng_ext.xmp | 2 +- .../sidecars/8SOE9s0XQVGsuq4ONohTng_keyword_template.xmp | 2 +- .../8SOE9s0XQVGsuq4ONohTng_persons_as_keywords.xmp | 2 +- tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C.xmp | 2 +- ...F98-2ECD-431F-9AC9-5AFEFE2D3A5C_albums_as_keywords.xmp | 2 +- .../sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_ext.xmp | 2 +- ...D1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_keyword_template.xmp | 2 +- ...98-2ECD-431F-9AC9-5AFEFE2D3A5C_persons_as_keywords.xmp | 2 +- tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B.xmp | 2 +- ...D77-BFFC-460B-9312-034F2877D35B_albums_as_keywords.xmp | 2 +- .../sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_ext.xmp | 2 +- ...B8D77-BFFC-460B-9312-034F2877D35B_keyword_template.xmp | 2 +- ...77-BFFC-460B-9312-034F2877D35B_persons_as_keywords.xmp | 2 +- tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30.xmp | 2 +- ...BDD-7A52-4100-A5BB-344131646C30_albums_as_keywords.xmp | 2 +- .../sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_ext.xmp | 2 +- ...9FBDD-7A52-4100-A5BB-344131646C30_keyword_template.xmp | 2 +- ...DD-7A52-4100-A5BB-344131646C30_persons_as_keywords.xmp | 2 +- tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51.xmp | 2 +- ...C36-7CD1-40A1-A72B-8B8FAC227D51_albums_as_keywords.xmp | 2 +- .../sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_ext.xmp | 2 +- ...C5C36-7CD1-40A1-A72B-8B8FAC227D51_keyword_template.xmp | 2 +- ...36-7CD1-40A1-A72B-8B8FAC227D51_persons_as_keywords.xmp | 2 +- tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E.xmp | 2 +- ...4F6-CD17-4151-ACBA-AE0E3688539E_albums_as_keywords.xmp | 2 +- .../sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_ext.xmp | 2 +- ...384F6-CD17-4151-ACBA-AE0E3688539E_keyword_template.xmp | 2 +- ...F6-CD17-4151-ACBA-AE0E3688539E_persons_as_keywords.xmp | 2 +- 53 files changed, 59 insertions(+), 53 deletions(-) diff --git a/osxphotos/__main__.py b/osxphotos/__main__.py index d22c8898..0b2f187d 100644 --- a/osxphotos/__main__.py +++ b/osxphotos/__main__.py @@ -2616,7 +2616,9 @@ def export_photo( original_filename = pathlib.Path(filename) file_ext = ( "." + jpeg_ext - if jpeg_ext and photo.uti == "public.jpeg" + if jpeg_ext and (photo.uti == "public.jpeg" or convert_to_jpeg) + else ".jpeg" + if convert_to_jpeg and photo.uti != "public.jpeg" else original_filename.suffix ) original_filename = ( @@ -2758,6 +2760,10 @@ def export_photo( if photo.path_edited else pathlib.Path(photo.filename).suffix ) + # Big Sur uses .heic for some edited photos so need to check + # if extension isn't jpeg/jpg and using --convert-to-jpeg + if convert_to_jpeg and edited_ext.lower() not in [".jpg", ".jpeg"]: + edited_ext = "." + jpeg_ext if jpeg_ext else ".jpeg" if edited_suffix: try: diff --git a/osxphotos/_version.py b/osxphotos/_version.py index 77040130..9dad466e 100644 --- a/osxphotos/_version.py +++ b/osxphotos/_version.py @@ -1,3 +1,3 @@ """ version info """ -__version__ = "0.40.2" +__version__ = "0.40." diff --git a/tests/search_info_test_data_10_15_7.json b/tests/search_info_test_data_10_15_7.json index 3e4b208a..d0fb85fc 100644 --- a/tests/search_info_test_data_10_15_7.json +++ b/tests/search_info_test_data_10_15_7.json @@ -1 +1 @@ -{"UUID_SEARCH_INFO": {"C8EAF50A-D891-4E0C-8086-C417E1284153": {"labels": ["Food", "Butter"], "place_names": ["Durham Bulls Athletic Park"], "streets": ["Blackwell St"], "neighborhoods": ["American Tobacco District", "Downtown Durham"], "city": "Durham", "locality_names": ["Durham"], "state": "North Carolina", "state_abbreviation": "NC", "country": "United States", "bodies_of_water": [], "month": "October", "year": "2018", "holidays": [], "activities": ["Dinner", "Travel", "Entertainment", "Dining", "Trip"], "season": "Fall", "venues": ["Luna Rotisserie and Empanadas", "The Pinhook", "Pie Pusher's", "Copa"], "venue_types": [], "media_types": []}, "71DFB4C3-E868-4BE4-906E-D96BD8692D7E": {"labels": ["Land", "Desert", "Sky", "Sunset Sunrise", "Outdoor"], "place_names": ["Royal Palms State Beach"], "streets": [], "neighborhoods": ["San Pedro"], "city": "Los Angeles", "locality_names": [], "state": "California", "state_abbreviation": "", "country": "United States", "bodies_of_water": ["Catalina Channel"], "month": "November", "year": "2017", "holidays": [], "activities": ["Beach Activity", "Activity"], "season": "Fall", "venues": [], "venue_types": [], "media_types": ["Live Photos"]}, "2C151013-5BBA-4D00-B70F-1C9420418B86": {"labels": ["Water Body", "People", "Land", "Water", "Plant", "Outdoor", "Vegetation", "Forest", "Furniture", "Bench"], "place_names": [], "streets": [], "neighborhoods": [], "city": "", "locality_names": [], "state": "", "state_abbreviation": "", "country": "", "bodies_of_water": [], "month": "December", "year": "2014", "holidays": ["Christmas Day"], "activities": ["Celebration", "Holiday"], "season": "Winter", "venues": [], "venue_types": [], "media_types": []}}, "UUID_SEARCH_INFO_NORMALIZED": {"C8EAF50A-D891-4E0C-8086-C417E1284153": {"labels": ["food", "butter"], "place_names": ["durham bulls athletic park"], "streets": ["blackwell st"], "neighborhoods": ["american tobacco district", "downtown durham"], "city": "durham", "locality_names": ["durham"], "state": "north carolina", "state_abbreviation": "nc", "country": "united states", "bodies_of_water": [], "month": "october", "year": "2018", "holidays": [], "activities": ["dinner", "travel", "entertainment", "dining", "trip"], "season": "fall", "venues": ["luna rotisserie and empanadas", "the pinhook", "pie pusher's", "copa"], "venue_types": [], "media_types": []}, "71DFB4C3-E868-4BE4-906E-D96BD8692D7E": {"labels": ["land", "desert", "sky", "sunset sunrise", "outdoor"], "place_names": ["royal palms state beach"], "streets": [], "neighborhoods": ["san pedro"], "city": "los angeles", "locality_names": [], "state": "california", "state_abbreviation": "", "country": "united states", "bodies_of_water": ["catalina channel"], "month": "november", "year": "2017", "holidays": [], "activities": ["beach activity", "activity"], "season": "fall", "venues": [], "venue_types": [], "media_types": ["live photos"]}, "2C151013-5BBA-4D00-B70F-1C9420418B86": {"labels": ["water body", "people", "land", "water", "plant", "outdoor", "vegetation", "forest", "furniture", "bench"], "place_names": [], "streets": [], "neighborhoods": [], "city": "", "locality_names": [], "state": "", "state_abbreviation": "", "country": "", "bodies_of_water": [], "month": "december", "year": "2014", "holidays": ["christmas day"], "activities": ["celebration", "holiday"], "season": "winter", "venues": [], "venue_types": [], "media_types": []}}, "UUID_SEARCH_INFO_ALL": {"C8EAF50A-D891-4E0C-8086-C417E1284153": ["Food", "Butter", "Durham Bulls Athletic Park", "Blackwell St", "American Tobacco District", "Downtown Durham", "Durham", "Dinner", "Travel", "Entertainment", "Dining", "Trip", "Luna Rotisserie and Empanadas", "The Pinhook", "Pie Pusher's", "Copa", "Durham", "North Carolina", "NC", "United States", "October", "2018", "Fall"], "71DFB4C3-E868-4BE4-906E-D96BD8692D7E": ["Land", "Desert", "Sky", "Sunset Sunrise", "Outdoor", "Royal Palms State Beach", "San Pedro", "Catalina Channel", "Beach Activity", "Activity", "Live Photos", "Los Angeles", "California", "United States", "November", "2017", "Fall"], "2C151013-5BBA-4D00-B70F-1C9420418B86": ["Water Body", "People", "Land", "Water", "Plant", "Outdoor", "Vegetation", "Forest", "Furniture", "Bench", "Christmas Day", "Celebration", "Holiday", "December", "2014", "Winter"]}, "UUID_SEARCH_INFO_ALL_NORMALIZED": {"C8EAF50A-D891-4E0C-8086-C417E1284153": ["food", "butter", "durham bulls athletic park", "blackwell st", "american tobacco district", "downtown durham", "durham", "dinner", "travel", "entertainment", "dining", "trip", "luna rotisserie and empanadas", "the pinhook", "pie pusher's", "copa", "durham", "north carolina", "nc", "united states", "october", "2018", "fall"], "71DFB4C3-E868-4BE4-906E-D96BD8692D7E": ["land", "desert", "sky", "sunset sunrise", "outdoor", "royal palms state beach", "san pedro", "catalina channel", "beach activity", "activity", "live photos", "los angeles", "california", "united states", "november", "2017", "fall"], "2C151013-5BBA-4D00-B70F-1C9420418B86": ["water body", "people", "land", "water", "plant", "outdoor", "vegetation", "forest", "furniture", "bench", "christmas day", "celebration", "holiday", "december", "2014", "winter"]}} +{"UUID_SEARCH_INFO": {"C8EAF50A-D891-4E0C-8086-C417E1284153": {"labels": ["Food", "Butter"], "place_names": ["Durham Bulls Athletic Park"], "streets": ["Blackwell St"], "neighborhoods": ["American Tobacco District", "Downtown Durham"], "city": "Durham", "locality_names": ["Durham"], "state": "North Carolina", "state_abbreviation": "NC", "country": "United States", "bodies_of_water": [], "month": "October", "year": "2018", "holidays": [], "activities": ["Entertainment", "Travel", "Dining", "Dinner", "Trip"], "season": "Fall", "venues": ["Luna Rotisserie and Empanadas", "The Pinhook", "Copa", "Pie Pusher's"], "venue_types": [], "media_types": []}, "71DFB4C3-E868-4BE4-906E-D96BD8692D7E": {"labels": ["Sunset Sunrise", "Sky", "Desert", "Outdoor", "Land"], "place_names": ["Royal Palms State Beach"], "streets": [], "neighborhoods": ["San Pedro"], "city": "Los Angeles", "locality_names": [], "state": "California", "state_abbreviation": "", "country": "United States", "bodies_of_water": ["Catalina Channel"], "month": "November", "year": "2017", "holidays": [], "activities": ["Beach Activity", "Activity"], "season": "Fall", "venues": [], "venue_types": [], "media_types": ["Live Photos"]}, "2C151013-5BBA-4D00-B70F-1C9420418B86": {"labels": ["People", "Land", "Forest", "Vegetation", "Outdoor", "Furniture", "Bench", "Water", "Water Body"], "place_names": [], "streets": [], "neighborhoods": [], "city": "", "locality_names": [], "state": "", "state_abbreviation": "", "country": "", "bodies_of_water": [], "month": "December", "year": "2014", "holidays": ["Christmas Day"], "activities": ["Celebration", "Holiday"], "season": "Winter", "venues": [], "venue_types": [], "media_types": []}}, "UUID_SEARCH_INFO_NORMALIZED": {"C8EAF50A-D891-4E0C-8086-C417E1284153": {"labels": ["food", "butter"], "place_names": ["durham bulls athletic park"], "streets": ["blackwell st"], "neighborhoods": ["american tobacco district", "downtown durham"], "city": "durham", "locality_names": ["durham"], "state": "north carolina", "state_abbreviation": "nc", "country": "united states", "bodies_of_water": [], "month": "october", "year": "2018", "holidays": [], "activities": ["entertainment", "travel", "dining", "dinner", "trip"], "season": "fall", "venues": ["luna rotisserie and empanadas", "the pinhook", "copa", "pie pusher's"], "venue_types": [], "media_types": []}, "71DFB4C3-E868-4BE4-906E-D96BD8692D7E": {"labels": ["sunset sunrise", "sky", "desert", "outdoor", "land"], "place_names": ["royal palms state beach"], "streets": [], "neighborhoods": ["san pedro"], "city": "los angeles", "locality_names": [], "state": "california", "state_abbreviation": "", "country": "united states", "bodies_of_water": ["catalina channel"], "month": "november", "year": "2017", "holidays": [], "activities": ["beach activity", "activity"], "season": "fall", "venues": [], "venue_types": [], "media_types": ["live photos"]}, "2C151013-5BBA-4D00-B70F-1C9420418B86": {"labels": ["people", "land", "forest", "vegetation", "outdoor", "furniture", "bench", "water", "water body"], "place_names": [], "streets": [], "neighborhoods": [], "city": "", "locality_names": [], "state": "", "state_abbreviation": "", "country": "", "bodies_of_water": [], "month": "december", "year": "2014", "holidays": ["christmas day"], "activities": ["celebration", "holiday"], "season": "winter", "venues": [], "venue_types": [], "media_types": []}}, "UUID_SEARCH_INFO_ALL": {"C8EAF50A-D891-4E0C-8086-C417E1284153": ["Food", "Butter", "Durham Bulls Athletic Park", "Blackwell St", "American Tobacco District", "Downtown Durham", "Durham", "Entertainment", "Travel", "Dining", "Dinner", "Trip", "Luna Rotisserie and Empanadas", "The Pinhook", "Copa", "Pie Pusher's", "Durham", "North Carolina", "NC", "United States", "October", "2018", "Fall"], "71DFB4C3-E868-4BE4-906E-D96BD8692D7E": ["Sunset Sunrise", "Sky", "Desert", "Outdoor", "Land", "Royal Palms State Beach", "San Pedro", "Catalina Channel", "Beach Activity", "Activity", "Live Photos", "Los Angeles", "California", "United States", "November", "2017", "Fall"], "2C151013-5BBA-4D00-B70F-1C9420418B86": ["People", "Land", "Forest", "Vegetation", "Outdoor", "Furniture", "Bench", "Water", "Water Body", "Christmas Day", "Celebration", "Holiday", "December", "2014", "Winter"]}, "UUID_SEARCH_INFO_ALL_NORMALIZED": {"C8EAF50A-D891-4E0C-8086-C417E1284153": ["food", "butter", "durham bulls athletic park", "blackwell st", "american tobacco district", "downtown durham", "durham", "entertainment", "travel", "dining", "dinner", "trip", "luna rotisserie and empanadas", "the pinhook", "copa", "pie pusher's", "durham", "north carolina", "nc", "united states", "october", "2018", "fall"], "71DFB4C3-E868-4BE4-906E-D96BD8692D7E": ["sunset sunrise", "sky", "desert", "outdoor", "land", "royal palms state beach", "san pedro", "catalina channel", "beach activity", "activity", "live photos", "los angeles", "california", "united states", "november", "2017", "fall"], "2C151013-5BBA-4D00-B70F-1C9420418B86": ["people", "land", "forest", "vegetation", "outdoor", "furniture", "bench", "water", "water body", "christmas day", "celebration", "holiday", "december", "2014", "winter"]}} diff --git a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw.xmp b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw.xmp index 4ee3b658..0706b297 100644 --- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw.xmp +++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw.xmp @@ -1,5 +1,5 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +