Better exception handling for AdjustmentsInfo

Updated CHANGELOG.md, [skip ci]
Merge pull request #383 from RhetTbull/all-contributors/add-neilpa
2021-02-20 12:28:19 -08:00 · 2021-02-20 11:35:15 -08:00 · 2021-02-20 11:05:19 -08:00 · 2021-02-20 19:04:05 +00:00 · 2021-02-20 19:04:04 +00:00 · 2021-02-20 11:01:58 -08:00
152 changed files with 1230 additions and 483 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -175,6 +175,15 @@
      "contributions": [
        "doc"
      ]
+    },
+    {
+      "login": "neilpa",
+      "name": "Neil Pankey",
+      "avatar_url": "https://avatars.githubusercontent.com/u/42419?v=4",
+      "profile": "https://neilpa.me",
+      "contributions": [
+        "code"
+      ]
    }
  ],
  "contributorsPerLine": 7,
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,16 @@
+.metrics
+.DS_store
+__pycache__
+.coverage
+.condaauto
+t.out
+.vscode/
+.tox/
+dist/
+build/
+working/
+osxphotos.egg-info/
+.mypy_cache/
+cli.spec
+*.pyc
+docsrc/_build/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,102 @@ All notable changes to this project will be documented in this file. Dates are d

 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

+#### [v0.40.18](https://github.com/RhetTbull/osxphotos/compare/v0.40.17...v0.40.18)
+
+> 20 February 2021
+
+- docs: add neilpa as a contributor [`#383`](https://github.com/RhetTbull/osxphotos/pull/383)
+- Added AdjustmentsInfo, #150, #379 [`5ee6aff`](https://github.com/RhetTbull/osxphotos/commit/5ee6affc0525db1975cb5095f62494ef10d92f7e)
+- docs: update .all-contributorsrc [skip ci] [`ebac9d0`](https://github.com/RhetTbull/osxphotos/commit/ebac9d0bfb43f59f046aacdd0290d1fcd29a3b5e)
+- docs: update README.md [skip ci] [`29716c5`](https://github.com/RhetTbull/osxphotos/commit/29716c52726a4e699c03d43ecc67db57f55b36f8)
+- Version bump [`fbe8229`](https://github.com/RhetTbull/osxphotos/commit/fbe822910370652975ab83b82344169df4c3027c)
+
+#### [v0.40.17](https://github.com/RhetTbull/osxphotos/compare/v0.40.16...v0.40.17)
+
+> 18 February 2021
+
+- Updated docs for --ignore-signature, #286 [`e5f1c29`](https://github.com/RhetTbull/osxphotos/commit/e5f1c299742fcfa0a855a33df7b266aa2c39e48b)
+- Added depth_state to _info [`b3a7869`](https://github.com/RhetTbull/osxphotos/commit/b3a7869bd3cc13e40cb3f68ff8caf12edda9a49c)
+
+#### [v0.40.16](https://github.com/RhetTbull/osxphotos/compare/v0.40.14...v0.40.16)
+
+> 14 February 2021
+
+- Write description to ITPC:CaptionAbstract (#380) [`4b7a53f`](https://github.com/RhetTbull/osxphotos/commit/4b7a53faa8d7ff2e941e7653554f61bcbd416fc9)
+- Removed orientation from XMP, #378 [`70848e1`](https://github.com/RhetTbull/osxphotos/commit/70848e1ff6def928b052271b47c1697c23a8c73f)
+- Added image orientation bug to Known Bugs [`1316866`](https://github.com/RhetTbull/osxphotos/commit/1316866dc47486ac61db8903d2d7d006f2598a77)
+
+#### [v0.40.14](https://github.com/RhetTbull/osxphotos/compare/v0.40.13...v0.40.14)
+
+> 12 February 2021
+
+- Fix for issue #366, --jpeg-ext, --convert-to-jpeg bug [`3027350`](https://github.com/RhetTbull/osxphotos/commit/30273509d40a270d2610b662ed9238449350064c)
+- Added test for #374 [`2691902`](https://github.com/RhetTbull/osxphotos/commit/2691902d5c7a4f4f81e3a9b36fd560ff0a07aec1)
+
+#### [v0.40.13](https://github.com/RhetTbull/osxphotos/compare/v0.40.12...v0.40.13)
+
+> 10 February 2021
+
+- Bug fix for --jpeg-ext, #374 [`da47821`](https://github.com/RhetTbull/osxphotos/commit/da47821fae7ee7b2d6d89f5542e729e01d3338df)
+
+#### [v0.40.12](https://github.com/RhetTbull/osxphotos/compare/v0.40.11...v0.40.12)
+
+> 9 February 2021
+
+- Fixed --exiftool-option, #369, for real this time [`857e3db`](https://github.com/RhetTbull/osxphotos/commit/857e3db6ccce810d682cd4632ac9bc8448c4f86b)
+
+#### [v0.40.11](https://github.com/RhetTbull/osxphotos/compare/v0.40.10...v0.40.11)
+
+> 9 February 2021
+
+- Fixed --exiftool-option, #369 [`198adda`](https://github.com/RhetTbull/osxphotos/commit/198addaa07a86ac5b0fd82787fdffff0a0fc19c6)
+
+#### [v0.40.10](https://github.com/RhetTbull/osxphotos/compare/v0.40.9...v0.40.10)
+
+> 7 February 2021
+
+- Fix for issue #366 [`5c3360f`](https://github.com/RhetTbull/osxphotos/commit/5c3360f29d52df2f804c70f37a2ca9a3f102d93c)
+
+#### [v0.40.9](https://github.com/RhetTbull/osxphotos/compare/v0.40.8...v0.40.9)
+
+> 7 February 2021
+
+- Fixed unnecessary warning for long keywords, issue #365 [`f8616ac`](https://github.com/RhetTbull/osxphotos/commit/f8616acf167b5e73ab3e4b68dcfbf578230c330d)
+
+#### [v0.40.8](https://github.com/RhetTbull/osxphotos/compare/v0.40.7...v0.40.8)
+
+> 4 February 2021
+
+- Implemented --in-album, --not-in-album, issue #364 [`addd952`](https://github.com/RhetTbull/osxphotos/commit/addd952aa315007852945a352b2c7c451ba5f21a)
+- Updated docs [`7fa5fba`](https://github.com/RhetTbull/osxphotos/commit/7fa5fbaa5b7c9aa1412eceef56e068dc044c91e0)
+- Updated docs Makefile [skip ci] [`683dfe7`](https://github.com/RhetTbull/osxphotos/commit/683dfe7f3ffd235659b58f403562ce2d51123cfb)
+
+#### [v0.40.7](https://github.com/RhetTbull/osxphotos/compare/v0.40.6...v0.40.7)
+
+> 3 February 2021
+
+- Bump bleach from 3.1.4 to 3.3.0 [`#362`](https://github.com/RhetTbull/osxphotos/pull/362)
+- Fixed XMP template for issue #361 [`43af4d2`](https://github.com/RhetTbull/osxphotos/commit/43af4d205a7264e530bc2b2789d297be633391e1)
+- Updated sidecar test data [`591f9bc`](https://github.com/RhetTbull/osxphotos/commit/591f9bcc62720f7eddebba3b3dcff265907550dd)
+- Added tests for --only-new, #358 [`adc4b05`](https://github.com/RhetTbull/osxphotos/commit/adc4b056029794faddd464d22022a2a17298a924)
+- Updated tests for ExportDB, #358 [`48d2223`](https://github.com/RhetTbull/osxphotos/commit/48d2223edde4850830cc6a3f9776ce08f81a6636)
+- Added 11.2 to tested versions, #360 [`2284598`](https://github.com/RhetTbull/osxphotos/commit/2284598a24f63232c01dcf27b9982002123834ca)
+
+#### [v0.40.6](https://github.com/RhetTbull/osxphotos/compare/v0.40.5...v0.40.6)
+
+> 2 February 2021
+
+-  Add @davidjroos  as a contributor [`8dbedef`](https://github.com/RhetTbull/osxphotos/commit/8dbedef1874882815afb4a885184249aae73bf9f)
+- Fixed documentation, #359 [`77371b6`](https://github.com/RhetTbull/osxphotos/commit/77371b6e5d8a9b8662b7b7d540378beb897f6988)
+
+#### [v0.40.5](https://github.com/RhetTbull/osxphotos/compare/v0.40.3...v0.40.5)
+
+> 1 February 2021
+
+- Restructured docs [`3a4a8bd`](https://github.com/RhetTbull/osxphotos/commit/3a4a8bdb0bdd995c937e0a15f5d8f1685b73407f)
+- Refactored __main__, added sphinx docs [`51f6958`](https://github.com/RhetTbull/osxphotos/commit/51f69585be60d12f912ba08f138b9c1f74481dbd)
+- Implemented --only-new, #358 [`5c093c4`](https://github.com/RhetTbull/osxphotos/commit/5c093c43528193ed1704ed4ef1b8d841a95a81cf)
+
 #### [v0.40.3](https://github.com/RhetTbull/osxphotos/compare/v0.40.2...v0.40.3)

 > 23 January 2021
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 [![tests](https://github.com/RhetTbull/osxphotos/workflows/Tests/badge.svg)](https://github.com/RhetTbull/osxphotos/workflows/Tests/badge.svg)
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/osxphotos)
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-18-orange.svg?style=flat)](#contributors)
+[![All Contributors](https://img.shields.io/badge/all_contributors-19-orange.svg?style=flat)](#contributors)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->

 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.
@@ -31,6 +31,7 @@ OSXPhotos provides the ability to interact with and query Apple's Photos.app lib
  + [FaceInfo](#faceinfo)
  + [CommentInfo](#commentinfo)
  + [LikeInfo](#likeinfo)
+  + [AdjustmentsInfo](#adjustmentsinfo)
  + [Raw Photos](#raw-photos)
  + [Template Substitutions](#template-substitutions)
  + [Utility Functions](#utility-functions)
@@ -51,7 +52,7 @@ Only works on macOS (aka Mac OS X). Tested on macOS Sierra (10.12.6) until macOS

 | macOS Version     | macOS name | Photos.app version |
 | ----------------- |------------|:-------------------|
-| 10.16             | Big Sur    | 6.0 ✅             |
+| 10.16, 11.0-11.2  | 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 ✅             |
@@ -273,6 +274,9 @@ Options:
  --is-reference                  Search for photos that were imported as
                                  referenced files (not copied into Photos
                                  library).
+  --in-album                      Search for photos that are in one or more
+                                  albums.
+  --not-in-album                  Search for photos that are not in any albums.
  --missing                       Export only photos missing from the Photos
                                  library; must be used with --download-missing.
  --deleted                       Include photos from the 'Recently Deleted'
@@ -281,15 +285,24 @@ Options:
                                  Deleted' folder.
  --update                        Only export new or updated files. See notes
                                  below on export and --update.
-  --ignore-signature              When used with --update, ignores file
+  --ignore-signature              When used with '--update', ignores file
                                  signature when updating files. This is useful
                                  if you have processed or edited exported
                                  photos changing the file signature (size &
-                                  modification date). In this case, --update
+                                  modification date). In this case, '--update'
                                  would normally re-export the processed files
-                                  but with --ignore-signature, files which exist
-                                  in the export directory will not be re-
-                                  exported.
+                                  but with '--ignore-signature', files which
+                                  exist in the export directory will not be re-
+                                  exported. If used with '--sidecar', '--ignore-
+                                  signature' has the following behavior: 1) if
+                                  the metadata (in Photos) that went into the
+                                  sidecar did not change, the sidecar will not
+                                  be updated; 2) if the metadata (in Photos)
+                                  that went into the sidecar did change, a new
+                                  sidecar is written but a new image file is
+                                  not; 3) if a sidecar does not exist for the
+                                  photo, a sidecar will be written whether or
+                                  not the photo file was written or updated.
  --only-new                      If used with --update, ignores any previously
                                  exported files, even if missing from the
                                  export folder and only exports new files that
@@ -374,7 +387,8 @@ Options:
                                  does not export tag groups. Sidecar filename
                                  is in format photoname.ext.json; For a list of
                                  tags exported in the JSON and exiftool
-                                  sidecar, see '--exiftool'.
+                                  sidecar, see '--exiftool'. See also '--ignore-
+                                  signature'.
  --sidecar-drop-ext              Drop the photo's extension when naming sidecar
                                  files. By default, sidecar files are named in
                                  format 'photo_filename.photo_ext.sidecar_ext',
@@ -1550,7 +1564,7 @@ Returns height of the photo in pixels.  If image has been edited, returns height
 Returns width of the photo in pixels.  If image has been edited, returns width of the edited image, otherwise returns width of the original image.  See also [original_width](#original_width).

 #### `orientation`
-Returns EXIF orientation value of the photo as integer.  If image has been edited, returns orientation of the edited image, otherwise returns orientation of the original image. See also [original_orientation](#original_orientation).
+Returns EXIF orientation value of the photo as integer.  If image has been edited, returns orientation of the edited image, otherwise returns orientation of the original image. See also [original_orientation](#original_orientation).  If orientation cannot be determined, returns 0 (this happens if osxphotos cannot decode the adjustment info for an edited image).

 #### `original_height`
 Returns height of the original photo in pixels. See also [height](#height).
@@ -1570,6 +1584,9 @@ Returns `True` if the original image file is missing on disk, otherwise `False`.
 #### `hasadjustments`
 Returns `True` if the picture has been edited, otherwise `False`

+#### `adjustments`
+On Photos 5+, returns an [AdjustmentsInfo](#adjustmentsinfo) object representing the adjustments (edits) to the photo or None if there are no adjustments.  On earlier versions of Photos, always returns None.
+
 #### `external_edit`
 Returns `True` if the picture was edited in an external editor (outside Photos.app), otherwise `False`

@@ -2368,9 +2385,26 @@ Returns a JSON representation of the FaceInfo instance.
 [PhotoInfo.likes](#likes) returns a list of LikeInfo objects for "likes" on shared photos. (Photos 5/MacOS 10.15+ only).  The list of LikeInfo objects will be sorted in ascending order by date like was made.  LikeInfo contains the following fields:

 - `datetime`: `datetime.datetime`, date/time like was made
- `user`: `str`, name of user who made the like 
+- `user`: `str`, name of user who made the like
 - `ismine`: `bool`, True if like was made by person who owns the Photos library being operated on

+### AdjustmentsInfo
+[PhotoInfo.adjustments](#adjustments) returns an AdjustmentsInfo object, if the photo has adjustments, or `None` if the photo does not have adjusments.   AdjustmentsInfo has the following properties and methods:
+
+- `plist`: The adjustments plist file maintained by Photos as a dict.
+- `data`: The raw, undecoded adjustments info as binary blob.
+- `editor`: The editor bundle ID of the app which made the edits, e.g. `com.apple.photos`.
+- `format_id`: The format identifier set by the app which made the edits, e.g. `com.apple.photos`.
+- `base_version`: Version info set by the app which made the edits.
+- `format_version`: Version info set by the app which made the edits.
+- `timestamp`: Time stamp of the adjustment as a timezone-aware datetime.datetime object; None if no timestamp is set.
+- `adjustments`: a list of dicts containing information about the decoded adjustments to the photo or None if adjustments could not be decoded. AdjustmentsInfo can decode adjustments made by Photos but cannot decode adjustments made by external plugins or apps.
+- `adj_metadata`: a dict containing additional data about the photo decoded from the adjustment data.
+- `adj_orientation`: the EXIF orientation of the edited photo decoded from the adjustment metadata.
+- `adj_format_version`: version for adjustments format decoded from the adjustment data.
+- `adj_version_info`: version info for the application which made the adjustments to the photo decoded from the adjustments data.
+- `asdict()`: dict representation of the AdjustmentsInfo object; contains all properties with exception of `plist`.
+
 ### Raw Photos
 Handling raw photos in `osxphotos` requires a bit of extra work.  Raw photos in Photos can be imported in two different ways: 1) a single raw photo with no associated JPEG image is imported 2) a raw+JPEG pair is imported -- two separate images with same file stem (e.g. `IMG_0001.CR2` and `IMG_001.JPG`) are imported.  

@@ -2618,6 +2652,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
    <td align="center"><a href="https://github.com/narensankar0529"><img src="https://avatars3.githubusercontent.com/u/74054766?v=4?s=75" width="75px;" alt=""/><br /><sub><b>narensankar0529</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/issues?q=author%3Anarensankar0529" title="Bug reports">🐛</a> <a href="#userTesting-narensankar0529" title="User Testing">📓</a></td>
    <td align="center"><a href="https://github.com/martinhrpi"><img src="https://avatars2.githubusercontent.com/u/19407684?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Martin</b></sub></a><br /><a href="#research-martinhrpi" title="Research">🔬</a> <a href="#userTesting-martinhrpi" title="User Testing">📓</a></td>
    <td align="center"><a href="https://github.com/davidjroos"><img src="https://avatars.githubusercontent.com/u/15630844?v=4?s=75" width="75px;" alt=""/><br /><sub><b>davidjroos </b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=davidjroos" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://neilpa.me"><img src="https://avatars.githubusercontent.com/u/42419?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Neil Pankey</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=neilpa" title="Code">💻</a></td>
  </tr>
 </table>

@@ -2632,6 +2667,7 @@ This project follows the [all-contributors](https://github.com/all-contributors/

 My goal is make osxphotos as reliable and comprehensive as possible.  The test suite currently has over 800 tests--but there are still some [bugs](https://github.com/RhetTbull/osxphotos/issues?q=is%3Aissue+is%3Aopen+label%3Abug) or incomplete features lurking.  If you find bugs please open an [issue](https://github.com/RhetTbull/osxphotos/issues).  Please consult the list of open bugs before deciding that you want to use this code on your Photos library.  Notable issues include:

+- Image orientation is not always correct for photos rotated in Photos.app.  See [Issue #379](https://github.com/RhetTbull/osxphotos/issues/379).
 - Face coordinates (mouth, left eye, right eye) may not be correct for images where the head is tilted.  See [Issue #196](https://github.com/RhetTbull/osxphotos/issues/196).
 - Raw images imported to Photos with an associated jpeg preview are not handled correctly by osxphotos.  osxphotos query and export will operate on the jpeg preview instead of the raw image as will `PhotoInfo.path`.  If the user selects "Use RAW as original" in Photos, the raw image will be exported or operated on but the jpeg will be ignored.  See [Issue #101](https://github.com/RhetTbull/osxphotos/issues/101). Note: Beta version of fix for this bug is implemented in the current version of osxphotos.
 - The `--download-missing` option for `osxphotos export` does not work correctly with burst images.  It will download the primary image but not the other burst images.  See [Issue #75](https://github.com/RhetTbull/osxphotos/issues/75).
--- 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: 547179dc83846d861e5f79c600fa9301
+config: 657c3de477547cc2058cc24ebb377071
 tags: 645f666f9bcd5a90fca523b33c5a78b7
--- a/docs/_modules/index.html
+++ b/docs/_modules/index.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Overview: module code &#8212; osxphotos 0.40.4 documentation</title>
+    <title>Overview: module code &#8212; osxphotos 0.40.16 documentation</title>
    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="../_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="../" src="../_static/documentation_options.js"></script>
--- a/docs/_modules/osxphotos/photoinfo/_photoinfo_exifinfo.html
+++ b/docs/_modules/osxphotos/photoinfo/_photoinfo_exifinfo.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos.photoinfo._photoinfo_exifinfo &#8212; osxphotos 0.40.4 documentation</title>
+    <title>osxphotos.photoinfo._photoinfo_exifinfo &#8212; osxphotos 0.40.16 documentation</title>
    <link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="../../../_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="../../../" src="../../../_static/documentation_options.js"></script>
--- a/docs/_modules/osxphotos/photoinfo/_photoinfo_export.html
+++ b/docs/_modules/osxphotos/photoinfo/_photoinfo_export.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos.photoinfo._photoinfo_export &#8212; osxphotos 0.40.4 documentation</title>
+    <title>osxphotos.photoinfo._photoinfo_export &#8212; osxphotos 0.40.16 documentation</title>
    <link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="../../../_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="../../../" src="../../../_static/documentation_options.js"></script>
@@ -595,11 +595,11 @@
    <span class="k">if</span> <span class="n">export_db</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
        <span class="n">export_db</span> <span class="o">=</span> <span class="n">ExportDBNoOp</span><span class="p">()</span>

-    <span class="k">if</span> <span class="n">verbose</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
-        <span class="n">verbose</span> <span class="o">=</span> <span class="n">noop</span>
-    <span class="k">elif</span> <span class="ow">not</span> <span class="n">callable</span><span class="p">(</span><span class="n">verbose</span><span class="p">):</span>
+    <span class="k">if</span> <span class="n">verbose</span> <span class="ow">and</span> <span class="ow">not</span> <span class="n">callable</span><span class="p">(</span><span class="n">verbose</span><span class="p">):</span>
        <span class="k">raise</span> <span class="ne">TypeError</span><span class="p">(</span><span class="s2">&quot;verbose must be callable&quot;</span><span class="p">)</span>
-    <span class="bp">self</span><span class="o">.</span><span class="n">_verbose</span> <span class="o">=</span> <span class="n">verbose</span>
+
+    <span class="k">if</span> <span class="n">verbose</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
+        <span class="n">verbose</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_verbose</span>

    <span class="c1"># suffix to add to edited files</span>
    <span class="c1"># e.g. name will be filename_edited.jpg</span>
@@ -1534,8 +1534,8 @@
            <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">long_str</span><span class="p">)</span> <span class="o">&gt;</span> <span class="n">_MAX_IPTC_KEYWORD_LEN</span>
        <span class="p">]</span>
        <span class="k">if</span> <span class="n">long_keywords</span><span class="p">:</span>
-            <span class="n">logging</span><span class="o">.</span><span class="n">warning</span><span class="p">(</span>
-                <span class="sa">f</span><span class="s2">&quot;Some keywords exceed max IPTC Keyword length of </span><span class="si">{</span><span class="n">_MAX_IPTC_KEYWORD_LEN</span><span class="si">}</span><span class="s2">: </span><span class="si">{</span><span class="n">long_keywords</span><span class="si">}</span><span class="s2">&quot;</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">_verbose</span><span class="p">(</span>
+                <span class="sa">f</span><span class="s2">&quot;Warning: some keywords exceed max IPTC Keyword length of </span><span class="si">{</span><span class="n">_MAX_IPTC_KEYWORD_LEN</span><span class="si">}</span><span class="s2"> (exiftool will truncate these): </span><span class="si">{</span><span class="n">long_keywords</span><span class="si">}</span><span class="s2">&quot;</span>
            <span class="p">)</span>

        <span class="n">keyword_list</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="n">rendered_keywords</span><span class="p">)</span>
@@ -1814,17 +1814,6 @@
            <span class="k">if</span> <span class="n">_OSXPHOTOS_NONE_SENTINEL</span> <span class="ow">not</span> <span class="ow">in</span> <span class="n">keyword</span>
        <span class="p">]</span>

-        <span class="c1"># check to see if any keywords too long</span>
-        <span class="n">long_keywords</span> <span class="o">=</span> <span class="p">[</span>
-            <span class="n">long_str</span>
-            <span class="k">for</span> <span class="n">long_str</span> <span class="ow">in</span> <span class="n">rendered_keywords</span>
-            <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">long_str</span><span class="p">)</span> <span class="o">&gt;</span> <span class="n">_MAX_IPTC_KEYWORD_LEN</span>
-        <span class="p">]</span>
-        <span class="k">if</span> <span class="n">long_keywords</span><span class="p">:</span>
-            <span class="n">logging</span><span class="o">.</span><span class="n">warning</span><span class="p">(</span>
-                <span class="sa">f</span><span class="s2">&quot;Some keywords exceed max IPTC Keyword length of </span><span class="si">{</span><span class="n">_MAX_IPTC_KEYWORD_LEN</span><span class="si">}</span><span class="s2">: </span><span class="si">{</span><span class="n">long_keywords</span><span class="si">}</span><span class="s2">&quot;</span>
-            <span class="p">)</span>
-
        <span class="n">keyword_list</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="n">rendered_keywords</span><span class="p">)</span>

    <span class="c1"># remove duplicates</span>
--- a/docs/_modules/osxphotos/photoinfo/_photoinfo_scoreinfo.html
+++ b/docs/_modules/osxphotos/photoinfo/_photoinfo_scoreinfo.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos.photoinfo._photoinfo_scoreinfo &#8212; osxphotos 0.40.4 documentation</title>
+    <title>osxphotos.photoinfo._photoinfo_scoreinfo &#8212; osxphotos 0.40.16 documentation</title>
    <link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="../../../_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="../../../" src="../../../_static/documentation_options.js"></script>
--- a/docs/_modules/osxphotos/photoinfo/_photoinfo_searchinfo.html
+++ b/docs/_modules/osxphotos/photoinfo/_photoinfo_searchinfo.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos.photoinfo._photoinfo_searchinfo &#8212; osxphotos 0.40.4 documentation</title>
+    <title>osxphotos.photoinfo._photoinfo_searchinfo &#8212; osxphotos 0.40.16 documentation</title>
    <link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="../../../_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="../../../" src="../../../_static/documentation_options.js"></script>
--- a/docs/_modules/osxphotos/photoinfo/photoinfo.html
+++ b/docs/_modules/osxphotos/photoinfo/photoinfo.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos.photoinfo.photoinfo &#8212; osxphotos 0.40.4 documentation</title>
+    <title>osxphotos.photoinfo.photoinfo &#8212; osxphotos 0.40.16 documentation</title>
    <link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="../../../_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="../../../" src="../../../_static/documentation_options.js"></script>
@@ -103,6 +103,7 @@
        <span class="bp">self</span><span class="o">.</span><span class="n">_uuid</span> <span class="o">=</span> <span class="n">uuid</span>
        <span class="bp">self</span><span class="o">.</span><span class="n">_info</span> <span class="o">=</span> <span class="n">info</span>
        <span class="bp">self</span><span class="o">.</span><span class="n">_db</span> <span class="o">=</span> <span class="n">db</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">_verbose</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_db</span><span class="o">.</span><span class="n">_verbose</span>

    <span class="nd">@property</span>
    <span class="k">def</span> <span class="nf">filename</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
--- a/docs/_modules/osxphotos/photosdb/photosdb.html
+++ b/docs/_modules/osxphotos/photosdb/photosdb.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos.photosdb.photosdb &#8212; osxphotos 0.40.4 documentation</title>
+    <title>osxphotos.photosdb.photosdb &#8212; osxphotos 0.40.16 documentation</title>
    <link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="../../../_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="../../../" src="../../../_static/documentation_options.js"></script>
--- 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.40.4',
+    VERSION: '0.40.16',
    LANGUAGE: 'None',
    COLLAPSE_INDEX: false,
    BUILDER: 'html',
--- a/docs/cli.html
+++ b/docs/cli.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos command line interface (CLI) &#8212; osxphotos 0.40.4 documentation</title>
+    <title>osxphotos command line interface (CLI) &#8212; osxphotos 0.40.16 documentation</title>
    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@@ -465,6 +465,18 @@ to modify this behavior.</p>
 <dd><p>Search for photos that were imported as referenced files (not copied into Photos library).</p>
 </dd></dl>

+<dl class="std option">
+<dt id="cmdoption-osxphotos-export-in-album">
+<code class="sig-name descname">--in-album</code><code class="sig-prename descclassname"></code><a class="headerlink" href="#cmdoption-osxphotos-export-in-album" title="Permalink to this definition">¶</a></dt>
+<dd><p>Search for photos that are in one or more albums.</p>
+</dd></dl>
+
+<dl class="std option">
+<dt id="cmdoption-osxphotos-export-not-in-album">
+<code class="sig-name descname">--not-in-album</code><code class="sig-prename descclassname"></code><a class="headerlink" href="#cmdoption-osxphotos-export-not-in-album" title="Permalink to this definition">¶</a></dt>
+<dd><p>Search for photos that are not in any albums.</p>
+</dd></dl>
+
 <dl class="std option">
 <dt id="cmdoption-osxphotos-export-missing">
 <code class="sig-name descname">--missing</code><code class="sig-prename descclassname"></code><a class="headerlink" href="#cmdoption-osxphotos-export-missing" title="Permalink to this definition">¶</a></dt>
@@ -495,6 +507,12 @@ to modify this behavior.</p>
 <dd><p>When used with –update, ignores file signature when updating files. This is useful if you have processed or edited exported photos changing the file signature (size &amp; modification date). In this case, –update would normally re-export the processed files but with –ignore-signature, files which exist in the export directory will not be re-exported.</p>
 </dd></dl>

+<dl class="std option">
+<dt id="cmdoption-osxphotos-export-only-new">
+<code class="sig-name descname">--only-new</code><code class="sig-prename descclassname"></code><a class="headerlink" href="#cmdoption-osxphotos-export-only-new" title="Permalink to this definition">¶</a></dt>
+<dd><p>If used with –update, ignores any previously exported files, even if missing from the export folder and only exports new files that haven’t previously been exported.</p>
+</dd></dl>
+
 <dl class="std option">
 <dt id="cmdoption-osxphotos-export-dry-run">
 <code class="sig-name descname">--dry-run</code><code class="sig-prename descclassname"></code><a class="headerlink" href="#cmdoption-osxphotos-export-dry-run" title="Permalink to this definition">¶</a></dt>
@@ -691,7 +709,7 @@ to modify this behavior.</p>
 <dl class="std option">
 <dt id="cmdoption-osxphotos-export-jpeg-ext">
 <code class="sig-name descname">--jpeg-ext</code><code class="sig-prename descclassname"> &lt;EXTENSION&gt;</code><a class="headerlink" href="#cmdoption-osxphotos-export-jpeg-ext" title="Permalink to this definition">¶</a></dt>
-<dd><p>Specify file extension for JPEG files. Photos uses .jpeg for edited images but many images are imported with .jpg or .JPG which can result in multiple different extensions used for JPEG files upon export.  Use –jpg-ext to specify a single extension to use for all exported JPEG images. Valid values are jpeg, jpg, JPEG, JPG; e.g. ‘–jpg-ext jpg’ to use ‘.jpg’ for all JPEGs.</p>
+<dd><p>Specify file extension for JPEG files. Photos uses .jpeg for edited images but many images are imported with .jpg or .JPG which can result in multiple different extensions used for JPEG files upon export.  Use –jpeg-ext to specify a single extension to use for all exported JPEG images. Valid values are jpeg, jpg, JPEG, JPG; e.g. ‘–jpeg-ext jpg’ to use ‘.jpg’ for all JPEGs.</p>
 <dl class="field-list simple">
 <dt class="field-odd">Options</dt>
 <dd class="field-odd"><p>jpeg|jpg|JPEG|JPG</p>
@@ -1263,6 +1281,18 @@ if more than one option is provided, they are treated as “AND”
 <dd><p>Search for photos that were imported as referenced files (not copied into Photos library).</p>
 </dd></dl>

+<dl class="std option">
+<dt id="cmdoption-osxphotos-query-in-album">
+<code class="sig-name descname">--in-album</code><code class="sig-prename descclassname"></code><a class="headerlink" href="#cmdoption-osxphotos-query-in-album" title="Permalink to this definition">¶</a></dt>
+<dd><p>Search for photos that are in one or more albums.</p>
+</dd></dl>
+
+<dl class="std option">
+<dt id="cmdoption-osxphotos-query-not-in-album">
+<code class="sig-name descname">--not-in-album</code><code class="sig-prename descclassname"></code><a class="headerlink" href="#cmdoption-osxphotos-query-not-in-album" title="Permalink to this definition">¶</a></dt>
+<dd><p>Search for photos that are not in any albums.</p>
+</dd></dl>
+
 <dl class="std option">
 <dt id="cmdoption-osxphotos-query-deleted">
 <code class="sig-name descname">--deleted</code><code class="sig-prename descclassname"></code><a class="headerlink" href="#cmdoption-osxphotos-query-deleted" title="Permalink to this definition">¶</a></dt>
--- a/docs/genindex.html
+++ b/docs/genindex.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Index &#8212; osxphotos 0.40.4 documentation</title>
+    <title>Index &#8212; osxphotos 0.40.16 documentation</title>
    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@@ -395,6 +395,15 @@

      <ul>
        <li><a href="cli.html#cmdoption-osxphotos-export-ignore-signature">osxphotos-export command line option</a>
+</li>
+      </ul></li>
+      <li>
+    --in-album
+
+      <ul>
+        <li><a href="cli.html#cmdoption-osxphotos-export-in-album">osxphotos-export command line option</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-query-in-album">osxphotos-query command line option</a>
 </li>
      </ul></li>
      <li>
@@ -590,6 +599,15 @@
        <li><a href="cli.html#cmdoption-osxphotos-export-not-hidden">osxphotos-export command line option</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-query-not-hidden">osxphotos-query command line option</a>
+</li>
+      </ul></li>
+      <li>
+    --not-in-album
+
+      <ul>
+        <li><a href="cli.html#cmdoption-osxphotos-export-not-in-album">osxphotos-export command line option</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-query-not-in-album">osxphotos-query command line option</a>
 </li>
      </ul></li>
      <li>
@@ -685,6 +703,13 @@
        <li><a href="cli.html#cmdoption-osxphotos-export-only-movies">osxphotos-export command line option</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-query-only-movies">osxphotos-query command line option</a>
+</li>
+      </ul></li>
+      <li>
+    --only-new
+
+      <ul>
+        <li><a href="cli.html#cmdoption-osxphotos-export-only-new">osxphotos-export command line option</a>
 </li>
      </ul></li>
      <li>
@@ -1452,6 +1477,8 @@
        <li><a href="cli.html#cmdoption-osxphotos-export-ignore-date-modified">--ignore-date-modified</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-export-ignore-signature">--ignore-signature</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-export-in-album">--in-album</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-export-is-reference">--is-reference</a>
 </li>
@@ -1488,6 +1515,8 @@
        <li><a href="cli.html#cmdoption-osxphotos-export-not-hdr">--not-hdr</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-export-not-hidden">--not-hidden</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-export-not-in-album">--not-in-album</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-export-not-live">--not-live</a>
 </li>
@@ -1506,6 +1535,8 @@
        <li><a href="cli.html#cmdoption-osxphotos-export-not-time-lapse">--not-time-lapse</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-export-only-movies">--only-movies</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-export-only-new">--only-new</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-export-only-photos">--only-photos</a>
 </li>
@@ -1694,6 +1725,8 @@
        <li><a href="cli.html#cmdoption-osxphotos-query-hidden">--hidden</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-query-i">--ignore-case</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-query-in-album">--in-album</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-query-incloud">--incloud</a>
 </li>
@@ -1728,6 +1761,8 @@
        <li><a href="cli.html#cmdoption-osxphotos-query-not-hdr">--not-hdr</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-query-not-hidden">--not-hidden</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-query-not-in-album">--not-in-album</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-query-not-incloud">--not-incloud</a>
 </li>
--- a/docs/index.html
+++ b/docs/index.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Welcome to osxphotos’s documentation! &#8212; osxphotos 0.40.4 documentation</title>
+    <title>Welcome to osxphotos’s documentation! &#8212; osxphotos 0.40.16 documentation</title>
    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
--- a/docs/modules.html
+++ b/docs/modules.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos &#8212; osxphotos 0.40.4 documentation</title>
+    <title>osxphotos &#8212; osxphotos 0.40.16 documentation</title>
    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
--- a/docs/objects.inv
+++ b/docs/objects.inv
--- a/docs/osxphotos.pdf
+++ b/docs/osxphotos.pdf
--- a/docs/reference.html
+++ b/docs/reference.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos package &#8212; osxphotos 0.40.4 documentation</title>
+    <title>osxphotos package &#8212; osxphotos 0.40.16 documentation</title>
    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
--- a/docs/search.html
+++ b/docs/search.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Search &#8212; osxphotos 0.40.4 documentation</title>
+    <title>Search &#8212; osxphotos 0.40.16 documentation</title>
    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
    
--- a/docs/searchindex.js
+++ b/docs/searchindex.js
--- a/docsrc/Makefile
+++ b/docsrc/Makefile
@@ -16,6 +16,10 @@ github:
 	@make html
 	@cp -a _build/html/. ../docs

+pdf:
+	@make latexpdf
+	@cp -a _build/latex/osxphotos.pdf ../docs
+
 .PHONY: help Makefile

 # Catch-all target: route all unknown targets to Sphinx using the new
--- a/osxphotos/_constants.py
+++ b/osxphotos/_constants.py
@@ -69,6 +69,7 @@ _TESTED_OS_VERSIONS = [
    ("10", "16"),
    ("11", "0"),
    ("11", "1"),
+    ("11", "2"),
 ]

 # Photos 5 has persons who are empty string if unidentified face
--- a/osxphotos/_version.py
+++ b/osxphotos/_version.py
@@ -1,3 +1,3 @@
 """ version info """

-__version__ = "0.40.6"
+__version__ = "0.40.19"
--- a/osxphotos/adjustmentsinfo.py
+++ b/osxphotos/adjustmentsinfo.py
@@ -0,0 +1,174 @@
+""" AdjustmentsInfo class to read adjustments data for photos edited in Apple's Photos.app
+    In Catalina and Big Sur, the adjustments data (data about edits done to the photo)
+    is stored in a plist file in 
+    ~/Pictures/Photos Library.photoslibrary/resources/renders/X/UUID.plist
+    where X is first character of the photo's UUID string and UUID is the full UUID, 
+    e.g.: ~/Pictures/Photos Library.photoslibrary/resources/renders/3/30362C1D-192F-4CCD-9A2A-968F436DC0DE.plist
+
+    Thanks to @neilpa who figured out how to decode this information:
+    Reference: https://github.com/neilpa/photohack/issues/4
+"""
+
+import datetime
+import json
+import plistlib
+import zlib
+
+from .datetime_utils import datetime_naive_to_utc
+
+
+class AdjustmentsDecodeError(Exception):
+    """Could not decode adjustments plist file"""
+
+    def __init__(self, message):
+        self.message = message
+        super().__init__(self.message)
+
+
+class AdjustmentsInfo:
+    def __init__(self, plist_file):
+        self._plist_file = plist_file
+        self._plist = self._load_plist_file(plist_file)
+
+        self._base_version = self._plist.get("adjustmentBaseVersion", None)
+        self._data = self._plist.get("adjustmentData", None)
+        self._editor_bundle_id = self._plist.get("adjustmentEditorBundleID", None)
+        self._format_identifier = self._plist.get("adjustmentFormatIdentifier", None)
+        self._format_version = self._plist.get("adjustmentFormatVersion")
+        self._timestamp = self._plist.get("adjustmentTimestamp", None)
+        if self._timestamp and type(self._timestamp) == datetime.datetime:
+            self._timestamp = datetime_naive_to_utc(self._timestamp)
+
+        try:
+            self._adjustments = self._decode_adjustments_from_plist(self._plist)
+        except Exception as e:
+            self._adjustments = None
+
+    def _decode_adjustments_from_plist(self, plist):
+        """decode adjustmentData from Apple Photos adjustments
+
+        Args:
+            plist: a plist dict as loaded by plistlib
+
+        Returns:
+            decoded adjustmentsData as dict
+        """
+
+        return json.loads(
+            zlib.decompress(plist["adjustmentData"], -zlib.MAX_WBITS).decode()
+        )
+
+    def _load_plist_file(self, plist_file):
+        """Load plist file from disk
+
+        Args:
+            plist_file: full path to plist file
+
+        Returns:
+            plist as dict
+        """
+        with open(str(plist_file), "rb") as fd:
+            plist_dict = plistlib.load(fd)
+        return plist_dict
+
+    @property
+    def plist(self):
+        """The actual adjustments plist content as a dict """
+        return self._plist
+
+    @property
+    def data(self):
+        """The raw adjustments data as a binary blob """
+        return self._data
+
+    @property
+    def editor(self):
+        """The editor bundle ID for app/plug-in which made the adjustments """
+        return self._editor_bundle_id
+
+    @property
+    def format_id(self):
+        """The value of the adjustmentFormatIdentifier field in the plist """
+        return self._format_identifier
+
+    @property
+    def base_version(self):
+        """Value of adjustmentBaseVersion field """
+        return self._base_version
+
+    @property
+    def format_version(self):
+        """The value of the adjustmentFormatVersion in the plist """
+        return self._format_version
+
+    @property
+    def timestamp(self):
+        """The time stamp of the adjustment as timezone aware datetime.datetime object or None if no timestamp """
+        return self._timestamp
+
+    @property
+    def adjustments(self):
+        """List of adjustment dictionaries (or empty list if none or could not be decoded)"""
+        try:
+            return self._adjustments["adjustments"] if self._adjustments else []
+        except KeyError:
+            return []
+
+    @property
+    def adj_metadata(self):
+        """Metadata dictionary or None if adjustment data could not be decoded"""
+        try:
+            return self._adjustments["metadata"] if self._adjustments else None
+        except KeyError:
+            return None
+
+    @property
+    def adj_orientation(self):
+        """EXIF orientation of image or 0 if none specified or None if adjustments could not be decoded"""
+        try:
+            return self._adjustments["metadata"]["orientation"]
+        except KeyError:
+            # no orientation field
+            return 0
+        except TypeError:
+            # adjustments is None
+            return 0
+
+    @property
+    def adj_format_version(self):
+        """Format version for adjustments data (formatVersion field from adjustmentData) or None if adjustments could not be decoded"""
+        try:
+            return self._adjustments["formatVersion"] if self._adjustments else None
+        except KeyError:
+            return None
+
+    @property
+    def adj_version_info(self):
+        """version info for adjustments data or None if adjustments data could not be decoded"""
+        try:
+            return self._adjustments["versionInfo"] if self._adjustments else None
+        except KeyError:
+            return None
+
+    def asdict(self):
+        """Returns all adjustments info as dictionary"""
+        timestamp = self.timestamp
+        if type(timestamp) == datetime.datetime:
+            timestamp = timestamp.isoformat()
+
+        return {
+            "data": self.data,
+            "editor": self.editor,
+            "format_id": self.format_id,
+            "base_version": self.base_version,
+            "format_version": self.format_version,
+            "adjustments": self.adjustments,
+            "metadata": self.adj_metadata,
+            "orientation": self.adj_orientation,
+            "adjustment_format_version": self.adj_format_version,
+            "version_info": self.adj_version_info,
+            "timestamp": timestamp,
+        }
+
+    def __repr__(self):
+        return f"AdjustmentsInfo(plist_file='{self._plist_file}')"
--- a/osxphotos/cli.py
+++ b/osxphotos/cli.py
@@ -403,6 +403,16 @@ def query_options(f):
            is_flag=True,
            help="Search for photos that were imported as referenced files (not copied into Photos library).",
        ),
+        o(
+            "--in-album",
+            is_flag=True,
+            help="Search for photos that are in one or more albums.",
+        ),
+        o(
+            "--not-in-album",
+            is_flag=True,
+            help="Search for photos that are not in any albums.",
+        ),
    ]
    for o in options[::-1]:
        f = o(f)
@@ -437,11 +447,18 @@ def cli(ctx, db, json_, debug):
@click.option(
    "--ignore-signature",
    is_flag=True,
-    help="When used with --update, ignores file signature when updating files. "
+    help="When used with '--update', ignores file signature when updating files. "
    "This is useful if you have processed or edited exported photos changing the "
-    "file signature (size & modification date). In this case, --update would normally "
-    "re-export the processed files but with --ignore-signature, files which exist "
-    "in the export directory will not be re-exported.",
+    "file signature (size & modification date). In this case, '--update' would normally "
+    "re-export the processed files but with '--ignore-signature', files which exist "
+    "in the export directory will not be re-exported. "
+    "If used with '--sidecar', '--ignore-signature' has the following behavior: "
+    "1) if the metadata (in Photos) that went into the sidecar did not change, "
+    "the sidecar will not be updated; "
+    "2) if the metadata (in Photos) that went into the sidecar did change, "
+    "a new sidecar is written but a new image file is not; "
+    "3) if a sidecar does not exist for the photo, a sidecar will be written "
+    "whether or not the photo file was written or updated.",
 )
@click.option(
    "--only-new",
@@ -559,7 +576,8 @@ def cli(ctx, db, json_, debug):
    "\n--sidecar exiftool: create JSON sidecar compatible with output of 'exiftool -j'. "
    "Unlike '--sidecar json', '--sidecar exiftool' does not export tag groups. "
    "Sidecar filename is in format photoname.ext.json; "
-    "For a list of tags exported in the JSON and exiftool sidecar, see '--exiftool'.",
+    "For a list of tags exported in the JSON and exiftool sidecar, see '--exiftool'. "
+    "See also '--ignore-signature'.",
 )
@click.option(
    "--sidecar-drop-ext",
@@ -907,6 +925,8 @@ def export(
    save_config,
    is_reference,
    beta,
+    in_album,
+    not_in_album,
 ):
    """Export photos from the Photos database.
    Export path DEST is required.
@@ -1047,6 +1067,8 @@ def export(
        exportdb = cfg.exportdb
        beta = cfg.beta
        only_new = cfg.only_new
+        in_album = cfg.in_album
+        not_in_album = cfg.not_in_album

        # config file might have changed verbose
        VERBOSE = bool(verbose)
@@ -1080,6 +1102,7 @@ def export(
        ("shared", "not_shared"),
        ("has_comment", "no_comment"),
        ("has_likes", "no_likes"),
+        ("in_album", "not_in_album"),
    ]
    dependent_options = [
        ("missing", ("download_missing", "use_photos_export")),
@@ -1339,6 +1362,8 @@ def export(
        has_likes=has_likes,
        no_likes=no_likes,
        is_reference=is_reference,
+        in_album=in_album,
+        not_in_album=not_in_album,
    )

    if photos:
@@ -1620,6 +1645,8 @@ def query(
    has_likes,
    no_likes,
    is_reference,
+    in_album,
+    not_in_album,
 ):
    """Query the Photos database using 1 or more search options;
    if more than one option is provided, they are treated as "AND"
@@ -1667,6 +1694,7 @@ def query(
        (shared, not_shared),
        (has_comment, no_comment),
        (has_likes, no_likes),
+        (in_album, not_in_album),
    ]
    # print help if no non-exclusive term or a double exclusive term is given
    if any(all(bb) for bb in exclusive) or not any(
@@ -1759,6 +1787,8 @@ def query(
        has_likes=has_likes,
        no_likes=no_likes,
        is_reference=is_reference,
+        in_album=in_album,
+        not_in_album=not_in_album,
    )

    # below needed for to make CliRunner work for testing
@@ -1930,6 +1960,8 @@ def _query(
    has_likes=False,
    no_likes=False,
    is_reference=False,
+    in_album=False,
+    not_in_album=False,
 ):
    """Run a query against PhotosDB to extract the photos based on user supply criteria used by query and export commands

@@ -2162,6 +2194,11 @@ def _query(
    if is_reference:
        photos = [p for p in photos if p.isreference]

+    if in_album:
+        photos = [p for p in photos if p.albums]
+    elif not_in_album:
+        photos = [p for p in photos if not p.albums]
+
    return photos


@@ -2352,13 +2389,16 @@ def export_photo(
            rendered_suffix = rendered_suffix[0]

        original_filename = pathlib.Path(filename)
-        file_ext = (
-            "." + jpeg_ext
-            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
-        )
+        file_ext = original_filename.suffix
+        if photo.isphoto and (jpeg_ext or convert_to_jpeg):
+            # change the file extension to correct jpeg extension if needed
+            file_ext = (
+                "." + jpeg_ext
+                if jpeg_ext and (photo.uti_original == "public.jpeg" or convert_to_jpeg)
+                else ".jpeg"
+                if convert_to_jpeg and photo.uti_original != "public.jpeg"
+                else original_filename.suffix
+            )
        original_filename = (
            original_filename.parent
            / f"{original_filename.stem}{rendered_suffix}{file_ext}"
@@ -2490,17 +2530,28 @@ def export_photo(
            if export_edited and photo.hasadjustments:
                edited_filename = pathlib.Path(filename)
                edited_ext = (
-                    "." + jpeg_ext
-                    if jpeg_ext and photo.uti_edited == "public.jpeg"
-                    else "." + get_preferred_uti_extension(photo.uti_edited)
+                    # rare cases on Photos <= 4 that uti_edited is None
+                    "." + get_preferred_uti_extension(photo.uti_edited)
                    if photo.uti_edited
                    else pathlib.Path(photo.path_edited).suffix
                    if photo.path_edited
                    else pathlib.Path(photo.filename).suffix
                )
+
+                if (
+                    photo.isphoto
+                    and jpeg_ext
+                    and edited_ext.lower() in [".jpg", ".jpeg"]
+                ):
+                    edited_ext = "." + jpeg_ext
+
                # 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"]:
+                if (
+                    photo.isphoto
+                    and convert_to_jpeg
+                    and edited_ext.lower() not in [".jpg", ".jpeg"]
+                ):
                    edited_ext = "." + jpeg_ext if jpeg_ext else ".jpeg"

                if edited_suffix:
--- a/osxphotos/exiftool.py
+++ b/osxphotos/exiftool.py
@@ -254,7 +254,11 @@ class ExifTool:
        filename = os.fsencode(self.file) if not no_file else b""

        if self.flags:
-            command_str = b"\n".join([f.encode("utf-8") for f in self.flags])
+            # need to split flags, e.g. so "--ext AVI" becomes ["--ext", "AVI"]
+            flags = []
+            for f in self.flags:
+                flags.extend(f.split())
+            command_str = b"\n".join([f.encode("utf-8") for f in flags])
            command_str += b"\n"
        else:
            command_str = b""
@@ -311,7 +315,13 @@ class ExifTool:
        if not json_str:
            return dict()

-        exifdict = json.loads(json_str)
+        try:
+            exifdict = json.loads(json_str)
+        except Exception as e:
+            # will fail with some commands, e.g --ext AVI which produces
+            # 'No file with specified extension' instead of json
+            return dict()
+
        exifdict = exifdict[0]
        if not tag_groups:
            # strip tag groups
--- a/osxphotos/personinfo.py
+++ b/osxphotos/personinfo.py
@@ -11,16 +11,15 @@ MPRI_Reg_Rect = namedtuple("MPRI_Reg_Rect", ["x", "y", "h", "w"])


 class PersonInfo:
-    """ Info about a person in the Photos library
-    """
+    """Info about a person in the Photos library"""

    def __init__(self, db=None, pk=None):
-        """ Creates a new PersonInfo instance
+        """Creates a new PersonInfo instance

        Arguments:
            db: instance of PhotosDB object
-            pk: primary key value of person to initialize PersonInfo with    
-        
+            pk: primary key value of person to initialize PersonInfo with
+
        Returns:
            PersonInfo instance
        """
@@ -57,8 +56,8 @@ class PersonInfo:

    @property
    def face_info(self):
-        """ Returns a list of FaceInfo objects associated with this person sorted by quality score
-            Highest quality face is result[0] and lowest quality face is result[n] 
+        """Returns a list of FaceInfo objects associated with this person sorted by quality score
+        Highest quality face is result[0] and lowest quality face is result[n]
        """
        try:
            faces = self._db._db_faceinfo_person[self._pk]
@@ -103,16 +102,15 @@ class PersonInfo:


 class FaceInfo:
-    """ Info about a face in the Photos library
-    """
+    """Info about a face in the Photos library"""

    def __init__(self, db=None, pk=None):
-        """ Creates a new FaceInfo instance
+        """Creates a new FaceInfo instance

        Arguments:
            db: instance of PhotosDB object
-            pk: primary key value of face to init the object with    
-        
+            pk: primary key value of face to init the object with
+
        Returns:
            FaceInfo instance
        """
@@ -156,7 +154,7 @@ class FaceInfo:

    @property
    def center(self):
-        """ Coordinates, in PIL format, for center of face 
+        """Coordinates, in PIL format, for center of face

        Returns:
            tuple of coordinates in form (x, y)
@@ -165,7 +163,7 @@ class FaceInfo:

    @property
    def size_pixels(self):
-        """ Size of face in pixels (centered around center_x, center_y)
+        """Size of face in pixels (centered around center_x, center_y)

        Returns:
            size, in int pixels, of a circle drawn around the center of the face
@@ -176,7 +174,7 @@ class FaceInfo:

    @property
    def mouth(self):
-        """ Coordinates, in PIL format, for mouth position
+        """Coordinates, in PIL format, for mouth position

        Returns:
            tuple of coordinates in form (x, y)
@@ -185,7 +183,7 @@ class FaceInfo:

    @property
    def left_eye(self):
-        """ Coordinates, in PIL format, for left eye position
+        """Coordinates, in PIL format, for left eye position

        Returns:
            tuple of coordinates in form (x, y)
@@ -194,7 +192,7 @@ class FaceInfo:

    @property
    def right_eye(self):
-        """ Coordinates, in PIL format, for right eye position
+        """Coordinates, in PIL format, for right eye position

        Returns:
            tuple of coordinates in form (x, y)
@@ -223,7 +221,7 @@ class FaceInfo:

    @property
    def mwg_rs_area(self):
-        """ Get coordinates for Metadata Working Group Region Area. 
+        """Get coordinates for Metadata Working Group Region Area.

        Returns:
            MWG_RS_Area named tuple with x, y, h, w where:
@@ -249,7 +247,7 @@ class FaceInfo:

    @property
    def mpri_reg_rect(self):
-        """ Get coordinates for Microsoft Photo Region Rectangle.
+        """Get coordinates for Microsoft Photo Region Rectangle.

        Returns:
            MPRI_Reg_Rect named tuple with x, y, h, w where:
@@ -278,7 +276,7 @@ class FaceInfo:
        return MPRI_Reg_Rect(x, y, h, w)

    def face_rect(self):
-        """ Get face rectangle coordinates for current version of the associated image
+        """Get face rectangle coordinates for current version of the associated image
            If image has been edited, rectangle applies to edited version, otherwise original version
            Coordinates in format and reference frame used by PIL

@@ -321,12 +319,12 @@ class FaceInfo:
        return yaw

    def _fix_orientation(self, xy):
-        """ Translate an (x, y) tuple based on image orientation
+        """Translate an (x, y) tuple based on image orientation

        Arguments:
            xy: tuple of (x, y) coordinates for point to translate
                in format used by Photos (percent of height/width)
-        
+
        Returns:
            (x, y) tuple of translated coordinates
        """
@@ -350,21 +348,24 @@ class FaceInfo:
        elif orientation == 7:
            x, y = y, x
            y = 1.0 - y
-        elif orientation ==8:
+        elif orientation == 8:
            x, y = y, x
+        elif orientation == 0:
+            # set by osxphotos if adjusted orientation cannot be read, assume it's 1
+            y = 1.0 - y
        else:
            logging.warning(f"Unhandled orientation: {orientation}")

        return (x, y)

    def _make_point(self, xy):
-        """ Translate an (x, y) tuple based on image orientation
+        """Translate an (x, y) tuple based on image orientation
            and convert to image coordinates

        Arguments:
            xy: tuple of (x, y) coordinates for point to translate
                in format used by Photos (percent of height/width)
-        
+
        Returns:
            (x, y) tuple of translated coordinates in pixels in PIL format/reference frame
        """
@@ -379,13 +380,13 @@ class FaceInfo:
        return (int(x * dx), int(y * dy))

    def _make_point_with_rotation(self, xy):
-        """ Translate an (x, y) tuple based on image orientation and rotation
+        """Translate an (x, y) tuple based on image orientation and rotation
            and convert to image coordinates

        Arguments:
            xy: tuple of (x, y) coordinates for point to translate
                in format used by Photos (percent of height/width)
-        
+
        Returns:
            (x, y) tuple of translated coordinates in pixels in PIL format/reference frame
        """
@@ -472,14 +473,14 @@ class FaceInfo:


 def rotate_image_point(x, y, xmid, ymid, angle):
-    """ rotate image point about xm, ym by angle in radians
+    """rotate image point about xm, ym by angle in radians

    Arguments:
-        x: x coordinate of point to rotate    
+        x: x coordinate of point to rotate
        y: y coordinate of point to rotate
        xmid: x coordinate of center point to rotate about
        ymid: y coordinate of center point to rotate about
-        angle: angle in radians about which to coordinate, 
+        angle: angle in radians about which to coordinate,
            counter-clockwise is positive

    Returns:
--- a/osxphotos/photoinfo/_photoinfo_export.py
+++ b/osxphotos/photoinfo/_photoinfo_export.py
@@ -475,6 +475,8 @@ def export2(
    merge_exif_keywords=False,
    merge_exif_persons=False,
    jpeg_ext=None,
+    persons=True,
+    location=True,
 ):
    """export photo, like export but with update and dry_run options
    dest: must be valid destination path or exception raised
@@ -527,6 +529,8 @@ def export2(
    merge_exif_keywords: boolean; if True, merged keywords found in file's exif data (requires exiftool)
    merge_exif_persons: boolean; if True, merged persons found in file's exif data (requires exiftool)
    jpeg_ext: if set, will use this value for extension on jpegs converted to jpeg with convert_to_jpeg; if not set, uses jpeg; do not include the leading "."
+    persons: if True, include persons in exported metadata
+    location: if True, include location in exported metadata

    Returns: ExportResults class 
        ExportResults has attributes: 
@@ -562,11 +566,11 @@ def export2(
    if export_db is None:
        export_db = ExportDBNoOp()

-    if verbose is None:
-        verbose = noop
-    elif not callable(verbose):
+    if verbose and not callable(verbose):
        raise TypeError("verbose must be callable")
-    self._verbose = verbose
+
+    if verbose is None:
+        verbose = self._verbose

    # suffix to add to edited files
    # e.g. name will be filename_edited.jpg
@@ -941,6 +945,8 @@ def export2(
            merge_exif_keywords=merge_exif_keywords,
            merge_exif_persons=merge_exif_persons,
            filename=dest.name,
+            persons=persons,
+            location=location,
        )
        sidecars.append(
            (
@@ -964,6 +970,8 @@ def export2(
            merge_exif_keywords=merge_exif_keywords,
            merge_exif_persons=merge_exif_persons,
            filename=dest.name,
+            persons=persons,
+            location=location,
        )
        sidecars.append(
            (
@@ -983,6 +991,8 @@ def export2(
            keyword_template=keyword_template,
            description_template=description_template,
            extension=dest.suffix[1:] if dest.suffix else None,
+            persons=persons,
+            location=location,
        )
        sidecars.append(
            (
@@ -1050,6 +1060,8 @@ def export2(
                        ignore_date_modified=ignore_date_modified,
                        merge_exif_keywords=merge_exif_keywords,
                        merge_exif_persons=merge_exif_persons,
+                        persons=persons,
+                        location=location,
                    )
                )[0]
                if old_data != current_data:
@@ -1070,6 +1082,8 @@ def export2(
                        flags=exiftool_flags,
                        merge_exif_keywords=merge_exif_keywords,
                        merge_exif_persons=merge_exif_persons,
+                        persons=persons,
+                        location=location,
                    )
                    if warning_:
                        all_results.exiftool_warning.append((exported_file, warning_))
@@ -1087,6 +1101,8 @@ def export2(
                        ignore_date_modified=ignore_date_modified,
                        merge_exif_keywords=merge_exif_keywords,
                        merge_exif_persons=merge_exif_persons,
+                        persons=persons,
+                        location=location,
                    ),
                )
                export_db.set_stat_exif_for_file(
@@ -1109,6 +1125,8 @@ def export2(
                    flags=exiftool_flags,
                    merge_exif_keywords=merge_exif_keywords,
                    merge_exif_persons=merge_exif_persons,
+                    persons=persons,
+                    location=location,
                )
                if warning_:
                    all_results.exiftool_warning.append((exported_file, warning_))
@@ -1126,6 +1144,8 @@ def export2(
                    ignore_date_modified=ignore_date_modified,
                    merge_exif_keywords=merge_exif_keywords,
                    merge_exif_persons=merge_exif_persons,
+                    persons=persons,
+                    location=location,
                ),
            )
            export_db.set_stat_exif_for_file(
@@ -1345,6 +1365,8 @@ def _write_exif_data(
    flags=None,
    merge_exif_keywords=False,
    merge_exif_persons=False,
+    persons=True,
+    location=True,
 ):
    """write exif data to image file at filepath

@@ -1355,6 +1377,8 @@ def _write_exif_data(
        keyword_template: (list of strings); list of template strings to render as keywords
        ignore_date_modified: if True, sets EXIF:ModifyDate to EXIF:DateTimeOriginal even if date_modified is set
        flags: optional list of exiftool flags to prepend to exiftool command when writing metadata (e.g. -m or -F)
+        persons: if True, write person data to metadata
+        location: if True, write location data to metadata

    Returns:
        (warning, error) of warning and error strings if exiftool produces warnings or errors
@@ -1369,6 +1393,8 @@ def _write_exif_data(
        ignore_date_modified=ignore_date_modified,
        merge_exif_keywords=merge_exif_keywords,
        merge_exif_persons=merge_exif_persons,
+        persons=persons,
+        location=location,
    )

    with ExifTool(filepath, flags=flags, exiftool=self._db._exiftool_path) as exiftool:
@@ -1391,6 +1417,8 @@ def _exiftool_dict(
    merge_exif_keywords=False,
    merge_exif_persons=False,
    filename=None,
+    persons=True,
+    location=True,
 ):
    """Return dict of EXIF details for building exiftool JSON sidecar or sending commands to ExifTool.
        Does not include all the EXIF fields as those are likely already in the image.
@@ -1404,6 +1432,8 @@ def _exiftool_dict(
        ignore_date_modified: if True, sets EXIF:ModifyDate to EXIF:DateTimeOriginal even if date_modified is set
        merge_exif_keywords: merge keywords in the file's exif metadata (requires exiftool)
        merge_exif_persons: merge persons in the file's exif metadata (requires exiftool)
+        persons: if True, include person data
+        location: if True, include location data

    Returns: dict with exiftool tags / values

@@ -1411,8 +1441,10 @@ def _exiftool_dict(
        EXIF:ImageDescription (may include template)
        XMP:Description (may include template)
        XMP:Title
+        IPTC:ObjectName
        XMP:TagsList (may include album name, person name, or template)
        IPTC:Keywords (may include album name, person name, or template)
+        IPTC:Caption-Abstract
        XMP:Subject (set to keywords + persons)
        XMP:PersonInImage
        EXIF:GPSLatitudeRef, EXIF:GPSLongitudeRef
@@ -1428,6 +1460,9 @@ def _exiftool_dict(
        QuickTime:ModifyDate (UTC)
        QuickTime:GPSCoordinates
        UserData:GPSCoordinates
+
+    Reference: 
+        https://iptc.org/std/photometadata/specification/IPTC-PhotoMetadata-201610_1.pdf
    """

    exif = (
@@ -1447,12 +1482,15 @@ def _exiftool_dict(
        description = " ".join(rendered) if rendered else ""
        exif["EXIF:ImageDescription"] = description
        exif["XMP:Description"] = description
+        exif["IPTC:Caption-Abstract"] = description
    elif self.description:
        exif["EXIF:ImageDescription"] = self.description
        exif["XMP:Description"] = self.description
+        exif["IPTC:Caption-Abstract"] = self.description

    if self.title:
        exif["XMP:Title"] = self.title
+        exif["IPTC:ObjectName"] = self.title

    keyword_list = []
    if merge_exif_keywords:
@@ -1462,15 +1500,16 @@ def _exiftool_dict(
        keyword_list.extend(self.keywords)

    person_list = []
-    if merge_exif_persons:
-        person_list.extend(self._get_exif_persons())
+    if persons:
+        if merge_exif_persons:
+            person_list.extend(self._get_exif_persons())

-    if self.persons:
-        # filter out _UNKNOWN_PERSON
-        person_list.extend([p for p in self.persons if p != _UNKNOWN_PERSON])
+        if self.persons:
+            # filter out _UNKNOWN_PERSON
+            person_list.extend([p for p in self.persons if p != _UNKNOWN_PERSON])

-    if use_persons_as_keywords and person_list:
-        keyword_list.extend(person_list)
+        if use_persons_as_keywords and person_list:
+            keyword_list.extend(person_list)

    if use_albums_as_keywords and self.albums:
        keyword_list.extend(self.albums)
@@ -1501,8 +1540,8 @@ def _exiftool_dict(
            if len(long_str) > _MAX_IPTC_KEYWORD_LEN
        ]
        if long_keywords:
-            logging.warning(
-                f"Some keywords exceed max IPTC Keyword length of {_MAX_IPTC_KEYWORD_LEN}: {long_keywords}"
+            self._verbose(
+                f"Warning: some keywords exceed max IPTC Keyword length of {_MAX_IPTC_KEYWORD_LEN} (exiftool will truncate these): {long_keywords}"
            )

        keyword_list.extend(rendered_keywords)
@@ -1514,25 +1553,26 @@ def _exiftool_dict(
        exif["XMP:Subject"] = keyword_list.copy()
        exif["XMP:TagsList"] = keyword_list.copy()

-    if person_list:
+    if persons and person_list:
        person_list = sorted(list(set(person_list)))
        exif["XMP:PersonInImage"] = person_list.copy()

    # if self.favorite():
    #     exif["Rating"] = 5

-    (lat, lon) = self.location
-    if lat is not None and lon is not None:
-        if self.isphoto:
-            exif["EXIF:GPSLatitude"] = lat
-            exif["EXIF:GPSLongitude"] = lon
-            lat_ref = "N" if lat >= 0 else "S"
-            lon_ref = "E" if lon >= 0 else "W"
-            exif["EXIF:GPSLatitudeRef"] = lat_ref
-            exif["EXIF:GPSLongitudeRef"] = lon_ref
-        elif self.ismovie:
-            exif["Keys:GPSCoordinates"] = f"{lat} {lon}"
-            exif["UserData:GPSCoordinates"] = f"{lat} {lon}"
+    if location:
+        (lat, lon) = self.location
+        if lat is not None and lon is not None:
+            if self.isphoto:
+                exif["EXIF:GPSLatitude"] = lat
+                exif["EXIF:GPSLongitude"] = lon
+                lat_ref = "N" if lat >= 0 else "S"
+                lon_ref = "E" if lon >= 0 else "W"
+                exif["EXIF:GPSLatitudeRef"] = lat_ref
+                exif["EXIF:GPSLongitudeRef"] = lon_ref
+            elif self.ismovie:
+                exif["Keys:GPSCoordinates"] = f"{lat} {lon}"
+                exif["UserData:GPSCoordinates"] = f"{lat} {lon}"

    # process date/time and timezone offset
    # Photos exports the following fields and sets modify date to creation date
@@ -1640,6 +1680,8 @@ def _exiftool_json_sidecar(
    merge_exif_keywords=False,
    merge_exif_persons=False,
    filename=None,
+    persons=True,
+    location=True,
 ):
    """Return dict of EXIF details for building exiftool JSON sidecar or sending commands to ExifTool.
        Does not include all the EXIF fields as those are likely already in the image.
@@ -1654,13 +1696,17 @@ def _exiftool_json_sidecar(
        merge_exif_keywords: boolean; if True, merged keywords found in file's exif data (requires exiftool)
        merge_exif_persons: boolean; if True, merged persons found in file's exif data (requires exiftool)
        filename: filename of the destination image file for including in exiftool signature in JSON sidecar
+        persons: if True, include person data
+        location: if True, include location data

    Returns: dict with exiftool tags / values

    Exports the following:
        EXIF:ImageDescription
        XMP:Description (may include template)
+        IPTC:CaptionAbstract
        XMP:Title
+        IPTC:ObjectName
        XMP:TagsList
        IPTC:Keywords (may include album name, person name, or template)
        XMP:Subject (set to keywords + person)
@@ -1688,6 +1734,8 @@ def _exiftool_json_sidecar(
        merge_exif_keywords=merge_exif_keywords,
        merge_exif_persons=merge_exif_persons,
        filename=filename,
+        persons=persons,
+        location=location,
    )

    if not tag_groups:
@@ -1710,6 +1758,8 @@ def _xmp_sidecar(
    extension=None,
    merge_exif_keywords=False,
    merge_exif_persons=False,
+    persons=True,
+    location=True,
 ):
    """returns string for XMP sidecar
    use_albums_as_keywords: treat album names as keywords
@@ -1719,6 +1769,8 @@ def _xmp_sidecar(
    extension: which extension to use for SidecarForExtension property
    merge_exif_keywords: boolean; if True, merged keywords found in file's exif data (requires exiftool)
    merge_exif_persons: boolean; if True, merged persons found in file's exif data (requires exiftool)
+    persons: if True, include person data
+    location: if True, include location data
    """

    xmp_template_file = (
@@ -1749,15 +1801,16 @@ def _xmp_sidecar(
    # good candidate for pulling out in a function

    person_list = []
-    if merge_exif_persons:
-        person_list.extend(self._get_exif_persons())
+    if persons:
+        if merge_exif_persons:
+            person_list.extend(self._get_exif_persons())

-    if self.persons:
-        # filter out _UNKNOWN_PERSON
-        person_list.extend([p for p in self.persons if p != _UNKNOWN_PERSON])
+        if self.persons:
+            # filter out _UNKNOWN_PERSON
+            person_list.extend([p for p in self.persons if p != _UNKNOWN_PERSON])

-    if use_persons_as_keywords and person_list:
-        keyword_list.extend(person_list)
+        if use_persons_as_keywords and person_list:
+            keyword_list.extend(person_list)

    if use_albums_as_keywords and self.albums:
        keyword_list.extend(self.albums)
@@ -1781,28 +1834,20 @@ def _xmp_sidecar(
            if _OSXPHOTOS_NONE_SENTINEL not in keyword
        ]

-        # check to see if any keywords too long
-        long_keywords = [
-            long_str
-            for long_str in rendered_keywords
-            if len(long_str) > _MAX_IPTC_KEYWORD_LEN
-        ]
-        if long_keywords:
-            logging.warning(
-                f"Some keywords exceed max IPTC Keyword length of {_MAX_IPTC_KEYWORD_LEN}: {long_keywords}"
-            )
-
        keyword_list.extend(rendered_keywords)

    # remove duplicates
    # sorted mainly to make testing the XMP file easier
    if keyword_list:
        keyword_list = sorted(list(set(keyword_list)))
-    if person_list:
+    if persons and person_list:
        person_list = sorted(list(set(person_list)))

    subject_list = keyword_list

+    if location:
+        latlon = self.location
+
    xmp_str = xmp_template.render(
        photo=self,
        description=description,
@@ -1810,6 +1855,7 @@ def _xmp_sidecar(
        persons=person_list,
        subjects=subject_list,
        extension=extension,
+        location=latlon,
        version=__version__,
    )

--- a/osxphotos/photoinfo/photoinfo.py
+++ b/osxphotos/photoinfo/photoinfo.py
@@ -27,6 +27,7 @@ from .._constants import (
    _PHOTOS_5_SHARED_PHOTO_PATH,
    _PHOTOS_5_VERSION,
 )
+from ..adjustmentsinfo import AdjustmentsInfo
 from ..albuminfo import AlbumInfo, ImportInfo
 from ..personinfo import FaceInfo, PersonInfo
 from ..phototemplate import PhotoTemplate
@@ -70,6 +71,7 @@ class PhotoInfo:
        self._uuid = uuid
        self._info = info
        self._db = db
+        self._verbose = self._db._verbose

    @property
    def filename(self):
@@ -509,6 +511,30 @@ class PhotoInfo:
        """ True if picture has adjustments / edits """
        return self._info["hasAdjustments"] == 1

+    @property
+    def adjustments(self):
+        """ Returns AdjustmentsInfo class for adjustment data or None if no adjustments; Photos 5+ only """
+        if self._db._db_version <= _PHOTOS_4_VERSION:
+            return None
+
+        if self.hasadjustments:
+            try:
+                return self._adjustmentinfo
+            except AttributeError:
+                library = self._db._library_path
+                directory = self._uuid[0]  # first char of uuid
+                plist_file = (
+                    pathlib.Path(library)
+                    / "resources"
+                    / "renders"
+                    / directory
+                    / f"{self._uuid}.plist"
+                )
+                if not plist_file.is_file():
+                    return None
+                self._adjustmentinfo = AdjustmentsInfo(plist_file)
+                return self._adjustmentinfo
+
    @property
    def external_edit(self):
        """ Returns True if picture was edited outside of Photos using external editor """
@@ -822,8 +848,19 @@ class PhotoInfo:

    @property
    def orientation(self):
-        """ returns EXIF orientation of the current photo version as int """
-        return self._info["orientation"]
+        """ returns EXIF orientation of the current photo version as int or 0 if current orientation cannot be determined """
+        if self._db._db_version <= _PHOTOS_4_VERSION:
+            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:
+            return self._info["orientation"]

    @property
    def original_height(self):
--- a/osxphotos/photosdb/photosdb.py
+++ b/osxphotos/photosdb/photosdb.py
@@ -2041,6 +2041,7 @@ class PhotosDB:
            # > 6 = portrait (sometimes, see ZDEPTHSTATE/ZDEPTHTYPE)
            info["customRenderedValue"] = row[22]
            info["hdr"] = True if row[22] == 3 else False
+            info["depth_state"] = row[36]
            info["portrait"] = True if row[36] != 0 else False

            # Set panorama from either KindSubType or RenderedValue
--- a/osxphotos/templates/xmp_sidecar.mako
+++ b/osxphotos/templates/xmp_sidecar.mako
@@ -99,12 +99,6 @@
    % endif
 </%def>

-<%def name="orientation(orientation)">
-    % if orientation is not None:
-        <tiff:Orientation>${orientation}</tiff:Orientation>
-    % endif
-</%def>
-
 <%def name="mwg_face_regions(photo)">
    % if photo.face_info:
    <mwg-rs:Regions rdf:parseType="Resource">
@@ -152,7 +146,7 @@


 <?xpacket begin="${"\uFEFF"}" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos ${version}">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -182,12 +176,7 @@

 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
- ${gps_info(*photo.location)}
-</rdf:Description>
-
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
- ${orientation(photo.orientation)}
+ ${gps_info(*location)}
 </rdf:Description>

 <rdf:Description rdf:about=""
--- a/osxphotos/templates/xmp_sidecar_beta.mako
+++ b/osxphotos/templates/xmp_sidecar_beta.mako
@@ -99,12 +99,6 @@
    % endif
 </%def>

-<%def name="orientation(orientation)">
-    % if orientation is not None:
-        <tiff:Orientation>${orientation}</tiff:Orientation>
-    % endif
-</%def>
-
 <%def name="mwg_face_regions(photo)">
    % if photo.face_info:
    <mwg-rs:Regions rdf:parseType="Resource">
@@ -152,7 +146,7 @@


 <?xpacket begin="${"\uFEFF"}" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos ${version}">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -182,12 +176,7 @@

 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
- ${gps_info(*photo.location)}
-</rdf:Description>
-
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
- ${orientation(photo.orientation)}
+ ${gps_info(*location)}
 </rdf:Description>

 <rdf:Description rdf:about=""
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,8 +9,7 @@ atomicwrites==1.3.0
 attrs==19.1.0
 backcall==0.1.0
 better-exceptions-fork==0.2.1.post6
-black==19.10b0
-bleach==3.1.4
+bleach==3.3.0
 bpylist2==3.0.2
 certifi==2020.4.5.1
 cffi==1.14.0
--- a/tests/search_info_test_data_10_15_7.json
+++ b/tests/search_info_test_data_10_15_7.json
--- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw.json
+++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw.json
@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}]
+[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}]
--- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw.xmp
+++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -46,10 +46,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_albums_as_keywords.json
+++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_albums_as_keywords.json
@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:Keywords": ["AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:Subject": ["AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:TagsList": ["AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}]
+[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:Subject": ["AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:TagsList": ["AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}]
--- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_albums_as_keywords.xmp
+++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_albums_as_keywords.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -52,10 +52,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_ext.xmp
+++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_ext.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -46,10 +46,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_ignore_date_modified.json
+++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_ignore_date_modified.json
@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}]
+[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}]
--- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_keyword_template.json
+++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_keyword_template.json
@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:Keywords": ["Folder1/SubFolder2/AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:Subject": ["Folder1/SubFolder2/AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:TagsList": ["Folder1/SubFolder2/AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}]
+[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Folder1/SubFolder2/AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:Subject": ["Folder1/SubFolder2/AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:TagsList": ["Folder1/SubFolder2/AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}]
--- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_keyword_template.xmp
+++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_keyword_template.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -54,10 +54,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_no_tag_groups.json
+++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_no_tag_groups.json
@@ -1 +1 @@
-[{"ImageDescription": "Girl holding pumpkin", "Description": "Girl holding pumpkin", "Title": "I found one!", "Keywords": ["Kids"], "Subject": ["Kids"], "TagsList": ["Kids"], "PersonInImage": ["Katie"], "DateTimeOriginal": "2018:09:28 16:07:07", "CreateDate": "2018:09:28 16:07:07", "OffsetTimeOriginal": "-04:00", "DateCreated": "2018:09:28", "TimeCreated": "16:07:07-04:00", "ModifyDate": "2018:09:28 16:07:07"}]
+[{"ImageDescription": "Girl holding pumpkin", "Description": "Girl holding pumpkin", "Caption-Abstract": "Girl holding pumpkin", "Title": "I found one!", "ObjectName": "I found one!", "Keywords": ["Kids"], "Subject": ["Kids"], "TagsList": ["Kids"], "PersonInImage": ["Katie"], "DateTimeOriginal": "2018:09:28 16:07:07", "CreateDate": "2018:09:28 16:07:07", "OffsetTimeOriginal": "-04:00", "DateCreated": "2018:09:28", "TimeCreated": "16:07:07-04:00", "ModifyDate": "2018:09:28 16:07:07"}]
--- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_persons_as_keywords.json
+++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_persons_as_keywords.json
@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:Keywords": ["Katie", "Kids"], "XMP:Subject": ["Katie", "Kids"], "XMP:TagsList": ["Katie", "Kids"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}]
+[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Katie", "Kids"], "XMP:Subject": ["Katie", "Kids"], "XMP:TagsList": ["Katie", "Kids"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}]
--- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_persons_as_keywords.xmp
+++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_persons_as_keywords.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -48,10 +48,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA.json
+++ b/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA.json
@@ -1 +1 @@
-[{"XMP:Title": "St. James's Park", "IPTC:Keywords": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:Subject": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:TagsList": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "EXIF:GPSLatitude": 51.50357167, "EXIF:GPSLongitude": -0.1318055, "EXIF:GPSLatitudeRef": "N", "EXIF:GPSLongitudeRef": "W", "EXIF:DateTimeOriginal": "2018:10:13 09:18:12", "EXIF:CreateDate": "2018:10:13 09:18:12", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:10:13", "IPTC:TimeCreated": "09:18:12-04:00", "EXIF:ModifyDate": "2019:12:01 11:43:45"}]
+[{"XMP:Title": "St. James's Park", "IPTC:ObjectName": "St. James's Park", "IPTC:Keywords": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:Subject": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:TagsList": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "EXIF:GPSLatitude": 51.50357167, "EXIF:GPSLongitude": -0.1318055, "EXIF:GPSLatitudeRef": "N", "EXIF:GPSLongitudeRef": "W", "EXIF:DateTimeOriginal": "2018:10:13 09:18:12", "EXIF:CreateDate": "2018:10:13 09:18:12", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:10:13", "IPTC:TimeCreated": "09:18:12-04:00", "EXIF:ModifyDate": "2019:12:01 11:43:45"}]
--- a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA.xmp
+++ b/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -53,10 +53,6 @@
        <exif:GPSLongitude>0,7.908329999999999W</exif:GPSLongitude>
        <exif:GPSLatitude>51,30.21430019999997N</exif:GPSLatitude>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_albums_as_keywords.json
+++ b/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_albums_as_keywords.json
@@ -1 +1 @@
-[{"XMP:Title": "St. James's Park", "IPTC:Keywords": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:Subject": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:TagsList": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "EXIF:GPSLatitude": 51.50357167, "EXIF:GPSLongitude": -0.1318055, "EXIF:GPSLatitudeRef": "N", "EXIF:GPSLongitudeRef": "W", "EXIF:DateTimeOriginal": "2018:10:13 09:18:12", "EXIF:CreateDate": "2018:10:13 09:18:12", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:10:13", "IPTC:TimeCreated": "09:18:12-04:00", "EXIF:ModifyDate": "2019:12:01 11:43:45"}]
+[{"XMP:Title": "St. James's Park", "IPTC:ObjectName": "St. James's Park", "IPTC:Keywords": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:Subject": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:TagsList": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "EXIF:GPSLatitude": 51.50357167, "EXIF:GPSLongitude": -0.1318055, "EXIF:GPSLatitudeRef": "N", "EXIF:GPSLongitudeRef": "W", "EXIF:DateTimeOriginal": "2018:10:13 09:18:12", "EXIF:CreateDate": "2018:10:13 09:18:12", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:10:13", "IPTC:TimeCreated": "09:18:12-04:00", "EXIF:ModifyDate": "2019:12:01 11:43:45"}]
--- a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_albums_as_keywords.xmp
+++ b/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_albums_as_keywords.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -53,10 +53,6 @@
        <exif:GPSLongitude>0,7.908329999999999W</exif:GPSLongitude>
        <exif:GPSLatitude>51,30.21430019999997N</exif:GPSLatitude>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_ext.xmp
+++ b/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_ext.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -53,10 +53,6 @@
        <exif:GPSLongitude>0,7.908329999999999W</exif:GPSLongitude>
        <exif:GPSLatitude>51,30.21430019999997N</exif:GPSLatitude>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_ignore_date_modified.json
+++ b/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_ignore_date_modified.json
@@ -1 +1 @@
-[{"XMP:Title": "St. James's Park", "IPTC:Keywords": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:Subject": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:TagsList": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "EXIF:GPSLatitude": 51.50357167, "EXIF:GPSLongitude": -0.1318055, "EXIF:GPSLatitudeRef": "N", "EXIF:GPSLongitudeRef": "W", "EXIF:DateTimeOriginal": "2018:10:13 09:18:12", "EXIF:CreateDate": "2018:10:13 09:18:12", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:10:13", "IPTC:TimeCreated": "09:18:12-04:00", "EXIF:ModifyDate": "2018:10:13 09:18:12"}]
+[{"XMP:Title": "St. James's Park", "IPTC:ObjectName": "St. James's Park", "IPTC:Keywords": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:Subject": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:TagsList": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "EXIF:GPSLatitude": 51.50357167, "EXIF:GPSLongitude": -0.1318055, "EXIF:GPSLatitudeRef": "N", "EXIF:GPSLongitudeRef": "W", "EXIF:DateTimeOriginal": "2018:10:13 09:18:12", "EXIF:CreateDate": "2018:10:13 09:18:12", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:10:13", "IPTC:TimeCreated": "09:18:12-04:00", "EXIF:ModifyDate": "2018:10:13 09:18:12"}]
--- a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_keyword_template.json
+++ b/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_keyword_template.json
@@ -1 +1 @@
-[{"XMP:Title": "St. James's Park", "IPTC:Keywords": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:Subject": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:TagsList": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "EXIF:GPSLatitude": 51.50357167, "EXIF:GPSLongitude": -0.1318055, "EXIF:GPSLatitudeRef": "N", "EXIF:GPSLongitudeRef": "W", "EXIF:DateTimeOriginal": "2018:10:13 09:18:12", "EXIF:CreateDate": "2018:10:13 09:18:12", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:10:13", "IPTC:TimeCreated": "09:18:12-04:00", "EXIF:ModifyDate": "2019:12:01 11:43:45"}]
+[{"XMP:Title": "St. James's Park", "IPTC:ObjectName": "St. James's Park", "IPTC:Keywords": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:Subject": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:TagsList": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "EXIF:GPSLatitude": 51.50357167, "EXIF:GPSLongitude": -0.1318055, "EXIF:GPSLatitudeRef": "N", "EXIF:GPSLongitudeRef": "W", "EXIF:DateTimeOriginal": "2018:10:13 09:18:12", "EXIF:CreateDate": "2018:10:13 09:18:12", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:10:13", "IPTC:TimeCreated": "09:18:12-04:00", "EXIF:ModifyDate": "2019:12:01 11:43:45"}]
--- a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_keyword_template.xmp
+++ b/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_keyword_template.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -55,10 +55,6 @@
        <exif:GPSLongitude>0,7.908329999999999W</exif:GPSLongitude>
        <exif:GPSLatitude>51,30.21430019999997N</exif:GPSLatitude>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_no_tag_groups.json
+++ b/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_no_tag_groups.json
@@ -1 +1 @@
-[{"Title": "St. James's Park", "Keywords": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "Subject": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "TagsList": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "GPSLatitude": 51.50357167, "GPSLongitude": -0.1318055, "GPSLatitudeRef": "N", "GPSLongitudeRef": "W", "DateTimeOriginal": "2018:10:13 09:18:12", "CreateDate": "2018:10:13 09:18:12", "OffsetTimeOriginal": "-04:00", "DateCreated": "2018:10:13", "TimeCreated": "09:18:12-04:00", "ModifyDate": "2019:12:01 11:43:45"}]
+[{"Title": "St. James's Park", "ObjectName": "St. James's Park", "Keywords": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "Subject": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "TagsList": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "GPSLatitude": 51.50357167, "GPSLongitude": -0.1318055, "GPSLatitudeRef": "N", "GPSLongitudeRef": "W", "DateTimeOriginal": "2018:10:13 09:18:12", "CreateDate": "2018:10:13 09:18:12", "OffsetTimeOriginal": "-04:00", "DateCreated": "2018:10:13", "TimeCreated": "09:18:12-04:00", "ModifyDate": "2019:12:01 11:43:45"}]
--- a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_persons_as_keywords.json
+++ b/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_persons_as_keywords.json
@@ -1 +1 @@
-[{"XMP:Title": "St. James's Park", "IPTC:Keywords": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:Subject": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:TagsList": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "EXIF:GPSLatitude": 51.50357167, "EXIF:GPSLongitude": -0.1318055, "EXIF:GPSLatitudeRef": "N", "EXIF:GPSLongitudeRef": "W", "EXIF:DateTimeOriginal": "2018:10:13 09:18:12", "EXIF:CreateDate": "2018:10:13 09:18:12", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:10:13", "IPTC:TimeCreated": "09:18:12-04:00", "EXIF:ModifyDate": "2019:12:01 11:43:45"}]
+[{"XMP:Title": "St. James's Park", "IPTC:ObjectName": "St. James's Park", "IPTC:Keywords": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:Subject": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:TagsList": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "EXIF:GPSLatitude": 51.50357167, "EXIF:GPSLongitude": -0.1318055, "EXIF:GPSLatitudeRef": "N", "EXIF:GPSLongitudeRef": "W", "EXIF:DateTimeOriginal": "2018:10:13 09:18:12", "EXIF:CreateDate": "2018:10:13 09:18:12", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:10:13", "IPTC:TimeCreated": "09:18:12-04:00", "EXIF:ModifyDate": "2019:12:01 11:43:45"}]
--- a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_persons_as_keywords.xmp
+++ b/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_persons_as_keywords.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -53,10 +53,6 @@
        <exif:GPSLongitude>0,7.908329999999999W</exif:GPSLongitude>
        <exif:GPSLatitude>51,30.21430019999997N</exif:GPSLatitude>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4.json
+++ b/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4.json
@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Wedding tulips", "XMP:Description": "Wedding tulips", "XMP:Title": "Tulips tied together at a flower shop", "IPTC:Keywords": ["flowers", "wedding"], "XMP:Subject": ["flowers", "wedding"], "XMP:TagsList": ["flowers", "wedding"], "EXIF:DateTimeOriginal": "2019:07:04 16:24:01", "EXIF:CreateDate": "2019:07:04 16:24:01", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:07:04", "IPTC:TimeCreated": "16:24:01-04:00", "EXIF:ModifyDate": "2020:05:28 23:39:38"}]
+[{"EXIF:ImageDescription": "Wedding tulips", "XMP:Description": "Wedding tulips", "IPTC:Caption-Abstract": "Wedding tulips", "XMP:Title": "Tulips tied together at a flower shop", "IPTC:ObjectName": "Tulips tied together at a flower shop", "IPTC:Keywords": ["flowers", "wedding"], "XMP:Subject": ["flowers", "wedding"], "XMP:TagsList": ["flowers", "wedding"], "EXIF:DateTimeOriginal": "2019:07:04 16:24:01", "EXIF:CreateDate": "2019:07:04 16:24:01", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:07:04", "IPTC:TimeCreated": "16:24:01-04:00", "EXIF:ModifyDate": "2020:05:28 23:39:38"}]
--- a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4.xmp
+++ b/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -43,10 +43,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_albums_as_keywords.json
+++ b/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_albums_as_keywords.json
@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Wedding tulips", "XMP:Description": "Wedding tulips", "XMP:Title": "Tulips tied together at a flower shop", "IPTC:Keywords": ["flowers", "wedding"], "XMP:Subject": ["flowers", "wedding"], "XMP:TagsList": ["flowers", "wedding"], "EXIF:DateTimeOriginal": "2019:07:04 16:24:01", "EXIF:CreateDate": "2019:07:04 16:24:01", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:07:04", "IPTC:TimeCreated": "16:24:01-04:00", "EXIF:ModifyDate": "2020:05:28 23:39:38"}]
+[{"EXIF:ImageDescription": "Wedding tulips", "XMP:Description": "Wedding tulips", "IPTC:Caption-Abstract": "Wedding tulips", "XMP:Title": "Tulips tied together at a flower shop", "IPTC:ObjectName": "Tulips tied together at a flower shop", "IPTC:Keywords": ["flowers", "wedding"], "XMP:Subject": ["flowers", "wedding"], "XMP:TagsList": ["flowers", "wedding"], "EXIF:DateTimeOriginal": "2019:07:04 16:24:01", "EXIF:CreateDate": "2019:07:04 16:24:01", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:07:04", "IPTC:TimeCreated": "16:24:01-04:00", "EXIF:ModifyDate": "2020:05:28 23:39:38"}]
--- a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_albums_as_keywords.xmp
+++ b/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_albums_as_keywords.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -43,10 +43,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_ext.xmp
+++ b/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_ext.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -43,10 +43,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_ignore_date_modified.json
+++ b/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_ignore_date_modified.json
@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Wedding tulips", "XMP:Description": "Wedding tulips", "XMP:Title": "Tulips tied together at a flower shop", "IPTC:Keywords": ["flowers", "wedding"], "XMP:Subject": ["flowers", "wedding"], "XMP:TagsList": ["flowers", "wedding"], "EXIF:DateTimeOriginal": "2019:07:04 16:24:01", "EXIF:CreateDate": "2019:07:04 16:24:01", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:07:04", "IPTC:TimeCreated": "16:24:01-04:00", "EXIF:ModifyDate": "2019:07:04 16:24:01"}]
+[{"EXIF:ImageDescription": "Wedding tulips", "XMP:Description": "Wedding tulips", "IPTC:Caption-Abstract": "Wedding tulips", "XMP:Title": "Tulips tied together at a flower shop", "IPTC:ObjectName": "Tulips tied together at a flower shop", "IPTC:Keywords": ["flowers", "wedding"], "XMP:Subject": ["flowers", "wedding"], "XMP:TagsList": ["flowers", "wedding"], "EXIF:DateTimeOriginal": "2019:07:04 16:24:01", "EXIF:CreateDate": "2019:07:04 16:24:01", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:07:04", "IPTC:TimeCreated": "16:24:01-04:00", "EXIF:ModifyDate": "2019:07:04 16:24:01"}]
--- a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_keyword_template.json
+++ b/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_keyword_template.json
@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Wedding tulips", "XMP:Description": "Wedding tulips", "XMP:Title": "Tulips tied together at a flower shop", "IPTC:Keywords": ["flowers", "wedding"], "XMP:Subject": ["flowers", "wedding"], "XMP:TagsList": ["flowers", "wedding"], "EXIF:DateTimeOriginal": "2019:07:04 16:24:01", "EXIF:CreateDate": "2019:07:04 16:24:01", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:07:04", "IPTC:TimeCreated": "16:24:01-04:00", "EXIF:ModifyDate": "2020:05:28 23:39:38"}]
+[{"EXIF:ImageDescription": "Wedding tulips", "XMP:Description": "Wedding tulips", "IPTC:Caption-Abstract": "Wedding tulips", "XMP:Title": "Tulips tied together at a flower shop", "IPTC:ObjectName": "Tulips tied together at a flower shop", "IPTC:Keywords": ["flowers", "wedding"], "XMP:Subject": ["flowers", "wedding"], "XMP:TagsList": ["flowers", "wedding"], "EXIF:DateTimeOriginal": "2019:07:04 16:24:01", "EXIF:CreateDate": "2019:07:04 16:24:01", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:07:04", "IPTC:TimeCreated": "16:24:01-04:00", "EXIF:ModifyDate": "2020:05:28 23:39:38"}]
--- a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_keyword_template.xmp
+++ b/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_keyword_template.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -45,10 +45,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_no_tag_groups.json
+++ b/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_no_tag_groups.json
@@ -1 +1 @@
-[{"ImageDescription": "Wedding tulips", "Description": "Wedding tulips", "Title": "Tulips tied together at a flower shop", "Keywords": ["flowers", "wedding"], "Subject": ["flowers", "wedding"], "TagsList": ["flowers", "wedding"], "DateTimeOriginal": "2019:07:04 16:24:01", "CreateDate": "2019:07:04 16:24:01", "OffsetTimeOriginal": "-04:00", "DateCreated": "2019:07:04", "TimeCreated": "16:24:01-04:00", "ModifyDate": "2020:05:28 23:39:38"}]
+[{"ImageDescription": "Wedding tulips", "Description": "Wedding tulips", "Caption-Abstract": "Wedding tulips", "Title": "Tulips tied together at a flower shop", "ObjectName": "Tulips tied together at a flower shop", "Keywords": ["flowers", "wedding"], "Subject": ["flowers", "wedding"], "TagsList": ["flowers", "wedding"], "DateTimeOriginal": "2019:07:04 16:24:01", "CreateDate": "2019:07:04 16:24:01", "OffsetTimeOriginal": "-04:00", "DateCreated": "2019:07:04", "TimeCreated": "16:24:01-04:00", "ModifyDate": "2020:05:28 23:39:38"}]
--- a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_persons_as_keywords.json
+++ b/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_persons_as_keywords.json
@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Wedding tulips", "XMP:Description": "Wedding tulips", "XMP:Title": "Tulips tied together at a flower shop", "IPTC:Keywords": ["flowers", "wedding"], "XMP:Subject": ["flowers", "wedding"], "XMP:TagsList": ["flowers", "wedding"], "EXIF:DateTimeOriginal": "2019:07:04 16:24:01", "EXIF:CreateDate": "2019:07:04 16:24:01", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:07:04", "IPTC:TimeCreated": "16:24:01-04:00", "EXIF:ModifyDate": "2020:05:28 23:39:38"}]
+[{"EXIF:ImageDescription": "Wedding tulips", "XMP:Description": "Wedding tulips", "IPTC:Caption-Abstract": "Wedding tulips", "XMP:Title": "Tulips tied together at a flower shop", "IPTC:ObjectName": "Tulips tied together at a flower shop", "IPTC:Keywords": ["flowers", "wedding"], "XMP:Subject": ["flowers", "wedding"], "XMP:TagsList": ["flowers", "wedding"], "EXIF:DateTimeOriginal": "2019:07:04 16:24:01", "EXIF:CreateDate": "2019:07:04 16:24:01", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:07:04", "IPTC:TimeCreated": "16:24:01-04:00", "EXIF:ModifyDate": "2020:05:28 23:39:38"}]
--- a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_persons_as_keywords.xmp
+++ b/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_persons_as_keywords.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -43,10 +43,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ.json
+++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ.json
@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Keywords": ["wedding"], "XMP:Subject": ["wedding"], "XMP:TagsList": ["wedding"], "XMP:PersonInImage": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:11:27 01:30:16"}]
+[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["wedding"], "XMP:Subject": ["wedding"], "XMP:TagsList": ["wedding"], "XMP:PersonInImage": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:11:27 01:30:16"}]
--- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ.xmp
+++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -46,10 +46,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_albums_as_keywords.json
+++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_albums_as_keywords.json
@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Keywords": ["wedding"], "XMP:Subject": ["wedding"], "XMP:TagsList": ["wedding"], "XMP:PersonInImage": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:11:27 01:30:16"}]
+[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["wedding"], "XMP:Subject": ["wedding"], "XMP:TagsList": ["wedding"], "XMP:PersonInImage": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:11:27 01:30:16"}]
--- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_albums_as_keywords.xmp
+++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_albums_as_keywords.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -46,10 +46,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_ext.xmp
+++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_ext.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -46,10 +46,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_ignore_date_modified.json
+++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_ignore_date_modified.json
@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Keywords": ["wedding"], "XMP:Subject": ["wedding"], "XMP:TagsList": ["wedding"], "XMP:PersonInImage": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:04:15 14:40:24"}]
+[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["wedding"], "XMP:Subject": ["wedding"], "XMP:TagsList": ["wedding"], "XMP:PersonInImage": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:04:15 14:40:24"}]
--- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_keyword_template.json
+++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_keyword_template.json
@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Keywords": ["wedding"], "XMP:Subject": ["wedding"], "XMP:TagsList": ["wedding"], "XMP:PersonInImage": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:11:27 01:30:16"}]
+[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["wedding"], "XMP:Subject": ["wedding"], "XMP:TagsList": ["wedding"], "XMP:PersonInImage": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:11:27 01:30:16"}]
--- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_keyword_template.xmp
+++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_keyword_template.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -48,10 +48,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_no_tag_groups.json
+++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_no_tag_groups.json
@@ -1 +1 @@
-[{"ImageDescription": "Bride Wedding day", "Description": "Bride Wedding day", "Keywords": ["wedding"], "Subject": ["wedding"], "TagsList": ["wedding"], "PersonInImage": ["Maria"], "DateTimeOriginal": "2019:04:15 14:40:24", "CreateDate": "2019:04:15 14:40:24", "OffsetTimeOriginal": "-04:00", "DateCreated": "2019:04:15", "TimeCreated": "14:40:24-04:00", "ModifyDate": "2019:11:27 01:30:16"}]
+[{"ImageDescription": "Bride Wedding day", "Description": "Bride Wedding day", "Caption-Abstract": "Bride Wedding day", "Keywords": ["wedding"], "Subject": ["wedding"], "TagsList": ["wedding"], "PersonInImage": ["Maria"], "DateTimeOriginal": "2019:04:15 14:40:24", "CreateDate": "2019:04:15 14:40:24", "OffsetTimeOriginal": "-04:00", "DateCreated": "2019:04:15", "TimeCreated": "14:40:24-04:00", "ModifyDate": "2019:11:27 01:30:16"}]
--- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_persons_as_keywords.json
+++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_persons_as_keywords.json
@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Keywords": ["Maria", "wedding"], "XMP:Subject": ["Maria", "wedding"], "XMP:TagsList": ["Maria", "wedding"], "XMP:PersonInImage": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:11:27 01:30:16"}]
+[{"EXIF:ImageDescription": "Bride Wedding day", "XMP:Description": "Bride Wedding day", "IPTC:Caption-Abstract": "Bride Wedding day", "IPTC:Keywords": ["Maria", "wedding"], "XMP:Subject": ["Maria", "wedding"], "XMP:TagsList": ["Maria", "wedding"], "XMP:PersonInImage": ["Maria"], "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", "EXIF:CreateDate": "2019:04:15 14:40:24", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2019:04:15", "IPTC:TimeCreated": "14:40:24-04:00", "EXIF:ModifyDate": "2019:11:27 01:30:16"}]
--- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_persons_as_keywords.xmp
+++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_persons_as_keywords.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -48,10 +48,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng.json
+++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng.json
@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}]
+[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}]
--- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng.xmp
+++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -47,10 +47,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_albums_as_keywords.json
+++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_albums_as_keywords.json
@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:Keywords": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:Subject": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:TagsList": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}]
+[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:Subject": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:TagsList": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}]
--- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_albums_as_keywords.xmp
+++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_albums_as_keywords.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -51,10 +51,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_ext.xmp
+++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_ext.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -47,10 +47,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_ignore_date_modified.json
+++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_ignore_date_modified.json
@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}]
+[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}]
--- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_keyword_template.json
+++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_keyword_template.json
@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:Keywords": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:Subject": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:TagsList": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}]
+[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:Subject": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:TagsList": ["Kids", "Pumpkin Farm", "Test Album"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}]
--- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_keyword_template.xmp
+++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_keyword_template.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -53,10 +53,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_no_tag_groups.json
+++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_no_tag_groups.json
@@ -1 +1 @@
-[{"ImageDescription": "Girls with pumpkins", "Description": "Girls with pumpkins", "Title": "Can we carry this?", "Keywords": ["Kids"], "Subject": ["Kids"], "TagsList": ["Kids"], "PersonInImage": ["Katie", "Suzy"], "DateTimeOriginal": "2018:09:28 15:35:49", "CreateDate": "2018:09:28 15:35:49", "OffsetTimeOriginal": "-04:00", "DateCreated": "2018:09:28", "TimeCreated": "15:35:49-04:00", "ModifyDate": "2018:09:28 15:35:49"}]
+[{"ImageDescription": "Girls with pumpkins", "Description": "Girls with pumpkins", "Caption-Abstract": "Girls with pumpkins", "Title": "Can we carry this?", "ObjectName": "Can we carry this?", "Keywords": ["Kids"], "Subject": ["Kids"], "TagsList": ["Kids"], "PersonInImage": ["Katie", "Suzy"], "DateTimeOriginal": "2018:09:28 15:35:49", "CreateDate": "2018:09:28 15:35:49", "OffsetTimeOriginal": "-04:00", "DateCreated": "2018:09:28", "TimeCreated": "15:35:49-04:00", "ModifyDate": "2018:09:28 15:35:49"}]
--- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_persons_as_keywords.json
+++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_persons_as_keywords.json
@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:Keywords": ["Katie", "Kids", "Suzy"], "XMP:Subject": ["Katie", "Kids", "Suzy"], "XMP:TagsList": ["Katie", "Kids", "Suzy"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}]
+[{"EXIF:ImageDescription": "Girls with pumpkins", "XMP:Description": "Girls with pumpkins", "IPTC:Caption-Abstract": "Girls with pumpkins", "XMP:Title": "Can we carry this?", "IPTC:ObjectName": "Can we carry this?", "IPTC:Keywords": ["Katie", "Kids", "Suzy"], "XMP:Subject": ["Katie", "Kids", "Suzy"], "XMP:TagsList": ["Katie", "Kids", "Suzy"], "XMP:PersonInImage": ["Katie", "Suzy"], "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", "EXIF:CreateDate": "2018:09:28 15:35:49", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:35:49-04:00", "EXIF:ModifyDate": "2018:09:28 15:35:49"}]
--- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_persons_as_keywords.xmp
+++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_persons_as_keywords.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -51,10 +51,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C.json
+++ b/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C.json
@@ -1 +1 @@
-[{"XMP:Title": "Pumpkin heads", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "EXIF:DateTimeOriginal": "2018:09:28 15:39:59", "EXIF:CreateDate": "2018:09:28 15:39:59", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:39:59-04:00", "EXIF:ModifyDate": "2018:09:28 15:39:59"}]
+[{"XMP:Title": "Pumpkin heads", "IPTC:ObjectName": "Pumpkin heads", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "EXIF:DateTimeOriginal": "2018:09:28 15:39:59", "EXIF:CreateDate": "2018:09:28 15:39:59", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:39:59-04:00", "EXIF:ModifyDate": "2018:09:28 15:39:59"}]
--- a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C.xmp
+++ b/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -41,10 +41,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_albums_as_keywords.json
+++ b/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_albums_as_keywords.json
@@ -1 +1 @@
-[{"XMP:Title": "Pumpkin heads", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "EXIF:DateTimeOriginal": "2018:09:28 15:39:59", "EXIF:CreateDate": "2018:09:28 15:39:59", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:39:59-04:00", "EXIF:ModifyDate": "2018:09:28 15:39:59"}]
+[{"XMP:Title": "Pumpkin heads", "IPTC:ObjectName": "Pumpkin heads", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "EXIF:DateTimeOriginal": "2018:09:28 15:39:59", "EXIF:CreateDate": "2018:09:28 15:39:59", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:39:59-04:00", "EXIF:ModifyDate": "2018:09:28 15:39:59"}]
--- a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_albums_as_keywords.xmp
+++ b/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_albums_as_keywords.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -41,10 +41,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_ext.xmp
+++ b/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_ext.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -41,10 +41,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_ignore_date_modified.json
+++ b/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_ignore_date_modified.json
@@ -1 +1 @@
-[{"XMP:Title": "Pumpkin heads", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "EXIF:DateTimeOriginal": "2018:09:28 15:39:59", "EXIF:CreateDate": "2018:09:28 15:39:59", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:39:59-04:00", "EXIF:ModifyDate": "2018:09:28 15:39:59"}]
+[{"XMP:Title": "Pumpkin heads", "IPTC:ObjectName": "Pumpkin heads", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "EXIF:DateTimeOriginal": "2018:09:28 15:39:59", "EXIF:CreateDate": "2018:09:28 15:39:59", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:39:59-04:00", "EXIF:ModifyDate": "2018:09:28 15:39:59"}]
--- a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_keyword_template.json
+++ b/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_keyword_template.json
@@ -1 +1 @@
-[{"XMP:Title": "Pumpkin heads", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "EXIF:DateTimeOriginal": "2018:09:28 15:39:59", "EXIF:CreateDate": "2018:09:28 15:39:59", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:39:59-04:00", "EXIF:ModifyDate": "2018:09:28 15:39:59"}]
+[{"XMP:Title": "Pumpkin heads", "IPTC:ObjectName": "Pumpkin heads", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "EXIF:DateTimeOriginal": "2018:09:28 15:39:59", "EXIF:CreateDate": "2018:09:28 15:39:59", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "15:39:59-04:00", "EXIF:ModifyDate": "2018:09:28 15:39:59"}]
--- a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_keyword_template.xmp
+++ b/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_keyword_template.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
 xmlns:dc="http://purl.org/dc/elements/1.1/" 
@@ -43,10 +43,6 @@
 <rdf:Description rdf:about=""
 xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
 xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
 xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"
--- a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_no_tag_groups.json
+++ b/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_no_tag_groups.json
@@ -1 +1 @@
-[{"Title": "Pumpkin heads", "Keywords": ["Kids"], "Subject": ["Kids"], "TagsList": ["Kids"], "DateTimeOriginal": "2018:09:28 15:39:59", "CreateDate": "2018:09:28 15:39:59", "OffsetTimeOriginal": "-04:00", "DateCreated": "2018:09:28", "TimeCreated": "15:39:59-04:00", "ModifyDate": "2018:09:28 15:39:59"}]
+[{"Title": "Pumpkin heads", "ObjectName": "Pumpkin heads", "Keywords": ["Kids"], "Subject": ["Kids"], "TagsList": ["Kids"], "DateTimeOriginal": "2018:09:28 15:39:59", "CreateDate": "2018:09:28 15:39:59", "OffsetTimeOriginal": "-04:00", "DateCreated": "2018:09:28", "TimeCreated": "15:39:59-04:00", "ModifyDate": "2018:09:28 15:39:59"}]
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rhet Turnbull	44a1e3e7a7	Better exception handling for AdjustmentsInfo	2021-02-20 12:28:19 -08:00
Rhet Turnbull	6c84e476cc	Updated CHANGELOG.md, [skip ci]	2021-02-20 11:35:15 -08:00
Rhet Turnbull	14fbe5e068	Merge pull request #383 from RhetTbull/all-contributors/add-neilpa docs: add neilpa as a contributor	2021-02-20 11:05:19 -08:00
allcontributors[bot]	ebac9d0bfb	docs: update .all-contributorsrc [skip ci]	2021-02-20 19:04:05 +00:00
allcontributors[bot]	29716c5272	docs: update README.md [skip ci]	2021-02-20 19:04:04 +00:00
Rhet Turnbull	fbe8229103	Version bump	2021-02-20 11:01:58 -08:00
Rhet Turnbull	5ee6affc05	Added AdjustmentsInfo, #150 , #379	2021-02-20 11:01:08 -08:00
Rhet Turnbull	b3a7869bd3	Added depth_state to _info	2021-02-17 21:37:22 -08:00
Rhet Turnbull	e5f1c29974	Updated docs for --ignore-signature, #286	2021-02-14 11:37:32 -08:00
Rhet Turnbull	70848e1ff6	Removed orientation from XMP, #378	2021-02-13 18:58:33 -08:00
Rhet Turnbull	4b7a53faa8	Write description to ITPC:CaptionAbstract (#380 )	2021-02-13 10:37:01 -08:00
Rhet Turnbull	a78dd80af4	Updated CHANGELOG.md, [skip ci]	2021-02-12 18:52:06 -08:00
Rhet Turnbull	1316866dc4	Added image orientation bug to Known Bugs	2021-02-12 08:24:24 -08:00
Rhet Turnbull	30273509d4	Fix for issue #366 , --jpeg-ext, --convert-to-jpeg bug	2021-02-12 07:52:18 -08:00
Rhet Turnbull	15a3e69015	Updated CHANGELOG.md, [skip ci]	2021-02-10 06:50:56 -08:00
Rhet Turnbull	2691902d5c	Added test for #374	2021-02-10 06:50:40 -08:00
Rhet Turnbull	da47821fae	Bug fix for --jpeg-ext, #374	2021-02-09 22:17:20 -08:00
Rhet Turnbull	6f38e2da49	Updated CHANGELOG.md, [skip ci]	2021-02-08 22:07:17 -08:00
Rhet Turnbull	857e3db6cc	Fixed --exiftool-option, #369 , for real this time	2021-02-08 21:59:20 -08:00
Rhet Turnbull	7ed3115f36	Updated CHANGELOG.md, [skip ci]	2021-02-08 21:31:21 -08:00
Rhet Turnbull	198addaa07	Fixed --exiftool-option, #369	2021-02-08 21:21:30 -08:00
Rhet Turnbull	d91fc93737	Updated CHANGELOG.md, [skip ci]	2021-02-07 09:34:00 -08:00
Rhet Turnbull	5c3360f29d	Fix for issue #366	2021-02-07 09:26:19 -08:00
Rhet Turnbull	d4513832a6	Updated CHANGELOG.md, [skip ci]	2021-02-07 09:05:59 -08:00
Rhet Turnbull	f8616acf16	Fixed unnecessary warning for long keywords, issue #365	2021-02-07 05:40:41 -08:00
Rhet Turnbull	addd952aa3	Implemented --in-album, --not-in-album, issue #364	2021-02-04 06:40:49 -08:00
Rhet Turnbull	773b619e24	Updated requirements.txt	2021-02-03 06:42:46 -08:00
Rhet Turnbull	683dfe7f3f	Updated docs Makefile [skip ci]	2021-02-03 06:27:09 -08:00
Rhet Turnbull	7fa5fbaa5b	Updated docs	2021-02-03 06:06:32 -08:00
Rhet Turnbull	e075868281	Updated CHANGELOG.md, [skip ci]	2021-02-02 22:14:41 -08:00
Rhet Turnbull	bf0589118b	Version bump	2021-02-02 22:02:20 -08:00
Rhet Turnbull	adc4b05602	Added tests for --only-new, #358	2021-02-02 22:01:53 -08:00
Rhet Turnbull	a740d82e7f	Updated XMP beta template	2021-02-02 21:18:00 -08:00
Rhet Turnbull	43af4d205a	Fixed XMP template for issue #361	2021-02-02 21:16:12 -08:00
Rhet Turnbull	4d98fa9279	Merge pull request #362 from RhetTbull/dependabot/pip/bleach-3.3.0 Bump bleach from 3.1.4 to 3.3.0	2021-02-02 21:05:02 -08:00
dependabot[bot]	67e579be4c	Bump bleach from 3.1.4 to 3.3.0 Bumps [bleach](https://github.com/mozilla/bleach) from 3.1.4 to 3.3.0. - [Release notes](https://github.com/mozilla/bleach/releases) - [Changelog](https://github.com/mozilla/bleach/blob/master/CHANGES) - [Commits](https://github.com/mozilla/bleach/compare/v3.1.4...v3.3.0) Signed-off-by: dependabot[bot] <support@github.com>	2021-02-02 22:57:26 +00:00
Rhet Turnbull	48d2223edd	Updated tests for ExportDB, #358	2021-02-02 06:53:32 -08:00
Rhet Turnbull	591f9bcc62	Updated sidecar test data	2021-02-02 06:39:34 -08:00
Rhet Turnbull	2284598a24	Added 11.2 to tested versions, #360	2021-02-02 06:33:50 -08:00