diff --git a/README.md b/README.md index 122eb28d..7d84771d 100644 --- a/README.md +++ b/README.md @@ -1725,7 +1725,7 @@ Substitution Description {lf} A line feed: '\n', alias for {newline} {cr} A carriage return: '\r' {crlf} a carriage return + line feed: '\r\n' -{osxphotos_version} The osxphotos version, e.g. '0.45.7' +{osxphotos_version} The osxphotos version, e.g. '0.45.8' {osxphotos_cmd_line} The full command line used to run osxphotos The following substitutions may result in multiple values. Thus if specified for @@ -3629,7 +3629,7 @@ The following template field substitutions are availabe for use the templating s |{lf}|A line feed: '\n', alias for {newline}| |{cr}|A carriage return: '\r'| |{crlf}|a carriage return + line feed: '\r\n'| -|{osxphotos_version}|The osxphotos version, e.g. '0.45.7'| +|{osxphotos_version}|The osxphotos version, e.g. '0.45.8'| |{osxphotos_cmd_line}|The full command line used to run osxphotos| |{album}|Album(s) photo is contained in| |{folder_album}|Folder path + album photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder| diff --git a/docs/.buildinfo b/docs/.buildinfo index d10b30bd..9defd753 100644 --- a/docs/.buildinfo +++ b/docs/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: 1227bc7d62720aadf11cb3dffcd9baed +config: bf43bf49b725c31ce72a8823e4f8012b tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/_static/documentation_options.js b/docs/_static/documentation_options.js index 0d86887f..0896a973 100644 --- a/docs/_static/documentation_options.js +++ b/docs/_static/documentation_options.js @@ -1,6 +1,6 @@ var DOCUMENTATION_OPTIONS = { URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'), - VERSION: '0.45.7', + VERSION: '0.45.8', LANGUAGE: 'None', COLLAPSE_INDEX: false, BUILDER: 'html', diff --git a/docs/cli.html b/docs/cli.html index 052e6c78..1dc80919 100644 --- a/docs/cli.html +++ b/docs/cli.html @@ -6,7 +6,7 @@ - osxphotos command line interface (CLI) — osxphotos 0.45.7 documentation + osxphotos command line interface (CLI) — osxphotos 0.45.8 documentation diff --git a/docs/genindex.html b/docs/genindex.html index 735b7fef..0d697e09 100644 --- a/docs/genindex.html +++ b/docs/genindex.html @@ -5,7 +5,7 @@ - Index — osxphotos 0.45.7 documentation + Index — osxphotos 0.45.8 documentation diff --git a/docs/index.html b/docs/index.html index 72ed24fe..f1d4cf16 100644 --- a/docs/index.html +++ b/docs/index.html @@ -6,7 +6,7 @@ - Welcome to osxphotos’s documentation! — osxphotos 0.45.7 documentation + Welcome to osxphotos’s documentation! — osxphotos 0.45.8 documentation diff --git a/docs/modules.html b/docs/modules.html index 9299f5a3..dd54b250 100644 --- a/docs/modules.html +++ b/docs/modules.html @@ -6,7 +6,7 @@ - osxphotos — osxphotos 0.45.7 documentation + osxphotos — osxphotos 0.45.8 documentation diff --git a/docs/reference.html b/docs/reference.html index ac40b88a..20928185 100644 --- a/docs/reference.html +++ b/docs/reference.html @@ -6,7 +6,7 @@ - osxphotos package — osxphotos 0.45.7 documentation + osxphotos package — osxphotos 0.45.8 documentation diff --git a/docs/search.html b/docs/search.html index e375f504..7fa67509 100644 --- a/docs/search.html +++ b/docs/search.html @@ -5,7 +5,7 @@ - Search — osxphotos 0.45.7 documentation + Search — osxphotos 0.45.8 documentation diff --git a/osxphotos/_version.py b/osxphotos/_version.py index a3333d9d..267ed7ea 100644 --- a/osxphotos/_version.py +++ b/osxphotos/_version.py @@ -1,3 +1,3 @@ """ version info """ -__version__ = "0.45.7" +__version__ = "0.45.8" diff --git a/osxphotos/photoexporter.py b/osxphotos/photoexporter.py index 2cc47e65..ae8ee60d 100644 --- a/osxphotos/photoexporter.py +++ b/osxphotos/photoexporter.py @@ -1267,6 +1267,13 @@ class PhotoExporter: f"Unsupported file type for exiftool, skipping exiftool for {dest}", ) ) + # set file signature so the file doesn't get re-exported with --update + export_db.set_data( + dest, + uuid=self.photo.uuid, + exif_stat=fileutil.file_sig(src), + exif_json=self._exiftool_json_sidecar(options=options), + ) return exiftool_results # determine if we need to write the exif metadata