diff --git a/README.md b/README.md index cd5d9333..4ffcdca3 100644 --- a/README.md +++ b/README.md @@ -3728,15 +3728,10 @@ if __name__ == "__main__": ## Related Projects -- [rhettbull/photosmeta](https://github.com/rhettbull/photosmeta): uses osxphotos and [exiftool](https://exiftool.org/) to apply metadata from Photos as exif data in the photo files. Can also export photos while preserving metadata and also apply Photos keywords as spotlight tags to make it easier to search for photos using spotlight. This is mostly made obsolete by osxphotos. The one feature that photosmeta has that osxphotos does not is ability to update the metadata of the actual photo files in the Photos library without exporting them. (Use with caution!) +- [rhettbull/exif2findertags](https://github.com/RhetTbull/exif2findertags): Read EXIF metadata from image and video files and convert it to macOS Finder tags and/or Finder comments and other extended attributes. +- [rhettbull/photos_time_warp](https://github.com/RhetTbull/photos_time_warp): Batch adjust the date, time, or timezone of photos in Apple Photos. - [rhettbull/PhotoScript](https://github.com/RhetTbull/PhotoScript): python wrapper around Photos' applescript API allowing automation of Photos (including creation/deletion of items) from python. -- [patrikhson/photo-export](https://github.com/patrikhson/photo-export): Exports older versions of Photos databases. Provided the inspiration for osxphotos. -- [doersino/apple-photos-export](https://github.com/doersino/apple-photos-export): Photos export script for Mojave. -- [orangeturtle739/photos-export](https://github.com/orangeturtle739/photos-export): Set of scripts to export Photos libraries. -- [ndbroadbent/icloud_photos_downloader](https://github.com/ndbroadbent/icloud_photos_downloader): Download photos from iCloud. Currently unmaintained. -- [AaronVanGeffen/ExportPhotosLibrary](https://github.com/AaronVanGeffen/ExportPhotosLibrary): Another python script for exporting older versions of Photos libraries. -- [MossieurPropre/PhotosAlbumExporter](https://github.com/MossieurPropre/PhotosAlbumExporter): Javascript script to export photos while maintaining album structure. -- [ajslater/magritte](https://github.com/ajslater/magritte): Another python command line script for exporting photos from older versions of Photos libraries. +- [ndbroadbent/icloud_photos_downloader](https://github.com/ndbroadbent/icloud_photos_downloader): Download photos from iCloud. ## Contributing diff --git a/docs/.buildinfo b/docs/.buildinfo index 2bc5560d..670cc057 100644 --- a/docs/.buildinfo +++ b/docs/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: 7fc4fe26df020008d210765b32b7a1a9 +config: c9edb56c4efc3c4dd60be49110417224 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/_modules/index.html b/docs/_modules/index.html index a791e505..b6780fe3 100644 --- a/docs/_modules/index.html +++ b/docs/_modules/index.html @@ -5,7 +5,7 @@ - Overview: module code — osxphotos 0.42.82 documentation + Overview: module code — osxphotos 0.42.83 documentation diff --git a/docs/_modules/osxphotos/photoinfo/photoinfo.html b/docs/_modules/osxphotos/photoinfo/photoinfo.html index ad6293e4..e9e69cc2 100644 --- a/docs/_modules/osxphotos/photoinfo/photoinfo.html +++ b/docs/_modules/osxphotos/photoinfo/photoinfo.html @@ -5,7 +5,7 @@ - osxphotos.photoinfo.photoinfo — osxphotos 0.42.80 documentation + osxphotos.photoinfo.photoinfo — osxphotos 0.42.83 documentation @@ -1087,15 +1087,15 @@ return self._info["orientation"] # For Photos 5+, try to get the adjusted orientation - if self.hasadjustments: - if self.adjustments: - return self.adjustments.adj_orientation - else: - # can't reliably determine orientation for edited photo if adjustmentinfo not available - return 0 - else: + if not self.hasadjustments: return self._info["orientation"] + if self.adjustments: + return self.adjustments.adj_orientation + else: + # can't reliably determine orientation for edited photo if adjustmentinfo not available + return 0 + @property def original_height(self): """returns height of the original photo version in pixels""" @@ -1189,7 +1189,8 @@ md = OSXMetaData(path) detected_text = md.get_attribute("osxphotos_detected_text") if detected_text is None: - detected_text = detect_text(path) + orientation = self.orientation or None + detected_text = detect_text(path, orientation) md.set_attribute("osxphotos_detected_text", detected_text) return detected_text diff --git a/docs/_static/documentation_options.js b/docs/_static/documentation_options.js index a8741bee..f5239cb0 100644 --- a/docs/_static/documentation_options.js +++ b/docs/_static/documentation_options.js @@ -1,6 +1,6 @@ var DOCUMENTATION_OPTIONS = { URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'), - VERSION: '0.42.82', + VERSION: '0.42.83', LANGUAGE: 'None', COLLAPSE_INDEX: false, BUILDER: 'html', diff --git a/docs/cli.html b/docs/cli.html index cb16a991..5787ddad 100644 --- a/docs/cli.html +++ b/docs/cli.html @@ -5,7 +5,7 @@ - osxphotos command line interface (CLI) — osxphotos 0.42.82 documentation + osxphotos command line interface (CLI) — osxphotos 0.42.83 documentation diff --git a/docs/genindex.html b/docs/genindex.html index 2a8d52fa..820ea9a0 100644 --- a/docs/genindex.html +++ b/docs/genindex.html @@ -5,7 +5,7 @@ - Index — osxphotos 0.42.82 documentation + Index — osxphotos 0.42.83 documentation diff --git a/docs/index.html b/docs/index.html index 1c5d6d3e..0de7a44e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -5,7 +5,7 @@ - Welcome to osxphotos’s documentation! — osxphotos 0.42.82 documentation + Welcome to osxphotos’s documentation! — osxphotos 0.42.83 documentation diff --git a/docs/modules.html b/docs/modules.html index b9eedfa1..2493069d 100644 --- a/docs/modules.html +++ b/docs/modules.html @@ -5,7 +5,7 @@ - osxphotos — osxphotos 0.42.82 documentation + osxphotos — osxphotos 0.42.83 documentation diff --git a/docs/reference.html b/docs/reference.html index bcc049b5..85510be1 100644 --- a/docs/reference.html +++ b/docs/reference.html @@ -5,7 +5,7 @@ - osxphotos package — osxphotos 0.42.82 documentation + osxphotos package — osxphotos 0.42.83 documentation diff --git a/docs/search.html b/docs/search.html index 8f08d4bc..569e6ac3 100644 --- a/docs/search.html +++ b/docs/search.html @@ -5,7 +5,7 @@ - Search — osxphotos 0.42.82 documentation + Search — osxphotos 0.42.83 documentation