Fix for issue #234

Updated CHANGELOG.md
Fix for issue #230
2020-10-12 05:59:44 -07:00 · 2020-10-11 22:52:03 -07:00 · 2020-10-11 22:40:16 -07:00 · 2020-10-11 22:27:53 -07:00 · 2020-10-11 22:24:17 -07:00 · 2020-10-11 22:20:42 -07:00
149 changed files with 2179 additions and 528 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,43 @@ 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.35.1](https://github.com/RhetTbull/osxphotos/compare/v0.35.0...v0.35.1)
+
+> 12 October 2020
+
+- Fix for issue #230 [`dcbf8f2`](https://github.com/RhetTbull/osxphotos/commit/dcbf8f25f61e21bcf1040046aa9d6ddba4ac9735)
+
+#### [v0.35.0](https://github.com/RhetTbull/osxphotos/compare/v0.34.5...v0.35.0)
+
+> 12 October 2020
+
+- Convert to jpeg [`#233`](https://github.com/RhetTbull/osxphotos/pull/233)
+- Updated tests, closes #231 [`#231`](https://github.com/RhetTbull/osxphotos/issues/231)
+- Updated tests [`b0171ba`](https://github.com/RhetTbull/osxphotos/commit/b0171ba6f5b73e1ff71e16d27852f8df7f208f60)
+- Updated tests [`07b0843`](https://github.com/RhetTbull/osxphotos/commit/07b08433df5a60f191e23a95394e83e51dca016f)
+- Merge branch 'master' into convert_to_jpeg [`fe5185b`](https://github.com/RhetTbull/osxphotos/commit/fe5185be8893002da663039f8ec103faed0f1831)
+- Added israw, tests for Big Sur [`b5a9794`](https://github.com/RhetTbull/osxphotos/commit/b5a9794f6bff5683fd42a22197454940e4d7ba88)
+- Updates to path, path_raw, uti for RAW+JPEG pairs [`b32f4b8`](https://github.com/RhetTbull/osxphotos/commit/b32f4b8504768a5f4b5ad54c00315b9e82fca980)
+
+#### [v0.34.5](https://github.com/RhetTbull/osxphotos/compare/v0.34.3...v0.34.5)
+
+> 6 October 2020
+
+- --convert-to-jpeg initial version working [`38f201d`](https://github.com/RhetTbull/osxphotos/commit/38f201d0fb70bf299a828c1dd0d034a119e380c4)
+- Added tests, fixed bug in export_db [`5a13605`](https://github.com/RhetTbull/osxphotos/commit/5a13605f850bb947c8888246f06a5ca4e6aa5f10)
+- Updated tests [`b2b39aa`](https://github.com/RhetTbull/osxphotos/commit/b2b39aa6075df11861cf5d8945b657204f120e87)
+
+#### [v0.34.3](https://github.com/RhetTbull/osxphotos/compare/v0.34.2...v0.34.3)
+
+> 29 September 2020
+
+- Update exiftool.py to preserve file modification time, thanks to @hhoeck  [`#223`](https://github.com/RhetTbull/osxphotos/pull/223)
+- Added tests for 10.15.6 [`432da7f`](https://github.com/RhetTbull/osxphotos/commit/432da7f139a5e4b37eeb358f4ede45314407f8e5)
+- Added HEIC test image [`ddc1e69`](https://github.com/RhetTbull/osxphotos/commit/ddc1e69b4a4ac712e1af312b865c4216f9ad350c)
+- Fixed bug related to issue #222 [`c939df7`](https://github.com/RhetTbull/osxphotos/commit/c939df717159e8b97955c0b267327cd56a9ed56c)
+- Version bump for bug fix [`62d54cc`](https://github.com/RhetTbull/osxphotos/commit/62d54cc0beabd0141545608184d4b2c658eedf0f)
+- Update README.md [`6883fec`](https://github.com/RhetTbull/osxphotos/commit/6883fec2b2236d892b88327e1b4e9da1237f7dea)
+
 #### [v0.34.2](https://github.com/RhetTbull/osxphotos/compare/v0.34.1...v0.34.2)

 > 14 September 2020
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@
    + [ScoreInfo](#scoreinfo)
    + [PersonInfo](#personinfo)
    + [FaceInfo](#faceinfo)
+    + [Raw Photos](#raw-photos)
    + [Template Substitutions](#template-substitutions)
    + [Utility Functions](#utility-functions)
  * [Examples](#examples)
@@ -114,7 +115,7 @@ Usage: osxphotos export [OPTIONS] [PHOTOS_LIBRARY]... DEST
  for photos matching all options). If no query options are provided, all
  photos will be exported. By default, all versions of all photos will be
  exported including edited versions, live photo movies, burst photos, and
-  associated RAW images.  See --skip-edited, --skip-live, --skip-bursts, and
+  associated raw images.  See --skip-edited, --skip-live, --skip-bursts, and
  --skip-raw options to modify this behavior.

 Options:
@@ -199,7 +200,7 @@ Options:
  --not-selfie                    Search for photos that are not selfies.
  --panorama                      Search for panorama photos.
  --not-panorama                  Search for photos that are not panoramas.
-  --has-raw                       Search for photos with both a jpeg and RAW
+  --has-raw                       Search for photos with both a jpeg and raw
                                  version
  --only-movies                   Search only for movies (default searches
                                  both images and movies).
@@ -242,10 +243,10 @@ Options:
                                  the library if a photo is a burst photo.
  --skip-live                     Do not export the associated live video
                                  component of a live photo.
-  --skip-raw                      Do not export associated RAW images of a
-                                  RAW/jpeg pair.  Note: this does not skip RAW
-                                  photos if the RAW photo does not have an
-                                  associated jpeg image (e.g. the RAW file was
+  --skip-raw                      Do not export associated raw images of a
+                                  RAW+JPEG pair.  Note: this does not skip raw
+                                  photos if the raw photo does not have an
+                                  associated jpeg image (e.g. the raw file was
                                  imported to Photos without a jpeg preview).
  --person-keyword                Use person in image as keyword/tag when
                                  exporting metadata.
@@ -279,6 +280,13 @@ Options:
                                  renamed upon import.  By default, photos are
                                  exported with the the original name they had
                                  before import.
+  --convert-to-jpeg               Convert all non-jpeg images (e.g. raw, HEIC,
+                                  PNG, etc) to JPEG upon export.  Only works
+                                  if your Mac has a GPU.
+  --jpeg-quality FLOAT RANGE      Value in range 0.0 to 1.0 to use with
+                                  --convert-to-jpeg. A value of 1.0 specifies
+                                  best quality, a value of 0.0 specifies
+                                  maximum compression. Defaults to 1.0.
  --sidecar FORMAT                Create sidecar for each photo exported;
                                  valid FORMAT values: xmp, json; --sidecar
                                  json: create JSON sidecar useable by
@@ -347,7 +355,7 @@ If using --update, the exported library should be treated as a backup, not a
 working copy where you intend to make changes.

 Note: The number of files reported for export and the number actually exported
-may differ due to live photos, associated RAW images, and edited photos which
+may differ due to live photos, associated raw images, and edited photos which
 are reported in the total photos exported.

 Implementation note: To determine which files need to be updated, osxphotos
@@ -1084,6 +1092,18 @@ Returns the absolute path to the edited photo on disk as a string.  If the photo

 **Note**: will also return None if the edited photo is missing on disk. 

+#### `path_raw`
+Returns the absolute path to the associated raw photo on disk as a string, if photo is part of a RAW+JPEG pair, otherwise returns None.  See [notes on Raw Photos](#raw-photos).
+
+#### `has_raw`
+Returns True if photo has an associated raw image, otherwise False. (e.g. Photo is a RAW+JPEG pair). See also [is_raw](#israw) and [notes on Raw Photos](#raw-photos).
+
+#### `israw`
+Returns True if photo is a raw image. E.g. it was imported as a single raw image, not part of a RAW+JPEG pair.  See also [has_raw](#has_raw) and .
+
+#### `raw_original`
+Returns True if associated raw image and the raw image is selected in Photos via "Use RAW as Original", otherwise returns False.  See [notes on Raw Photos](#raw-photos).
+
 #### `height`
 Returns height of the photo in pixels.  If image has been edited, returns height of the edited image, otherwise returns height of the original image.  See also [original_height](#original_height).

@@ -1149,7 +1169,16 @@ Returns True if photo is a [cloud asset](#iscloudasset) and is synched to iCloud
 **Note**: Applies to master (original) photo only.  It's possible for the master to be in iCloud but a local edited version is not yet synched to iCloud. `incloud` provides status of only the master photo.  osxphotos does not yet provide a means to determine if the edited version is in iCloud.  If you need this feature, please open an [issue](https://github.com/RhetTbull/osxphotos/issues).

 #### `uti`
-Returns Uniform Type Identifier (UTI) for the image, for example: 'public.jpeg' or 'com.apple.quicktime-movie'
+Returns Uniform Type Identifier (UTI) for the current version of the image, for example: 'public.jpeg' or 'com.apple. quicktime-movie'.  If the image has been edited, `uti` will return the UTI for the edited image, otherwise it will return the UTI for the original image.
+
+#### `uti_original`
+Returns Uniform Type Identifier (UTI) for the original unedited image, for example: 'public.jpeg' or 'com.apple.quicktime-movie'.
+
+#### `uti_edited`
+Returns Uniform Type Identifier (UTI) for the edited image, for example: 'public.jpeg'.  Returns None if the photo does not have adjustments.
+
+#### `uti_raw`
+Returns Uniform Type Identifier (UTI) for the associated raw image, if there is one; for example, 'com.canon.cr2-raw-image'.  If the image is raw but not part of a RAW+JPEG pair, `uti_raw` returns None.  In this case, use `uti`, or `uti_original`.  See also [has_raw](#has_raw) and [notes on Raw Photos](#raw-photos).

 #### `burst`
 Returns True if photos is a burst image (e.g. part of a set of burst images), otherwise False.
@@ -1704,6 +1733,38 @@ Returns a dictionary representation of the FaceInfo instance.
 #### `json()`
 Returns a JSON representation of the FaceInfo instance.

+### Raw Photos
+Handling raw photos in `osxphotos` requires a bit of extra work.  Raw photos in Photos can be imported in two different ways: 1) a single raw photo with no associated JPEG image is imported 2) a raw+JPEG pair is imported -- two separate images with same file stem (e.g. `IMG_0001.CR2` and `IMG_001.JPG`) are imported.  
+
+The latter are treated by Photos as a single image.  By default, Photos will treat these as a JPEG image.  They are denoted in the Photos interface with a "J" icon superimposed on the image.  In Photos, the user can select "Use RAW as original" in which case the "J" icon changes to an "R" icon and all subsequent edits will use the raw image as the original. To further complicate this, different versions of Photos handle these differently in their internal logic.  
+
+`osxphotos` attempts to simplify the handling of these raw+JPEG pairs by providing a set of attributes for accessing both the JPEG and the raw version.  For example, [PhotoInfo.has_raw](#has_raw) will be True if the photo has an associated raw image but False otherwise and [PhotoInfo.path_raw](#path_raw) provides the path to the associated raw image.  Reference the following table for the various attributes useful for dealing with raw images.  Given the different ways Photos deals with raw images I've struggled with how to represent these in a logical and consistent manner.  If you have suggestions for a better interface, please open an [issue](https://github.com/RhetTbull/osxphotos/issues)!
+
+#### Raw-Related Attributes 
+
+|`PhotoInfo` attribute|`IMG_0001.CR2` imported without raw+JPEG pair|`IMG_0001.CR2` + `IMG_0001.JPG` raw+JPEG pair, JPEG is original|`IMG_0001.CR2` + `IMG_0001.JPG` raw+jpeg pair, raw is original|
+|----------|----------|----------|----------|
+|[israw](#israw)| True | False | False |
+|[has_raw](#has_raw)| False | True | True |
+|[uti](#uti) | `com.canon.cr2-raw-image` | `public.jpeg` | `public.jpeg` |
+|[uti_raw](#uti_raw) | None | `com.canon.cr2-raw-image` | `com.canon.cr2-raw-image` |
+|[raw_original](#raw_original) | False | False | True |
+|[path](#path) | `/path/to/IMG_0001.CR2` | `/path/to/IMG_0001.JPG` | `/path/to/IMG_0001.JPG` |
+|[path_raw](#path_raw) | None | `/path/to/IMG_0001.CR2` | `/path/to/IMG_0001.CR2` | 
+
+#### Example
+To get the path of every raw photo, whether it's a single raw photo or a raw+JPEG pair, one could do something like this:
+
+```python
+>>> import osxphotos
+>>> photosdb = osxphotos.PhotosDB()
+>>> photos = photosdb.photos()
+>>> all_raw = [p for p in photos if p.israw or p.has_raw]
+>>> for raw in all_raw:
+...     path = raw.path if raw.israw else raw.path_raw
+...     print(path)
+```
+
 ### Template Substitutions

 The following substitutions are availabe for use with `PhotoInfo.render_template()` 
@@ -1885,10 +1946,10 @@ Thank-you to the following people who have contributed to improving osxphotos!

 ## Known Bugs

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

 - Face coordinates (mouth, left eye, right eye) may not be correct for images where the head is tilted.  See [Issue #196](https://github.com/RhetTbull/osxphotos/issues/196).
- RAW images imported to Photos with an associated jpeg preview are not handled correctly by osxphotos.  osxphotos query and export will operate on the jpeg preview instead of the RAW image as will `PhotoInfo.path`.  If the user selects "Use RAW as original" in Photos, the RAW image will be exported or operated on but the jpeg will be ignored.  See [Issue #101](https://github.com/RhetTbull/osxphotos/issues/101). Note: Beta version of fix for this bug is implemented in the current version of osxphotos.
+- Raw images imported to Photos with an associated jpeg preview are not handled correctly by osxphotos.  osxphotos query and export will operate on the jpeg preview instead of the raw image as will `PhotoInfo.path`.  If the user selects "Use RAW as original" in Photos, the raw image will be exported or operated on but the jpeg will be ignored.  See [Issue #101](https://github.com/RhetTbull/osxphotos/issues/101). Note: Beta version of fix for this bug is implemented in the current version of osxphotos.
 - The `--download-missing` option for `osxphotos export` does not work correctly with burst images.  It will download the primary image but not the other burst images.  See [Issue #75](https://github.com/RhetTbull/osxphotos/issues/75).

 ## Implementation Notes
@@ -1908,6 +1969,8 @@ For additional details about how osxphotos is implemented or if you would like t
 - [Mako](https://www.makotemplates.org/)
 - [bpylist2](https://pypi.org/project/bpylist2/)
 - [pathvalidate](https://pypi.org/project/pathvalidate/)
+- [wurlitzer](https://pypi.org/project/wurlitzer/)
+

 ## Acknowledgements
 This project was originally inspired by [photo-export](https://github.com/patrikhson/photo-export) by Patrick Fältström,  Copyright (c) 2015 Patrik Fältström paf@frobbit.se
--- a/osxphotos/main.py
+++ b/osxphotos/main.py
@@ -29,7 +29,7 @@ from ._constants import (
    _UNKNOWN_PLACE,
    UNICODE_FORMAT,
 )
-from ._export_db import ExportDB, ExportDBInMemory
+from .export_db import ExportDB, ExportDBInMemory
 from ._version import __version__
 from .datetime_formatter import DateTimeFormatter
 from .exiftool import get_exiftool_path
@@ -148,7 +148,7 @@ class ExportCommand(click.Command):
        formatter.write("\n")
        formatter.write_text(
            "Note: The number of files reported for export and the number actually exported "
-            + "may differ due to live photos, associated RAW images, and edited photos which are reported "
+            + "may differ due to live photos, associated raw images, and edited photos which are reported "
            + "in the total photos exported."
        )
        formatter.write("\n")
@@ -474,7 +474,7 @@ def query_options(f):
        o(
            "--has-raw",
            is_flag=True,
-            help="Search for photos with both a jpeg and RAW version",
+            help="Search for photos with both a jpeg and raw version",
        ),
        o(
            "--only-movies",
@@ -1183,9 +1183,9 @@ def query(
@click.option(
    "--skip-raw",
    is_flag=True,
-    help="Do not export associated RAW images of a RAW/jpeg pair.  "
-    "Note: this does not skip RAW photos if the RAW photo does not have an associated jpeg image "
-    "(e.g. the RAW file was imported to Photos without a jpeg preview).",
+    help="Do not export associated raw images of a RAW+JPEG pair.  "
+    "Note: this does not skip raw photos if the raw photo does not have an associated jpeg image "
+    "(e.g. the raw file was imported to Photos without a jpeg preview).",
 )
@click.option(
    "--person-keyword",
@@ -1230,6 +1230,21 @@ def query(
    "Note: Starting with Photos 5, all photos are renamed upon import.  By default, "
    "photos are exported with the the original name they had before import.",
 )
+@click.option(
+    "--convert-to-jpeg",
+    is_flag=True,
+    help="Convert all non-jpeg images (e.g. raw, HEIC, PNG, etc) "
+    "to JPEG upon export.  Only works if your Mac has a GPU.",
+)
+@click.option(
+    "--jpeg-quality",
+    type=click.FloatRange(0.0, 1.0),
+    default=1.0,
+    help="Value in range 0.0 to 1.0 to use with --convert-to-jpeg. " 
+    "A value of 1.0 specifies best quality, "
+    "a value of 0.0 specifies maximum compression. "
+    "Defaults to 1.0." 
+)
@click.option(
    "--sidecar",
    default=None,
@@ -1349,6 +1364,8 @@ def export(
    keyword_template,
    description_template,
    current_name,
+    convert_to_jpeg,
+    jpeg_quality,
    sidecar,
    only_photos,
    only_movies,
@@ -1392,13 +1409,13 @@ def export(
        (e.g. search for photos matching all options).
        If no query options are provided, all photos will be exported.
        By default, all versions of all photos will be exported including edited
-        versions, live photo movies, burst photos, and associated RAW images. 
+        versions, live photo movies, burst photos, and associated raw images. 
        See --skip-edited, --skip-live, --skip-bursts, and --skip-raw options
        to modify this behavior. 
    """

    global VERBOSE
-    VERBOSE = True if verbose_ else False
+    VERBOSE = bool(verbose_)

    if not os.path.isdir(dest):
        sys.exit(f"DEST {dest} must be valid path")
@@ -1424,6 +1441,7 @@ def export(
        (any(place), no_place),
        (deleted, deleted_only),
        (skip_edited, skip_original_if_edited),
+        (export_as_hardlink, convert_to_jpeg),
    ]
    if any(all(bb) for bb in exclusive):
        click.echo("Incompatible export options", err=True)
@@ -1491,13 +1509,22 @@ def export(

    if dry_run:
        export_db = ExportDBInMemory(export_db_path)
-        # echo = functools.partial(click.echo, err=True)
-        # fileutil = FileUtilNoOp(verbose=echo)
        fileutil = FileUtilNoOp
    else:
        export_db = ExportDB(export_db_path)
        fileutil = FileUtil

+    if verbose_:
+        if export_db.was_created:
+            verbose(f"Created export database {export_db_path}")
+        else:
+            verbose(f"Using export database {export_db_path}")
+        upgraded = export_db.was_upgraded
+        if upgraded:
+            verbose(
+                f"Upgraded export database {export_db_path} from version {upgraded[0]} to {upgraded[1]}"
+            )
+
    photos = _query(
        db=db,
        keyword=keyword,
@@ -1610,6 +1637,8 @@ def export(
                    touch_file=touch_file,
                    edited_suffix=edited_suffix,
                    use_photos_export=use_photos_export,
+                    convert_to_jpeg=convert_to_jpeg,
+                    jpeg_quality=jpeg_quality,
                )
                results_exported.extend(results.exported)
                results_new.extend(results.new)
@@ -1618,6 +1647,12 @@ def export(
                results_exif_updated.extend(results.exif_updated)
                results_touched.extend(results.touched)

+                # if convert_to_jpeg and p.isphoto and p.uti != "public.jpeg":
+                #     for photo_file in set(
+                #         results.exported + results.updated + results.exif_updated
+                #     ):
+                #         verbose(f"Converting {photo_file} to jpeg")
+
        else:
            # show progress bar
            with click.progressbar(photos) as bar:
@@ -1651,6 +1686,8 @@ def export(
                        touch_file=touch_file,
                        edited_suffix=edited_suffix,
                        use_photos_export=use_photos_export,
+                        convert_to_jpeg=convert_to_jpeg,
+                        jpeg_quality=jpeg_quality,
                    )
                    results_exported.extend(results.exported)
                    results_new.extend(results.new)
@@ -1658,6 +1695,7 @@ def export(
                    results_skipped.extend(results.skipped)
                    results_exif_updated.extend(results.exif_updated)
                    results_touched.extend(results.touched)
+
        stop_time = time.perf_counter()
        # print summary results
        if update:
@@ -2020,7 +2058,7 @@ def _query(
        photos = [p for p in photos if not p.shared]

    if uti:
-        photos = [p for p in photos if uti in p.uti]
+        photos = [p for p in photos if uti in p.uti_original]

    if burst:
        photos = [p for p in photos if p.burst]
@@ -2140,6 +2178,8 @@ def export_photo(
    touch_file=None,
    edited_suffix="_edited",
    use_photos_export=False,
+    convert_to_jpeg=False,
+    jpeg_quality=1.0,
 ):
    """ Helper function for export that does the actual export

@@ -2159,7 +2199,7 @@ def export_photo(
        directory: template used to determine output directory
        filename_template: template use to determine output file
        no_extended_attributes: boolean; if True, exports photo without preserving extended attributes
-        export_raw: boolean; if True exports RAW image associate with the photo
+        export_raw: boolean; if True exports raw image associate with the photo
        export_edited: boolean; if True exports edited version of photo if there is one
        skip_original_if_edited: boolean; if True does not export original if photo has been edited
        album_keyword: boolean; if True, exports album names as keywords in metadata
@@ -2171,6 +2211,8 @@ def export_photo(
        dry_run: boolean; if True, doesn't actually export or update any files
        touch_file: boolean; sets file's modification time to match photo date
        use_photos_export: boolean; if True forces the use of AppleScript to export even if photo not missing
+        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.

    Returns:
        list of path(s) of exported photo or None if photo was missing
@@ -2179,7 +2221,7 @@ def export_photo(
        ValueError on invalid filename_template
    """
    global VERBOSE
-    VERBOSE = True if verbose_ else False
+    VERBOSE = bool(verbose_)

    if not download_missing:
        if photo.ismissing:
@@ -2257,6 +2299,8 @@ def export_photo(
                    fileutil=fileutil,
                    dry_run=dry_run,
                    touch_file=touch_file,
+                    convert_to_jpeg=convert_to_jpeg,
+                    jpeg_quality=jpeg_quality,
                )

                results_exported.extend(export_results.exported)
@@ -2316,6 +2360,8 @@ def export_photo(
                        fileutil=fileutil,
                        dry_run=dry_run,
                        touch_file=touch_file,
+                        convert_to_jpeg=convert_to_jpeg,
+                        jpeg_quality=jpeg_quality,
                    )

                    results_exported.extend(export_results_edited.exported)
--- a/osxphotos/_version.py
+++ b/osxphotos/_version.py
@@ -1,3 +1,4 @@
 """ version info """

-__version__ = "0.34.3"
+__version__ = "0.35.2"
+
--- a/osxphotos/_export_db.py
+++ b/osxphotos/_export_db.py
@@ -14,7 +14,7 @@ from sqlite3 import Error

 from ._version import __version__

-OSXPHOTOS_EXPORTDB_VERSION = "1.0"
+OSXPHOTOS_EXPORTDB_VERSION = "2.0"


 class ExportDB_ABC(ABC):
@@ -36,6 +36,22 @@ class ExportDB_ABC(ABC):
    def get_stat_orig_for_file(self, filename):
        pass

+    @abstractmethod
+    def set_stat_edited_for_file(self, filename, stats):
+        pass
+
+    @abstractmethod
+    def get_stat_edited_for_file(self, filename):
+        pass
+
+    @abstractmethod
+    def set_stat_converted_for_file(self, filename, stats):
+        pass
+
+    @abstractmethod
+    def get_stat_converted_for_file(self, filename):
+        pass
+
    @abstractmethod
    def set_stat_exif_for_file(self, filename, stats):
        pass
@@ -61,13 +77,28 @@ class ExportDB_ABC(ABC):
        pass

    @abstractmethod
-    def set_data(self, filename, uuid, orig_stat, exif_stat, info_json, exif_json):
+    def set_data(
+        self,
+        filename,
+        uuid,
+        orig_stat,
+        exif_stat,
+        converted_stat,
+        edited_stat,
+        info_json,
+        exif_json,
+    ):
        pass


 class ExportDBNoOp(ExportDB_ABC):
    """ An ExportDB with NoOp methods """

+    def __init__(self):
+        self.was_created = True
+        self.was_upgraded = False
+        self.version = OSXPHOTOS_EXPORTDB_VERSION
+
    def get_uuid_for_file(self, filename):
        pass

@@ -80,6 +111,18 @@ class ExportDBNoOp(ExportDB_ABC):
    def get_stat_orig_for_file(self, filename):
        pass

+    def set_stat_edited_for_file(self, filename, stats):
+        pass
+
+    def get_stat_edited_for_file(self, filename):
+        pass
+
+    def set_stat_converted_for_file(self, filename, stats):
+        pass
+
+    def get_stat_converted_for_file(self, filename):
+        pass
+
    def set_stat_exif_for_file(self, filename, stats):
        pass

@@ -98,7 +141,17 @@ class ExportDBNoOp(ExportDB_ABC):
    def set_exifdata_for_file(self, uuid, exifdata):
        pass

-    def set_data(self, filename, uuid, orig_stat, exif_stat, info_json, exif_json):
+    def set_data(
+        self,
+        filename,
+        uuid,
+        orig_stat,
+        exif_stat,
+        converted_stat,
+        edited_stat,
+        info_json,
+        exif_json,
+    ):
        pass


@@ -122,7 +175,6 @@ class ExportDB(ExportDB_ABC):
            returns None if filename not found in database
        """
        filename = str(pathlib.Path(filename).relative_to(self._path)).lower()
-        logging.debug(f"get_uuid: {filename}")
        conn = self._conn
        try:
            c = conn.cursor()
@@ -135,14 +187,12 @@ class ExportDB(ExportDB_ABC):
            logging.warning(e)
            uuid = None

-        logging.debug(f"get_uuid: {uuid}")
        return uuid

    def set_uuid_for_file(self, filename, uuid):
        """ set UUID of filename to uuid in the database """
        filename = str(pathlib.Path(filename).relative_to(self._path))
        filename_normalized = filename.lower()
-        logging.debug(f"set_uuid: {filename} {uuid}")
        conn = self._conn
        try:
            c = conn.cursor()
@@ -162,7 +212,6 @@ class ExportDB(ExportDB_ABC):
        if len(stats) != 3:
            raise ValueError(f"expected 3 elements for stat, got {len(stats)}")

-        logging.debug(f"set_stat_orig_for_file: {filename} {stats}")
        conn = self._conn
        try:
            c = conn.cursor()
@@ -199,9 +248,20 @@ class ExportDB(ExportDB_ABC):
            logging.warning(e)
            stats = (None, None, None)

-        logging.debug(f"get_stat_orig_for_file: {stats}")
        return stats

+    def set_stat_edited_for_file(self, filename, stats):
+        """ set stat info for edited version of image (in Photos' library)
+            filename: filename to set the stat info for
+            stat: a tuple of length 3: mode, size, mtime """
+        return self._set_stat_for_file("edited", filename, stats)
+
+    def get_stat_edited_for_file(self, filename):
+        """ get stat info for edited version of image (in Photos' library)
+            filename: filename to set the stat info for
+            stat: a tuple of length 3: mode, size, mtime """
+        return self._get_stat_for_file("edited", filename)
+
    def set_stat_exif_for_file(self, filename, stats):
        """ set stat info for filename (after exiftool has updated it)
            filename: filename to set the stat info for
@@ -210,7 +270,6 @@ class ExportDB(ExportDB_ABC):
        if len(stats) != 3:
            raise ValueError(f"expected 3 elements for stat, got {len(stats)}")

-        logging.debug(f"set_stat_exif_for_file: {filename} {stats}")
        conn = self._conn
        try:
            c = conn.cursor()
@@ -247,9 +306,20 @@ class ExportDB(ExportDB_ABC):
            logging.warning(e)
            stats = (None, None, None)

-        logging.debug(f"get_stat_exif_for_file: {stats}")
        return stats

+    def set_stat_converted_for_file(self, filename, stats):
+        """ set stat info for filename (after image converted to jpeg)
+            filename: filename to set the stat info for
+            stat: a tuple of length 3: mode, size, mtime """
+        return self._set_stat_for_file("converted", filename, stats)
+
+    def get_stat_converted_for_file(self, filename):
+        """ get stat info for filename (after jpeg conversion)
+            returns: tuple of (mode, size, mtime) 
+        """
+        return self._get_stat_for_file("converted", filename)
+
    def get_info_for_uuid(self, uuid):
        """ returns the info JSON struct for a UUID """
        conn = self._conn
@@ -262,7 +332,6 @@ class ExportDB(ExportDB_ABC):
            logging.warning(e)
            info = None

-        logging.debug(f"get_info: {uuid}, {info}")
        return info

    def set_info_for_uuid(self, uuid, info):
@@ -278,8 +347,6 @@ class ExportDB(ExportDB_ABC):
        except Error as e:
            logging.warning(e)

-        logging.debug(f"set_info: {uuid}, {info}")
-
    def get_exifdata_for_file(self, filename):
        """ returns the exifdata JSON struct for a file """
        filename = str(pathlib.Path(filename).relative_to(self._path)).lower()
@@ -296,7 +363,6 @@ class ExportDB(ExportDB_ABC):
            logging.warning(e)
            exifdata = None

-        logging.debug(f"get_exifdata: {filename}, {exifdata}")
        return exifdata

    def set_exifdata_for_file(self, filename, exifdata):
@@ -313,9 +379,17 @@ class ExportDB(ExportDB_ABC):
        except Error as e:
            logging.warning(e)

-        logging.debug(f"set_exifdata: {filename}, {exifdata}")
-
-    def set_data(self, filename, uuid, orig_stat, exif_stat, info_json, exif_json):
+    def set_data(
+        self,
+        filename,
+        uuid,
+        orig_stat,
+        exif_stat,
+        converted_stat,
+        edited_stat,
+        info_json,
+        exif_json,
+    ):
        """ sets all the data for file and uuid at once 
        """
        filename = str(pathlib.Path(filename).relative_to(self._path))
@@ -339,6 +413,14 @@ class ExportDB(ExportDB_ABC):
                + "WHERE filepath_normalized = ?;",
                (*exif_stat, filename_normalized),
            )
+            c.execute(
+                "INSERT OR REPLACE INTO converted(filepath_normalized, mode, size, mtime) VALUES (?, ?, ?, ?);",
+                (filename_normalized, *converted_stat),
+            )
+            c.execute(
+                "INSERT OR REPLACE INTO edited(filepath_normalized, mode, size, mtime) VALUES (?, ?, ?, ?);",
+                (filename_normalized, *edited_stat),
+            )
            c.execute(
                "INSERT OR REPLACE INTO info(uuid, json_info) VALUES (?, ?);",
                (uuid, info_json),
@@ -358,6 +440,37 @@ class ExportDB(ExportDB_ABC):
        except Error as e:
            logging.warning(e)

+    def _set_stat_for_file(self, table, filename, stats):
+        filename = str(pathlib.Path(filename).relative_to(self._path)).lower()
+        if len(stats) != 3:
+            raise ValueError(f"expected 3 elements for stat, got {len(stats)}")
+
+        conn = self._conn
+        c = conn.cursor()
+        c.execute(
+            f"INSERT OR REPLACE INTO {table}(filepath_normalized, mode, size, mtime) VALUES (?, ?, ?, ?);",
+            (filename, *stats),
+        )
+        conn.commit()
+
+    def _get_stat_for_file(self, table, filename):
+        filename = str(pathlib.Path(filename).relative_to(self._path)).lower()
+        conn = self._conn
+        c = conn.cursor()
+        c.execute(
+            f"SELECT mode, size, mtime FROM {table} WHERE filepath_normalized = ?",
+            (filename,),
+        )
+        results = c.fetchone()
+        if results:
+            stats = results[0:3]
+            mtime = int(stats[2]) if stats[2] is not None else None
+            stats = (stats[0], stats[1], mtime)
+        else:
+            stats = (None, None, None)
+
+        return stats
+
    def _open_export_db(self, dbfile):
        """ open export database and return a db connection
            if dbfile does not exist, will create and initialize the database 
@@ -365,15 +478,24 @@ class ExportDB(ExportDB_ABC):
        """

        if not os.path.isfile(dbfile):
-            logging.debug(f"dbfile {dbfile} doesn't exist, creating it")
            conn = self._get_db_connection(dbfile)
            if conn:
                self._create_db_tables(conn)
+                self.was_created = True
+                self.was_upgraded = ()
+                self.version = OSXPHOTOS_EXPORTDB_VERSION
            else:
                raise Exception("Error getting connection to database {dbfile}")
        else:
-            logging.debug(f"dbfile {dbfile} exists, opening it")
            conn = self._get_db_connection(dbfile)
+            self.was_created = False
+            version_info = self._get_database_version(conn)
+            if version_info[1] < OSXPHOTOS_EXPORTDB_VERSION:
+                self._create_db_tables(conn)
+                self.was_upgraded = (version_info[1], OSXPHOTOS_EXPORTDB_VERSION)
+            else:
+                self.was_upgraded = ()
+            self.version = OSXPHOTOS_EXPORTDB_VERSION

        return conn

@@ -387,6 +509,13 @@ class ExportDB(ExportDB_ABC):

        return conn

+    def _get_database_version(self, conn):
+        """ return tuple of (osxphotos, exportdb) versions for database connection conn """
+        version_info = conn.execute(
+            "SELECT osxphotos, exportdb, max(id) FROM version"
+        ).fetchone()
+        return (version_info[0], version_info[1])
+
    def _create_db_tables(self, conn):
        """ create (if not already created) the necessary db tables for the export database
            conn: sqlite3 db connection 
@@ -427,9 +556,25 @@ class ExportDB(ExportDB_ABC):
                             filepath_normalized TEXT NOT NULL,
                             json_exifdata JSON 
                             ); """,
-            "sql_files_idx": """ CREATE UNIQUE INDEX idx_files_filepath_normalized on files (filepath_normalized); """,
-            "sql_info_idx": """ CREATE UNIQUE INDEX idx_info_uuid on info (uuid); """,
-            "sql_exifdata_idx": """ CREATE UNIQUE INDEX idx_exifdata_filename on exifdata (filepath_normalized); """,
+            "sql_edited_table": """ CREATE TABLE IF NOT EXISTS edited (
+                              id INTEGER PRIMARY KEY,
+                              filepath_normalized TEXT NOT NULL,
+                              mode INTEGER,
+                              size INTEGER,
+                              mtime REAL
+                              ); """,
+            "sql_converted_table": """ CREATE TABLE IF NOT EXISTS converted (
+                              id INTEGER PRIMARY KEY,
+                              filepath_normalized TEXT NOT NULL,
+                              mode INTEGER,
+                              size INTEGER,
+                              mtime REAL
+                              ); """,
+            "sql_files_idx": """ CREATE UNIQUE INDEX IF NOT EXISTS idx_files_filepath_normalized on files (filepath_normalized); """,
+            "sql_info_idx": """ CREATE UNIQUE INDEX IF NOT EXISTS idx_info_uuid on info (uuid); """,
+            "sql_exifdata_idx": """ CREATE UNIQUE INDEX IF NOT EXISTS idx_exifdata_filename on exifdata (filepath_normalized); """,
+            "sql_edited_idx": """ CREATE UNIQUE INDEX IF NOT EXISTS idx_edited_filename on edited (filepath_normalized);""",
+            "sql_converted_idx": """ CREATE UNIQUE INDEX IF NOT EXISTS idx_converted_filename on converted (filepath_normalized);""",
        }
        try:
            c = conn.cursor()
@@ -445,11 +590,10 @@ class ExportDB(ExportDB_ABC):

    def __del__(self):
        """ ensure the database connection is closed """
-        if self._conn:
-            try:
-                self._conn.close()
-            except Error as e:
-                logging.warning(e)
+        try:
+            self._conn.close()
+        except:
+            pass

    def _insert_run_info(self):
        dt = datetime.datetime.utcnow().isoformat()
@@ -488,18 +632,18 @@ class ExportDBInMemory(ExportDB):

    def _open_export_db(self, dbfile):
        """ open export database and return a db connection
-            if dbfile does not exist, will create and initialize the database 
            returns: connection to the database 
        """
        if not os.path.isfile(dbfile):
-            logging.debug(f"dbfile {dbfile} doesn't exist, creating in memory version")
            conn = self._get_db_connection()
            if conn:
                self._create_db_tables(conn)
+                self.was_created = True
+                self.was_upgraded = ()
+                self.version = OSXPHOTOS_EXPORTDB_VERSION
            else:
                raise Exception("Error getting connection to in-memory database")
        else:
-            logging.debug(f"dbfile {dbfile} exists, opening it and copying to memory")
            try:
                conn = sqlite3.connect(dbfile)
            except Error as e:
@@ -516,6 +660,14 @@ class ExportDBInMemory(ExportDB):
            conn = sqlite3.connect(":memory:")
            conn.cursor().executescript(tempfile.read())
            conn.commit()
+            self.was_created = False
+            _, exportdb_ver = self._get_database_version(conn)
+            if exportdb_ver < OSXPHOTOS_EXPORTDB_VERSION:
+                self._create_db_tables(conn)
+                self.was_upgraded = (exportdb_ver, OSXPHOTOS_EXPORTDB_VERSION)
+            else:
+                self.was_upgraded = ()
+            self.version = OSXPHOTOS_EXPORTDB_VERSION

        return conn

--- a/osxphotos/fileutil.py
+++ b/osxphotos/fileutil.py
@@ -8,6 +8,7 @@ import subprocess
 import sys
 from abc import ABC, abstractmethod

+from .imageconverter import ImageConverter

 class FileUtilABC(ABC):
    """ Abstract base class for FileUtil """
@@ -47,6 +48,11 @@ class FileUtilABC(ABC):
    def file_sig(cls, file1):
        pass

+    @classmethod
+    @abstractmethod
+    def convert_to_jpeg(cls, src_file, dest_file, compression_quality=1.0):
+        pass
+

 class FileUtilMacOS(FileUtilABC):
    """ Various file utilities """
@@ -163,6 +169,21 @@ class FileUtilMacOS(FileUtilABC):
    def file_sig(cls, f1):
        """ return os.stat signature for file f1 """
        return cls._sig(os.stat(f1))
+    
+    @classmethod
+    def convert_to_jpeg(cls, src_file, dest_file, compression_quality=1.0):
+        """ converts image file src_file to jpeg format as dest_file
+
+            Args:
+                src_file: image file to convert
+                dest_file: destination path to write converted file to
+                compression quality: JPEG compression quality in range 0.0 <= compression_quality <= 1.0; default 1.0 (best quality)
+                
+            Returns:
+                True if success, otherwise False 
+        """
+        converter = ImageConverter()
+        return converter.write_jpeg(src_file, dest_file, compression_quality=compression_quality)

    @staticmethod
    def _sig(st):
@@ -173,7 +194,6 @@ class FileUtilMacOS(FileUtilABC):
        # use int(st.st_mtime) because ditto does not copy fractional portion of mtime
        return (stat.S_IFMT(st.st_mode), st.st_size, int(st.st_mtime))

-
 class FileUtil(FileUtilMacOS):
    """ Various file utilities """

@@ -221,3 +241,7 @@ class FileUtilNoOp(FileUtil):
    def file_sig(cls, file1):
        cls.verbose(f"file_sig: {file1}")
        return (42, 42, 42)
+
+    @classmethod
+    def convert_to_jpeg(cls, src_file, dest_file, compression_quality=1.0):
+        cls.verbose(f"convert_to_jpeg: {src_file}, {dest_file}, {compression_quality}")
--- a/osxphotos/imageconverter.py
+++ b/osxphotos/imageconverter.py
@@ -0,0 +1,112 @@
+""" ImageConverter class
+    Convert an image to JPEG using CoreImage -- 
+    for example, RAW to JPEG.  Only works if Mac equipped with GPU. """
+
+# reference: https://stackoverflow.com/questions/59330149/coreimage-ciimage-write-jpg-is-shifting-colors-macos/59334308#59334308
+
+import logging
+import pathlib
+
+import Metal
+import Quartz
+from Cocoa import NSURL
+from Foundation import NSDictionary
+
+# needed to capture system-level stderr
+from wurlitzer import pipes
+
+
+class ImageConverter:
+    """ Convert images to jpeg.  This class is a singleton
+        which will re-use the Core Image CIContext to avoid
+        creating a new context for every conversion. """
+
+    def __new__(cls, *args, **kwargs):
+        """ create new object or return instance of already created singleton """
+        if not hasattr(cls, "instance") or not cls.instance:
+            cls.instance = super().__new__(cls)
+
+        return cls.instance
+
+    def __init__(self):
+        """ return existing singleton or create a new one """
+
+        if hasattr(self, "context"):
+            return
+
+        """ initialize CIContext """
+        context_options = NSDictionary.dictionaryWithDictionary_(
+            {
+                "workingColorSpace": Quartz.CoreGraphics.kCGColorSpaceExtendedSRGB,
+                "workingFormat": Quartz.kCIFormatRGBAh,
+            }
+        )
+        mtldevice = Metal.MTLCreateSystemDefaultDevice()
+        self.context = Quartz.CIContext.contextWithMTLDevice_options_(
+            mtldevice, context_options
+        )
+
+    def write_jpeg(self, input_path, output_path, compression_quality=1.0):
+        """ convert image to jpeg and write image to output_path
+
+        Args:
+            input_path: path to input image (e.g. '/path/to/import/file.CR2') as str or pathlib.Path
+            output_path: path to exported jpeg (e.g. '/path/to/export/file.jpeg') as str or pathlib.Path
+            compression_quality: JPEG compression quality, float in range 0.0 to 1.0; default is 1.0 (best quality)
+
+        Return:
+            True if conversion successful, else False
+
+        Raises:
+            ValueError if compression quality not in range 0.0 to 1.0
+            FileNotFoundError if input_path doesn't exist
+        """
+
+        # accept input_path or output_path as pathlib.Path
+        if not isinstance(input_path, str):
+            input_path = str(input_path)
+
+        if not isinstance(output_path, str):
+            output_path = str(output_path)
+
+        if not pathlib.Path(input_path).is_file():
+            raise FileNotFoundError(f"could not find {input_path}")
+
+        if not (0.0 <= compression_quality <= 1.0):
+            raise ValueError(
+                "illegal value for compression_quality: {compression_quality}"
+            )
+
+        input_url = NSURL.fileURLWithPath_(input_path)
+        output_url = NSURL.fileURLWithPath_(output_path)
+
+        with pipes() as (out, err):
+            # capture stdout and stderr from system calls
+            # otherwise, Quartz.CIImage.imageWithContentsOfURL_
+            # prints to stderr something like:
+            # 2020-09-20 20:55:25.538 python[73042:5650492] Creating client/daemon connection: B8FE995E-3F27-47F4-9FA8-559C615FD774
+            # 2020-09-20 20:55:25.652 python[73042:5650492] Got the query meta data reply for: com.apple.MobileAsset.RawCamera.Camera, response: 0
+            input_image = Quartz.CIImage.imageWithContentsOfURL_(input_url)
+
+        if input_image is None:
+            logging.debug(f"Could not create CIImage for {input_path}")
+            return False
+
+        output_colorspace = input_image.colorSpace() or Quartz.CGColorSpaceCreateWithName(
+            Quartz.CoreGraphics.kCGColorSpaceSRGB
+        )
+
+        output_options = NSDictionary.dictionaryWithDictionary_(
+            {"kCGImageDestinationLossyCompressionQuality": compression_quality}
+        )
+        _, error = self.context.writeJPEGRepresentationOfImage_toURL_colorSpace_options_error_(
+            input_image, output_url, output_colorspace, output_options, None
+        )
+        if not error:
+            return True
+        else:
+            logging.debug(
+                "Error converting file {input_path} to jpeg at {output_path}: {error}"
+            )
+            return False
+
--- a/osxphotos/photoinfo/_photoinfo_export.py
+++ b/osxphotos/photoinfo/_photoinfo_export.py
@@ -30,7 +30,7 @@ from .._constants import (
    _UNKNOWN_PERSON,
    _XMP_TEMPLATE_NAME,
 )
-from .._export_db import ExportDBNoOp
+from ..export_db import ExportDBNoOp
 from ..exiftool import ExifTool
 from ..fileutil import FileUtil
 from ..utils import dd_to_dms_str, findfiles
@@ -306,6 +306,8 @@ def export2(
    fileutil=FileUtil,
    dry_run=False,
    touch_file=False,
+    convert_to_jpeg=False,
+    jpeg_quality=1.0,
 ):
    """ export photo, like export but with update and dry_run options
        dest: must be valid destination path or exception raised 
@@ -313,10 +315,8 @@ def export2(
                    **NOTE**: if provided, user must ensure file extension (suffix) is correct. 
                    For example, if photo is .CR2 file, edited image may be .jpeg.  
                    If you provide an extension different than what the actual file is, 
-                    export will print a warning but will export the photo using the 
-                    incorrect file extension (unless use_photos_export is true, in which case export will
-                    use the extension provided by Photos upon export; in this case, an incorrect extension is
-                    silently ignored).
+                    will export the photo using the incorrect file extension (unless use_photos_export is true, 
+                    in which case export will use the extension provided by Photos upon export.
                    e.g. to get the extension of the edited photo, 
                    reference PhotoInfo.path_edited
        edited: (boolean, default=False); if True will export the edited version of the photo 
@@ -335,7 +335,6 @@ def export2(
        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
        no_xattr: (boolean, default = False); if True, exports file without preserving extended attributes
-        returns list of full paths to the exported files
        use_albums_as_keywords: (boolean, default = False); if True, will include album names in keywords
        when exporting metadata with exiftool or sidecar
        use_persons_as_keywords: (boolean, default = False); if True, will include person names in keywords
@@ -349,6 +348,8 @@ def export2(
        fileutil: (FileUtilABC); class that conforms to FileUtilABC with various file utilities
        dry_run: (boolean, default=False); set to True to run in "dry run" mode
        touch_file: (boolean, default=False); if True, sets file's modification time upon photo date
+        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.

        Returns: ExportResults namedtuple with fields: exported, new, updated, skipped 
                    where each field is a list of file paths
@@ -357,6 +358,10 @@ def export2(
              and no-op fileutil (e.g. ExportDBInMemory and FileUtilNoOp)
            """

+    # NOTE: This function is very complex and does a lot of things.
+    # Don't modify this code if you don't fully understand everything it does.
+    # TODO: This is a good candidate for refactoring.
+
    # when called from export(), won't get an export_db, so use no-op version
    if export_db is None:
        export_db = ExportDBNoOp()
@@ -392,34 +397,41 @@ def export2(
        raise TypeError(
            "Too many positional arguments.  Should be at most two: destination, filename."
        )
-    else:
-        # verify destination is a valid path
-        if dest is None:
-            raise ValueError("Destination must not be None")
-        elif not dry_run and not os.path.isdir(dest):
-            raise FileNotFoundError("Invalid path passed to export")

-        if filename and len(filename) == 1:
-            # if filename passed, use it
-            fname = filename[0]
-        else:
-            # no filename provided so use the default
-            # if edited file requested, use filename but add _edited
-            # need to use file extension from edited file as Photos saves a jpeg once edited
-            if edited and not use_photos_export:
-                # verify we have a valid path_edited and use that to get filename
-                if not self.path_edited:
-                    raise FileNotFoundError(
-                        "edited=True but path_edited is none; hasadjustments: "
-                        f" {self.hasadjustments}"
-                    )
-                edited_name = pathlib.Path(self.path_edited).name
-                edited_suffix = pathlib.Path(edited_name).suffix
-                fname = (
-                    pathlib.Path(self.filename).stem + edited_identifier + edited_suffix
+    # verify destination is a valid path
+    if dest is None:
+        raise ValueError("Destination must not be None")
+    elif not dry_run and not os.path.isdir(dest):
+        raise FileNotFoundError("Invalid path passed to export")
+
+    if filename and len(filename) == 1:
+        # if filename passed, use it
+        fname = filename[0]
+    else:
+        # no filename provided so use the default
+        # if edited file requested, use filename but add _edited
+        # need to use file extension from edited file as Photos saves a jpeg once edited
+        if edited and not use_photos_export:
+            # verify we have a valid path_edited and use that to get filename
+            if not self.path_edited:
+                raise FileNotFoundError(
+                    "edited=True but path_edited is none; hasadjustments: "
+                    f" {self.hasadjustments}"
                )
-            else:
-                fname = self.filename
+            edited_name = pathlib.Path(self.path_edited).name
+            edited_suffix = pathlib.Path(edited_name).suffix
+            fname = pathlib.Path(self.filename).stem + edited_identifier + edited_suffix
+        else:
+            fname = self.filename
+
+    uti = self.uti if edited else self.uti_original
+    if convert_to_jpeg and self.isphoto and uti != "public.jpeg":
+        # not a jpeg but will convert to jpeg upon export so fix file extension
+        fname_new = pathlib.Path(fname)
+        fname = str(fname_new.parent / f"{fname_new.stem}.jpeg")
+    else:
+        # nothing to convert
+        convert_to_jpeg = False

    # check destination path
    dest = pathlib.Path(dest)
@@ -473,16 +485,12 @@ def export2(
            raise FileNotFoundError(f"{src} does not appear to exist")

        if not _check_export_suffix(src, dest, edited):
-            logging.warning(
+            logging.debug(
                f"Invalid destination suffix: {dest.suffix} for {self.path}, "
                + f"edited={edited}, path_edited={self.path_edited}, "
                + f"original_filename={self.original_filename}, filename={self.filename}"
            )

-        logging.debug(
-            f"exporting {src} to {dest}, overwrite={overwrite}, increment={increment}, dest exists: {dest.exists()}"
-        )
-
        # found source now try to find right destination
        if update and dest.exists():
            # destination exists, check to see if destination is the right UUID
@@ -498,14 +506,13 @@ def export2(
                    self.uuid,
                    fileutil.file_sig(dest),
                    (None, None, None),
+                    (None, None, None),
+                    (None, None, None),
                    self.json(),
                    None,
                )
            if dest_uuid != self.uuid:
                # not the right file, find the right one
-                logging.debug(
-                    f"Need to find right photo: uuid={self.uuid}, dest={dest_uuid}, dest={dest}, path={self.path}"
-                )
                count = 1
                glob_str = str(dest.parent / f"{dest.stem} (*{dest.suffix}")
                dest_files = glob.glob(glob_str)
@@ -513,17 +520,11 @@ def export2(
                for file_ in dest_files:
                    dest_uuid = export_db.get_uuid_for_file(file_)
                    if dest_uuid == self.uuid:
-                        logging.debug(
-                            f"Found matching file for uuid: {dest_uuid}, {file_}"
-                        )
                        dest = pathlib.Path(file_)
                        found_match = True
                        break
                    elif dest_uuid is None and fileutil.cmp(src, file_):
                        # files match, update the UUID
-                        logging.debug(
-                            f"Found matching file with blank uuid: {self.uuid}, {file_}"
-                        )
                        dest = pathlib.Path(file_)
                        found_match = True
                        export_db.set_data(
@@ -531,16 +532,14 @@ def export2(
                            self.uuid,
                            fileutil.file_sig(dest),
                            (None, None, None),
+                            (None, None, None),
+                            (None, None, None),
                            self.json(),
                            None,
                        )
                        break

                if not found_match:
-                    logging.debug(
-                        f"Didn't find destination match for uuid {self.uuid} {dest}"
-                    )
-
                    # increment the destination file
                    count = 1
                    glob_str = str(dest.parent / f"{dest.stem}*")
@@ -551,7 +550,6 @@ def export2(
                        dest_new = f"{dest.stem} ({count})"
                        count += 1
                    dest = dest.parent / f"{dest_new}{dest.suffix}"
-                    logging.debug(f"New destination = {dest}, uuid = {self.uuid}")

        # export the dest file
        results = self._export_photo(
@@ -564,7 +562,10 @@ def export2(
            export_as_hardlink,
            exiftool,
            touch_file,
-            fileutil,
+            convert_to_jpeg,
+            fileutil=fileutil,
+            edited=edited,
+            jpeg_quality=jpeg_quality,
        )
        exported_files = results.exported
        update_new_files = results.new
@@ -591,7 +592,9 @@ def export2(
                    export_as_hardlink,
                    exiftool,
                    touch_file,
-                    fileutil,
+                    convert_to_jpeg,
+                    fileutil=fileutil,
+                    jpeg_quality=jpeg_quality,
                )
                exported_files.extend(results.exported)
                update_new_files.extend(results.new)
@@ -618,7 +621,9 @@ def export2(
                    export_as_hardlink,
                    exiftool,
                    touch_file,
-                    fileutil,
+                    convert_to_jpeg,
+                    fileutil=fileutil,
+                    jpeg_quality=jpeg_quality,
                )
                exported_files.extend(results.exported)
                update_new_files.extend(results.new)
@@ -683,6 +688,7 @@ def export2(
                f"Error exporting photo {self.uuid} to {dest} with use_photos_export"
            )

+    # export metadata
    if sidecar_json:
        logging.debug("writing exiftool_json_sidecar")
        sidecar_filename = dest.parent / pathlib.Path(f"{dest.stem}{dest.suffix}.json")
@@ -744,7 +750,6 @@ def export2(
            if old_data is None or files_are_different:
                # didn't have old data, assume we need to write it
                # or files were different
-                logging.debug(f"No exifdata for {exported_file}, writing it")
                if not dry_run:
                    self._write_exif_data(
                        exported_file,
@@ -768,7 +773,6 @@ def export2(
                exif_files_updated.append(exported_file)
    elif exiftool and exif_files:
        for exported_file in exif_files:
-            logging.debug(f"Writing exif data to {exported_file}")
            if not dry_run:
                self._write_exif_data(
                    exported_file,
@@ -822,7 +826,10 @@ def _export_photo(
    export_as_hardlink,
    exiftool,
    touch_file,
+    convert_to_jpeg,
    fileutil=FileUtil,
+    edited=False,
+    jpeg_quality=1.0,
 ):
    """ Helper function for export()
        Does the actual copy or hardlink taking the appropriate 
@@ -840,12 +847,21 @@ def _export_photo(
        export_as_hardlink: bool
        exiftool: bool
        touch_file: bool
+        convert_to_jpeg: bool; if True, convert file to jpeg on export
        fileutil: FileUtil class that conforms to fileutil.FileUtilABC
+        edited: bool; set to True if exporting edited version of photo
+        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.

    Returns:
        ExportResults
+
+    Raises:
+        ValueError if export_as_hardlink and convert_to_jpeg both True
    """

+    if export_as_hardlink and convert_to_jpeg:
+        raise ValueError("export_as_hardlink and convert_to_jpeg cannot both be True")
+
    exported_files = []
    update_updated_files = []
    update_new_files = []
@@ -854,40 +870,44 @@ def _export_photo(

    dest_str = str(dest)
    dest_exists = dest.exists()
-    if export_as_hardlink:
-        op_desc = "export_as_hardlink"
-    else:
-        op_desc = "export_by_copying"
+    op_desc = "export_as_hardlink" if export_as_hardlink else "export_by_copying"

-    if not update:
-        # not update, export the file
-        logging.debug(f"Exporting file with {op_desc} {src} {dest}")
-        exported_files.append(dest_str)
-        if touch_file:
-            sig = fileutil.file_sig(src)
-            sig = (sig[0], sig[1], int(self.date.timestamp()))
-            if not fileutil.cmp_file_sig(src, sig):
-                touched_files.append(dest_str)
-    else:  # updating
-        if not dest_exists:
-            # update, destination doesn't exist (new file)
-            logging.debug(f"Update: exporting new file with {op_desc} {src} {dest}")
-            update_new_files.append(dest_str)
-            if touch_file:
-                touched_files.append(dest_str)
-        else:
+    if update:  # updating
+        cmp_touch, cmp_orig = False, False
+        if dest_exists:
            # update, destination exists, but we might not need to replace it...
            if exiftool:
                sig_exif = export_db.get_stat_exif_for_file(dest_str)
                cmp_orig = fileutil.cmp_file_sig(dest_str, sig_exif)
                sig_exif = (sig_exif[0], sig_exif[1], int(self.date.timestamp()))
                cmp_touch = fileutil.cmp_file_sig(dest_str, sig_exif)
+            elif convert_to_jpeg:
+                sig_converted = export_db.get_stat_converted_for_file(dest_str)
+                cmp_orig = fileutil.cmp_file_sig(dest_str, sig_converted)
+                sig_converted = (
+                    sig_converted[0],
+                    sig_converted[1],
+                    int(self.date.timestamp()),
+                )
+                cmp_touch = fileutil.cmp_file_sig(dest_str, sig_converted)
            else:
                cmp_orig = fileutil.cmp(src, dest)
                cmp_touch = fileutil.cmp(src, dest, mtime1=int(self.date.timestamp()))

            sig_cmp = cmp_touch if touch_file else cmp_orig

+            if edited:
+                # requested edited version of photo
+                # need to see if edited version in Photos library has changed
+                # (e.g. it's been edited again)
+                sig_edited = export_db.get_stat_edited_for_file(dest_str)
+                cmp_edited = (
+                    fileutil.cmp_file_sig(src, sig_edited)
+                    if sig_edited != (None, None, None)
+                    else False
+                )
+                sig_cmp = sig_cmp and cmp_edited
+
            if (export_as_hardlink and dest.samefile(src)) or (
                not export_as_hardlink and not dest.samefile(src) and sig_cmp
            ):
@@ -911,7 +931,24 @@ def _export_photo(
                    if touch_file:
                        touched_files.append(dest_str)

+        else:
+            # update, destination doesn't exist (new file)
+            logging.debug(f"Update: exporting new file with {op_desc} {src} {dest}")
+            update_new_files.append(dest_str)
+            if touch_file:
+                touched_files.append(dest_str)
+    else:
+        # not update, export the file
+        logging.debug(f"Exporting file with {op_desc} {src} {dest}")
+        exported_files.append(dest_str)
+        if touch_file:
+            sig = fileutil.file_sig(src)
+            sig = (sig[0], sig[1], int(self.date.timestamp()))
+            if not fileutil.cmp_file_sig(src, sig):
+                touched_files.append(dest_str)
    if not update_skipped_files:
+        converted_stat = (None, None, None)
+        edited_stat = fileutil.file_sig(src) if edited else (None, None, None)
        if dest_exists and (update or overwrite):
            # need to remove the destination first
            logging.debug(
@@ -920,6 +957,10 @@ def _export_photo(
            fileutil.unlink(dest)
        if export_as_hardlink:
            fileutil.hardlink(src, dest)
+        elif convert_to_jpeg:
+            # use convert_to_jpeg to export the file
+            fileutil.convert_to_jpeg(src, dest_str, compression_quality=jpeg_quality)
+            converted_stat = fileutil.file_sig(dest_str)
        else:
            fileutil.copy(src, dest_str, norsrc=no_xattr)

@@ -928,6 +969,8 @@ def _export_photo(
            self.uuid,
            fileutil.file_sig(dest_str),
            (None, None, None),
+            converted_stat,
+            edited_stat,
            self.json(),
            None,
        )
--- a/osxphotos/photoinfo/photoinfo.py
+++ b/osxphotos/photoinfo/photoinfo.py
@@ -20,6 +20,7 @@ from .._constants import (
    _PHOTOS_4_ALBUM_KIND,
    _PHOTOS_4_ROOT_FOLDER,
    _PHOTOS_4_VERSION,
+    _PHOTOS_5_VERSION,
    _PHOTOS_5_ALBUM_KIND,
    _PHOTOS_5_IMPORT_SESSION_ALBUM_KIND,
    _PHOTOS_5_SHARED_ALBUM_KIND,
@@ -67,11 +68,9 @@ class PhotoInfo:
    @property
    def filename(self):
        """ filename of the picture """
-        # sourcery off
-        if self.has_raw and self.raw_original:
-            # return name of the RAW file
-            # TODO: not yet implemented
-            return self._info["filename"]
+        if self._db._db_version <= _PHOTOS_4_VERSION and self.has_raw and self.raw_original:
+            # return the JPEG version as that's what Photos 5+ does
+            return self._info["raw_pair_info"]["filename"]
        else:
            return self._info["filename"]

@@ -79,7 +78,11 @@ class PhotoInfo:
    def original_filename(self):
        """ original filename of the picture 
            Photos 5 mangles filenames upon import """
-        return self._info["originalFilename"]
+        if self._db._db_version <= _PHOTOS_4_VERSION and self.has_raw and self.raw_original:
+            # return the JPEG version as that's what Photos 5+ does
+            return self._info["raw_pair_info"]["originalFilename"]
+        else:
+            return self._info["originalFilename"]

    @property
    def date(self):
@@ -107,39 +110,67 @@ class PhotoInfo:
    @property
    def path(self):
        """ absolute path on disk of the original picture """
+        try:
+            return self._path
+        except AttributeError:
+            self._path = None
+            photopath = None
+            if self._info["isMissing"] == 1:
+                return photopath  # path would be meaningless until downloaded

-        photopath = None
-        if self._info["isMissing"] == 1:
-            return photopath  # path would be meaningless until downloaded
+            if self._db._db_version <= _PHOTOS_4_VERSION:
+                if self._info["has_raw"]:
+                    # return the path to JPEG even if RAW is original
+                    vol = (
+                        self._db._dbvolumes[self._info["raw_pair_info"]["volumeId"]]
+                        if self._info["raw_pair_info"]["volumeId"] is not None
+                        else None
+                    )
+                    if vol is not None:
+                        photopath = os.path.join(
+                            "/Volumes", vol, self._info["raw_pair_info"]["imagePath"]
+                        )
+                    else:
+                        photopath = os.path.join(
+                            self._db._masters_path,
+                            self._info["raw_pair_info"]["imagePath"],
+                        )
+                else:
+                    vol = self._info["volume"]
+                    if vol is not None:
+                        photopath = os.path.join(
+                            "/Volumes", vol, self._info["imagePath"]
+                        )
+                    else:
+                        photopath = os.path.join(
+                            self._db._masters_path, self._info["imagePath"]
+                        )
+                self._path = photopath
+                return photopath

-        if self._db._db_version <= _PHOTOS_4_VERSION:
-            vol = self._info["volume"]
-            if vol is not None:
-                photopath = os.path.join("/Volumes", vol, self._info["imagePath"])
+            if self._info["shared"]:
+                # shared photo
+                photopath = os.path.join(
+                    self._db._library_path,
+                    _PHOTOS_5_SHARED_PHOTO_PATH,
+                    self._info["directory"],
+                    self._info["filename"],
+                )
+                self._path = photopath
+                return photopath
+
+            if self._info["directory"].startswith("/"):
+                photopath = os.path.join(
+                    self._info["directory"], self._info["filename"]
+                )
            else:
                photopath = os.path.join(
-                    self._db._masters_path, self._info["imagePath"]
+                    self._db._masters_path,
+                    self._info["directory"],
+                    self._info["filename"],
                )
+            self._path = photopath
            return photopath
-            # TODO: Is there a way to use applescript or PhotoKit to force the download in this
-
-        if self._info["shared"]:
-            # shared photo
-            photopath = os.path.join(
-                self._db._library_path,
-                _PHOTOS_5_SHARED_PHOTO_PATH,
-                self._info["directory"],
-                self._info["filename"],
-            )
-            return photopath
-
-        if self._info["directory"].startswith("/"):
-            photopath = os.path.join(self._info["directory"], self._info["filename"])
-        else:
-            photopath = os.path.join(
-                self._db._masters_path, self._info["directory"], self._info["filename"]
-            )
-        return photopath

    @property
    def path_edited(self):
@@ -149,109 +180,132 @@ class PhotoInfo:
        # TODO: break this code into a _path_edited_4 and _path_edited_5
        # version to simplify the big if/then; same for path_live_photo

-        photopath = None
-
-        if self._db._db_version <= _PHOTOS_4_VERSION:
-            if self._info["hasAdjustments"]:
-                edit_id = self._info["edit_resource_id"]
-                if edit_id is not None:
-                    library = self._db._library_path
-                    folder_id, file_id = _get_resource_loc(edit_id)
-                    # todo: is this always true or do we need to search file file_id under folder_id
-                    # figure out what kind it is and build filename
-                    filename = None
-                    if self._info["type"] == _PHOTO_TYPE:
-                        # it's a photo
-                        filename = f"fullsizeoutput_{file_id}.jpeg"
-                    elif self._info["type"] == _MOVIE_TYPE:
-                        # it's a movie
-                        filename = f"fullsizeoutput_{file_id}.mov"
-                    else:
-                        # don't know what it is!
-                        logging.debug(f"WARNING: unknown type {self._info['type']}")
-                        return None
-
-                    # photopath appears to usually be in "00" subfolder but
-                    # could be elsewhere--I haven't figured out this logic yet
-                    # first see if it's in 00
-                    photopath = os.path.join(
-                        library,
-                        "resources",
-                        "media",
-                        "version",
-                        folder_id,
-                        "00",
-                        filename,
-                    )
-
-                    if not os.path.isfile(photopath):
-                        rootdir = os.path.join(
-                            library, "resources", "media", "version", folder_id
-                        )
-
-                        for dirname, _, filelist in os.walk(rootdir):
-                            if filename in filelist:
-                                photopath = os.path.join(dirname, filename)
-                                break
-
-                    # check again to see if we found a valid file
-                    if not os.path.isfile(photopath):
-                        logging.debug(
-                            f"MISSING PATH: edited file for UUID {self._uuid} should be at {photopath} but does not appear to exist"
-                        )
-                        photopath = None
-                else:
-                    logging.debug(
-                        f"{self.uuid} hasAdjustments but edit_resource_id is None"
-                    )
-                    photopath = None
+        try:
+            return self._path_edited
+        except AttributeError:
+            if self._db._db_version <= _PHOTOS_4_VERSION:
+                self._path_edited = self._path_edited_4()
+                return self._path_edited
            else:
+                self._path_edited = self._path_edited_5()
+                return self._path_edited
+
+    def _path_edited_5(self):
+        """ return path_edited for Photos >= 5 """
+        # In Photos 5.0 / Catalina / MacOS 10.15:
+        # edited photos appear to always be converted to .jpeg and stored in
+        # library_name/resources/renders/X/UUID_1_201_a.jpeg
+        # where X = first letter of UUID
+        # and UUID = UUID of image
+        # this seems to be true even for photos not copied to Photos library and
+        # where original format was not jpg/jpeg
+        # if more than one edit, previous edit is stored as UUID_p.jpeg
+        #
+        # In Photos 6.0 / Big Sur, the edited image is a .heic if the photo isn't a jpeg,
+        # otherwise it's a jpeg.  It could also be a jpeg if photo library upgraded from earlier
+        # version.
+
+        if self._db._db_version < _PHOTOS_5_VERSION:
+            raise RuntimeError("Wrong database format!")
+
+        if self._info["hasAdjustments"]:
+            library = self._db._library_path
+            directory = self._uuid[0]  # first char of uuid
+            filename = None
+            if self._info["type"] == _PHOTO_TYPE:
+                # it's a photo
+                if self._db._photos_ver == 5:
+                    filename = f"{self._uuid}_1_201_a.jpeg"
+                else:
+                    # could be a heic or a jpeg
+                    if self.uti == "public.heic":
+                        filename = f"{self._uuid}_1_201_a.heic"
+                    else:
+                        filename = f"{self._uuid}_1_201_a.jpeg"
+            elif self._info["type"] == _MOVIE_TYPE:
+                # it's a movie
+                filename = f"{self._uuid}_2_0_a.mov"
+            else:
+                # don't know what it is!
+                logging.debug(f"WARNING: unknown type {self._info['type']}")
+                return None
+
+            photopath = os.path.join(
+                library, "resources", "renders", directory, filename
+            )
+
+            if not os.path.isfile(photopath):
+                logging.debug(
+                    f"edited file for UUID {self._uuid} should be at {photopath} but does not appear to exist"
+                )
                photopath = None
-
-            # if self._info["isMissing"] == 1:
-            #     photopath = None  # path would be meaningless until downloaded
        else:
-            # in Photos 5.0 / Catalina / MacOS 10.15:
-            # edited photos appear to always be converted to .jpeg and stored in
-            # library_name/resources/renders/X/UUID_1_201_a.jpeg
-            # where X = first letter of UUID
-            # and UUID = UUID of image
-            # this seems to be true even for photos not copied to Photos library and
-            # where original format was not jpg/jpeg
-            # if more than one edit, previous edit is stored as UUID_p.jpeg
+            photopath = None

-            if self._info["hasAdjustments"]:
+        # TODO: might be possible for original/master to be missing but edit to still be there
+        # if self._info["isMissing"] == 1:
+        #     photopath = None  # path would be meaningless until downloaded
+
+        # logging.debug(photopath)
+
+        return photopath
+
+    def _path_edited_4(self):
+        """ return path_edited for Photos <= 4 """
+
+        if self._db._db_version > _PHOTOS_4_VERSION:
+            raise RuntimeError("Wrong database format!")
+
+        photopath = None
+        if self._info["hasAdjustments"]:
+            edit_id = self._info["edit_resource_id"]
+            if edit_id is not None:
                library = self._db._library_path
-                directory = self._uuid[0]  # first char of uuid
+                folder_id, file_id = _get_resource_loc(edit_id)
+                # todo: is this always true or do we need to search file file_id under folder_id
+                # figure out what kind it is and build filename
                filename = None
                if self._info["type"] == _PHOTO_TYPE:
                    # it's a photo
-                    filename = f"{self._uuid}_1_201_a.jpeg"
+                    filename = f"fullsizeoutput_{file_id}.jpeg"
                elif self._info["type"] == _MOVIE_TYPE:
                    # it's a movie
-                    filename = f"{self._uuid}_2_0_a.mov"
+                    filename = f"fullsizeoutput_{file_id}.mov"
                else:
                    # don't know what it is!
                    logging.debug(f"WARNING: unknown type {self._info['type']}")
                    return None

+                # photopath appears to usually be in "00" subfolder but
+                # could be elsewhere--I haven't figured out this logic yet
+                # first see if it's in 00
                photopath = os.path.join(
-                    library, "resources", "renders", directory, filename
+                    library, "resources", "media", "version", folder_id, "00", filename,
                )

+                if not os.path.isfile(photopath):
+                    rootdir = os.path.join(
+                        library, "resources", "media", "version", folder_id
+                    )
+
+                    for dirname, _, filelist in os.walk(rootdir):
+                        if filename in filelist:
+                            photopath = os.path.join(dirname, filename)
+                            break
+
+                # check again to see if we found a valid file
                if not os.path.isfile(photopath):
                    logging.debug(
-                        f"edited file for UUID {self._uuid} should be at {photopath} but does not appear to exist"
+                        f"MISSING PATH: edited file for UUID {self._uuid} should be at {photopath} but does not appear to exist"
                    )
                    photopath = None
            else:
+                logging.debug(
+                    f"{self.uuid} hasAdjustments but edit_resource_id is None"
+                )
                photopath = None
-
-            # TODO: might be possible for original/master to be missing but edit to still be there
-            # if self._info["isMissing"] == 1:
-            #     photopath = None  # path would be meaningless until downloaded
-
-            # logging.debug(photopath)
+        else:
+            photopath = None

        return photopath

@@ -473,7 +527,37 @@ class PhotoInfo:
        """ Returns Uniform Type Identifier (UTI) for the image
            for example: public.jpeg or com.apple.quicktime-movie
        """
-        return self._info["UTI"]
+        if self._db._db_version <= _PHOTOS_4_VERSION:
+            if self.hasadjustments:
+                return self._info["UTI_edited"]
+            elif self.has_raw and self.raw_original:
+                # return UTI of the non-raw image to match Photos 5+ behavior
+                return self._info["raw_pair_info"]["UTI"]
+            else:
+                return self._info["UTI"]
+        else:
+            return self._info["UTI"]
+
+    @property
+    def uti_original(self):
+        """ Returns Uniform Type Identifier (UTI) for the original image
+            for example: public.jpeg or com.apple.quicktime-movie
+        """
+        if self._db._db_version <= _PHOTOS_4_VERSION and self._info["has_raw"]:
+            return self._info["raw_pair_info"]["UTI"]
+        else:
+            return self._info["UTI_original"]
+
+    @property
+    def uti_edited(self):
+        """ Returns Uniform Type Identifier (UTI) for the edited image 
+            if the photo has been edited, otherwise None; 
+            for example: public.jpeg 
+        """
+        if self._db._db_version >= _PHOTOS_5_VERSION:
+            return self.uti if self.hasadjustments else None
+        else:
+            return self._info["UTI_edited"]

    @property
    def uti_raw(self):
@@ -664,12 +748,17 @@ class PhotoInfo:

    @property
    def has_raw(self):
-        """ returns True if photo has an associated RAW image, otherwise False """
+        """ returns True if photo has an associated raw image (that is, it's a RAW+JPEG pair), otherwise False """
        return self._info["has_raw"]

+    @property
+    def israw(self):
+        """ returns True if photo is a raw image. For images with an associated RAW+JPEG pair, see has_raw """
+        return "raw-image" in self.uti_original
+
    @property
    def raw_original(self):
-        """ returns True if associated RAW image and the RAW image is selected in Photos
+        """ returns True if associated raw image and the raw image is selected in Photos
            via "Use RAW as Original "
            otherwise returns False """
        return self._info["raw_is_original"]
--- a/osxphotos/photosdb/photosdb.py
+++ b/osxphotos/photosdb/photosdb.py
@@ -846,7 +846,8 @@ class PhotosDB:
                    RKMaster.height,
                    RKMaster.width, 
                    RKMaster.orientation,
-                    RKMaster.fileSize
+                    RKMaster.fileSize,
+                    RKVersion.subType
                    FROM RKVersion, RKMaster
                    WHERE RKVersion.masterUuid = RKMaster.uuid"""
            )
@@ -873,7 +874,8 @@ class PhotosDB:
                    RKMaster.height,
                    RKMaster.width, 
                    RKMaster.orientation,
-                    RKMaster.originalFileSize
+                    RKMaster.originalFileSize,
+                    RKVersion.subType
                    FROM RKVersion, RKMaster 
                    WHERE RKVersion.masterUuid = RKMaster.uuid"""
            )
@@ -919,6 +921,7 @@ class PhotosDB:
        # 37    RKMaster.width,
        # 38    RKMaster.orientation,
        # 39    RKMaster.originalFileSize
+        # 40    RKVersion.subType

        for row in c:
            uuid = row[0]
@@ -989,6 +992,13 @@ class PhotosDB:

            self._dbphotos[uuid]["UTI"] = row[22]

+            # The UTI in RKMaster will always be UTI of the original
+            # Unlike Photos 5 which changes the UTI to match latest edit
+            self._dbphotos[uuid]["UTI_original"] = row[22]
+
+            # UTI edited will be read from RKModelResource
+            self._dbphotos[uuid]["UTI_edited"] = None
+
            # handle burst photos
            # if burst photo, determine whether or not it's a selected burst photo
            self._dbphotos[uuid]["burstUUID"] = row[23]
@@ -1055,11 +1065,6 @@ class PhotosDB:
            self._dbphotos[uuid]["cloudAvailable"] = None
            self._dbphotos[uuid]["incloud"] = None

-            # TODO: NOT YET USED -- PLACEHOLDER for RAW processing (currently only in _process_database5)
-            # original resource choice (e.g. RAW or jpeg)
-            self._dbphotos[uuid]["original_resource_choice"] = None
-            self._dbphotos[uuid]["raw_is_original"] = None
-
            # associated RAW image info
            self._dbphotos[uuid]["has_raw"] = True if row[25] == 7 else False
            self._dbphotos[uuid]["UTI_raw"] = None
@@ -1071,6 +1076,25 @@ class PhotosDB:
            self._dbphotos[uuid]["non_raw_master_uuid"] = row[30]
            self._dbphotos[uuid]["alt_master_uuid"] = row[31]

+            # original resource choice (e.g. RAW or jpeg)
+            # In Photos 5+, original_resource_choice set from:
+            # ZADDITIONALASSETATTRIBUTES.ZORIGINALRESOURCECHOICE
+            # = 0 if jpeg is selected as "original" in Photos (the default)
+            # = 1 if RAW is selected as "original" in Photos
+            # RKVersion.subType, RAW always appears to be 16
+            #   4 = mov
+            #   16 = RAW
+            #   32 = JPEG
+            #   64 = TIFF
+            #   2048 = PNG
+            #   32768 = HIEC
+            self._dbphotos[uuid]["original_resource_choice"] = (
+                1 if row[40] == 16 and self._dbphotos[uuid]["has_raw"] else 0
+            )
+            self._dbphotos[uuid]["raw_is_original"] = bool(
+                self._dbphotos[uuid]["original_resource_choice"]
+            )
+
            # recently deleted items
            self._dbphotos[uuid]["intrash"] = True if row[32] == 1 else False

@@ -1100,7 +1124,8 @@ class PhotosDB:
                RKMaster.modelID, 
                RKMaster.fileSize, 
                RKMaster.isTrulyRaw,
-                RKMaster.alternateMasterUuid
+                RKMaster.alternateMasterUuid,
+                RKMaster.filename
                FROM RKMaster
            """
        )
@@ -1116,6 +1141,7 @@ class PhotosDB:
        # 7     RKMaster.fileSize,
        # 8     RKMaster.isTrulyRaw,
        # 9     RKMaster.alternateMasterUuid
+        # 10    RKMaster.filename

        for row in c:
            uuid = row[0]
@@ -1130,6 +1156,7 @@ class PhotosDB:
            info["fileSize"] = row[7]
            info["isTrulyRAW"] = row[8]
            info["alternateMasterUuid"] = row[9]
+            info["filename"] = row[10]
            self._dbphotos_master[uuid] = info

        # get details needed to find path of the edited photos
@@ -1159,7 +1186,6 @@ class PhotosDB:
                    if (
                        row[1] != "UNADJUSTEDNONRAW"
                        and row[1] != "UNADJUSTED"
-                        # and row[4] == "public.jpeg"
                        and row[6] == 2
                    ):
                        if "edit_resource_id" in self._dbphotos[uuid]:
@@ -1173,6 +1199,7 @@ class PhotosDB:
                        # should we return all edits or just most recent one?
                        # For now, return most recent edit
                        self._dbphotos[uuid]["edit_resource_id"] = row[2]
+                        self._dbphotos[uuid]["UTI_edited"] = row[4]

        # get details on external edits
        c.execute(
@@ -1245,7 +1272,7 @@ class PhotosDB:
        )

        # Order of results
-        # 0  RKMaster.uuid,
+        # 0  RKVersion.uuid,
        # 1  RKMaster.cloudLibraryState,
        # 2  RKCloudResource.available,
        # 3  RKCloudResource.status
@@ -1296,11 +1323,12 @@ class PhotosDB:

            # get the place info that matches the RKPlace modelIDs for this photo
            # (place_ids), sort by area (element 3 of the place_data tuple in places)
+            # area could be None so assume 0 if it is (issue #230)
            place_names = [
                pname
                for pname in sorted(
                    [places[p] for p in places if p in place_ids],
-                    key=lambda place: place[3],
+                    key=lambda place: place[3] if place[3] is not None else 0,
                )
            ]

@@ -1317,17 +1345,28 @@ class PhotosDB:

        # add volume name to _dbphotos_master
        for info in self._dbphotos_master.values():
-            info["volume"] = (
-                self._dbvolumes[info["volumeId"]]
-                if info["volumeId"] is not None
-                else None
-            )
+            # issue 230: have seen bad volumeID values
+            try:
+                info["volume"] = (
+                    self._dbvolumes[info["volumeId"]]
+                    if info["volumeId"] is not None
+                    else None
+                )
+            except KeyError:
+                info["volume"] = None

        # add data on RAW images
        for info in self._dbphotos.values():
            if info["has_raw"]:
                raw_uuid = info["raw_master_uuid"]
                info["raw_info"] = self._dbphotos_master[raw_uuid]
+                info["UTI_raw"] = self._dbphotos_master[raw_uuid]["UTI"]
+                non_raw_uuid = info["non_raw_master_uuid"]
+                info["raw_pair_info"] = self._dbphotos_master[non_raw_uuid]
+            else:
+                info["raw_info"] = None
+                info["UTI_raw"] = None
+                info["raw_pair_info"] = None

        # done with the database connection
        conn.close()
@@ -1358,9 +1397,13 @@ class PhotosDB:
                self._dbphotos[uuid]["hasAlbums"] = 0

            if self._dbphotos[uuid]["volumeId"] is not None:
-                self._dbphotos[uuid]["volume"] = self._dbvolumes[
-                    self._dbphotos[uuid]["volumeId"]
-                ]
+                # issue 230: have seen bad volumeID values
+                try:
+                    self._dbphotos[uuid]["volume"] = self._dbvolumes[
+                        self._dbphotos[uuid]["volumeId"]
+                    ]
+                except KeyError:
+                    self._dbphotos[uuid]["volume"] = None
            else:
                self._dbphotos[uuid]["volume"] = None

@@ -2061,36 +2104,43 @@ class PhotosDB:
        # determine if a photo is missing in Photos 5

        # Get info on remote/local availability for photos in shared albums
+        # Also get UTI of original image (zdatastoresubtype = 1)
        c.execute(
            f""" SELECT 
                {asset_table}.ZUUID, 
                ZINTERNALRESOURCE.ZLOCALAVAILABILITY, 
-                ZINTERNALRESOURCE.ZREMOTEAVAILABILITY
+                ZINTERNALRESOURCE.ZREMOTEAVAILABILITY,
+                ZINTERNALRESOURCE.ZDATASTORESUBTYPE,
+                ZINTERNALRESOURCE.ZUNIFORMTYPEIDENTIFIER,
+                ZUNIFORMTYPEIDENTIFIER.ZIDENTIFIER
                FROM {asset_table}
                JOIN ZADDITIONALASSETATTRIBUTES ON ZADDITIONALASSETATTRIBUTES.ZASSET = {asset_table}.Z_PK 
                JOIN ZINTERNALRESOURCE ON ZINTERNALRESOURCE.ZASSET = ZADDITIONALASSETATTRIBUTES.ZASSET 
+                JOIN ZUNIFORMTYPEIDENTIFIER ON ZUNIFORMTYPEIDENTIFIER.Z_PK = ZINTERNALRESOURCE.ZUNIFORMTYPEIDENTIFIER 
                WHERE  ZDATASTORESUBTYPE = 1 OR ZDATASTORESUBTYPE = 3 """
        )

+        # Order of results:
+        # 0 {asset_table}.ZUUID,
+        # 1 ZINTERNALRESOURCE.ZLOCALAVAILABILITY,
+        # 2 ZINTERNALRESOURCE.ZREMOTEAVAILABILITY,
+        # 3 ZINTERNALRESOURCE.ZDATASTORESUBTYPE,
+        # 4 ZINTERNALRESOURCE.ZUNIFORMTYPEIDENTIFIER,
+        # 5 ZUNIFORMTYPEIDENTIFIER.ZIDENTIFIER
+
        for row in c:
            uuid = row[0]
            if uuid in self._dbphotos:
-                #  and self._dbphotos[uuid]["isMissing"] is None:
                self._dbphotos[uuid]["localAvailability"] = row[1]
                self._dbphotos[uuid]["remoteAvailability"] = row[2]
-
-                # old = self._dbphotos[uuid]["isMissing"]
+                if row[3] == 1:
+                    self._dbphotos[uuid]["UTI_original"] = row[5]

                if row[1] != 1:
                    self._dbphotos[uuid]["isMissing"] = 1
                else:
                    self._dbphotos[uuid]["isMissing"] = 0

-                # if old is not None and old != self._dbphotos[uuid]["isMissing"]:
-                #     logging.warning(
-                #         f"{uuid} isMissing changed: {old} {self._dbphotos[uuid]['isMissing']}"
-                #     )
-
        # get information on local/remote availability
        c.execute(
            f""" SELECT {asset_table}.ZUUID,
@@ -2107,18 +2157,11 @@ class PhotosDB:
                self._dbphotos[uuid]["localAvailability"] = row[1]
                self._dbphotos[uuid]["remoteAvailability"] = row[2]

-                # old = self._dbphotos[uuid]["isMissing"]
-
                if row[1] != 1:
                    self._dbphotos[uuid]["isMissing"] = 1
                else:
                    self._dbphotos[uuid]["isMissing"] = 0

-                # if old is not None and old != self._dbphotos[uuid]["isMissing"]:
-                #     logging.warning(
-                #         f"{uuid} isMissing changed: {old} {self._dbphotos[uuid]['isMissing']}"
-                #     )
-
        # get information about cloud sync state
        c.execute(
            f""" SELECT
--- a/requirements.txt
+++ b/requirements.txt
@@ -202,5 +202,6 @@ virtualenv==20.0.30
 wcwidth==0.1.9
 webencodings==0.5.1
 wrapt==1.11.1
+wurlitzer==2.0.1
 yarl==1.4.2
-zipp==0.5.2
+zipp==0.5.2
--- a/setup.py
+++ b/setup.py
@@ -78,6 +78,7 @@ setup(
        "bpylist2==3.0.2",
        "pathvalidate==2.2.1",
        "dataclasses==0.7;python_version<'3.7'",
+        "wurlitzer>=2.0.1",
    ],
    entry_points={"console_scripts": ["osxphotos=osxphotos.__main__:cli"]},
    include_package_data=True,
--- a/tests/Test-10.14.6.photoslibrary/Masters/2020/06/27/20200627-160436/IMG_1064.jpeg
+++ b/tests/Test-10.14.6.photoslibrary/Masters/2020/06/27/20200627-160436/IMG_1064.jpeg
--- a/tests/Test-10.14.6.photoslibrary/Masters/2020/10/05/20201005-041506/IMG_1997.JPG
+++ b/tests/Test-10.14.6.photoslibrary/Masters/2020/10/05/20201005-041506/IMG_1997.JPG
--- a/tests/Test-10.14.6.photoslibrary/Masters/2020/10/05/20201005-041506/IMG_1997.cr2
+++ b/tests/Test-10.14.6.photoslibrary/Masters/2020/10/05/20201005-041506/IMG_1997.cr2
--- a/tests/Test-10.14.6.photoslibrary/Masters/2020/10/05/20201005-041514/IMG_1994.JPG
+++ b/tests/Test-10.14.6.photoslibrary/Masters/2020/10/05/20201005-041514/IMG_1994.JPG
--- a/tests/Test-10.14.6.photoslibrary/Masters/2020/10/05/20201005-041514/IMG_1994.cr2
+++ b/tests/Test-10.14.6.photoslibrary/Masters/2020/10/05/20201005-041514/IMG_1994.cr2
--- a/tests/Test-10.14.6.photoslibrary/Masters/2020/10/05/20201005-041520/IMG_1693.tif
+++ b/tests/Test-10.14.6.photoslibrary/Masters/2020/10/05/20201005-041520/IMG_1693.tif
--- a/tests/Test-10.14.6.photoslibrary/Masters/2020/10/05/20201005-041542/DSC03584.dng
+++ b/tests/Test-10.14.6.photoslibrary/Masters/2020/10/05/20201005-041542/DSC03584.dng
--- a/tests/Test-10.14.6.photoslibrary/Masters/2020/10/05/20201005-041653/IMG_3092.heic
+++ b/tests/Test-10.14.6.photoslibrary/Masters/2020/10/05/20201005-041653/IMG_3092.heic
--- a/tests/Test-10.14.6.photoslibrary/Masters/2020/10/05/20201005-041858/IMG_3984.jpeg
+++ b/tests/Test-10.14.6.photoslibrary/Masters/2020/10/05/20201005-041858/IMG_3984.jpeg
--- a/tests/Test-10.14.6.photoslibrary/database/RKVersion_searchIndexText.skindex
+++ b/tests/Test-10.14.6.photoslibrary/database/RKVersion_searchIndexText.skindex
--- a/tests/Test-10.14.6.photoslibrary/database/photos.db
+++ b/tests/Test-10.14.6.photoslibrary/database/photos.db
--- a/tests/Test-10.14.6.photoslibrary/private/com.apple.Photos/appPrivateData.plist
+++ b/tests/Test-10.14.6.photoslibrary/private/com.apple.Photos/appPrivateData.plist
@@ -36,7 +36,7 @@
 			<key>other</key>
 			<integer>0</integer>
 			<key>photos</key>
-			<integer>6</integer>
+			<integer>11</integer>
 			<key>videos</key>
 			<integer>0</integer>
 		</dict>
--- a/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotoAnalysisServicePreferences.plist
+++ b/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotoAnalysisServicePreferences.plist
@@ -3,8 +3,8 @@
 <plist version="1.0">
 <dict>
 	<key>PhotoAnalysisGraphLastBackgroundGraphRebuildJobDate</key>
-	<date>2020-07-27T03:16:28Z</date>
+	<date>2020-10-09T16:14:42Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundMemoryGenerationJobDate</key>
-	<date>2020-07-27T12:35:43Z</date>
+	<date>2020-10-10T05:21:03Z</date>
 </dict>
 </plist>
--- a/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/liveupdate-photosgraph.graphdb
+++ b/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/liveupdate-photosgraph.graphdb
--- a/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/photosgraph.graphdb
+++ b/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/photosgraph.graphdb
--- a/tests/Test-10.14.6.photoslibrary/private/com.apple.photomodel/appPrivateData.plist
+++ b/tests/Test-10.14.6.photoslibrary/private/com.apple.photomodel/appPrivateData.plist
@@ -5,7 +5,7 @@
 	<key>LithiumMessageTracer</key>
 	<dict>
 		<key>LastReportedDate</key>
-		<date>2020-07-27T03:18:40Z</date>
+		<date>2020-10-04T23:49:39Z</date>
 	</dict>
 </dict>
 </plist>
--- a/tests/Test-10.14.6.photoslibrary/resources/media/master/00/00/fullsizeoutput_10.jpeg
+++ b/tests/Test-10.14.6.photoslibrary/resources/media/master/00/00/fullsizeoutput_10.jpeg
--- a/tests/Test-10.14.6.photoslibrary/resources/media/master/00/00/fullsizeoutput_e.jpeg
+++ b/tests/Test-10.14.6.photoslibrary/resources/media/master/00/00/fullsizeoutput_e.jpeg
--- a/tests/Test-10.14.6.photoslibrary/resources/media/master/00/00/fullsizeoutput_f.jpeg
+++ b/tests/Test-10.14.6.photoslibrary/resources/media/master/00/00/fullsizeoutput_f.jpeg
--- a/tests/Test-10.14.6.photoslibrary/resources/media/version/00/00/fullsizeoutput_11.jpeg
+++ b/tests/Test-10.14.6.photoslibrary/resources/media/version/00/00/fullsizeoutput_11.jpeg
--- a/tests/Test-10.14.6.photoslibrary/resources/moments/analysismetadata.plist
+++ b/tests/Test-10.14.6.photoslibrary/resources/moments/analysismetadata.plist
@@ -11,6 +11,6 @@
 	<key>PLLastRevGeoForcedProviderOutOfDateCheckVersionKey</key>
 	<integer>1</integer>
 	<key>PLLastRevGeoVerFileFetchDateKey</key>
-	<date>2020-07-27T03:16:25Z</date>
+	<date>2020-10-04T23:43:17Z</date>
 </dict>
 </plist>
--- a/tests/Test-10.14.6.photoslibrary/resources/moments/historicalmarker.plist
+++ b/tests/Test-10.14.6.photoslibrary/resources/moments/historicalmarker.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>LastHistoryRowId</key>
-	<integer>707</integer>
+	<integer>948</integer>
 	<key>LibraryBuildTag</key>
 	<string>D8C4AAA1-3AB6-4A65-BEBD-99CC3E5D433E</string>
 	<key>LibrarySchemaVersion</key>
--- a/tests/Test-10.14.6.photoslibrary/resources/moments/needsanalysis
+++ b/tests/Test-10.14.6.photoslibrary/resources/moments/needsanalysis
--- a/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/8/UNADJUSTEDNONRAW_mini_8.jpg
+++ b/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/8/UNADJUSTEDNONRAW_mini_8.jpg
--- a/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/8/UNADJUSTEDNONRAW_thumb_8.jpg
+++ b/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/8/UNADJUSTEDNONRAW_thumb_8.jpg
--- a/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/9/UNADJUSTEDNONRAW_mini_9.jpg
+++ b/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/9/UNADJUSTEDNONRAW_mini_9.jpg
--- a/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/9/UNADJUSTEDNONRAW_thumb_9.jpg
+++ b/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/9/UNADJUSTEDNONRAW_thumb_9.jpg
--- a/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/a/UNADJUSTEDRAW_mini_a.jpg
+++ b/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/a/UNADJUSTEDRAW_mini_a.jpg
--- a/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/a/UNADJUSTEDRAW_thumb_a.jpg
+++ b/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/a/UNADJUSTEDRAW_thumb_a.jpg
--- a/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/b/UNADJUSTEDNONRAW_mini_b.jpg
+++ b/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/b/UNADJUSTEDNONRAW_mini_b.jpg
--- a/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/b/UNADJUSTEDNONRAW_thumb_b.jpg
+++ b/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/b/UNADJUSTEDNONRAW_thumb_b.jpg
--- a/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/c/UNADJUSTEDRAW_largepv_c.jpg
+++ b/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/c/UNADJUSTEDRAW_largepv_c.jpg
--- a/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/c/UNADJUSTEDRAW_mini_c.jpg
+++ b/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/c/UNADJUSTEDRAW_mini_c.jpg
--- a/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/c/UNADJUSTEDRAW_thumb_c.jpg
+++ b/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/c/UNADJUSTEDRAW_thumb_c.jpg
--- a/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/d/kALjMq4oSXWM4XefUXj44Q_mini_d.jpg
+++ b/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/d/kALjMq4oSXWM4XefUXj44Q_mini_d.jpg
--- a/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/d/kALjMq4oSXWM4XefUXj44Q_thumb_d.jpg
+++ b/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/d/kALjMq4oSXWM4XefUXj44Q_thumb_d.jpg
--- a/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/e/UNADJUSTEDNONRAW_mini_e.jpg
+++ b/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/e/UNADJUSTEDNONRAW_mini_e.jpg
--- a/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/e/UNADJUSTEDNONRAW_thumb_e.jpg
+++ b/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/e/UNADJUSTEDNONRAW_thumb_e.jpg
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/Info.plist
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/Info.plist
@@ -9,7 +9,7 @@
 	<key>HistoricalMarker</key>
 	<dict>
 		<key>LastHistoryRowId</key>
-		<integer>707</integer>
+		<integer>948</integer>
 		<key>LibraryBuildTag</key>
 		<string>D8C4AAA1-3AB6-4A65-BEBD-99CC3E5D433E</string>
 		<key>LibrarySchemaVersion</key>
@@ -24,7 +24,7 @@
 	<key>SnapshotCompletedDate</key>
 	<date>2019-07-27T13:16:43Z</date>
 	<key>SnapshotLastValidated</key>
-	<date>2020-07-27T03:18:40Z</date>
+	<date>2020-10-10T05:22:36Z</date>
 	<key>SnapshotTables</key>
 	<dict/>
 </dict>
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKAdjustmentData/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKAdjustmentData/0000000000.lij
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKAlbum/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKAlbum/0000000000.lij
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKImageProxyState/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKImageProxyState/0000000000.lij
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKImportGroup/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKImportGroup/0000000000.lij
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKMaster/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKMaster/0000000000.lij
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKModelResource/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKModelResource/0000000000.lij
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKPlaceForVersion/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKPlaceForVersion/0000000000.lij
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKSceneInVersion/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKSceneInVersion/0000000000.lij
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKVersion/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKVersion/0000000000.lij
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKVersionAnalysisState/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKVersionAnalysisState/0000000000.lij
--- a/tests/Test-10.14.6.photoslibrary/resources/segments/Thumb64Segment_0.data
+++ b/tests/Test-10.14.6.photoslibrary/resources/segments/Thumb64Segment_0.data
--- a/tests/Test-10.14.6.photoslibrary/resources/segments/ThumbJPGSegment_0.data
+++ b/tests/Test-10.14.6.photoslibrary/resources/segments/ThumbJPGSegment_0.data
--- a/tests/Test-10.15.6.photoslibrary/database/Photos.sqlite-shm
+++ b/tests/Test-10.15.6.photoslibrary/database/Photos.sqlite-shm
--- a/tests/Test-10.15.6.photoslibrary/database/Photos.sqlite-wal
+++ b/tests/Test-10.15.6.photoslibrary/database/Photos.sqlite-wal
--- a/tests/Test-10.15.6.photoslibrary/database/Photos.sqlite.lock
+++ b/tests/Test-10.15.6.photoslibrary/database/Photos.sqlite.lock
@@ -7,7 +7,7 @@
 	<key>hostuuid</key>
 	<string>9575E48B-8D5F-5654-ABAC-4431B1167324</string>
 	<key>pid</key>
-	<integer>80508</integer>
+	<integer>2964</integer>
 	<key>processname</key>
 	<string>photolibraryd</string>
 	<key>uid</key>
--- a/tests/Test-10.15.6.photoslibrary/database/search/psi.sqlite
+++ b/tests/Test-10.15.6.photoslibrary/database/search/psi.sqlite
--- a/tests/Test-10.15.6.photoslibrary/database/search/searchMetadata.plist
+++ b/tests/Test-10.15.6.photoslibrary/database/search/searchMetadata.plist
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BlacklistedMeaningsByMeaning</key>
+	<dict/>
+	<key>MePersonUUID</key>
+	<string>39488755-78C0-40B2-B378-EDA280E1823C</string>
+	<key>SceneWhitelist</key>
+	<array>
+		<string>Graduation</string>
+		<string>Aquarium</string>
+		<string>Food</string>
+		<string>Ice Skating</string>
+		<string>Mountain</string>
+		<string>Cliff</string>
+		<string>Basketball</string>
+		<string>Tennis</string>
+		<string>Jewelry</string>
+		<string>Cheese</string>
+		<string>Softball</string>
+		<string>Football</string>
+		<string>Circus</string>
+		<string>Jet Ski</string>
+		<string>Playground</string>
+		<string>Carousel</string>
+		<string>Paint Ball</string>
+		<string>Windsurfing</string>
+		<string>Sailboat</string>
+		<string>Sunbathing</string>
+		<string>Dam</string>
+		<string>Fireplace</string>
+		<string>Flower</string>
+		<string>Scuba</string>
+		<string>Hiking</string>
+		<string>Cetacean</string>
+		<string>Pier</string>
+		<string>Bowling</string>
+		<string>Snowboarding</string>
+		<string>Zoo</string>
+		<string>Snowmobile</string>
+		<string>Theater</string>
+		<string>Boat</string>
+		<string>Casino</string>
+		<string>Car</string>
+		<string>Diving</string>
+		<string>Cycling</string>
+		<string>Musical Instrument</string>
+		<string>Board Game</string>
+		<string>Castle</string>
+		<string>Sunset Sunrise</string>
+		<string>Martial Arts</string>
+		<string>Motocross</string>
+		<string>Submarine</string>
+		<string>Cat</string>
+		<string>Snow</string>
+		<string>Kiteboarding</string>
+		<string>Squash</string>
+		<string>Geyser</string>
+		<string>Music</string>
+		<string>Archery</string>
+		<string>Desert</string>
+		<string>Blackjack</string>
+		<string>Fireworks</string>
+		<string>Sportscar</string>
+		<string>Feline</string>
+		<string>Soccer</string>
+		<string>Museum</string>
+		<string>Baby</string>
+		<string>Fencing</string>
+		<string>Railroad</string>
+		<string>Nascar</string>
+		<string>Sky Surfing</string>
+		<string>Bird</string>
+		<string>Games</string>
+		<string>Baseball</string>
+		<string>Dressage</string>
+		<string>Snorkeling</string>
+		<string>Pyramid</string>
+		<string>Kite</string>
+		<string>Rowboat</string>
+		<string>Golf</string>
+		<string>Watersports</string>
+		<string>Lightning</string>
+		<string>Canyon</string>
+		<string>Auditorium</string>
+		<string>Night Sky</string>
+		<string>Karaoke</string>
+		<string>Skiing</string>
+		<string>Parade</string>
+		<string>Forest</string>
+		<string>Hot Air Balloon</string>
+		<string>Dragon Parade</string>
+		<string>Easter Egg</string>
+		<string>Monument</string>
+		<string>Jungle</string>
+		<string>Thanksgiving</string>
+		<string>Jockey Horse</string>
+		<string>Stadium</string>
+		<string>Airplane</string>
+		<string>Ballet</string>
+		<string>Yoga</string>
+		<string>Coral Reef</string>
+		<string>Skating</string>
+		<string>Wrestling</string>
+		<string>Bicycle</string>
+		<string>Tattoo</string>
+		<string>Amusement Park</string>
+		<string>Canoe</string>
+		<string>Cheerleading</string>
+		<string>Ping Pong</string>
+		<string>Fishing</string>
+		<string>Magic</string>
+		<string>Reptile</string>
+		<string>Winter Sport</string>
+		<string>Waterfall</string>
+		<string>Train</string>
+		<string>Bonsai</string>
+		<string>Surfing</string>
+		<string>Dog</string>
+		<string>Cake</string>
+		<string>Sledding</string>
+		<string>Sandcastle</string>
+		<string>Glacier</string>
+		<string>Lighthouse</string>
+		<string>Equestrian</string>
+		<string>Rafting</string>
+		<string>Shore</string>
+		<string>Hockey</string>
+		<string>Santa Claus</string>
+		<string>Formula One Car</string>
+		<string>Sport</string>
+		<string>Vehicle</string>
+		<string>Boxing</string>
+		<string>Rollerskating</string>
+		<string>Underwater</string>
+		<string>Orchestra</string>
+		<string>Carnival</string>
+		<string>Rocket</string>
+		<string>Skateboarding</string>
+		<string>Helicopter</string>
+		<string>Performance</string>
+		<string>Oktoberfest</string>
+		<string>Water Polo</string>
+		<string>Skate Park</string>
+		<string>Animal</string>
+		<string>Nightclub</string>
+		<string>String Instrument</string>
+		<string>Dinosaur</string>
+		<string>Gymnastics</string>
+		<string>Cricket</string>
+		<string>Volcano</string>
+		<string>Lake</string>
+		<string>Aurora</string>
+		<string>Dancing</string>
+		<string>Concert</string>
+		<string>Rock Climbing</string>
+		<string>Hang Glider</string>
+		<string>Rodeo</string>
+		<string>Fish</string>
+		<string>Art</string>
+		<string>Motorcycle</string>
+		<string>Volleyball</string>
+		<string>Wake Boarding</string>
+		<string>Badminton</string>
+		<string>Motor Sport</string>
+		<string>Sumo</string>
+		<string>Parasailing</string>
+		<string>Skydiving</string>
+		<string>Kickboxing</string>
+		<string>Pinata</string>
+		<string>Foosball</string>
+		<string>Go Kart</string>
+		<string>Poker</string>
+		<string>Kayak</string>
+		<string>Swimming</string>
+		<string>Atv</string>
+		<string>Beach</string>
+		<string>Dartboard</string>
+		<string>Athletics</string>
+		<string>Camping</string>
+		<string>Tornado</string>
+		<string>Billiards</string>
+		<string>Rugby</string>
+		<string>Airshow</string>
+	</array>
+</dict>
+</plist>
--- a/tests/Test-10.15.6.photoslibrary/database/search/zeroKeywords.data
+++ b/tests/Test-10.15.6.photoslibrary/database/search/zeroKeywords.data
--- a/tests/Test-10.15.6.photoslibrary/originals/7/7783E8E6-9CAC-40F3-BE22-81FB7051C266.heic
+++ b/tests/Test-10.15.6.photoslibrary/originals/7/7783E8E6-9CAC-40F3-BE22-81FB7051C266.heic
--- a/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-shm
+++ b/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-shm
--- a/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-wal
+++ b/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-wal
--- a/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-shm
+++ b/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-shm
--- a/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-wal
+++ b/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-wal
--- a/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm
+++ b/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm
--- a/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal
+++ b/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal
--- a/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-shm
+++ b/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-shm
--- a/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-wal
+++ b/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-wal
--- a/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-shm
+++ b/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-shm
--- a/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-wal
+++ b/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-wal
--- a/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-shm
+++ b/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-shm
--- a/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-wal
+++ b/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-wal
--- a/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-shm
+++ b/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-shm
--- a/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-wal
+++ b/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-wal
--- a/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb
+++ b/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb
--- a/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist
+++ b/tests/Test-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist
--- a/tests/Test-10.15.6.photoslibrary/resources/derivatives/7/7783E8E6-9CAC-40F3-BE22-81FB7051C266_1_105_c.jpeg
+++ b/tests/Test-10.15.6.photoslibrary/resources/derivatives/7/7783E8E6-9CAC-40F3-BE22-81FB7051C266_1_105_c.jpeg
--- a/tests/Test-10.15.6.photoslibrary/resources/derivatives/masters/7/7783E8E6-9CAC-40F3-BE22-81FB7051C266_4_5005_c.jpeg
+++ b/tests/Test-10.15.6.photoslibrary/resources/derivatives/masters/7/7783E8E6-9CAC-40F3-BE22-81FB7051C266_4_5005_c.jpeg
--- a/tests/Test-10.15.6.photoslibrary/resources/derivatives/thumbs/3305.ithmb
+++ b/tests/Test-10.15.6.photoslibrary/resources/derivatives/thumbs/3305.ithmb
--- a/tests/Test-10.15.6.photoslibrary/resources/derivatives/thumbs/4031.ithmb
+++ b/tests/Test-10.15.6.photoslibrary/resources/derivatives/thumbs/4031.ithmb
--- a/tests/Test-10.15.6.photoslibrary/resources/derivatives/thumbs/4132.ithmb
+++ b/tests/Test-10.15.6.photoslibrary/resources/derivatives/thumbs/4132.ithmb
--- a/tests/Test-10.15.6.photoslibrary/resources/journals/Asset-change.plj
+++ b/tests/Test-10.15.6.photoslibrary/resources/journals/Asset-change.plj
--- a/tests/Test-10.15.6.photoslibrary/resources/journals/HistoryToken.plist
+++ b/tests/Test-10.15.6.photoslibrary/resources/journals/HistoryToken.plist
--- a/tests/Test-10.15.6.photoslibrary/resources/journals/ImportSession-change.plj
+++ b/tests/Test-10.15.6.photoslibrary/resources/journals/ImportSession-change.plj
--- a/tests/Test-10.15.6.photoslibrary/resources/renders/7/7783E8E6-9CAC-40F3-BE22-81FB7051C266.plist
+++ b/tests/Test-10.15.6.photoslibrary/resources/renders/7/7783E8E6-9CAC-40F3-BE22-81FB7051C266.plist
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>adjustmentBaseVersion</key>
+	<integer>0</integer>
+	<key>adjustmentData</key>
+	<data>
+	bVdbt6I6s/0vvtqjFygo9BjfA0jCRbklXMSzzgMCEi6CChp0j/3fv7i6++zeYxzekqrM
+	mlUJqZm/Zo/iNlR9Z3anfvbjr9nxXrW5cz8fi9vsx4yX9fVy9m2WXi7RT7/35Ir/zn3n
+	FxwzDBkpzikqHtVPI/9tdmnT8dTfzszTxfvZ399m52JM83RM3/jndBiLW1zlI5n9WHIL
+	gS2oLkVbdcU/Edi67wJD/+lsFFVJxtkPgVsuvs36W1V0Yzr+DMfQ37HS8f8WMwZpXt+H
+	8czchtmP//nr//EouvTYFvnsx3i7FyyLYhyrrhzeBPvTiQ13fZa2u59xuW+/Jg02bt9z
+	w9dk1V3u42+f70tuvRTE5YqTFsJaWCzk36vAdOmH+634A0ht06zx+qr7E129vaG6YviJ
+	PrxzHMYq+2J14RbvIBy3loQlv1wvREHmeHnFrVn9RO7LJkvcUl7w4kpaLdaCyEmsEvex
+	j9L2/g7+fSGJK+6PjxXz+CcRhr7k5fVK5FmlRVla8Gvx22zsu7RFaVcWv4II4mrNCbK0
+	XItr8b19C/HLshQXssDz65Ww5kRJWiyZSZbeJlH+98eIfZXRTi9ss2F02ebc5Yijxo8V
+	cY/4xolVJ4Ywudob92LB8hir5zvkE1JvgrUlg6rhDsSMLdjynhnpbZzy+RjHcpq1/GK/
+	bLXPD2JRrQ29qMkTC2ZehJQJqgczBiTRIwfEqrUHbZLEG9200tZJpkcJl0p5DG80zMWI
+	jw5DtOAPR/4y7Y3oVKhnTcONE1ExZkSiSIMx4nMj4sgew5zhtgy3CeLmZnrp8Pj8CNei
+	xg/eQUVjeD6EKYyu0YMbhk1txacpa1tRgE9wwKrKgJJjpDYZCITQAPkeR8RigAfcttuY
+	G7MA8va+ikp0As6mlFu3Q/gUoT7SL1HzLD8/tlyYIdJwode7pmqd0Jwxo5yjvezUUOUE
+	w9+Al23cjMcvwEYsgwX0kpLTtdjnH1r0+REZ9qLcwCESrA0/xSVMpZASE0PVDKMJ7d24
+	xxGqtnirmknzi2HD9o6fGCB/+gIkrFZ+6MSttXJ0O8yRyjuysqeT24GnHwBiI63J9ghl
+	IYzKGD+9wkqz6hBeqi+C3Jsgwwt/4bWw0eLEUUvxHnkCcsnWAkhBAJkYdH6Y86KUJCGK
+	JieCk7/nUL6H57L9/GiWnx/4If/DMOSL34jh3nZzVRy9a8k2i87lbUKvPWy5uHOON15c
+	smNEru9j2fb7GEU3a6SXWJuf8F1Z7cGl+6oh96uGPGy9Zd8fcB6asZkUakf0c58TMu+N
+	LqltHB9Mvdk/VLDDnx/WlgEc9aaMb2qxRSmxV83rEOSyy3GfH3kwd3yeN4JwJwTlpBDt
+	SZGLQAzigawnvzVfwwsFSLc5++6hcQX6iKU2FRBSDyiSq718hMgOgoHiO9lKxsU/ZhN9
+	wCf1/FI4aTGHX8o81Sj1gRo+tSm5eDXv+lCRAu0AHKe/NuGTQsghjTI8AnyAjB7ECk7I
+	WG91++JXycJ8+ce0lG9vHJ0KWCO9o1EOQ2wWzrNh2cibMBjt3VK0H68rgmqIMwTP8JjF
+	dPJ9/eR4bavWYRzeDvjQmedLdFSjMeoUJ/O5nYbtdIvBYOK+tmtFsl9iVkBRNLqmfFZr
+	3xZ7TyPTEWyoZ6J0bbhNuKaCqfmZV0SObLh5nMF2Ap3i6j41NMSd7Sdd7rTsZlcNtTVu
+	KPSNnezp46SuNtY2qhZqBOGoYKp8fpy0S+8YPpezBD2xXJw0P3E2SOati+nllF9qiAHj
+	QXK4kPNrR9nVw93FRNrfnbpsCkVPaNlVr7PBm4cL6XBwOvdz+vkha35jb8nuvD3ZrkQX
+	CHQJzlWTVYjDpkKRpQ0SrsetC5KXr+vKwVRWtZ5uIsHOq8qab+V2c/Pl0QjtQ4Bea20O
+	HID8AJp0f1V3V7D1Ix01pbHxcwtxnYYEZ/tswTYsL2jjS5oAzwRe3YPs1BX7W/VDSGXY
+	eVoq+Ve1c1w7QxOinV7beYLoSUd9qFdgsGrl5uCGtzT/tCu5LSS03W2Gp/ZSPFhKTti3
+	50q/27uLVHebTW5t7UOrggGoEvbIujZwxppq8rA0s949wWv7oi+kOdAO/Qmp4MWuhr1O
+	aLcFGQYIyCDIcM3rXmpFcTNVrtHTop+aC6uTq5Usr6ddO1hY2zX39GplbgYh8YOL60VA
+	xJTfAJ/bmxv7YWHhmpLIsVoq5Eg+b2HWHJ6I1w9c4D1dYsDEBlQ6ANXOLWyejbonXuUo
+	tiYN3mbgdkHTOCV31NTMhqg8G7gZ3Ocrt2ylSDefH54phN0VR56xFEKiOhttEXoWla9g
+	GhLzaXdmFRIL+3frRZ++Fml2wN1dRkwjmW0SP2QnqfMCS9gJTf2o8oft9Pe2ekLrPJAr
+	GR/gVR7bqS2tjrvUFbiaVVlvcXizlsM8qHnHacKXX40LrTUxK4wD94q9oVKug+HU1AXr
+	EEZZnXFU7m7vi3cVgFvmZdO4hDolNVks4bbv7CqnEGRhR6UH2Er+hqienvWOOtlYa0CY
+	KkLI2lzsTTI1UnB+TUUOeeUYofain5W0RrA2rCbKpic2Oy6oSP4ErY136h5bbpKskRID
+	f0CDzxkQJa5H7AMUwkOppore0nLCgQbTJiabuIWHZJ+TQ6MJprP35UpbjPmSiqxh9k7k
+	f36gnZzh+3QyIWz8TSnt2REPdZSreiSchoncYZaMdaUlhkmPFakAEH10RFELDROHPh8A
+	WHqpssg0QcETlRvY00tHnjtD58ixlBONlqzXcp4e9aTE7hqKwr4kDxX24f5MElk3KWvj
+	DgFLwbPRloCicScq3rUnEwkErqA03LhNTHYXn//8eO7mxrV0NwpnaOFwHav702I9a0QW
+	gfs+SCen1zgBF6qrAtEOEQJzgAWP3aY7dqtGkMo+uJh+Sp4LbSEgf4IL4Ax+rQjsVwxd
+	rzKsrelHKZWu4JywfZYo6EIvpLwI9uEwIEhABPwUNUd219iaMj+CvRA2yOJ1ScnuvnzS
+	VCFI6Txjt6ejIkfVRzt7YdcwhSQIETiBqNk36iSB3g865Ny1rnesUqCgHZwExTWQbJw8
+	vSAooHVXFqWmhE7tz2PtOTgq5SyjbRB4dgiukoKtb8BB8Xa+vNX3wGPdEmvL0juVXKkt
+	+/8w6d++Bbjyp3xd/ku8chyTnpRUY/FLvvJv+fqH/H2/RPifwvgfSfxLIn+bEaY/t8Xz
+	bZa41VJgsp3pdlFeSdL679+KfNN34409Qf4Q6ZikeU/fCp15VTl7YlSn6uuphM/pbQz6
+	rpj9/b9//xc=
+	</data>
+	<key>adjustmentEditorBundleID</key>
+	<string>com.apple.Photos</string>
+	<key>adjustmentFormatIdentifier</key>
+	<string>com.apple.photo</string>
+	<key>adjustmentFormatVersion</key>
+	<string>1.5</string>
+	<key>adjustmentTimestamp</key>
+	<date>2020-10-03T22:54:20Z</date>
+</dict>
+</plist>
--- a/tests/Test-10.15.6.photoslibrary/resources/renders/7/7783E8E6-9CAC-40F3-BE22-81FB7051C266_1_201_a.jpeg
+++ b/tests/Test-10.15.6.photoslibrary/resources/renders/7/7783E8E6-9CAC-40F3-BE22-81FB7051C266_1_201_a.jpeg
--- a/tests/Test-10.16.0.photoslibrary/database/Photos.sqlite
+++ b/tests/Test-10.16.0.photoslibrary/database/Photos.sqlite
--- a/tests/Test-10.16.0.photoslibrary/database/Photos.sqlite-shm
+++ b/tests/Test-10.16.0.photoslibrary/database/Photos.sqlite-shm
--- a/tests/Test-10.16.0.photoslibrary/database/Photos.sqlite-wal
+++ b/tests/Test-10.16.0.photoslibrary/database/Photos.sqlite-wal
--- a/tests/Test-10.16.0.photoslibrary/database/Photos.sqlite.lock
+++ b/tests/Test-10.16.0.photoslibrary/database/Photos.sqlite.lock
@@ -7,7 +7,7 @@
 	<key>hostuuid</key>
 	<string>9575E48B-8D5F-5654-ABAC-4431B1167324</string>
 	<key>pid</key>
-	<integer>434</integer>
+	<integer>561</integer>
 	<key>processname</key>
 	<string>photolibraryd</string>
 	<key>uid</key>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rhet Turnbull	da100f93a9	Fix for issue #234	2020-10-12 05:59:44 -07:00
Rhet Turnbull	d049967c6b	Updated CHANGELOG.md	2020-10-11 22:52:03 -07:00
Rhet Turnbull	dcbf8f25f6	Fix for issue #230	2020-10-11 22:40:16 -07:00
Rhet Turnbull	0d6b68d7ba	Updated CHANGELOG.md	2020-10-11 22:27:53 -07:00
Rhet Turnbull	07b08433df	Updated tests	2020-10-11 22:24:17 -07:00
Rhet Turnbull	b0171ba6f5	Updated tests	2020-10-11 22:20:42 -07:00
Rhet Turnbull	16305cf233	Merge pull request #233 from RhetTbull/convert_to_jpeg Convert to jpeg	2020-10-11 21:48:51 -07:00
Rhet Turnbull	fe5185be88	Merge branch 'master' into convert_to_jpeg	2020-10-11 21:41:10 -07:00
Rhet Turnbull	58362020cb	Updated docs	2020-10-11 21:27:05 -07:00
Rhet Turnbull	464eae2b98	Updated README.md with raw notes	2020-10-11 11:56:31 -07:00
Rhet Turnbull	b5a9794f6b	Added israw, tests for Big Sur	2020-10-11 08:59:49 -07:00
Rhet Turnbull	b32f4b8504	Updates to path, path_raw, uti for RAW+JPEG pairs	2020-10-09 22:15:47 -07:00
Rhet Turnbull	0dd05b8cc1	Updated tests, closes #231	2020-10-07 06:14:16 -07:00
Rhet Turnbull	9515736019	version bump	2020-10-06 06:31:10 -07:00
Rhet Turnbull	42a6373f8d	Fix for issue #230	2020-10-06 06:22:17 -07:00
Rhet Turnbull	6413342bdb	Updated tests for Mojave	2020-10-05 06:16:35 -07:00
Rhet Turnbull	5f14349964	Updated README.md	2020-10-04 22:25:56 -07:00
Rhet Turnbull	b2b39aa607	Updated tests	2020-10-04 22:18:01 -07:00
Rhet Turnbull	0ddd5234b2	Added uti_raw for 10.14, added tests	2020-10-04 21:29:53 -07:00
Rhet Turnbull	ae0166da04	Added test for Big Sur path_edited	2020-10-04 08:25:22 -07:00
Rhet Turnbull	c389207daa	Fixed path_edited for Big Sur	2020-10-04 08:18:10 -07:00
Rhet Turnbull	25141e4945	Updated test for Big Sur	2020-10-03 23:02:50 -07:00
Rhet Turnbull	1b181094ed	Working on uti and uti_original	2020-10-03 22:04:35 -07:00
Rhet Turnbull	d406d30414	Updated docs for convert-to-jpeg	2020-10-03 14:21:27 -07:00
Rhet Turnbull	9324d8e795	Updated tests	2020-10-03 13:57:46 -07:00
Rhet Turnbull	4099253c8e	Updated tests to run in GitHub actions	2020-10-03 13:48:18 -07:00
Rhet Turnbull	2e652b04d0	Updated requirements.txt	2020-10-03 12:09:31 -07:00
Rhet Turnbull	5a13605f85	Added tests, fixed bug in export_db	2020-10-03 11:58:48 -07:00
Rhet Turnbull	15eb940ff0	Added tests for convert_to_jpeg	2020-10-02 22:23:06 -07:00
Rhet Turnbull	22ecf8279a	Updated test library for latest Big Sur beta	2020-10-02 06:41:04 -07:00
Rhet Turnbull	38f201d0fb	--convert-to-jpeg initial version working	2020-10-02 06:31:20 -07:00
Rhet Turnbull	08725fd27f	Updated CHANGELOG.md	2020-09-28 21:38:51 -07:00
Rhet Turnbull	ddc1e69b4a	Added HEIC test image	2020-09-26 01:44:32 -07:00