diff --git a/API_README.md b/API_README.md index 4e7b3608..1368d9d2 100644 --- a/API_README.md +++ b/API_README.md @@ -1943,7 +1943,7 @@ cog.out(get_template_field_table()) |{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.48.3'| +|{osxphotos_version}|The osxphotos version, e.g. '0.48.4'| |{osxphotos_cmd_line}|The full command line used to run osxphotos| |{album}|Album(s) photo is contained in| |{folder_album}|Folder path + album photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder| diff --git a/README.md b/README.md index 2da28de4..58adb501 100644 --- a/README.md +++ b/README.md @@ -1831,7 +1831,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.48.3' +{osxphotos_version} The osxphotos version, e.g. '0.48.4' {osxphotos_cmd_line} The full command line used to run osxphotos The following substitutions may result in multiple values. Thus if specified @@ -3997,7 +3997,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.48.3'| +|{osxphotos_version}|The osxphotos version, e.g. '0.48.4'| |{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 6f627643..b8a94035 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: 7bb2c9249a5178c80045917234b5db0f +config: 8e75e979ef179f86aec0b772d60e05d7 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/_modules/index.html b/docs/_modules/index.html index 7d0bd96f..c6bc0546 100644 --- a/docs/_modules/index.html +++ b/docs/_modules/index.html @@ -5,7 +5,7 @@ - Overview: module code - osxphotos 0.48.3 documentation + Overview: module code - osxphotos 0.48.4 documentation @@ -123,7 +123,7 @@
-
osxphotos 0.48.3 documentation
 +
osxphotos 0.48.4 documentation
@@ -146,7 +146,7 @@
- osxphotos 0.48.3 documentation + osxphotos 0.48.4 documentation
-
osxphotos 0.47.9 documentation
 +
osxphotos 0.48.3 documentation
@@ -146,7 +146,7 @@
- osxphotos 0.47.9 documentation + osxphotos 0.48.3 documentation @@ -155,11 +155,12 @@
@@ -197,13 +198,11 @@ """ import dataclasses -import hashlib import json import logging import os import pathlib import re -import tempfile import typing as t from collections import namedtuple # pylint: disable=syntax-error from dataclasses import asdict, dataclass @@ -240,14 +239,13 @@ from .phototemplate import RenderOptions from .rich_utils import add_rich_markup_tag from .uti import get_preferred_uti_extension -from .utils import increment_filename, lineno, list_directory +from .utils import hexdigest, increment_filename, lineno, list_directory __all__ = [ "ExportError", "ExportOptions", "ExportResults", "PhotoExporter", - "hexdigest", "rename_jpeg_files", ] @@ -461,6 +459,7 @@ exported_album=None, skipped_album=None, missing_album=None, + metadata_changed=None, ): self.exported = exported or [] self.new = new or [] @@ -487,6 +486,7 @@ self.exported_album = exported_album or [] self.skipped_album = skipped_album or [] self.missing_album = missing_album or [] + self.metadata_changed = metadata_changed or []
[docs] def all_files(self): """return all filenames contained in results""" @@ -537,6 +537,7 @@ self.exported_album += other.exported_album self.skipped_album += other.skipped_album self.missing_album += other.missing_album + self.metadata_changed += other.metadata_changed return self @@ -566,12 +567,14 @@ + f",exported_album={self.exported_album}" + f",skipped_album={self.skipped_album}" + f",missing_album={self.missing_album}" + + f",metadata_changed={self.metadata_changed}" + ")" )
[docs]class PhotoExporter: """Export a photo""" + def __init__(self, photo: "PhotoInfo", tmpdir: t.Optional[str] = None): self.photo = photo self._render_options = RenderOptions() @@ -934,7 +937,7 @@ return ShouldUpdate.EDITED_SIG_DIFFERENT if options.force_update: - current_digest = hexdigest(self.photo.json()) + current_digest = self.photo.hexdigest if current_digest != file_record.digest: # metadata in Photos changed, force update return ShouldUpdate.DIGEST_DIFFERENT @@ -1374,8 +1377,9 @@ rec.dest_sig = fileutil.file_sig(dest) if options.exiftool: rec.exifdata = self._exiftool_json_sidecar(options) - if options.force_update: - rec.digest = hexdigest(photoinfo) + if self.photo.hexdigest != rec.digest: + results.metadata_changed = [dest_str] + rec.digest = self.photo.hexdigest return results @@ -2206,13 +2210,6 @@ f.close()
-def hexdigest(strval): - """hexdigest of a string, using blake2b""" - h = hashlib.blake2b(digest_size=20) - h.update(bytes(strval, "utf-8")) - return h.hexdigest() - - def _check_export_suffix(src, dest, edited): """Helper function for exporting photos to check file extensions of destination path. diff --git a/docs/_modules/osxphotos/photoinfo.html b/docs/_modules/osxphotos/photoinfo.html index 2fdbcc05..dce27b0d 100644 --- a/docs/_modules/osxphotos/photoinfo.html +++ b/docs/_modules/osxphotos/photoinfo.html @@ -5,7 +5,7 @@ - osxphotos.photoinfo - osxphotos 0.48.1 documentation + osxphotos.photoinfo - osxphotos 0.48.3 documentation @@ -123,7 +123,7 @@
-
osxphotos 0.48.1 documentation
 +
osxphotos 0.48.3 documentation
@@ -146,7 +146,7 @@
- osxphotos 0.48.1 documentation + osxphotos 0.48.3 documentation