Refactored sidecar code

Refactored export2 to use sidecar bit field
Added --sidecar exiftool, issue #303
2020-12-28 08:23:23 -08:00 · 2020-12-27 22:45:47 -08:00 · 2020-12-27 22:17:56 -08:00 · 2020-12-27 09:29:32 -08:00 · 2020-12-27 09:26:54 -08:00 · 2020-12-27 08:45:49 -08:00
22 changed files with 1184 additions and 366 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,46 @@ 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.38.14](https://github.com/RhetTbull/osxphotos/compare/v0.38.13...v0.38.14)
+
+> 27 December 2020
+
+- Bug fix for --description-template, issue #304 [`4cc40d2`](https://github.com/RhetTbull/osxphotos/commit/4cc40d24cfb11ef8668c5d3c3bab40371fdd0436)
+
+#### [v0.38.13](https://github.com/RhetTbull/osxphotos/compare/v0.38.12...v0.38.13)
+
+> 27 December 2020
+
+- Set XMP:Subject to match Keywords, issue #302 [`75888cd`](https://github.com/RhetTbull/osxphotos/commit/75888cd6633d3f0180d24fef4f6776986a136f0f)
+
+#### [v0.38.12](https://github.com/RhetTbull/osxphotos/compare/v0.38.11...v0.38.12)
+
+> 26 December 2020
+
+- Fixed city/sub-locality for SearchInfo [`f9f699b`](https://github.com/RhetTbull/osxphotos/commit/f9f699ba3500d58494f955d4e5d8118e336e6a2c)
+
+#### [v0.38.11](https://github.com/RhetTbull/osxphotos/compare/v0.38.9...v0.38.11)
+
+> 26 December 2020
+
+- Exposed SearchInfo, closes #121 [`#121`](https://github.com/RhetTbull/osxphotos/issues/121)
+- Added version to --verbose, closes #297 [`#297`](https://github.com/RhetTbull/osxphotos/issues/297)
+- Added --exportdb [`2a49255`](https://github.com/RhetTbull/osxphotos/commit/2a49255277d3c6bd3b0d5f8288afd7de7dab0320)
+- Updated README.md [`f469ccc`](https://github.com/RhetTbull/osxphotos/commit/f469cccc4b4561db7611c3e9abf5aefc3ab0f648)
+- Fixed help text [`f3b7134`](https://github.com/RhetTbull/osxphotos/commit/f3b7134af1e3d07fb956eaccccd9d60bd075d3bf)
+
+#### [v0.38.9](https://github.com/RhetTbull/osxphotos/compare/v0.38.8...v0.38.9)
+
+> 21 December 2020
+
+- Added --exiftool-option to CLI, closes #298 [`#298`](https://github.com/RhetTbull/osxphotos/issues/298)
+
+#### [v0.38.8](https://github.com/RhetTbull/osxphotos/compare/v0.38.7...v0.38.8)
+
+> 21 December 2020
+
+- remove duplicate keywords with --exiftool and --sidecar, closes #294 [`#294`](https://github.com/RhetTbull/osxphotos/issues/294)
+
 #### [v0.38.7](https://github.com/RhetTbull/osxphotos/compare/v0.38.6...v0.38.7)

 > 21 December 2020
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@
    + [FolderInfo](#folderinfo)
    + [PlaceInfo](#placeinfo)
    + [ScoreInfo](#scoreinfo)
+    + [SearchInfo](#searchinfo)
    + [PersonInfo](#personinfo)
    + [FaceInfo](#faceinfo)
    + [CommentInfo](#commentinfo)
@@ -300,23 +301,33 @@ Options:
                                  the primary photo will be exported--
                                  associated burst images will be skipped.
  --sidecar FORMAT                Create sidecar for each photo exported;
-                                  valid FORMAT values: xmp, json; --sidecar
-                                  json: create JSON sidecar useable by
-                                  exiftool (https://exiftool.org/) The sidecar
-                                  file can be used to apply metadata to the
-                                  file with exiftool, for example: "exiftool
+                                  valid FORMAT values: xmp, json, exiftool;
+                                  --sidecar xmp: create XMP sidecar used by
+                                  Adobe Lightroom, etc. The sidecar file is
+                                  named in format photoname.ext.xmp The XMP
+                                  sidecar exports the following tags:
+                                  Description, Title, Keywords/Tags, Subject
+                                  (set to Keywords + PersonInImage),
+                                  PersonInImage, CreateDate, ModifyDate,
+                                  GPSLongitude. 
+                                  --sidecar json: create JSON
+                                  sidecar useable by exiftool
+                                  (https://exiftool.org/) The sidecar file can
+                                  be used to apply metadata to the file with
+                                  exiftool, for example: "exiftool
                                  -j=photoname.jpg.json photoname.jpg" The
                                  sidecar file is named in format
-                                  photoname.ext.json  --sidecar xmp: create
-                                  XMP sidecar used by Adobe Lightroom, etc.The
-                                  sidecar file is named in format
-                                  photoname.ext.xmpThe XMP sidecar exports the
-                                  following tags: Description, Title,
-                                  Keywords/Tags, Subject (set to Keywords +
-                                  PersonInImage), PersonInImage, CreateDate,
-                                  ModifyDate, GPSLongitude. For a list of tags
-                                  exported in the JSON sidecar, see
-                                  --exiftool.
+                                  photoname.ext.json; format includes tag
+                                  groups (equivalent to running 'exiftool -G
+                                  -j'). 
+                                  --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'.
  --exiftool                      Use exiftool to write metadata directly to
                                  exported photos. To use this option,
                                  exiftool must be installed and in the path.
@@ -326,14 +337,12 @@ Options:
                                  metadata: EXIF:ImageDescription,
                                  XMP:Description (see also --description-
                                  template); XMP:Title; XMP:TagsList,
-                                  IPTC:Keywords (see also --keyword-template,
-                                  --person-keyword, --album-keyword);
-                                  XMP:Subject (set to keywords + person in
-                                  image to mirror Photos' behavior);
-                                  XMP:PersonInImage; EXIF:GPSLatitudeRef;
-                                  EXIF:GPSLongitudeRef; EXIF:GPSLatitude;
-                                  EXIF:GPSLongitude; EXIF:GPSPosition;
-                                  EXIF:DateTimeOriginal;
+                                  IPTC:Keywords, XMP:Subject (see also
+                                  --keyword-template, --person-keyword,
+                                  --album-keyword); XMP:PersonInImage;
+                                  EXIF:GPSLatitudeRef; EXIF:GPSLongitudeRef;
+                                  EXIF:GPSLatitude; EXIF:GPSLongitude;
+                                  EXIF:GPSPosition; EXIF:DateTimeOriginal;
                                  EXIF:OffsetTimeOriginal; EXIF:ModifyDate
                                  (see --ignore-date-modified);
                                  IPTC:DateCreated; IPTC:TimeCreated; (video
@@ -342,6 +351,16 @@ Options:
                                  (see also --ignore-date-modified);
                                  QuickTime:GPSCoordinates;
                                  UserData:GPSCoordinates.
+  --exiftool-option OPTION        Optional flag/option to pass to exiftool
+                                  when using --exiftool. For example,
+                                  --exiftool-option '-m' to ignore minor
+                                  warnings. Specify these as you would on the
+                                  exiftool command line. See exiftool docs at
+                                  https://exiftool.org/exiftool_pod.html for
+                                  full list of options. More than one option
+                                  may be specified by repeating the option,
+                                  e.g. --exiftool-option '-m' --exiftool-
+                                  option '-F'.
  --ignore-date-modified          If used with --exiftool or --sidecar, will
                                  ignore the photo modification date and set
                                  EXIF:ModifyDate to EXIF:DateTimeOriginal;
@@ -419,6 +438,14 @@ Options:
                                  set. For example, photos which had
                                  previously been exported and were
                                  subsequently deleted in Photos.
+  --exportdb EXPORTDB_FILE        Specify alternate name for database file
+                                  which stores state information for export
+                                  and --update. If --exportdb is not
+                                  specified, export database will be saved to
+                                  '.osxphotos_export.db' in the export
+                                  directory.  Must be specified as filename
+                                  only, not a path, as export database will be
+                                  saved in export directory.
  --load-config <config file path>
                                  Load options from file as written with
                                  --save-config. This allows you to save a
@@ -1452,6 +1479,7 @@ Returns image categorization labels associated with the photo as list of str.
 #### `labels_normalized`
 Returns image categorization labels associated with the photo as list of str. Labels are normalized (e.g. converted to lower case).  Use of normalized strings makes it easier to search if you don't how Apple capitalizes a label. For example:

+
 ```python
 import osxphotos

@@ -1461,12 +1489,23 @@ for photo in photosdb.photos():
        print(f"I found a statue! {photo.original_filename}")
 ```

-**Note**: Only valid on Photos 5; on earlier versions, returns empty list. In Photos 5, Photos runs machine learning image categorization against photos in the library and automatically assigns labels to photos such as "People", "Dog", "Water", etc.  A photo may have zero or more labels associated with it.  See also [labels](#labels).  
+**Note**: Only valid on Photos 5+; on earlier versions, returns empty list. In Photos 5+, Photos runs machine learning image categorization against photos in the library and automatically assigns labels to photos such as "People", "Dog", "Water", etc.  A photo may have zero or more labels associated with it.  See also [labels](#labels).  
+
+
+#### <a name="photosearchinfo">`search_info`</a>
+Returns [SearchInfo](#searchinfo) object that represents search metadata for the photo.  
+
+**Note**: Only valid on Photos 5+; on ealier versions, returns None.
+
+#### <a name="photosearchinfo-normalized">`search_info_normalized`</a>
+Returns [SearchInfo](#searchinfo) object that represents normalized search metadata for the photo.  This returns a SearchInfo object just as `search_info` but all the properties of the object return normalized text (converted to lowercase).
+
+**Note**: Only valid on Photos 5+; on ealier versions, returns None.

 #### `exif_info`
 Returns an [ExifInfo](#exifinfo) object with EXIF details from the Photos database.  See [ExifInfo](#exifinfo) for additional details.

-**Note**: Only valid on Photos 5; on earlier versions, returns `None`.  The EXIF details returned are a subset of the actual EXIF data in a typical image.  At import Photos stores this subset in the database and it's this stored data that `exif_info` returns.
+**Note**: Only valid on Photos 5+; on earlier versions, returns `None`.  The EXIF details returned are a subset of the actual EXIF data in a typical image.  At import Photos stores this subset in the database and it's this stored data that `exif_info` returns.

 See also `exiftool`.

@@ -1525,7 +1564,7 @@ Returns a JSON representation of all photo info.
 Returns a dictionary representation of all photo info.

 #### `export()`
-`export(dest, *filename, edited=False, live_photo=False, export_as_hardlink=False, overwrite=False, increment=True, sidecar_json=False, sidecar_xmp=False, use_photos_export=False, timeout=120, exiftool=False, use_albums_as_keywords=False, use_persons_as_keywords=False)`
+`export(dest, *filename, edited=False, live_photo=False, export_as_hardlink=False, overwrite=False, increment=True, sidecar_json=False, sidecar_exiftool=False, sidecar_xmp=False, use_photos_export=False, timeout=120, exiftool=False, use_albums_as_keywords=False, use_persons_as_keywords=False)`

 Export photo from the Photos library to another destination on disk.  
 - dest: must be valid destination path as str (or exception raised).
@@ -1536,6 +1575,8 @@ Export photo from the Photos library to another destination on disk.
 - live_photo: boolean; if True (default=False), will also export the associted .mov for live photos; exported live photo will be named filename.mov
 - increment: boolean; if True (default=True), will increment file name until a non-existent name is found
 - sidecar_json: (boolean, default = False); if True will also write a json sidecar with metadata in format readable by exiftool; sidecar filename will be dest/filename.json where filename is the stem of the photo name
+- sidecar_json: (boolean, default = False); if True will also write a json sidecar with metadata in format readable by exiftool; sidecar filename will be dest/filename.json where filename is the stem of the photo name; resulting json file will include tag group names (e.g. `exiftool -G -j`)
+- sidecar_exiftool: (boolean, default = False); if True will also write a json sidecar with metadata in format readable by exiftool; sidecar filename will be dest/filename.json where filename is the stem of the photo name; resulting json file will not include tag group names (e.g. `exiftool -j`)
 - sidecar_xmp: (boolean, default = False); if True will also write a XMP sidecar with metadata; sidecar filename will be dest/filename.xmp where filename is the stem of the photo name
 - use_photos_export: boolean; (default=False), if True will attempt to export photo via applescript interaction with Photos; useful for forcing download of missing photos.  This only works if the Photos library being used is the default library (last opened by Photos) as applescript will directly interact with whichever library Photos is currently using.
 - timeout: (int, default=120) timeout in seconds used with use_photos_export
@@ -1854,7 +1895,7 @@ PostalAddress(street='3700 Wailea Alanui Dr', sub_locality=None, city='Kihei', s
 '96753'
 ```
 ### ScoreInfo
-[PhotoInfo.score](#score) returns a ScoreInfo object that exposes the computed aesthetic scores for each photo (**Photos 5 only**).  I have not yet reverse engineered the meaning of each score.  The `overall` score seems to the most useful and appears to be a composite of the other scores.  The following score properties are currently available:
+[PhotoInfo.score](#score) returns a ScoreInfo object that exposes the computed aesthetic scores for each photo (**Photos 5+ only**).  I have not yet reverse engineered the meaning of each score.  The `overall` score seems to the most useful and appears to be a composite of the other scores.  The following score properties are currently available:

 ```python
 overall: float
@@ -1893,6 +1934,71 @@ Example: find your "best" photo of food
 >>> best_food_photo = sorted([p for p in photos if "food" in p.labels_normalized], key=lambda p: p.score.overall, reverse=True)[0]
 ```

+### SearchInfo
+[PhotoInfo.search_info](#photosearchinfo) and [PhotoInfo.search_info_normalized](#photosearchinfo-normalized) return a SearchInfo object that exposes various metadata that Photos uses when searching for photos such as labels, associated holiday, etc. (**Photos 5+ only**).
+
+The following properties are available:
+
+#### `labels`
+Returns list of labels applied to photo by Photos image categorization algorithms.
+
+#### `place_names`
+Returns list of place names associated with the photo.
+
+#### `streets`
+Returns list of street names associated with the photo. (e.g. reverse geolocation of where the photo was taken)
+
+#### `neighborhoods`
+Returns list of neighborhood names associated with the photo.
+
+#### `locality_names`
+Returns list of locality names associated with the photo.
+
+#### `city`
+Returns str of city/town/municipality associated with the photo.
+
+#### `state`
+Returns str of state name associated with the photo.
+
+#### `state_abbreviation`
+Returns str of state abbreviation associated with the photo.
+
+#### `country`
+Returns str of country name associated with the photo.
+
+#### `month`
+Returns str of month name associated witht the photo (e.g. month in which the photo was taken)
+
+#### `year`
+Returns year associated with the photo.
+
+#### `bodies_of_water`
+Returns list of bodies of water associated with the photo.
+
+#### `holidays`
+Returns list of holiday names associated with the photo.
+
+#### `activities`
+Returns list of activities associated with the photo.
+
+#### `season`
+Returns str of season name associated with the photo.
+
+#### `venues`
+Returns list of venue names associated with the photo.
+
+#### `venue_types`
+Returns list of venue types associated with the photoo.
+
+#### `media_types`
+Returns list of media types associated with the photo.
+
+#### `all`
+Returns all search_info properties as a single list of strings.
+
+#### `asdict()`
+Returns all associated search_info metadata as a dict.
+
 ### PersonInfo
 [PhotosDB.person_info](#dbpersoninfo) and [PhotoInfo.person_info](#photopersoninfo) return a list of PersonInfo objects represents persons in the database and in a photo, respectively.  The PersonInfo class has the following properties and methods.

--- a/osxphotos/main.py
+++ b/osxphotos/main.py
@@ -21,9 +21,12 @@ from ._constants import (
    _UNKNOWN_PLACE,
    CLI_COLOR_ERROR,
    CLI_COLOR_WARNING,
-    DEFAULT_JPEG_QUALITY,
    DEFAULT_EDITED_SUFFIX,
+    DEFAULT_JPEG_QUALITY,
    DEFAULT_ORIGINAL_SUFFIX,
+    SIDECAR_EXIFTOOL,
+    SIDECAR_JSON,
+    SIDECAR_XMP,
    UNICODE_FORMAT,
 )
 from ._version import __version__
@@ -1337,18 +1340,22 @@ def query(
    default=None,
    multiple=True,
    metavar="FORMAT",
-    type=click.Choice(["xmp", "json"], case_sensitive=False),
-    help="Create sidecar for each photo exported; valid FORMAT values: xmp, json; "
-    f"--sidecar json: create JSON sidecar useable by exiftool ({_EXIF_TOOL_URL}) "
-    "The sidecar file can be used to apply metadata to the file with exiftool, for example: "
-    '"exiftool -j=photoname.jpg.json photoname.jpg" '
-    "The sidecar file is named in format photoname.ext.json  "
-    "--sidecar xmp: create XMP sidecar used by Adobe Lightroom, etc."
-    "The sidecar file is named in format photoname.ext.xmp"
+    type=click.Choice(["xmp", "json", "exiftool"], case_sensitive=False),
+    help="Create sidecar for each photo exported; valid FORMAT values: xmp, json, exiftool; "
+    "--sidecar xmp: create XMP sidecar used by Adobe Lightroom, etc. "
+    "The sidecar file is named in format photoname.ext.xmp "
    "The XMP sidecar exports the following tags: Description, Title, Keywords/Tags, "
    "Subject (set to Keywords + PersonInImage), PersonInImage, CreateDate, ModifyDate, "
    "GPSLongitude. "
-    "For a list of tags exported in the JSON sidecar, see --exiftool.",
+    f"\n--sidecar json: create JSON sidecar useable by exiftool ({_EXIF_TOOL_URL}) "
+    "The sidecar file can be used to apply metadata to the file with exiftool, for example: "
+    '"exiftool -j=photoname.jpg.json photoname.jpg" '
+    "The sidecar file is named in format photoname.ext.json; "
+    "format includes tag groups (equivalent to running 'exiftool -G -j'). "
+    "\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'.",
 )
@click.option(
    "--exiftool",
@@ -1358,14 +1365,25 @@ def query(
    "exiftool may be installed from https://exiftool.org/.  "
    "Cannot be used with --export-as-hardlink.  Writes the following metadata: "
    "EXIF:ImageDescription, XMP:Description (see also --description-template); "
-    "XMP:Title; XMP:TagsList, IPTC:Keywords (see also --keyword-template, --person-keyword, --album-keyword); "
-    "XMP:Subject (set to keywords + person in image to mirror Photos' behavior); "
+    "XMP:Title; XMP:TagsList, IPTC:Keywords, XMP:Subject "
+    "(see also --keyword-template, --person-keyword, --album-keyword); " 
    "XMP:PersonInImage; EXIF:GPSLatitudeRef; EXIF:GPSLongitudeRef; EXIF:GPSLatitude; EXIF:GPSLongitude; "
    "EXIF:GPSPosition; EXIF:DateTimeOriginal; EXIF:OffsetTimeOriginal; "
    "EXIF:ModifyDate (see --ignore-date-modified); IPTC:DateCreated; IPTC:TimeCreated; "
    "(video files only): QuickTime:CreationDate; QuickTime:CreateDate; QuickTime:ModifyDate (see also --ignore-date-modified); "
    "QuickTime:GPSCoordinates; UserData:GPSCoordinates.",
 )
+@click.option(
+    "--exiftool-option",
+    multiple=True,
+    metavar="OPTION",
+    help="Optional flag/option to pass to exiftool when using --exiftool. "
+    "For example, --exiftool-option '-m' to ignore minor warnings. "
+    "Specify these as you would on the exiftool command line. "
+    "See exiftool docs at https://exiftool.org/exiftool_pod.html for full list of options. "
+    "More than one option may be specified by repeating the option, e.g. "
+    "--exiftool-option '-m' --exiftool-option '-F'. ",
+)
@click.option(
    "--ignore-date-modified",
    is_flag=True,
@@ -1465,6 +1483,18 @@ def query(
    help="Cleanup export directory by deleting any files which were not included in this export set. "
    "For example, photos which had previously been exported and were subsequently deleted in Photos.",
 )
+@click.option(
+    "--exportdb",
+    metavar="EXPORTDB_FILE",
+    default=None,
+    help=(
+        "Specify alternate name for database file which stores state information for export and --update. "
+        f"If --exportdb is not specified, export database will be saved to '{OSXPHOTOS_EXPORT_DB}' "
+        "in the export directory.  Must be specified as filename only, not a path, as export database "
+        "will be saved in export directory."
+    ),
+    type=click.Path(),
+)
@click.option(
    "--load-config",
    required=False,
@@ -1550,6 +1580,7 @@ def export(
    download_missing,
    dest,
    exiftool,
+    exiftool_option,
    ignore_date_modified,
    portrait,
    not_portrait,
@@ -1583,6 +1614,7 @@ def export(
    use_photokit,
    report,
    cleanup,
+    exportdb,
    load_config,
    save_config,
 ):
@@ -1712,11 +1744,15 @@ def export(
        use_photokit = cfg.use_photokit
        report = cfg.report
        cleanup = cfg.cleanup
+        exportdb = cfg.exportdb

        # config file might have changed verbose
        VERBOSE = bool(verbose)
        verbose_(f"Loaded options from file {load_config}")

+    verbose_(f"osxphotos version {__version__}")
+
+    # validate options
    exclusive_options = [
        ("favorite", "not_favorite"),
        ("hidden", "not_hidden"),
@@ -1747,6 +1783,7 @@ def export(
        ("missing", ("download_missing", "use_photos_export")),
        ("jpeg_quality", ("convert_to_jpeg")),
        ("ignore_signature", ("update")),
+        ("exiftool_option", ("exiftool")),
    ]
    try:
        cfg.validate(exclusive=exclusive_options, dependent=dependent_options, cli=True)
@@ -1759,6 +1796,16 @@ def export(
        )
        raise click.Abort()

+    if all(x in [s.lower() for s in sidecar] for x in ["json", "exiftool"]):
+        click.echo(
+            click.style(
+                "Cannot use --sidecar json with --sidecar exiftool due to name collisions",
+                fg=CLI_COLOR_ERROR,
+            ),
+            err=True,
+        )
+        raise click.Abort()
+
    if save_config:
        verbose_(f"Saving options to file {save_config}")
        cfg.write_to_file(save_config)
@@ -1841,8 +1888,27 @@ def export(
        _list_libraries()
        return

+    # sanity check exportdb
+    if exportdb and exportdb != OSXPHOTOS_EXPORT_DB:
+        if "/" in exportdb:
+            click.echo(
+                click.style(
+                    f"Error: --exportdb must be specified as filename not path; "
+                    + f"export database will saved in export directory '{dest}'.",
+                    fg=CLI_COLOR_ERROR,
+                )
+            )
+            raise click.Abort()
+        elif pathlib.Path(pathlib.Path(dest) / OSXPHOTOS_EXPORT_DB).exists():
+            click.echo(
+                click.style(
+                    f"Warning: export database is '{exportdb}' but found '{OSXPHOTOS_EXPORT_DB}' in {dest}; using '{exportdb}'",
+                    fg=CLI_COLOR_WARNING,
+                )
+            )
+
    # open export database and assign copy/link/unlink functions
-    export_db_path = os.path.join(dest, OSXPHOTOS_EXPORT_DB)
+    export_db_path = os.path.join(dest, exportdb or OSXPHOTOS_EXPORT_DB)

    # check that export isn't in the parent or child of a previously exported library
    other_db_files = find_files_in_branch(dest, OSXPHOTOS_EXPORT_DB)
@@ -1998,6 +2064,7 @@ def export(
                    jpeg_quality=jpeg_quality,
                    ignore_date_modified=ignore_date_modified,
                    use_photokit=use_photokit,
+                    exiftool_option=exiftool_option,
                )
                results += export_results

@@ -2045,24 +2112,10 @@ def export(
                        jpeg_quality=jpeg_quality,
                        ignore_date_modified=ignore_date_modified,
                        use_photokit=use_photokit,
+                        exiftool_option=exiftool_option,
                    )
                    results += export_results

-        # print summary results
-        # print(f"results_exported: {results_exported}")
-        # print(f"results_new: {results_new}")
-        # print(f"results_updated: {results_updated}")
-        # print(f"results_skipped: {results_skipped}")
-        # print(f"results_exif_updated: {results_exif_updated}")
-        # print(f"results_touched: {results_touched}")
-        # print(f"results_converted: {results_converted}")
-        # print(f"results_sidecar_json_written: {results_sidecar_json_written}")
-        # print(f"results_sidecar_json_skipped: {results_sidecar_json_skipped}")
-        # print(f"results_sidecar_xmp_written: {results_sidecar_xmp_written}")
-        # print(f"results_sidecar_xmp_skipped: {results_sidecar_xmp_skipped}")
-        # print(f"results_missing: {results_missing}")
-        # print(f"results_error: {results_error}")
-
        if cleanup:
            all_files = (
                results.exported
@@ -2072,6 +2125,8 @@ def export(
                + results.converted_to_jpeg
                + results.sidecar_json_written
                + results.sidecar_json_skipped
+                + results.sidecar_exiftool_written
+                + results.sidecar_exiftool_skipped
                + results.sidecar_xmp_written
                + results.sidecar_xmp_skipped
                # include missing so a file that was already in export directory
@@ -2589,6 +2644,7 @@ def export_photo(
    jpeg_quality=1.0,
    ignore_date_modified=False,
    use_photokit=False,
+    exiftool_option=None,
 ):
    """Helper function for export that does the actual export

@@ -2622,6 +2678,7 @@ def export_photo(
        convert_to_jpeg: boolean; if True, converts non-jpeg images to jpeg
        jpeg_quality: float in range 0.0 <= jpeg_quality <= 1.0.  A value of 1.0 specifies use best quality, a value of 0.0 specifies use maximum compression.
        ignore_date_modified: if True, sets EXIF:ModifyDate to EXIF:DateTimeOriginal even if date_modified is set
+        exiftool_option: optional list flags (e.g. ["-m", "-F"]) to pass to exiftool

    Returns:
        list of path(s) of exported photo or None if photo was missing
@@ -2711,11 +2768,13 @@ def export_photo(
        )

        sidecar = [s.lower() for s in sidecar]
-        sidecar_json = sidecar_xmp = False
+        sidecar_flags = 0
        if "json" in sidecar:
-            sidecar_json = True
+            sidecar_flags |= SIDECAR_JSON
        if "xmp" in sidecar:
-            sidecar_xmp = True
+            sidecar_flags |= SIDECAR_XMP
+        if "exiftool" in sidecar:
+            sidecar_flags |= SIDECAR_EXIFTOOL

        # if download_missing and the photo is missing or path doesn't exist,
        # try to download with Photos
@@ -2744,8 +2803,7 @@ def export_photo(
                        export_results = photo.export2(
                            dest_path,
                            original_filename,
-                            sidecar_json=sidecar_json,
-                            sidecar_xmp=sidecar_xmp,
+                            sidecar=sidecar_flags,
                            live_photo=export_live,
                            raw_photo=export_raw,
                            export_as_hardlink=export_as_hardlink,
@@ -2767,12 +2825,21 @@ def export_photo(
                            ignore_date_modified=ignore_date_modified,
                            use_photokit=use_photokit,
                            verbose=verbose_,
+                            exiftool_flags=exiftool_option,
                        )
                        results += export_results
                        for warning_ in export_results.exiftool_warning:
-                            verbose_(f"exiftool warning for file {warning_[0]}: {warning_[1]}")
+                            verbose_(
+                                f"exiftool warning for file {warning_[0]}: {warning_[1]}"
+                            )
                        for error_ in export_results.exiftool_error:
-                            click.echo(click.style(f"exiftool error for file {error_[0]}: {error_[1]}", fg=CLI_COLOR_ERROR),err=True)
+                            click.echo(
+                                click.style(
+                                    f"exiftool error for file {error_[0]}: {error_[1]}",
+                                    fg=CLI_COLOR_ERROR,
+                                ),
+                                err=True,
+                            )

                    except Exception as e:
                        click.echo(
@@ -2840,8 +2907,7 @@ def export_photo(
                        export_results_edited = photo.export2(
                            dest_path,
                            edited_filename,
-                            sidecar_json=sidecar_json,
-                            sidecar_xmp=sidecar_xmp,
+                            sidecar=sidecar_flags,
                            export_as_hardlink=export_as_hardlink,
                            overwrite=overwrite,
                            edited=True,
@@ -2862,12 +2928,21 @@ def export_photo(
                            ignore_date_modified=ignore_date_modified,
                            use_photokit=use_photokit,
                            verbose=verbose_,
+                            exiftool_flags=exiftool_option,
                        )
                        results += export_results_edited
                        for warning_ in export_results_edited.exiftool_warning:
-                            verbose_(f"exiftool warning for file {warning_[0]}: {warning_[1]}")
+                            verbose_(
+                                f"exiftool warning for file {warning_[0]}: {warning_[1]}"
+                            )
                        for error_ in export_results_edited.exiftool_error:
-                            click.echo(click.style(f"exiftool error for file {error_[0]}: {error_[1]}", fg=CLI_COLOR_ERROR),err=True)
+                            click.echo(
+                                click.style(
+                                    f"exiftool error for file {error_[0]}: {error_[1]}",
+                                    fg=CLI_COLOR_ERROR,
+                                ),
+                                err=True,
+                            )
                    except Exception as e:
                        click.echo(
                            click.style(
@@ -3066,6 +3141,7 @@ def write_export_report(report_file, results):
            "converted_to_jpeg": 0,
            "sidecar_xmp": 0,
            "sidecar_json": 0,
+            "sidecar_exiftool": 0,
            "missing": 0,
            "error": 0,
            "exiftool_warning": "",
@@ -3111,6 +3187,14 @@ def write_export_report(report_file, results):
        all_results[result]["sidecar_json"] = 1
        all_results[result]["skipped"] = 1

+    for result in results.sidecar_exiftool_written:
+        all_results[result]["sidecar_exiftool"] = 1
+        all_results[result]["exported"] = 1
+
+    for result in results.sidecar_exiftool_skipped:
+        all_results[result]["sidecar_exiftool"] = 1
+        all_results[result]["skipped"] = 1
+
    for result in results.missing:
        all_results[result]["missing"] = 1

@@ -3134,6 +3218,7 @@ def write_export_report(report_file, results):
        "converted_to_jpeg",
        "sidecar_xmp",
        "sidecar_json",
+        "sidecar_exiftool",
        "missing",
        "error",
        "exiftool_warning",
--- a/osxphotos/_constants.py
+++ b/osxphotos/_constants.py
@@ -102,6 +102,63 @@ _OSXPHOTOS_NONE_SENTINEL = "OSXPhotosXYZZY42_Sentinel$"

 # SearchInfo categories for Photos 5, corresponds to categories in database/search/psi.sqlite
 SEARCH_CATEGORY_LABEL = 2024
+SEARCH_CATEGORY_PLACE_NAME = 1
+SEARCH_CATEGORY_STREET = 2
+SEARCH_CATEGORY_NEIGHBORHOOD = 3
+SEARCH_CATEGORY_LOCALITY_4 = 4
+SEARCH_CATEGORY_SUB_LOCALITY_5 = 5
+SEARCH_CATEGORY_SUB_LOCALITY_6 = 6
+SEARCH_CATEGORY_CITY = 7 
+SEARCH_CATEGORY_LOCALITY_8 = 8
+SEARCH_CATEGORY_NAMED_AREA = 9
+SEARCH_CATEGORY_ALL_LOCALITY = [
+    SEARCH_CATEGORY_LOCALITY_4,
+    SEARCH_CATEGORY_SUB_LOCALITY_5,
+    SEARCH_CATEGORY_SUB_LOCALITY_6,
+    SEARCH_CATEGORY_LOCALITY_8,
+    SEARCH_CATEGORY_NAMED_AREA,
+]
+SEARCH_CATEGORY_STATE = 10
+SEARCH_CATEGORY_STATE_ABBREVIATION = 11
+SEARCH_CATEGORY_COUNTRY = 12
+SEARCH_CATEGORY_BODY_OF_WATER = 14
+SEARCH_CATEGORY_MONTH = 1014
+SEARCH_CATEGORY_YEAR = 1015
+SEARCH_CATEGORY_KEYWORDS = 2016
+SEARCH_CATEGORY_TITLE = 2017
+SEARCH_CATEGORY_DESCRIPTION = 2018
+SEARCH_CATEGORY_HOME = 2020
+SEARCH_CATEGORY_PERSON = 2021
+SEARCH_CATEGORY_ACTIVITY = 2027
+SEARCH_CATEGORY_HOLIDAY = 2029
+SEARCH_CATEGORY_SEASON = 2030
+SEARCH_CATEGORY_WORK = 2036
+SEARCH_CATEGORY_VENUE = 2038
+SEARCH_CATEGORY_VENUE_TYPE = 2039
+SEARCH_CATEGORY_PHOTO_TYPE_VIDEO = 2044
+SEARCH_CATEGORY_PHOTO_TYPE_SLOMO = 2045
+SEARCH_CATEGORY_PHOTO_TYPE_LIVE = 2046
+SEARCH_CATEGORY_PHOTO_TYPE_SCREENSHOT = 2047
+SEARCH_CATEGORY_PHOTO_TYPE_PANORAMA = 2048
+SEARCH_CATEGORY_PHOTO_TYPE_TIMELAPSE = 2049
+SEARCH_CATEGORY_PHOTO_TYPE_BURSTS = 2052
+SEARCH_CATEGORY_PHOTO_TYPE_PORTRAIT = 2053
+SEARCH_CATEGORY_PHOTO_TYPE_SELFIES = 2054
+SEARCH_CATEGORY_PHOTO_TYPE_FAVORITES = 2055
+SEARCH_CATEGORY_MEDIA_TYPES = [
+    SEARCH_CATEGORY_PHOTO_TYPE_VIDEO,
+    SEARCH_CATEGORY_PHOTO_TYPE_SLOMO,
+    SEARCH_CATEGORY_PHOTO_TYPE_LIVE,
+    SEARCH_CATEGORY_PHOTO_TYPE_SCREENSHOT,
+    SEARCH_CATEGORY_PHOTO_TYPE_PANORAMA,
+    SEARCH_CATEGORY_PHOTO_TYPE_TIMELAPSE,
+    SEARCH_CATEGORY_PHOTO_TYPE_BURSTS,
+    SEARCH_CATEGORY_PHOTO_TYPE_PORTRAIT,
+    SEARCH_CATEGORY_PHOTO_TYPE_SELFIES,
+    SEARCH_CATEGORY_PHOTO_TYPE_FAVORITES,
+]
+SEARCH_CATEGORY_PHOTO_NAME = 2056
+

 # Max filename length on MacOS
 MAX_FILENAME_LEN = 255
@@ -119,5 +176,10 @@ DEFAULT_EDITED_SUFFIX = "_edited"
 DEFAULT_ORIGINAL_SUFFIX = ""

 # Colors for print CLI messages
-CLI_COLOR_ERROR = 'red'
-CLI_COLOR_WARNING = 'yellow'
+CLI_COLOR_ERROR = "red"
+CLI_COLOR_WARNING = "yellow"
+
+# Bit masks for --sidecar
+SIDECAR_JSON = 0x1
+SIDECAR_EXIFTOOL = 0x2
+SIDECAR_XMP = 0x4
--- a/osxphotos/_version.py
+++ b/osxphotos/_version.py
@@ -1,5 +1,5 @@
 """ version info """

-__version__ = "0.38.8"
+__version__ = "0.38.15"


--- a/osxphotos/exiftool.py
+++ b/osxphotos/exiftool.py
@@ -132,18 +132,21 @@ class _ExifToolProc:
 class ExifTool:
    """ Basic exiftool interface for reading and writing EXIF tags """

-    def __init__(self, filepath, exiftool=None, overwrite=True):
+    def __init__(self, filepath, exiftool=None, overwrite=True, flags=None):
        """ Create ExifTool object

        Args:
-                file: path to image file
-                exiftool: path to exiftool, if not specified will look in path
-                overwrite: if True, will overwrite image file without creating backup, default=False
+            file: path to image file
+            exiftool: path to exiftool, if not specified will look in path
+            overwrite: if True, will overwrite image file without creating backup, default=False
+            flags: optional list of exiftool flags to prepend to exiftool command when writing metadata (e.g. -m or -F)
+
        Returns:
            ExifTool instance
        """
        self.file = filepath
        self.overwrite = overwrite
+        self.flags = flags or []
        self.data = {}
        self.warning = None
        self.error = None
@@ -249,14 +252,21 @@ class ExifTool:
            commands.append("-overwrite_original")

        filename = os.fsencode(self.file) if not no_file else b""
-        command_str = (
+
+        if self.flags:
+            command_str = b"\n".join([f.encode("utf-8") for f in self.flags])
+            command_str += b"\n"
+        else:
+            command_str = b""
+
+        command_str += (
            b"\n".join([c.encode("utf-8") for c in commands])
            + b"\n"
            + filename
            + b"\n"
            + b"-execute\n"
        )
-
+        
        # send the command
        self._process.stdin.write(command_str)
        self._process.stdin.flush()
--- a/osxphotos/photoinfo/_photoinfo_export.py
+++ b/osxphotos/photoinfo/_photoinfo_export.py
@@ -11,6 +11,7 @@
    """

 # TODO: should this be its own PhotoExporter class?
+# TODO: the various sidecar_json, sidecar_xmp, etc args should all be collapsed to a sidecar param using a bit mask

 import glob
 import hashlib
@@ -32,6 +33,9 @@ from .._constants import (
    _TEMPLATE_DIR,
    _UNKNOWN_PERSON,
    _XMP_TEMPLATE_NAME,
+    SIDECAR_EXIFTOOL,
+    SIDECAR_JSON,
+    SIDECAR_XMP,
 )
 from ..datetime_utils import datetime_tz_to_utc
 from ..exiftool import ExifTool
@@ -40,8 +44,8 @@ from ..fileutil import FileUtil
 from ..photokit import (
    PHOTOS_VERSION_CURRENT,
    PHOTOS_VERSION_ORIGINAL,
-    PhotoLibrary,
    PhotoKitFetchFailed,
+    PhotoLibrary,
 )
 from ..utils import dd_to_dms_str, findfiles, noop

@@ -60,6 +64,8 @@ class ExportResults:
        converted_to_jpeg=None,
        sidecar_json_written=None,
        sidecar_json_skipped=None,
+        sidecar_exiftool_written=None,
+        sidecar_exiftool_skipped=None,
        sidecar_xmp_written=None,
        sidecar_xmp_skipped=None,
        missing=None,
@@ -76,6 +82,8 @@ class ExportResults:
        self.converted_to_jpeg = converted_to_jpeg or []
        self.sidecar_json_written = sidecar_json_written or []
        self.sidecar_json_skipped = sidecar_json_skipped or []
+        self.sidecar_exiftool_written = sidecar_exiftool_written or []
+        self.sidecar_exiftool_skipped = sidecar_exiftool_skipped or []
        self.sidecar_xmp_written = sidecar_xmp_written or []
        self.sidecar_xmp_skipped = sidecar_xmp_skipped or []
        self.missing = missing or []
@@ -95,6 +103,8 @@ class ExportResults:
            + self.converted_to_jpeg
            + self.sidecar_json_written
            + self.sidecar_json_skipped
+            + self.sidecar_exiftool_written
+            + self.sidecar_exiftool_skipped
            + self.sidecar_xmp_written
            + self.sidecar_xmp_skipped
            + self.missing
@@ -116,6 +126,8 @@ class ExportResults:
        self.converted_to_jpeg += other.converted_to_jpeg
        self.sidecar_json_written += other.sidecar_json_written
        self.sidecar_json_skipped += other.sidecar_json_skipped
+        self.sidecar_exiftool_written += other.sidecar_exiftool_written
+        self.sidecar_exiftool_skipped += other.sidecar_exiftool_skipped
        self.sidecar_xmp_written += other.sidecar_xmp_written
        self.sidecar_xmp_skipped += other.sidecar_xmp_skipped
        self.missing += other.missing
@@ -136,6 +148,8 @@ class ExportResults:
            + f",converted_to_jpeg={self.converted_to_jpeg}"
            + f",sidecar_json_written={self.sidecar_json_written}"
            + f",sidecar_json_skipped={self.sidecar_json_skipped}"
+            + f",sidecar_exiftool_written={self.sidecar_exiftool_written}"
+            + f",sidecar_exiftool_skipped={self.sidecar_exiftool_skipped}"
            + f",sidecar_xmp_written={self.sidecar_xmp_written}"
            + f",sidecar_xmp_skipped={self.sidecar_xmp_skipped}"
            + f",missing={self.missing}"
@@ -323,6 +337,7 @@ def export(
    overwrite=False,
    increment=True,
    sidecar_json=False,
+    sidecar_exiftool=False,
    sidecar_xmp=False,
    use_photos_export=False,
    timeout=120,
@@ -352,10 +367,12 @@ def export(
    overwrite: (boolean, default=False); if True will overwrite files if they alreay exist
    increment: (boolean, default=True); if True, will increment file name until a non-existant name is found
                if overwrite=False and increment=False, export will fail if destination file already exists
-    sidecar_json: (boolean, default = False); if True will also write a json sidecar with IPTC data in format readable by exiftool
-                sidecar filename will be dest/filename.json
-    sidecar_xmp: (boolean, default = False); if True will also write a XMP sidecar with IPTC data
-                sidecar filename will be dest/filename.xmp
+    sidecar_json: if set will write a json sidecar with data in format readable by exiftool
+                sidecar filename will be dest/filename.json; includes exiftool tag group names (e.g. `exiftool -G -j`)
+    sidecar_exiftool: if set will write a json sidecar with data in format readable by exiftool
+                sidecar filename will be dest/filename.json; does not include exiftool tag group names (e.g. `exiftool -j`)
+    sidecar_xmp: if set will write an XMP sidecar with IPTC data
+                sidecar filename will be dest/filename.xmp           
    use_photos_export: (boolean, default=False); if True will attempt to export photo via applescript interaction with Photos
    timeout: (int, default=120) timeout in seconds used with use_photos_export
    exiftool: (boolean, default = False); if True, will use exiftool to write metadata to export file
@@ -372,6 +389,14 @@ def export(

    # Implementation note: calls export2 to actually do the work

+    sidecar = 0
+    if sidecar_json:
+        sidecar |= SIDECAR_JSON
+    if sidecar_exiftool:
+        sidecar |= SIDECAR_EXIFTOOL
+    if sidecar_xmp:
+        sidecar |= SIDECAR_XMP
+
    results = self.export2(
        dest,
        *filename,
@@ -381,8 +406,7 @@ def export(
        export_as_hardlink=export_as_hardlink,
        overwrite=overwrite,
        increment=increment,
-        sidecar_json=sidecar_json,
-        sidecar_xmp=sidecar_xmp,
+        sidecar=sidecar,
        use_photos_export=use_photos_export,
        timeout=timeout,
        exiftool=exiftool,
@@ -405,8 +429,7 @@ def export2(
    export_as_hardlink=False,
    overwrite=False,
    increment=True,
-    sidecar_json=False,
-    sidecar_xmp=False,
+    sidecar=0,
    use_photos_export=False,
    timeout=120,
    exiftool=False,
@@ -425,6 +448,7 @@ def export2(
    ignore_date_modified=False,
    use_photokit=False,
    verbose=None,
+    exiftool_flags=None,
 ):
    """export photo, like export but with update and dry_run options
    dest: must be valid destination path or exception raised
@@ -444,9 +468,12 @@ def export2(
    overwrite: (boolean, default=False); if True will overwrite files if they alreay exist
    increment: (boolean, default=True); if True, will increment file name until a non-existant name is found
                if overwrite=False and increment=False, export will fail if destination file already exists
-    sidecar_json: (boolean, default = False); if True will also write a json sidecar with IPTC data in format readable by exiftool
-                sidecar filename will be dest/filename.json
-    sidecar_xmp: (boolean, default = False); if True will also write a XMP sidecar with IPTC data
+    sidecar: bit field: set to one or more of SIDECAR_XMP, SIDECAR_JSON, SIDECAR_EXIFTOOL
+             SIDECAR_JSON: if set will write a json sidecar with data in format readable by exiftool
+                sidecar filename will be dest/filename.json; includes exiftool tag group names (e.g. `exiftool -G -j`)
+             SIDECAR_EXIFTOOL: if set will write a json sidecar with data in format readable by exiftool
+                sidecar filename will be dest/filename.json; does not include exiftool tag group names (e.g. `exiftool -j`)
+             SIDECAR_XMP: if set will write an XMP sidecar with IPTC data
                sidecar filename will be dest/filename.xmp
    use_photos_export: (boolean, default=False); if True will attempt to export photo via applescript interaction with Photos
    timeout: (int, default=120) timeout in seconds used with use_photos_export
@@ -469,6 +496,7 @@ def export2(
    jpeg_quality: float in range 0.0 <= jpeg_quality <= 1.0.  A value of 1.0 specifies use best quality, a value of 0.0 specifies use maximum compression.
    ignore_date_modified: for use with sidecar and exiftool; if True, sets EXIF:ModifyDate to EXIF:DateTimeOriginal even if date_modified is set
    verbose: optional callable function to use for printing verbose text during processing; if None (default), does not print output.
+    exiftool_flags: optional list of flags to pass to exiftool when using exiftool option, e.g ["-m", "-F"]

    Returns: ExportResults class 
        ExportResults has attributes: 
@@ -481,6 +509,8 @@ def export2(
        "converted_to_jpeg",
        "sidecar_json_written",
        "sidecar_json_skipped",
+        "sidecar_exiftool_written",
+        "sidecar_exiftool_skipped",
        "sidecar_xmp_written",
        "sidecar_xmp_skipped",
        "missing",
@@ -855,9 +885,15 @@ def export2(
            )

    # export metadata
+    sidecars = []
    sidecar_json_files_skipped = []
    sidecar_json_files_written = []
-    if sidecar_json:
+    sidecar_exiftool_files_skipped = []
+    sidecar_exiftool_files_written = []
+    sidecar_xmp_files_skipped = []
+    sidecar_xmp_files_written = []
+
+    if sidecar & SIDECAR_JSON:
        sidecar_filename = dest.parent / pathlib.Path(f"{dest.stem}{dest.suffix}.json")
        sidecar_str = self._exiftool_json_sidecar(
            use_albums_as_keywords=use_albums_as_keywords,
@@ -866,36 +902,37 @@ def export2(
            description_template=description_template,
            ignore_date_modified=ignore_date_modified,
        )
-        sidecar_digest = hexdigest(sidecar_str)
-        old_sidecar_digest, sidecar_sig = export_db.get_sidecar_for_file(
-            sidecar_filename
-        )
-        write_sidecar = (
-            not update
-            or (update and not sidecar_filename.exists())
-            or (
-                update
-                and (sidecar_digest != old_sidecar_digest)
-                or not fileutil.cmp_file_sig(sidecar_filename, sidecar_sig)
+        sidecars.append(
+            (
+                sidecar_filename,
+                sidecar_str,
+                sidecar_json_files_written,
+                sidecar_json_files_skipped,
+                "JSON",
            )
        )
-        if write_sidecar:
-            verbose(f"Writing exiftool JSON sidecar {sidecar_filename}")
-            sidecar_json_files_written.append(str(sidecar_filename))
-            if not dry_run:
-                self._write_sidecar(sidecar_filename, sidecar_str)
-                export_db.set_sidecar_for_file(
-                    sidecar_filename,
-                    sidecar_digest,
-                    fileutil.file_sig(sidecar_filename),
-                )
-        else:
-            verbose(f"Skipped up to date exiftool JSON sidecar {sidecar_filename}")
-            sidecar_json_files_skipped.append(str(sidecar_filename))

-    sidecar_xmp_files_skipped = []
-    sidecar_xmp_files_written = []
-    if sidecar_xmp:
+    if sidecar & SIDECAR_EXIFTOOL:
+        sidecar_filename = dest.parent / pathlib.Path(f"{dest.stem}{dest.suffix}.json")
+        sidecar_str = self._exiftool_json_sidecar(
+            use_albums_as_keywords=use_albums_as_keywords,
+            use_persons_as_keywords=use_persons_as_keywords,
+            keyword_template=keyword_template,
+            description_template=description_template,
+            ignore_date_modified=ignore_date_modified,
+            tag_groups=False,
+        )
+        sidecars.append(
+            (
+                sidecar_filename,
+                sidecar_str,
+                sidecar_exiftool_files_written,
+                sidecar_exiftool_files_skipped,
+                "exiftool",
+            )
+        )
+
+    if sidecar & SIDECAR_XMP:
        sidecar_filename = dest.parent / pathlib.Path(f"{dest.stem}{dest.suffix}.xmp")
        sidecar_str = self._xmp_sidecar(
            use_albums_as_keywords=use_albums_as_keywords,
@@ -904,6 +941,23 @@ def export2(
            description_template=description_template,
            extension=dest.suffix[1:] if dest.suffix else None,
        )
+        sidecars.append(
+            (
+                sidecar_filename,
+                sidecar_str,
+                sidecar_xmp_files_written,
+                sidecar_xmp_files_skipped,
+                "XMP",
+            )
+        )
+
+    for data in sidecars:
+        sidecar_filename = data[0]
+        sidecar_str = data[1]
+        files_written = data[2]
+        files_skipped = data[3]
+        sidecar_type = data[4]
+
        sidecar_digest = hexdigest(sidecar_str)
        old_sidecar_digest, sidecar_sig = export_db.get_sidecar_for_file(
            sidecar_filename
@@ -918,8 +972,8 @@ def export2(
            )
        )
        if write_sidecar:
-            verbose(f"Writing XMP sidecar {sidecar_filename}")
-            sidecar_xmp_files_written.append(str(sidecar_filename))
+            verbose(f"Writing {sidecar_type} sidecar {sidecar_filename}")
+            files_written.append(str(sidecar_filename))
            if not dry_run:
                self._write_sidecar(sidecar_filename, sidecar_str)
                export_db.set_sidecar_for_file(
@@ -928,8 +982,8 @@ def export2(
                    fileutil.file_sig(sidecar_filename),
                )
        else:
-            verbose(f"Skipped up to date XMP sidecar {sidecar_filename}")
-            sidecar_xmp_files_skipped.append(str(sidecar_filename))
+            verbose(f"Skipped up to date {sidecar_type} sidecar {sidecar_filename}")
+            files_skipped.append(str(sidecar_filename))

    # if exiftool, write the metadata
    if update:
@@ -972,6 +1026,7 @@ def export2(
                        keyword_template=keyword_template,
                        description_template=description_template,
                        ignore_date_modified=ignore_date_modified,
+                        flags=exiftool_flags,
                    )
                    if warning_:
                        exiftool_warning.append((exported_file, warning_))
@@ -1006,6 +1061,7 @@ def export2(
                    keyword_template=keyword_template,
                    description_template=description_template,
                    ignore_date_modified=ignore_date_modified,
+                    flags=exiftool_flags,
                )
                if warning_:
                    exiftool_warning.append((exported_file, warning_))
@@ -1047,6 +1103,8 @@ def export2(
        converted_to_jpeg=converted_to_jpeg_files,
        sidecar_json_written=sidecar_json_files_written,
        sidecar_json_skipped=sidecar_json_files_skipped,
+        sidecar_exiftool_written=sidecar_exiftool_files_written,
+        sidecar_exiftool_skipped=sidecar_exiftool_files_skipped,
        sidecar_xmp_written=sidecar_xmp_files_written,
        sidecar_xmp_skipped=sidecar_xmp_files_skipped,
        error=errors,
@@ -1229,6 +1287,8 @@ def _export_photo(
        converted_to_jpeg=converted_to_jpeg_files,
        sidecar_json_written=[],
        sidecar_json_skipped=[],
+        sidecar_exiftool_written=[],
+        sidecar_exiftool_skipped=[],
        sidecar_xmp_written=[],
        sidecar_xmp_skipped=[],
        missing=[],
@@ -1244,6 +1304,7 @@ def _write_exif_data(
    keyword_template=None,
    description_template=None,
    ignore_date_modified=False,
+    flags=None,
 ):
    """write exif data to image file at filepath

@@ -1253,6 +1314,7 @@ def _write_exif_data(
        use_persons_as_keywords: treat person names as keywords
        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)

    Returns:
        (warning, error) of warning and error strings if exiftool produces warnings or errors
@@ -1267,7 +1329,7 @@ def _write_exif_data(
        ignore_date_modified=ignore_date_modified,
    )

-    with ExifTool(filepath) as exiftool:
+    with ExifTool(filepath, flags=flags) as exiftool:
        for exiftag, val in exif_info.items():
            if type(val) == list:
                for v in val:
@@ -1322,9 +1384,10 @@ def _exiftool_dict(

    exif = {}
    if description_template is not None:
-        description = self.render_template(
+        rendered = self.render_template(
            description_template, expand_inplace=True, inplace_sep=", "
        )[0]
+        description = " ".join(rendered) if rendered else ""
        exif["EXIF:ImageDescription"] = description
        exif["XMP:Description"] = description
    elif self.description:
@@ -1384,18 +1447,14 @@ def _exiftool_dict(
    if keyword_list:
        # remove duplicates
        keyword_list = sorted(list(set(keyword_list)))
-        exif["XMP:TagsList"] = keyword_list.copy()
        exif["IPTC:Keywords"] = keyword_list.copy()
+        exif["XMP:Subject"] = keyword_list.copy()
+        exif["XMP:TagsList"] = keyword_list.copy()

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

-    if self.keywords or person_list:
-        # Photos puts both keywords and persons in Subject when using "Export IPTC as XMP"
-        # only use Photos' keywords for subject (e.g. don't include template values)
-        exif["XMP:Subject"] = sorted(list(set(self.keywords + person_list)))
-
    # if self.favorite():
    #     exif["Rating"] = 5

@@ -1479,6 +1538,7 @@ def _exiftool_json_sidecar(
    keyword_template=None,
    description_template=None,
    ignore_date_modified=False,
+    tag_groups=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.
@@ -1489,6 +1549,7 @@ def _exiftool_json_sidecar(
        keyword_template: (list of strings); list of template strings to render as keywords
        description_template: (list of strings); list of template strings to render for the description
        ignore_date_modified: if True, sets EXIF:ModifyDate to EXIF:DateTimeOriginal even if date_modified is set
+        tag_groups: if True, tags are in form Group:TagName, e.g. IPTC:Keywords, otherwise group name is omitted, e.g. Keywords

    Returns: dict with exiftool tags / values

@@ -1521,6 +1582,15 @@ def _exiftool_json_sidecar(
        description_template=description_template,
        ignore_date_modified=ignore_date_modified,
    )
+
+    if not tag_groups:
+        # strip tag groups
+        exif_new = {}
+        for k, v in exif.items():
+            k = re.sub(r".*:", "", k)
+            exif_new[k] = v
+        exif = exif_new
+
    return json.dumps([exif])


@@ -1545,9 +1615,10 @@ def _xmp_sidecar(
        extension = extension.suffix[1:] if extension.suffix else None

    if description_template is not None:
-        description = self.render_template(
+        rendered = self.render_template(
            description_template, expand_inplace=True, inplace_sep=", "
        )[0]
+        description = " ".join(rendered) if rendered else ""
    else:
        description = self.description if self.description is not None else ""

@@ -1601,20 +1672,15 @@ def _xmp_sidecar(

        keyword_list.extend(rendered_keywords)

-    subject_list = []
-    if self.keywords or person_list:
-        # Photos puts both keywords and persons in Subject when using "Export IPTC as XMP"
-        subject_list = list(self.keywords) + person_list
-
    # remove duplicates
    # sorted mainly to make testing the XMP file easier
    if keyword_list:
        keyword_list = sorted(list(set(keyword_list)))
-    if subject_list:
-        subject_list = sorted(list(set(subject_list)))
    if person_list:
        person_list = sorted(list(set(person_list)))

+    subject_list = keyword_list
+
    xmp_str = xmp_template.render(
        photo=self,
        description=description,
@@ -1625,7 +1691,7 @@ def _xmp_sidecar(
    )

    # remove extra lines that mako inserts from template
-    xmp_str = "\n".join([line for line in xmp_str.split("\n") if line.strip() != ""])
+    xmp_str = "\n".join(line for line in xmp_str.split("\n") if line.strip() != "")
    return xmp_str


--- a/osxphotos/photoinfo/_photoinfo_searchinfo.py
+++ b/osxphotos/photoinfo/_photoinfo_searchinfo.py
@@ -1,11 +1,32 @@
 """ Methods and class for PhotoInfo exposing SearchInfo data such as labels 
    Adds the following properties to PhotoInfo (valid only for Photos 5):
        search_info: returns a SearchInfo object
+        search_info_normalized: returns a SearchInfo object with properties that produce normalized results
        labels: returns list of labels
        labels_normalized: returns list of normalized labels
 """

-from .._constants import _PHOTOS_4_VERSION, SEARCH_CATEGORY_LABEL
+from .._constants import (
+    _PHOTOS_4_VERSION,
+    SEARCH_CATEGORY_CITY,
+    SEARCH_CATEGORY_LABEL,
+    SEARCH_CATEGORY_NEIGHBORHOOD,
+    SEARCH_CATEGORY_PLACE_NAME,
+    SEARCH_CATEGORY_STREET,
+    SEARCH_CATEGORY_ALL_LOCALITY,
+    SEARCH_CATEGORY_COUNTRY,
+    SEARCH_CATEGORY_STATE,
+    SEARCH_CATEGORY_STATE_ABBREVIATION,
+    SEARCH_CATEGORY_BODY_OF_WATER,
+    SEARCH_CATEGORY_MONTH,
+    SEARCH_CATEGORY_YEAR,
+    SEARCH_CATEGORY_HOLIDAY,
+    SEARCH_CATEGORY_ACTIVITY,
+    SEARCH_CATEGORY_SEASON,
+    SEARCH_CATEGORY_VENUE,
+    SEARCH_CATEGORY_VENUE_TYPE,
+    SEARCH_CATEGORY_MEDIA_TYPES,
+)


@property
@@ -24,6 +45,22 @@ def search_info(self):
        return self._search_info


+@property
+def search_info_normalized(self):
+    """ returns SearchInfo object for photo that produces normalized results
+        only valid on Photos 5, on older libraries, returns None
+    """
+    if self._db._db_version <= _PHOTOS_4_VERSION:
+        return None
+
+    # memoize SearchInfo object
+    try:
+        return self._search_info_normalized
+    except AttributeError:
+        self._search_info_normalized = SearchInfo(self, normalized=True)
+        return self._search_info_normalized
+
+
@property
 def labels(self):
    """ returns list of labels applied to photo by Photos image categorization
@@ -43,14 +80,15 @@ def labels_normalized(self):
    if self._db._db_version <= _PHOTOS_4_VERSION:
        return []

-    return self.search_info.labels_normalized
+    return self.search_info_normalized.labels


 class SearchInfo:
    """ Info about search terms such as machine learning labels that Photos knows about a photo """

-    def __init__(self, photo):
-        """ photo: PhotoInfo object """
+    def __init__(self, photo, normalized=False):
+        """ photo: PhotoInfo object
+            normalized: if True, all properties return normalized (lower case) results """

        if photo._db._db_version <= _PHOTOS_4_VERSION:
            raise NotImplementedError(
@@ -58,6 +96,7 @@ class SearchInfo:
            )

        self._photo = photo
+        self._normalized = normalized
        self.uuid = photo.uuid
        try:
            # get search info for this UUID
@@ -69,25 +108,170 @@ class SearchInfo:
    @property
    def labels(self):
        """ return list of labels associated with Photo """
-        if self._db_searchinfo:
-            labels = [
-                rec["content_string"]
-                for rec in self._db_searchinfo
-                if rec["category"] == SEARCH_CATEGORY_LABEL
-            ]
-        else:
-            labels = []
-        return labels
+        return self._get_text_for_category(SEARCH_CATEGORY_LABEL)

    @property
-    def labels_normalized(self):
-        """ return list of normalized labels associated with Photo """
+    def place_names(self):
+        """ returns list of place names """
+        return self._get_text_for_category(SEARCH_CATEGORY_PLACE_NAME)
+
+    @property
+    def streets(self):
+        """ returns list of street names """
+        return self._get_text_for_category(SEARCH_CATEGORY_STREET)
+
+    @property
+    def neighborhoods(self):
+        """ returns list of neighborhoods """
+        return self._get_text_for_category(SEARCH_CATEGORY_NEIGHBORHOOD)
+
+    @property
+    def locality_names(self):
+        """ returns list of other locality names """
+        locality = []
+        for category in SEARCH_CATEGORY_ALL_LOCALITY:
+            locality += self._get_text_for_category(category)
+        return locality
+
+    @property
+    def city(self):
+        """ returns city/town """
+        city = self._get_text_for_category(SEARCH_CATEGORY_CITY)
+        return city[0] if city else ""
+
+    @property
+    def state(self):
+        """ returns state name """
+        state = self._get_text_for_category(SEARCH_CATEGORY_STATE)
+        return state[0] if state else ""
+
+    @property
+    def state_abbreviation(self):
+        """ returns state abbreviation """
+        abbrev = self._get_text_for_category(SEARCH_CATEGORY_STATE_ABBREVIATION)
+        return abbrev[0] if abbrev else ""
+
+    @property
+    def country(self):
+        """ returns country name """
+        country = self._get_text_for_category(SEARCH_CATEGORY_COUNTRY)
+        return country[0] if country else ""
+
+    @property
+    def month(self):
+        """ returns month name """
+        month = self._get_text_for_category(SEARCH_CATEGORY_MONTH)
+        return month[0] if month else ""
+
+    @property
+    def year(self):
+        """ returns year """
+        year = self._get_text_for_category(SEARCH_CATEGORY_YEAR)
+        return year[0] if year else ""
+
+    @property
+    def bodies_of_water(self):
+        """ returns list of body of water names """
+        return self._get_text_for_category(SEARCH_CATEGORY_BODY_OF_WATER)
+
+    @property
+    def holidays(self):
+        """ returns list of holiday names """
+        return self._get_text_for_category(SEARCH_CATEGORY_HOLIDAY)
+
+    @property
+    def activities(self):
+        """ returns list of activity names """
+        return self._get_text_for_category(SEARCH_CATEGORY_ACTIVITY)
+
+    @property
+    def season(self):
+        """ returns season name """
+        season = self._get_text_for_category(SEARCH_CATEGORY_SEASON)
+        return season[0] if season else ""
+
+    @property
+    def venues(self):
+        """ returns list of venue names """
+        return self._get_text_for_category(SEARCH_CATEGORY_VENUE)
+
+    @property
+    def venue_types(self):
+        """ returns list of venue types """
+        return self._get_text_for_category(SEARCH_CATEGORY_VENUE_TYPE)
+
+    @property
+    def media_types(self):
+        """ returns list of media types (photo, video, panorama, etc) """
+        types = []
+        for category in SEARCH_CATEGORY_MEDIA_TYPES:
+            types += self._get_text_for_category(category)
+        return types
+
+    @property
+    def all(self):
+        """ return all search info properties in a single list """
+        all = (
+            self.labels
+            + self.place_names
+            + self.streets
+            + self.neighborhoods
+            + self.locality_names
+            + self.bodies_of_water
+            + self.holidays
+            + self.activities
+            + self.venues
+            + self.venue_types
+            + self.media_types
+        )
+        if self.city:
+            all += [self.city]
+        if self.state:
+            all += [self.state]
+        if self.state_abbreviation:
+            all += [self.state_abbreviation]
+        if self.country:
+            all += [self.country]
+        if self.month:
+            all += [self.month]
+        if self.year:
+            all += [self.year]
+        if self.season:
+            all += [self.season]
+
+        return all
+
+    def asdict(self):
+        """ return dict of search info """
+        return {
+            "labels": self.labels,
+            "place_names": self.place_names,
+            "streets": self.streets,
+            "neighborhoods": self.neighborhoods,
+            "city": self.city,
+            "locality_names": self.locality_names,
+            "state": self.state,
+            "state_abbreviation": self.state_abbreviation,
+            "country": self.country,
+            "bodies_of_water": self.bodies_of_water,
+            "month": self.month,
+            "year": self.year,
+            "holidays": self.holidays,
+            "activities": self.activities,
+            "season": self.season,
+            "venues": self.venues,
+            "venue_types": self.venue_types,
+            "media_types": self.media_types,
+        }
+
+    def _get_text_for_category(self, category):
+        """ return list of text for a specified category ID """
        if self._db_searchinfo:
-            labels = [
-                rec["normalized_string"]
+            content = "normalized_string" if self._normalized else "content_string"
+            return [
+                rec[content]
                for rec in self._db_searchinfo
-                if rec["category"] == SEARCH_CATEGORY_LABEL
+                if rec["category"] == category
            ]
        else:
-            labels = []
-        return labels
+            return []
--- a/osxphotos/photoinfo/photoinfo.py
+++ b/osxphotos/photoinfo/photoinfo.py
@@ -43,6 +43,7 @@ class PhotoInfo:
    # import additional methods
    from ._photoinfo_searchinfo import (
        search_info,
+        search_info_normalized,
        labels,
        labels_normalized,
        SearchInfo,
@@ -980,6 +981,7 @@ class PhotoInfo:
        comments = [comment.asdict() for comment in self.comments]
        likes = [like.asdict() for like in self.likes]
        faces = [face.asdict() for face in self.face_info]
+        search_info = self.search_info.asdict() if self.search_info else {}

        return {
            "library": self._db._library_path,
@@ -1041,6 +1043,7 @@ class PhotoInfo:
            "original_filesize": self.original_filesize,
            "comments": comments,
            "likes": likes,
+            "search_info": search_info,
        }

    def json(self):
--- a/osxphotos/photosdb/_photosdb_process_searchinfo.py
+++ b/osxphotos/photosdb/_photosdb_process_searchinfo.py
@@ -104,17 +104,19 @@ def _process_searchinfo(self):
    for row in c:
        uuid = ints_to_uuid(row[1], row[2])
        # strings have null character appended, so strip it
-        record = {}
-        record["uuid"] = uuid
-        record["rowid"] = row[0]
-        record["uuid_0"] = row[1]
-        record["uuid_1"] = row[2]
-        record["groupid"] = row[3]
-        record["category"] = row[4]
-        record["owning_groupid"] = row[5]
-        record["content_string"] = normalize_unicode(row[6].replace("\x00", ""))
+        record = {
+            "uuid": uuid,
+            "rowid": row[0],
+            "uuid_0": row[1],
+            "uuid_1": row[2],
+            "groupid": row[3],
+            "category": row[4],
+            "owning_groupid": row[5],
+            "content_string": normalize_unicode(row[6].replace("\x00", "")),
+        }
+
        record["normalized_string"] = normalize_unicode(row[7].replace("\x00", ""))
-        record["lookup_identifier"] = row[8]
+        record["lookup_identifier"] = normalize_unicode(row[8].replace("\x00", ""))

        try:
            _db_searchinfo_uuid[uuid].append(record)
--- a/osxphotos/templates/xmp_sidecar.mako
+++ b/osxphotos/templates/xmp_sidecar.mako
@@ -26,7 +26,6 @@

 <%def name="dc_subject(subject)">
    % if subject:
-        <!-- keywords and persons listed in <dc:subject> as Photos does -->
        <dc:subject>
            <rdf:Seq>
            % for subj in subject:
--- a/tests/search_info_test_data_10_15_7.json
+++ b/tests/search_info_test_data_10_15_7.json
--- a/tests/test-images/exiftool_warning.heic
+++ b/tests/test-images/exiftool_warning.heic
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -1,4 +1,4 @@
-""" Test the command line interface (CLI) """
+r""" Test the command line interface (CLI) """

 import os

@@ -354,7 +354,7 @@ CLI_EXIFTOOL = {
        "EXIF:ImageDescription": "Girl holding pumpkin",
        "XMP:Description": "Girl holding pumpkin",
        "XMP:PersonInImage": "Katie",
-        "XMP:Subject": ["Kids", "Katie"],
+        "XMP:Subject": "Kids",
        "EXIF:GPSLatitudeRef": "N",
        "EXIF:GPSLongitudeRef": "W",
        "EXIF:GPSLatitude": 41.256566,
@@ -395,7 +395,7 @@ CLI_EXIFTOOL_IGNORE_DATE_MODIFIED = {
        "XMP:TagsList": "wedding",
        "IPTC:Keywords": "wedding",
        "XMP:PersonInImage": "Maria",
-        "XMP:Subject": ["wedding", "Maria"],
+        "XMP:Subject": "wedding",
        "EXIF:DateTimeOriginal": "2019:04:15 14:40:24",
        "EXIF:CreateDate": "2019:04:15 14:40:24",
        "EXIF:OffsetTimeOriginal": "-04:00",
@@ -1059,7 +1059,9 @@ def test_export_exiftool_ignore_date_modified():
            ).asdict()
            for key in CLI_EXIFTOOL_IGNORE_DATE_MODIFIED[uuid]:
                if type(exif[key]) == list:
-                    assert sorted(exif[key]) == sorted(CLI_EXIFTOOL_IGNORE_DATE_MODIFIED[uuid][key])
+                    assert sorted(exif[key]) == sorted(
+                        CLI_EXIFTOOL_IGNORE_DATE_MODIFIED[uuid][key]
+                    )
                else:
                    assert exif[key] == CLI_EXIFTOOL_IGNORE_DATE_MODIFIED[uuid][key]

@@ -1172,6 +1174,43 @@ def test_export_exiftool_error():
                    assert exif[key] == CLI_EXIFTOOL[uuid][key]


+@pytest.mark.skipif(exiftool is None, reason="exiftool not installed")
+def test_export_exiftool_option():
+    """ test --exiftool-option """
+    import glob
+    import os
+    import os.path
+    from osxphotos.__main__ import export
+    from osxphotos.exiftool import ExifTool
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        # first export with --exiftool, one file produces a warning
+        result = runner.invoke(
+            export, [os.path.join(cwd, PHOTOS_DB_15_7), ".", "-V", "--exiftool"]
+        )
+        assert result.exit_code == 0
+        assert "exiftool warning" in result.output
+
+        # run again with exiftool-option = "-m" (ignore minor warnings)
+        # shouldn't see the warning this time
+        result = runner.invoke(
+            export,
+            [
+                os.path.join(cwd, PHOTOS_DB_15_7),
+                ".",
+                "-V",
+                "--exiftool",
+                "--exiftool-option",
+                "-m",
+            ],
+        )
+        assert result.exit_code == 0
+        assert "exiftool warning" not in result.output
+
+
 def test_export_edited_suffix():
    """ test export with --edited-suffix """
    import glob
@@ -1964,6 +2003,38 @@ def test_export_sidecar():
        assert sorted(files) == sorted(CLI_EXPORT_SIDECAR_FILENAMES)


+def test_export_sidecar_exiftool():
+    """ test --sidecar exiftool """
+    import glob
+    import os
+    import os.path
+    import osxphotos
+
+    from osxphotos.__main__ import cli
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        result = runner.invoke(
+            cli,
+            [
+                "export",
+                "--db",
+                os.path.join(cwd, CLI_PHOTOS_DB),
+                ".",
+                "--sidecar=exiftool",
+                "--sidecar=xmp",
+                f"--uuid={CLI_EXPORT_UUID}",
+                "-V",
+            ],
+        )
+        assert result.exit_code == 0
+        assert "Writing exiftool sidecar" in result.output
+        files = glob.glob("*.*")
+        assert sorted(files) == sorted(CLI_EXPORT_SIDECAR_FILENAMES)
+
+
 def test_export_sidecar_templates():
    import json
    import os
@@ -1997,11 +2068,54 @@ def test_export_sidecar_templates():
        with open(CLI_TEMPLATE_SIDECAR_FILENAME, "r") as jsonfile:
            exifdata = json.load(jsonfile)
        assert (
-            exifdata[0]["XMP:Description"][0]
+            exifdata[0]["XMP:Description"]
            == "Girls with pumpkins Katie, Suzy Kids Pumpkin Farm, Test Album"
        )
        assert (
-            exifdata[0]["EXIF:ImageDescription"][0]
+            exifdata[0]["EXIF:ImageDescription"]
+            == "Girls with pumpkins Katie, Suzy Kids Pumpkin Farm, Test Album"
+        )
+
+
+def test_export_sidecar_templates_exiftool():
+    """ test --sidecar exiftool with templates """
+    import json
+    import os
+    import os.path
+    import osxphotos
+
+    from osxphotos.__main__ import cli
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        result = runner.invoke(
+            cli,
+            [
+                "export",
+                "--db",
+                os.path.join(cwd, PHOTOS_DB_15_5),
+                ".",
+                "--sidecar=exiftool",
+                f"--uuid={CLI_UUID_DICT_15_5['template']}",
+                "-V",
+                "--keyword-template",
+                "{person}",
+                "--description-template",
+                "{descr} {person} {keyword} {album}",
+            ],
+        )
+        assert result.exit_code == 0
+        assert os.path.isfile(CLI_TEMPLATE_SIDECAR_FILENAME)
+        with open(CLI_TEMPLATE_SIDECAR_FILENAME, "r") as jsonfile:
+            exifdata = json.load(jsonfile)
+        assert (
+            exifdata[0]["Description"]
+            == "Girls with pumpkins Katie, Suzy Kids Pumpkin Farm, Test Album"
+        )
+        assert (
+            exifdata[0]["ImageDescription"]
            == "Girls with pumpkins Katie, Suzy Kids Pumpkin Farm, Test Album"
        )

@@ -2036,7 +2150,7 @@ def test_export_sidecar_update():
        )
        assert result.exit_code == 0
        assert "Writing XMP sidecar" in result.output
-        assert "Writing exiftool JSON sidecar" in result.output
+        assert "Writing JSON sidecar" in result.output

        # delete a sidecar file and run update
        fileutil = FileUtil()
@@ -2058,7 +2172,7 @@ def test_export_sidecar_update():
        )
        assert result.exit_code == 0
        assert "Skipped up to date XMP sidecar" in result.output
-        assert "Writing exiftool JSON sidecar" in result.output
+        assert "Writing JSON sidecar" in result.output

        # run update again, no sidecar files should update
        result = runner.invoke(
@@ -2077,7 +2191,7 @@ def test_export_sidecar_update():
        )
        assert result.exit_code == 0
        assert "Skipped up to date XMP sidecar" in result.output
-        assert "Skipped up to date exiftool JSON sidecar" in result.output
+        assert "Skipped up to date JSON sidecar" in result.output

        # touch a file and export again
        ts = datetime.datetime.now().timestamp() + 1000
@@ -2099,7 +2213,7 @@ def test_export_sidecar_update():
        )
        assert result.exit_code == 0
        assert "Writing XMP sidecar" in result.output
-        assert "Skipped up to date exiftool JSON sidecar" in result.output
+        assert "Skipped up to date JSON sidecar" in result.output

        # run update again, no sidecar files should update
        result = runner.invoke(
@@ -2118,7 +2232,7 @@ def test_export_sidecar_update():
        )
        assert result.exit_code == 0
        assert "Skipped up to date XMP sidecar" in result.output
-        assert "Skipped up to date exiftool JSON sidecar" in result.output
+        assert "Skipped up to date JSON sidecar" in result.output

        # run update again with updated metadata, forcing update
        result = runner.invoke(
@@ -2139,7 +2253,34 @@ def test_export_sidecar_update():
        )
        assert result.exit_code == 0
        assert "Writing XMP sidecar" in result.output
-        assert "Writing exiftool JSON sidecar" in result.output
+        assert "Writing JSON sidecar" in result.output
+
+
+def test_export_sidecar_invalid():
+    """ test invalid combination of sidecars """
+    import os
+
+    from osxphotos.__main__ import cli
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        result = runner.invoke(
+            cli,
+            [
+                "export",
+                "--db",
+                os.path.join(cwd, CLI_PHOTOS_DB),
+                ".",
+                "--sidecar=json",
+                "--sidecar=exiftool",
+                f"--uuid={CLI_EXPORT_UUID}",
+                "-V",
+            ],
+        )
+        assert result.exit_code != 0
+        assert "Cannot use --sidecar json with --sidecar exiftool" in result.output


 def test_export_live():
@@ -3096,7 +3237,7 @@ def test_export_sidecar_keyword_template():
            "XMP:TagsList": ["Kids", "Multi Keyword", "Pumpkin Farm", "Test Album"], 
            "IPTC:Keywords": ["Kids", "Multi Keyword", "Pumpkin Farm", "Test Album"], 
            "XMP:PersonInImage": ["Katie"], 
-            "XMP:Subject": ["Kids", "Katie"], 
+            "XMP:Subject": ["Kids", "Multi Keyword", "Pumpkin Farm", "Test Album"], 
            "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", 
            "EXIF:CreateDate": "2018:09:28 16:07:07", 
            "EXIF:OffsetTimeOriginal": "-04:00", 
@@ -4403,5 +4544,73 @@ def test_save_load_config():
            ],
        )
        assert result.exit_code == 0
-        assert "Writing exiftool JSON sidecar" in result.output
+        assert "Writing JSON sidecar" in result.output
        assert "Writing XMP sidecar" not in result.output
+
+
+def test_export_exportdb():
+    """ test --exportdb """
+    import glob
+    import os
+    import os.path
+    import osxphotos
+    from osxphotos.__main__ import export
+    import re
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        result = runner.invoke(
+            export,
+            [os.path.join(cwd, CLI_PHOTOS_DB), ".", "-V", "--exportdb", "export.db"],
+        )
+        assert result.exit_code == 0
+        assert re.search(r"Created export database.*export\.db", result.output)
+        files = glob.glob("*")
+        assert "export.db" in files
+
+        result = runner.invoke(
+            export,
+            [
+                os.path.join(cwd, CLI_PHOTOS_DB),
+                ".",
+                "-V",
+                "--exportdb",
+                "export.db",
+                "--update",
+            ],
+        )
+        assert result.exit_code == 0
+        assert re.search(r"Using export database.*export\.db", result.output)
+
+        # export again w/o --exportdb
+        result = runner.invoke(export, [os.path.join(cwd, CLI_PHOTOS_DB), ".", "-V"])
+        assert result.exit_code == 0
+        assert re.search(
+            r"Created export database.*\.osxphotos_export\.db", result.output
+        )
+        files = glob.glob(".*")
+        assert ".osxphotos_export.db" in files
+
+        # now try again with --exportdb, should generate warning
+        result = runner.invoke(
+            export,
+            [os.path.join(cwd, CLI_PHOTOS_DB), ".", "-V", "--exportdb", "export.db"],
+        )
+        assert result.exit_code == 0
+        assert (
+            "Warning: export database is 'export.db' but found '.osxphotos_export.db'"
+            in result.output
+        )
+
+        # specify a path for exportdb, should generate error
+        result = runner.invoke(
+            export,
+            [os.path.join(cwd, CLI_PHOTOS_DB), ".", "-V", "--exportdb", "./export.db"],
+        )
+        assert result.exit_code != 0
+        assert (
+            "Error: --exportdb must be specified as filename not path" in result.output
+        )
+
--- a/tests/test_exiftool.py
+++ b/tests/test_exiftool.py
@@ -3,6 +3,7 @@ from osxphotos.exiftool import get_exiftool_path

 TEST_FILE_ONE_KEYWORD = "tests/test-images/wedding.jpg"
 TEST_FILE_BAD_IMAGE = "tests/test-images/badimage.jpeg"
+TEST_FILE_WARNING = "tests/test-images/exiftool_warning.heic"
 TEST_FILE_MULTI_KEYWORD = "tests/test-images/Tulips.jpg"
 TEST_MULTI_KEYWORDS = [
    "Top Shot",
@@ -200,6 +201,29 @@ def test_setvalue_context_manager_error():
    assert exif.error


+def test_flags():
+    # test that flags work
+    import os.path
+    import tempfile
+    import osxphotos.exiftool
+    from osxphotos.fileutil import FileUtil
+
+    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
+    tempfile = os.path.join(tempdir.name, os.path.basename(TEST_FILE_WARNING))
+    FileUtil.copy(TEST_FILE_WARNING, tempfile)
+
+    with osxphotos.exiftool.ExifTool(tempfile) as exif:
+        exif.setvalue("XMP:Subject", "foo/bar")
+    assert exif.warning
+
+    # test again with -m: ignore minor warnings
+    FileUtil.unlink(tempfile)
+    FileUtil.copy(TEST_FILE_WARNING, tempfile)
+    with osxphotos.exiftool.ExifTool(tempfile, flags=["-m"]) as exif:
+        exif.setvalue("XMP:Subject", "foo/bar")
+    assert not exif.warning
+
+
 def test_clear_value():
    # test clearing a tag value
    import os.path
--- a/tests/test_export_catalina_10_15_7.py
+++ b/tests/test_export_catalina_10_15_7.py
@@ -1,5 +1,6 @@
 import pytest

+import osxphotos
 from osxphotos._constants import _UNKNOWN_PERSON
 from osxphotos.exiftool import get_exiftool_path
 from osxphotos.utils import dd_to_dms_str
@@ -12,6 +13,12 @@ except:

 PHOTOS_DB = "./tests/Test-10.15.7.photoslibrary/database/photos.db"

+
+@pytest.fixture(scope="module")
+def photosdb():
+    return osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+
+
 KEYWORDS = [
    "Kids",
    "wedding",
@@ -22,7 +29,7 @@ KEYWORDS = [
    "St. James's Park",
    "UK",
    "United Kingdom",
-    "Maria"
+    "Maria",
 ]
 # Photos 5 includes blank person for detected face
 PERSONS = ["Katie", "Suzy", "Maria", _UNKNOWN_PERSON]
@@ -84,6 +91,21 @@ EXIF_JSON_EXPECTED = """
    "EXIF:ModifyDate": "2019:07:27 17:33:28"}]
    """

+EXIFTOOL_SIDECAR_EXPECTED = """ 
+    [{"ImageDescription": "Bride Wedding day", 
+    "Description": "Bride Wedding day", 
+    "TagsList": ["Maria", "wedding"], 
+    "Keywords": ["Maria", "wedding"], 
+    "PersonInImage": ["Maria"], 
+    "Subject": ["wedding", "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:07:27 17:33:28"}]
+    """
+
 EXIF_JSON_EXPECTED_IGNORE_DATE_MODIFIED = """ 
    [{"EXIF:ImageDescription": "Bride Wedding day", 
    "XMP:Description": "Bride Wedding day", 
@@ -100,18 +122,15 @@ EXIF_JSON_EXPECTED_IGNORE_DATE_MODIFIED = """
    """


-def test_export_1():
+def test_export_1(photosdb):
    # test basic export
    # get an unedited image and export it using default filename
    import os
    import os.path
    import tempfile

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["export"]])

    filename = photos[0].filename
@@ -122,18 +141,15 @@ def test_export_1():
    assert os.path.isfile(got_dest)


-def test_export_2():
+def test_export_2(photosdb):
    # test export with user provided filename
    import os
    import os.path
    import tempfile
    import time

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["export"]])

    timestamp = time.time()
@@ -145,18 +161,15 @@ def test_export_2():
    assert os.path.isfile(got_dest)


-def test_export_3():
+def test_export_3(photosdb):
    # test file already exists and test increment=True (default)
    import os
    import os.path
    import pathlib
    import tempfile

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["export"]])

    filename = photos[0].filename
@@ -172,7 +185,7 @@ def test_export_3():
    assert os.path.isfile(got_dest_2)


-def test_export_4():
+def test_export_4(photosdb):
    # test user supplied file already exists and test increment=True (default)
    import os
    import os.path
@@ -180,11 +193,8 @@ def test_export_4():
    import tempfile
    import time

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["export"]])

    timestamp = time.time()
@@ -200,18 +210,15 @@ def test_export_4():
    assert os.path.isfile(got_dest_2)


-def test_export_5():
+def test_export_5(photosdb):
    # test file already exists and test increment=True (default)
    # and overwrite = True
    import os
    import os.path
    import tempfile

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["export"]])

    filename = photos[0].filename
@@ -225,7 +232,7 @@ def test_export_5():
    assert os.path.isfile(got_dest_2)


-def test_export_6():
+def test_export_6(photosdb):
    # test user supplied file already exists and test increment=True (default)
    # and overwrite = True
    import os
@@ -234,11 +241,8 @@ def test_export_6():
    import tempfile
    import time

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["export"]])

    timestamp = time.time()
@@ -253,18 +257,15 @@ def test_export_6():
    assert os.path.isfile(got_dest_2)


-def test_export_7():
+def test_export_7(photosdb):
    # test file already exists and test increment=False (not default), overwrite=False (default)
    # should raise exception
    import os
    import os.path
    import tempfile

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["export"]])

    filename = photos[0].filename
@@ -277,18 +278,15 @@ def test_export_7():
    assert e.type == type(FileExistsError())


-def test_export_8():
+def test_export_8(photosdb):
    # try to export missing file
    # should raise exception
    import os
    import os.path
    import tempfile

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["missing"]])

    filename = photos[0].filename
@@ -299,18 +297,15 @@ def test_export_8():
    assert e.type == type(FileNotFoundError())


-def test_export_9():
+def test_export_9(photosdb):
    # try to export edited file that's not edited
    # should raise exception
    import os
    import os.path
    import tempfile

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["no_adjustments"]])

    with pytest.raises(Exception) as e:
@@ -318,7 +313,7 @@ def test_export_9():
    assert e.type == ValueError


-def test_export_10():
+def test_export_10(photosdb):
    # try to export edited file that's not edited and name provided
    # should raise exception
    import os
@@ -326,11 +321,8 @@ def test_export_10():
    import tempfile
    import time

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["no_adjustments"]])

    timestamp = time.time()
@@ -342,18 +334,15 @@ def test_export_10():
    assert e.type == ValueError


-def test_export_11():
+def test_export_11(photosdb):
    # export edited file with name provided
    import os
    import os.path
    import tempfile
    import time

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["has_adjustments"]])

    timestamp = time.time()
@@ -364,18 +353,15 @@ def test_export_11():
    assert got_dest == expected_dest


-def test_export_12():
+def test_export_12(photosdb):
    # export edited file with default name
    import os
    import os.path
    import pathlib
    import tempfile

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["has_adjustments"]])

    edited_name = pathlib.Path(photos[0].path_edited).name
@@ -387,15 +373,13 @@ def test_export_12():
    assert got_dest == expected_dest


-def test_export_13():
+def test_export_13(photosdb):
    # export to invalid destination
    # should raise exception
    import os
    import os.path
    import tempfile

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name

@@ -405,7 +389,6 @@ def test_export_13():
        dest = os.path.join(dest, str(i))
        i += 1

-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["export"]])

    filename = photos[0].filename
@@ -417,7 +400,6 @@ def test_export_13():


 def test_dd_to_dms_str_1():
-    import osxphotos

    lat_str, lon_str = dd_to_dms_str(
        34.559331096, 69.206499174
@@ -428,7 +410,6 @@ def test_dd_to_dms_str_1():


 def test_dd_to_dms_str_2():
-    import osxphotos

    lat_str, lon_str = dd_to_dms_str(
        -34.601997592, -58.375665164
@@ -439,7 +420,6 @@ def test_dd_to_dms_str_2():


 def test_dd_to_dms_str_3():
-    import osxphotos

    lat_str, lon_str = dd_to_dms_str(
        -1.2666656, 36.7999968
@@ -450,7 +430,6 @@ def test_dd_to_dms_str_3():


 def test_dd_to_dms_str_4():
-    import osxphotos

    lat_str, lon_str = dd_to_dms_str(
        38.889248, -77.050636
@@ -460,11 +439,9 @@ def test_dd_to_dms_str_4():
    assert lon_str == "77 deg 3' 2.29\" W"


-def test_exiftool_json_sidecar():
-    import osxphotos
+def test_exiftool_json_sidecar(photosdb):
    import json

-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[EXIF_JSON_UUID])

    json_expected = json.loads(EXIF_JSON_EXPECTED)[0]
@@ -486,11 +463,9 @@ def test_exiftool_json_sidecar():
            assert json_got[k] == v


-def test_exiftool_json_sidecar_ignore_date_modified():
-    import osxphotos
+def test_exiftool_json_sidecar_ignore_date_modified(photosdb):
    import json

-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[EXIF_JSON_UUID])

    json_expected = json.loads(EXIF_JSON_EXPECTED_IGNORE_DATE_MODIFIED)[0]
@@ -512,12 +487,10 @@ def test_exiftool_json_sidecar_ignore_date_modified():
            assert json_got[k] == v


-def test_exiftool_json_sidecar_keyword_template_long(caplog):
-    import osxphotos
+def test_exiftool_json_sidecar_keyword_template_long(caplog, photosdb):
    from osxphotos._constants import _MAX_IPTC_KEYWORD_LEN
    import json

-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[EXIF_JSON_UUID])

    json_expected = json.loads(
@@ -526,8 +499,8 @@ def test_exiftool_json_sidecar_keyword_template_long(caplog):
        "XMP:Description": "Bride Wedding day", 
        "XMP:TagsList": ["Maria", "wedding", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"], 
        "IPTC:Keywords": ["Maria", "wedding", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"], 
+        "XMP:Subject": ["Maria", "wedding", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"], 
        "XMP:PersonInImage": ["Maria"], 
-        "XMP:Subject": ["wedding", "Maria"], 
        "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", 
        "EXIF:CreateDate": "2019:04:15 14:40:24", 
        "EXIF:OffsetTimeOriginal": "-04:00", 
@@ -562,11 +535,9 @@ def test_exiftool_json_sidecar_keyword_template_long(caplog):
            assert json_got[k] == v


-def test_exiftool_json_sidecar_keyword_template():
-    import osxphotos
+def test_exiftool_json_sidecar_keyword_template(photosdb):
    import json

-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[EXIF_JSON_UUID])

    json_expected = json.loads(
@@ -575,8 +546,8 @@ def test_exiftool_json_sidecar_keyword_template():
        "XMP:Description": "Bride Wedding day", 
        "XMP:TagsList": ["Maria", "wedding", "Folder1/SubFolder2/AlbumInFolder", "I have a deleted twin"], 
        "IPTC:Keywords": ["Maria", "wedding", "Folder1/SubFolder2/AlbumInFolder", "I have a deleted twin"], 
+        "XMP:Subject": ["Maria", "wedding", "Folder1/SubFolder2/AlbumInFolder", "I have a deleted twin"], 
        "XMP:PersonInImage": ["Maria"], 
-        "XMP:Subject": ["wedding", "Maria"],
        "EXIF:DateTimeOriginal": "2019:04:15 14:40:24", 
        "EXIF:CreateDate": "2019:04:15 14:40:24", 
        "EXIF:OffsetTimeOriginal": "-04:00", 
@@ -622,11 +593,9 @@ def test_exiftool_json_sidecar_keyword_template():
            assert json_got[k] == v


-def test_exiftool_json_sidecar_use_persons_keyword():
-    import osxphotos
+def test_exiftool_json_sidecar_use_persons_keyword(photosdb):
    import json

-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["xmp"]])

    json_expected = json.loads(
@@ -664,11 +633,9 @@ def test_exiftool_json_sidecar_use_persons_keyword():
            assert json_got[k] == v


-def test_exiftool_json_sidecar_use_albums_keyword():
-    import osxphotos
+def test_exiftool_json_sidecar_use_albums_keyword(photosdb):
    import json

-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["xmp"]])

    json_expected = json.loads(
@@ -679,7 +646,7 @@ def test_exiftool_json_sidecar_use_albums_keyword():
        "XMP:TagsList": ["Kids", "Pumpkin Farm", "Test Album"], 
        "IPTC:Keywords": ["Kids", "Pumpkin Farm", "Test Album"], 
        "XMP:PersonInImage": ["Suzy", "Katie"], 
-        "XMP:Subject": ["Kids", "Suzy", "Katie"], 
+        "XMP:Subject": ["Kids", "Pumpkin Farm", "Test Album"], 
        "EXIF:DateTimeOriginal": "2018:09:28 15:35:49", 
        "EXIF:CreateDate": "2018:09:28 15:35:49", 
        "EXIF:OffsetTimeOriginal": "-04:00", 
@@ -706,13 +673,35 @@ def test_exiftool_json_sidecar_use_albums_keyword():
            assert json_got[k] == v


+def test_exiftool_sidecar(photosdb):
+    import json
+
+    photos = photosdb.photos(uuid=[EXIF_JSON_UUID])
+
+    json_expected = json.loads(EXIFTOOL_SIDECAR_EXPECTED)[0]
+
+    json_got = photos[0]._exiftool_json_sidecar(tag_groups=False)
+    json_got = json.loads(json_got)[0]
+
+    # some gymnastics to account for different sort order in different pythons
+    for k, v in json_got.items():
+        if type(v) in (list, tuple):
+            assert sorted(json_expected[k]) == sorted(v)
+        else:
+            assert json_expected[k] == v
+
+    for k, v in json_expected.items():
+        if type(v) in (list, tuple):
+            assert sorted(json_got[k]) == sorted(v)
+        else:
+            assert json_got[k] == v
+
+
@pytest.mark.skipif(exiftool is None, reason="exiftool not installed")
-def test_xmp_sidecar_is_valid(tmp_path):
+def test_xmp_sidecar_is_valid(tmp_path, photosdb):
    """ validate XMP sidecar file with exiftool """
-    import osxphotos
    from osxphotos.exiftool import ExifTool

-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["xmp"]])
    photos[0].export(str(tmp_path), XMP_JPG_FILENAME, sidecar_xmp=True)
    xmp_file = tmp_path / XMP_FILENAME
@@ -722,10 +711,8 @@ def test_xmp_sidecar_is_valid(tmp_path):
    assert output == b"[ExifTool]      Validate                        : 0 0 0"


-def test_xmp_sidecar():
-    import osxphotos
+def test_xmp_sidecar(photosdb):

-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["xmp"]])

    xmp_expected = """<!-- Created with osxphotos https://github.com/RhetTbull/osxphotos -->
@@ -738,12 +725,9 @@ def test_xmp_sidecar():
        <photoshop:SidecarForExtension>jpg</photoshop:SidecarForExtension>
        <dc:description>Girls with pumpkins</dc:description>
        <dc:title>Can we carry this?</dc:title>
-        <!-- keywords and persons listed in <dc:subject> as Photos does -->
        <dc:subject>
            <rdf:Seq>
                <rdf:li>Kids</rdf:li>
-                <rdf:li>Suzy</rdf:li>
-                <rdf:li>Katie</rdf:li>
            </rdf:Seq>
        </dc:subject>
        <photoshop:DateCreated>2018-09-28T15:35:49.063000-04:00</photoshop:DateCreated>
@@ -787,11 +771,9 @@ def test_xmp_sidecar():
        assert line_expected == line_got


-def test_xmp_sidecar_extension():
+def test_xmp_sidecar_extension(photosdb):
    """ test XMP sidecar when no extension is passed """
-    import osxphotos

-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["xmp"]])

    xmp_expected = """<!-- Created with osxphotos https://github.com/RhetTbull/osxphotos -->
@@ -804,12 +786,9 @@ def test_xmp_sidecar_extension():
        <photoshop:SidecarForExtension>jpg</photoshop:SidecarForExtension>
        <dc:description>Girls with pumpkins</dc:description>
        <dc:title>Can we carry this?</dc:title>
-        <!-- keywords and persons listed in <dc:subject> as Photos does -->
        <dc:subject>
            <rdf:Seq>
                <rdf:li>Kids</rdf:li>
-                <rdf:li>Suzy</rdf:li>
-                <rdf:li>Katie</rdf:li>
            </rdf:Seq>
        </dc:subject>
        <photoshop:DateCreated>2018-09-28T15:35:49.063000-04:00</photoshop:DateCreated>
@@ -853,10 +832,8 @@ def test_xmp_sidecar_extension():
        assert line_expected == line_got


-def test_xmp_sidecar_use_persons_keyword():
-    import osxphotos
+def test_xmp_sidecar_use_persons_keyword(photosdb):

-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["xmp"]])

    xmp_expected = """<!-- Created with osxphotos https://github.com/RhetTbull/osxphotos -->
@@ -869,7 +846,6 @@ def test_xmp_sidecar_use_persons_keyword():
        <photoshop:SidecarForExtension>jpg</photoshop:SidecarForExtension>
        <dc:description>Girls with pumpkins</dc:description>
        <dc:title>Can we carry this?</dc:title>
-        <!-- keywords and persons listed in <dc:subject> as Photos does -->
        <dc:subject>
            <rdf:Seq>
                <rdf:li>Kids</rdf:li>
@@ -920,10 +896,8 @@ def test_xmp_sidecar_use_persons_keyword():
        assert line_expected == line_got


-def test_xmp_sidecar_use_albums_keyword():
-    import osxphotos
+def test_xmp_sidecar_use_albums_keyword(photosdb):

-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["xmp"]])

    xmp_expected = """<!-- Created with osxphotos https://github.com/RhetTbull/osxphotos -->
@@ -936,12 +910,11 @@ def test_xmp_sidecar_use_albums_keyword():
        <photoshop:SidecarForExtension>jpg</photoshop:SidecarForExtension>
        <dc:description>Girls with pumpkins</dc:description>
        <dc:title>Can we carry this?</dc:title>
-        <!-- keywords and persons listed in <dc:subject> as Photos does -->
        <dc:subject>
            <rdf:Seq>
                <rdf:li>Kids</rdf:li>
-                <rdf:li>Suzy</rdf:li>
-                <rdf:li>Katie</rdf:li>
+                <rdf:li>Pumpkin Farm</rdf:li>
+                <rdf:li>Test Album</rdf:li>
            </rdf:Seq>
        </dc:subject>
        <photoshop:DateCreated>2018-09-28T15:35:49.063000-04:00</photoshop:DateCreated>
@@ -987,11 +960,9 @@ def test_xmp_sidecar_use_albums_keyword():
        assert line_expected == line_got


-def test_xmp_sidecar_gps():
+def test_xmp_sidecar_gps(photosdb):
    """ Test export XMP sidecar with GPS info """
-    import osxphotos

-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["location"]])

    xmp_expected = """<!-- Created with osxphotos https://github.com/RhetTbull/osxphotos -->
@@ -1004,7 +975,6 @@ def test_xmp_sidecar_gps():
        <photoshop:SidecarForExtension>jpg</photoshop:SidecarForExtension>
        <dc:description></dc:description>
        <dc:title>St. James&#39;s Park</dc:title>
-        <!-- keywords and persons listed in <dc:subject> as Photos does -->
        <dc:subject>
            <rdf:Seq>
                <rdf:li>UK</rdf:li>
@@ -1057,10 +1027,8 @@ def test_xmp_sidecar_gps():
        assert line_expected == line_got


-def test_xmp_sidecar_keyword_template():
-    import osxphotos
+def test_xmp_sidecar_keyword_template(photosdb):

-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["xmp"]])

    xmp_expected = """<!-- Created with osxphotos https://github.com/RhetTbull/osxphotos -->
@@ -1073,12 +1041,12 @@ def test_xmp_sidecar_keyword_template():
        <photoshop:SidecarForExtension>jpg</photoshop:SidecarForExtension>
        <dc:description>Girls with pumpkins</dc:description>
        <dc:title>Can we carry this?</dc:title>
-        <!-- keywords and persons listed in <dc:subject> as Photos does -->
        <dc:subject>
            <rdf:Seq>
                <rdf:li>Kids</rdf:li>
-                <rdf:li>Suzy</rdf:li>
-                <rdf:li>Katie</rdf:li>
+                <rdf:li>Pumpkin Farm</rdf:li>
+                <rdf:li>Test Album</rdf:li>
+                <rdf:li>2018</rdf:li>
            </rdf:Seq>
        </dc:subject>
        <photoshop:DateCreated>2018-09-28T15:35:49.063000-04:00</photoshop:DateCreated>
--- a/tests/test_export_mojave_10_14_6.py
+++ b/tests/test_export_mojave_10_14_6.py
@@ -1,9 +1,8 @@
 import pytest

+import osxphotos
 from osxphotos._constants import _UNKNOWN_PERSON

-# TODO: put some of this code into a pre-function
-

 PHOTOS_DB = "./tests/Test-10.14.6.photoslibrary/database/photos.db"
 PHOTOS_DB_PATH = "/Test-10.14.6.photoslibrary/database/photos.db"
@@ -63,18 +62,20 @@ EXIF_JSON_EXPECTED = """
    """


-def test_export_1():
+@pytest.fixture(scope="module")
+def photosdb():
+    return osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+
+
+def test_export_1(photosdb):
    # test basic export
    # get an unedited image and export it using default filename
    import os
    import os.path
    import tempfile

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["export"]])

    filename = photos[0].filename
@@ -85,18 +86,15 @@ def test_export_1():
    assert os.path.isfile(got_dest)


-def test_export_2():
+def test_export_2(photosdb):
    # test export with user provided filename
    import os
    import os.path
    import tempfile
    import time

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["export"]])

    timestamp = time.time()
@@ -108,18 +106,15 @@ def test_export_2():
    assert os.path.isfile(got_dest)


-def test_export_3():
+def test_export_3(photosdb):
    # test file already exists and test increment=True (default)
    import os
    import os.path
    import pathlib
    import tempfile

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["export"]])

    filename = photos[0].filename
@@ -135,7 +130,7 @@ def test_export_3():
    assert os.path.isfile(got_dest_2)


-def test_export_4():
+def test_export_4(photosdb):
    # test user supplied file already exists and test increment=True (default)
    import os
    import os.path
@@ -143,11 +138,8 @@ def test_export_4():
    import tempfile
    import time

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["export"]])

    timestamp = time.time()
@@ -163,18 +155,15 @@ def test_export_4():
    assert os.path.isfile(got_dest_2)


-def test_export_5():
+def test_export_5(photosdb):
    # test file already exists and test increment=True (default)
    # and overwrite = True
    import os
    import os.path
    import tempfile

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["export"]])

    filename = photos[0].filename
@@ -188,7 +177,7 @@ def test_export_5():
    assert os.path.isfile(got_dest_2)


-def test_export_6():
+def test_export_6(photosdb):
    # test user supplied file already exists and test increment=True (default)
    # and overwrite = True
    import os
@@ -197,11 +186,8 @@ def test_export_6():
    import tempfile
    import time

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["export"]])

    timestamp = time.time()
@@ -216,18 +202,15 @@ def test_export_6():
    assert os.path.isfile(got_dest_2)


-def test_export_7():
+def test_export_7(photosdb):
    # test file already exists and test increment=False (not default), overwrite=False (default)
    # should raise exception
    import os
    import os.path
    import tempfile

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["export"]])

    filename = photos[0].filename
@@ -240,18 +223,15 @@ def test_export_7():
    assert e.type == type(FileExistsError())


-def test_export_8():
+def test_export_8(photosdb):
    # try to export missing file
    # should raise exception
    import os
    import os.path
    import tempfile

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["missing"]])

    filename = photos[0].filename
@@ -262,18 +242,15 @@ def test_export_8():
    assert e.type == type(FileNotFoundError())


-def test_export_9():
+def test_export_9(photosdb):
    # try to export edited file that's not edited
    # should raise exception
    import os
    import os.path
    import tempfile

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["no_adjustments"]])

    filename = photos[0].filename
@@ -284,7 +261,7 @@ def test_export_9():
    assert e.type == ValueError


-def test_export_10():
+def test_export_10(photosdb):
    # try to export edited file that's not edited and name provided
    # should raise exception
    import os
@@ -292,11 +269,8 @@ def test_export_10():
    import tempfile
    import time

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["no_adjustments"]])

    timestamp = time.time()
@@ -308,18 +282,15 @@ def test_export_10():
    assert e.type == ValueError


-def test_export_11():
+def test_export_11(photosdb):
    # export edited file with name provided
    import os
    import os.path
    import tempfile
    import time

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["has_adjustments"]])

    timestamp = time.time()
@@ -330,18 +301,15 @@ def test_export_11():
    assert got_dest == expected_dest


-def test_export_12():
+def test_export_12(photosdb):
    # export edited file with default name
    import os
    import os.path
    import pathlib
    import tempfile

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name
-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["has_adjustments"]])

    edited_name = pathlib.Path(photos[0].path_edited).name
@@ -353,15 +321,13 @@ def test_export_12():
    assert got_dest == expected_dest


-def test_export_13():
+def test_export_13(photosdb):
    # export to invalid destination
    # should raise exception
    import os
    import os.path
    import tempfile

-    import osxphotos
-
    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    dest = tempdir.name

@@ -371,7 +337,6 @@ def test_export_13():
        dest = os.path.join(dest, str(i))
        i += 1

-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["export"]])

    filename = photos[0].filename
@@ -382,11 +347,9 @@ def test_export_13():
    assert e.type == type(FileNotFoundError())


-def test_exiftool_json_sidecar():
-    import osxphotos
+def test_exiftool_json_sidecar(photosdb):
    import json

-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["location"]])

    json_expected = json.loads(EXIF_JSON_EXPECTED)[0]
@@ -408,10 +371,8 @@ def test_exiftool_json_sidecar():
            assert json_got[k] == v


-def test_xmp_sidecar():
-    import osxphotos
+def test_xmp_sidecar(photosdb):

-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["xmp"]])

    xmp_expected = """<!-- Created with osxphotos https://github.com/RhetTbull/osxphotos -->
@@ -424,12 +385,9 @@ def test_xmp_sidecar():
        <photoshop:SidecarForExtension>jpg</photoshop:SidecarForExtension>
        <dc:description>Girls with pumpkins</dc:description>
        <dc:title>Can we carry this?</dc:title>
-        <!-- keywords and persons listed in <dc:subject> as Photos does -->
        <dc:subject>
            <rdf:Seq>
-                <rdf:li>Katie</rdf:li>
                <rdf:li>Kids</rdf:li>
-                <rdf:li>Suzy</rdf:li>
            </rdf:Seq>
        </dc:subject>
        <photoshop:DateCreated>2018-09-28T15:35:49.063000-04:00</photoshop:DateCreated>
@@ -471,10 +429,8 @@ def test_xmp_sidecar():
        assert line_expected == line_got


-def test_xmp_sidecar_keyword_template():
-    import osxphotos
+def test_xmp_sidecar_keyword_template(photosdb):

-    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(uuid=[UUID_DICT["xmp"]])

    xmp_expected = """<!-- Created with osxphotos https://github.com/RhetTbull/osxphotos -->
@@ -487,12 +443,12 @@ def test_xmp_sidecar_keyword_template():
        <photoshop:SidecarForExtension>jpg</photoshop:SidecarForExtension>
        <dc:description>Girls with pumpkins</dc:description>
        <dc:title>Can we carry this?</dc:title>
-        <!-- keywords and persons listed in <dc:subject> as Photos does -->
        <dc:subject>
            <rdf:Seq>
                <rdf:li>Kids</rdf:li>
-                <rdf:li>Suzy</rdf:li>
-                <rdf:li>Katie</rdf:li>
+                <rdf:li>Test Album</rdf:li>
+                <rdf:li>Pumpkin Farm</rdf:li>
+                <rdf:li>2018</rdf:li>
            </rdf:Seq>
        </dc:subject>
        <photoshop:DateCreated>2018-09-28T15:35:49.063000-04:00</photoshop:DateCreated>
--- a/tests/test_exportresults.py
+++ b/tests/test_exportresults.py
@@ -13,6 +13,8 @@ EXPORT_RESULT_ATTRIBUTES = [
    "converted_to_jpeg",
    "sidecar_json_written",
    "sidecar_json_skipped",
+    "sidecar_exiftool_written",
+    "sidecar_exiftool_skipped",
    "sidecar_xmp_written",
    "sidecar_xmp_skipped",
    "missing",
@@ -33,6 +35,8 @@ def test_exportresults_init():
    assert results.converted_to_jpeg == []
    assert results.sidecar_json_written == []
    assert results.sidecar_json_skipped == []
+    assert results.sidecar_exiftool_written == []
+    assert results.sidecar_exiftool_skipped == []
    assert results.sidecar_xmp_written == []
    assert results.sidecar_xmp_skipped == []
    assert results.missing == []
@@ -90,6 +94,6 @@ def test_str():
    results = ExportResults()
    assert (
        str(results)
-        == "ExportResults(exported=[],new=[],updated=[],skipped=[],exif_updated=[],touched=[],converted_to_jpeg=[],sidecar_json_written=[],sidecar_json_skipped=[],sidecar_xmp_written=[],sidecar_xmp_skipped=[],missing=[],error=[],exiftool_warning=[],exiftool_error=[])"
+        == "ExportResults(exported=[],new=[],updated=[],skipped=[],exif_updated=[],touched=[],converted_to_jpeg=[],sidecar_json_written=[],sidecar_json_skipped=[],sidecar_exiftool_written=[],sidecar_exiftool_skipped=[],sidecar_xmp_written=[],sidecar_xmp_skipped=[],missing=[],error=[],exiftool_warning=[],exiftool_error=[])"
    )

--- a/tests/test_search_info_10_15_4.py
+++ b/tests/test_search_info_10_15_4.py
@@ -210,7 +210,7 @@ def test_search_info(photosdb):
 def test_labels_normalized(photosdb):
    for uuid in LABELS_NORMALIZED_DICT:
        photo = photosdb.photos(uuid=[uuid])[0]
-        assert sorted(photo.search_info.labels_normalized) == sorted(
+        assert sorted(photo.search_info_normalized.labels) == sorted(
            LABELS_NORMALIZED_DICT[uuid]
        )
        assert sorted(photo.labels_normalized) == sorted(LABELS_NORMALIZED_DICT[uuid])
--- a/tests/test_search_info_10_15_5.py
+++ b/tests/test_search_info_10_15_5.py
@@ -349,7 +349,7 @@ def test_labels_normalized(photosdb):
    for uuid in LABELS_NORMALIZED_DICT:
        photo = photosdb.photos(uuid=[uuid])[0]
        logging.warning(f"uuid = {uuid}")
-        assert sorted(photo.search_info.labels_normalized) == sorted(
+        assert sorted(photo.search_info_normalized.labels) == sorted(
            LABELS_NORMALIZED_DICT[uuid]
        )
        assert sorted(photo.labels_normalized) == sorted(LABELS_NORMALIZED_DICT[uuid])
--- a/tests/test_search_info_10_15_7.py
+++ b/tests/test_search_info_10_15_7.py
@@ -0,0 +1,65 @@
+""" test SearchInfo class """
+
+import json
+import os
+
+import pytest
+
+import osxphotos
+
+# These tests must be run against the author's personal photo library
+skip_test = "OSXPHOTOS_TEST_EXPORT" not in os.environ
+pytestmark = pytest.mark.skipif(
+    skip_test, reason="These tests only run against system Photos library"
+)
+
+PHOTOS_DB = "/Users/rhet/Pictures/Photos Library.photoslibrary"
+
+with open("tests/search_info_test_data_10_15_7.json") as fp:
+    test_data = json.load(fp)
+
+UUID_SEARCH_INFO = test_data["UUID_SEARCH_INFO"]
+UUID_SEARCH_INFO_NORMALIZED = test_data["UUID_SEARCH_INFO_NORMALIZED"]
+UUID_SEARCH_INFO_ALL = test_data["UUID_SEARCH_INFO_ALL"]
+UUID_SEARCH_INFO_ALL_NORMALIZED = test_data["UUID_SEARCH_INFO_ALL_NORMALIZED"]
+
+
+@pytest.fixture(scope="module")
+def photosdb():
+    return osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+
+
+def test_search_info(photosdb):
+    for uuid in UUID_SEARCH_INFO:
+        photo = photosdb.get_photo(uuid)
+        search_dict = photo.search_info.asdict()
+        for k, v in search_dict.items():
+            if type(v) == list:
+                assert sorted(v) == sorted(UUID_SEARCH_INFO[uuid][k])
+            else:
+                assert v == UUID_SEARCH_INFO[uuid][k]
+
+
+def test_search_info_normalized(photosdb):
+    for uuid in UUID_SEARCH_INFO_NORMALIZED:
+        photo = photosdb.get_photo(uuid)
+        search_dict = photo.search_info_normalized.asdict()
+        for k, v in search_dict.items():
+            if type(v) == list:
+                assert sorted(v) == sorted(UUID_SEARCH_INFO_NORMALIZED[uuid][k])
+            else:
+                assert v == UUID_SEARCH_INFO_NORMALIZED[uuid][k]
+
+
+def test_search_info_all(photosdb):
+    for uuid in UUID_SEARCH_INFO_ALL:
+        photo = photosdb.get_photo(uuid)
+        assert sorted(photo.search_info.all) == sorted(UUID_SEARCH_INFO_ALL[uuid])
+
+
+def test_search_info_all_normalized(photosdb):
+    for uuid in UUID_SEARCH_INFO_ALL_NORMALIZED:
+        photo = photosdb.get_photo(uuid)
+        assert sorted(photo.search_info_normalized.all) == sorted(
+            UUID_SEARCH_INFO_ALL_NORMALIZED[uuid]
+        )
--- a/utils/generate_search_info_test_data.py
+++ b/utils/generate_search_info_test_data.py
@@ -0,0 +1,34 @@
+""" Create the test data needed for test_search_info_10_15_7.py """
+
+# reads data from the author's system photo library to build the test data
+# used to test SearchInfo
+
+import json
+
+import osxphotos
+
+UUID = [
+    "C8EAF50A-D891-4E0C-8086-C417E1284153",
+    "71DFB4C3-E868-4BE4-906E-D96BD8692D7E",
+    "2C151013-5BBA-4D00-B70F-1C9420418B86",
+]
+
+data = {
+    "UUID_SEARCH_INFO": {},
+    "UUID_SEARCH_INFO_NORMALIZED": {},
+    "UUID_SEARCH_INFO_ALL": {},
+    "UUID_SEARCH_INFO_ALL_NORMALIZED": {},
+}
+
+photosdb = osxphotos.PhotosDB()
+
+for uuid in UUID:
+    photo = photosdb.get_photo(uuid)
+    search = photo.search_info
+    search_norm = photo.search_info_normalized
+    data["UUID_SEARCH_INFO"][uuid] = search.asdict()
+    data["UUID_SEARCH_INFO_NORMALIZED"][uuid] = search_norm.asdict()
+    data["UUID_SEARCH_INFO_ALL"][uuid] = search.all
+    data["UUID_SEARCH_INFO_ALL_NORMALIZED"][uuid] = search_norm.all
+
+print(json.dumps(data))
Author	SHA1	Message	Date
Rhet Turnbull	ade98fc150	Refactored sidecar code	2020-12-28 08:23:23 -08:00
Rhet Turnbull	0d66759b1c	Refactored export2 to use sidecar bit field	2020-12-27 22:45:47 -08:00
Rhet Turnbull	d833c14ef4	Added --sidecar exiftool, issue #303	2020-12-27 22:17:56 -08:00
Rhet Turnbull	34841f86c0	Updated CHANGELOG.md	2020-12-27 09:29:32 -08:00
Rhet Turnbull	4cc40d24cf	Bug fix for --description-template, issue #304	2020-12-27 09:26:54 -08:00
Rhet Turnbull	1ccf03e158	Updated CHANGELOG.md	2020-12-27 08:45:49 -08:00
Rhet Turnbull	75888cd663	Set XMP:Subject to match Keywords, issue #302	2020-12-27 08:35:30 -08:00
Rhet Turnbull	a08d0725b9	Updated CHANGELOG.md	2020-12-26 08:36:17 -08:00
Rhet Turnbull	f9f699ba35	Fixed city/sub-locality for SearchInfo	2020-12-26 08:31:14 -08:00
Rhet Turnbull	f469cccc4b	Updated README.md	2020-12-26 08:12:43 -08:00
Rhet Turnbull	4ece5c0d1c	Exposed SearchInfo, closes #121	2020-12-26 08:08:18 -08:00
Rhet Turnbull	9ca5d8f0fd	Added version to --verbose, closes #297	2020-12-22 21:05:40 -08:00
Rhet Turnbull	2a49255277	Added --exportdb	2020-12-22 20:42:48 -08:00
Rhet Turnbull	f3b7134af1	Fixed help text	2020-12-21 07:40:42 -08:00
Rhet Turnbull	73716f12cd	Updated CHANGELOG.md	2020-12-21 07:35:21 -08:00
Rhet Turnbull	a4bbb6492d	Added --exiftool-option to CLI, closes #298	2020-12-21 07:32:38 -08:00
Rhet Turnbull	aca19f4063	Updated CHANGELOG.md	2020-12-20 22:16:06 -08:00