From 922634ab3e58c9e3920889dba8ce29b419826fc9 Mon Sep 17 00:00:00 2001 From: Rhet Turnbull Date: Sun, 7 May 2023 07:59:51 -0700 Subject: [PATCH] Updated release v0.60.0 (#1067) --- .bumpversion.cfg | 2 +- API_README.md | 2 +- README.md | 53 ++++++++++-------- docs/.buildinfo | 2 +- docs/_modules/index.html | 6 +- docs/_modules/osxphotos/_constants.html | 7 ++- docs/_modules/osxphotos/fileutil.html | 35 ++++++++++-- docs/_modules/osxphotos/photoexporter.html | 32 ++++++----- docs/_modules/osxphotos/photoinfo.html | 21 +++++-- docs/_modules/osxphotos/photosalbum.html | 15 +++-- .../_modules/osxphotos/photosdb/photosdb.html | 15 +++-- docs/_modules/osxphotos/phototemplate.html | 7 +-- docs/_modules/osxphotos/placeinfo.html | 7 ++- docs/_sources/template_help.rst.txt | 2 +- docs/_static/documentation_options.js | 2 +- docs/cli.html | 6 +- docs/genindex.html | 8 ++- docs/index.html | 7 ++- docs/objects.inv | Bin 9391 -> 9396 bytes docs/overview.html | 6 +- docs/package_overview.html | 6 +- docs/py-modindex.html | 6 +- docs/reference.html | 15 +++-- docs/search.html | 6 +- docs/searchindex.js | 2 +- docs/template_help.html | 8 +-- docs/tutorial.html | 6 +- docsrc/source/template_help.rst | 2 +- osxphotos/_constants.py | 1 + osxphotos/_version.py | 2 +- osxphotos/docs/docs.zip | Bin 1466350 -> 1459529 bytes 31 files changed, 175 insertions(+), 114 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index e4b2d4e5..c7d3836f 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.59.3 +current_version = 0.60.0 parse = (?P\d+)\.(?P\d+)\.(?P\d+) serialize = {major}.{minor}.{patch} diff --git a/API_README.md b/API_README.md index 8e0a64a5..0f0381cd 100644 --- a/API_README.md +++ b/API_README.md @@ -2494,7 +2494,7 @@ cog.out(get_template_field_table()) |{cr}|A carriage return: '\r'| |{crlf}|A carriage return + line feed: '\r\n'| |{tab}|:A tab: '\t'| -|{osxphotos_version}|The osxphotos version, e.g. '0.59.3'| +|{osxphotos_version}|The osxphotos version, e.g. '0.60.0'| |{osxphotos_cmd_line}|The full command line used to run osxphotos| |{album}|Album(s) photo is contained in| |{folder_album}|Folder path + album photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder| diff --git a/README.md b/README.md index d9fca727..903cde42 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ [![All Contributors](https://img.shields.io/badge/all_contributors-59-orange.svg?style=flat)](#contributors) -OSXPhotos provides the ability to interact with and query Apple's Photos.app library on macOS. You can query the Photos library database — for example, file name, file path, and metadata such as keywords/tags, persons/faces, albums, etc. You can also easily export both the original and edited photos. +OSXPhotos provides the ability to interact with and query Apple's Photos.app library on macOS and Linux. You can query the Photos library database — for example, file name, file path, and metadata such as keywords/tags, persons/faces, albums, etc. You can also easily export both the original and edited photos.

@@ -33,20 +33,24 @@ OSXPhotos provides the ability to interact with and query Apple's Photos.app lib ## Supported operating systems -Only works on macOS (aka Mac OS X). Tested on macOS Sierra (10.12.6) through macOS Monterey (12.0.1). Tested on both x86 and Apple silicon (M1). +Tested on Ubuntu Linux and macOS. Many features are only available on macOS. + +On Linux, macOS-specific features of the CLI will not be available (these will not be shown in the help output). +The export and query CLI commands as well as the Python API will work on Linux which enables you to export photos +from a Photos library on a Linux machine. + +Tested on macOS Sierra (10.12.6) through macOS Ventura (13.3). Tested on both x86 and Apple silicon (M1). | macOS Version | macOS name | Photos.app version | | ----------------- |------------|:-------------------| -| 13.0 | Ventura | 8.0 ✅ * | -| 12.0 - 12.6 | Monterey | 7.0 ✅ * | +| 13.0 - 13.3 | Ventura | 8.0 ✅ | +| 12.0 - 12.6 | Monterey | 7.0 ✅ | | 10.16, 11.0-11.4 | Big Sur | 6.0 ✅ | | 10.15.1 - 10.15.7 | Catalina | 5.0 ✅ | | 10.14.5, 10.14.6 | Mojave | 4.0 ✅ | | 10.13.6 | High Sierra| 3.0 ✅ | | 10.12.6 | Sierra | 2.0 ✅ | -\* Some features may not be fully supported on Monterey and Ventura. Notably, `--use-photokit` and `--download-missing` may or may not work depending on your configuration; this is a known issue that will be fixed if I can find a solution. Many users successfully use OSXPhotos on Monterey without problem. - This package will read Photos databases for any supported version on any supported macOS version. E.g. you can read a database created with Photos 5.0 on MacOS 10.15 on a machine running macOS 10.12 and vice versa. Requires python >= `3.9`. @@ -1440,22 +1444,23 @@ option to re-export the entire library thus rebuilding the Extended Attributes -Some options (currently '--finder-tag-template', '--finder-tag-keywords', -'-xattr-template') write additional metadata accessible by Spotlight to -facilitate searching. For example, --finder-tag-keyword writes all keywords -(including any specified by '--keyword-template' or other options) to Finder -tags that are searchable in Spotlight using the syntax: 'tag:tagname'. For -example, if you have images with keyword "Travel" then using '--finder-tag- -keywords' you could quickly find those images in the Finder by typing -'tag:Travel' in the Spotlight search bar. Finder tags are written to the -'com.apple.metadata:_kMDItemUserTags' extended attribute. Unlike EXIF -metadata, extended attributes do not modify the actual file; the metadata is -written to extended attributes associated with the file and the Spotlight -metadata database. Most cloud storage services do not synch extended -attributes. Dropbox does sync them and any changes to a file's extended -attributes will cause Dropbox to re-sync the files. - -The following attributes may be used with '--xattr-template': + Some options (currently '--finder-tag-template', '--finder-tag-keywords', + '-xattr-template') write additional metadata accessible by Spotlight + to facilitate searching. For example, --finder-tag-keyword writes all + keywords (including any specified by '--keyword-template' or other + options) to Finder tags that are searchable in Spotlight using the syntax: + 'tag:tagname'. For example, if you have images with keyword "Travel" + then using '--finder-tag-keywords' you could quickly find those images + in the Finder by typing 'tag:Travel' in the Spotlight search bar. + Finder tags are written to the 'com.apple.metadata:_kMDItemUserTags' + extended attribute. Unlike EXIF metadata, extended attributes do not + modify the actual file; the metadata is written to extended attributes + associated with the file and the Spotlight metadata database. Most + cloud storage services do not synch extended attributes. Dropbox does + sync them and any changes to a file's extended attributes will cause + Dropbox to re-sync the files. + + The following attributes may be used with '--xattr-template': Attribute Description @@ -2094,7 +2099,7 @@ Substitution Description {cr} A carriage return: '\r' {crlf} A carriage return + line feed: '\r\n' {tab} :A tab: '\t' -{osxphotos_version} The osxphotos version, e.g. '0.59.3' +{osxphotos_version} The osxphotos version, e.g. '0.60.0' {osxphotos_cmd_line} The full command line used to run osxphotos The following substitutions may result in multiple values. Thus if specified @@ -2581,7 +2586,7 @@ The following template field substitutions are availabe for use the templating s |{cr}|A carriage return: '\r'| |{crlf}|A carriage return + line feed: '\r\n'| |{tab}|:A tab: '\t'| -|{osxphotos_version}|The osxphotos version, e.g. '0.59.3'| +|{osxphotos_version}|The osxphotos version, e.g. '0.60.0'| |{osxphotos_cmd_line}|The full command line used to run osxphotos| |{album}|Album(s) photo is contained in| |{folder_album}|Folder path + album photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder| diff --git a/docs/.buildinfo b/docs/.buildinfo index b43e19e8..c5bf1f51 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: c9decb5b6d226b940d02770bb432ca41 +config: 5a3fd591e93c2b9f854abc0ac46771bd tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/_modules/index.html b/docs/_modules/index.html index fb14b942..4deca459 100644 --- a/docs/_modules/index.html +++ b/docs/_modules/index.html @@ -5,7 +5,7 @@ - Overview: module code - osxphotos 0.59.3 documentation + Overview: module code - osxphotos 0.60.0 documentation @@ -123,7 +123,7 @@
@@ -146,7 +146,7 @@
@@ -146,7 +146,7 @@