diff --git a/README.md b/README.md index 0bfabdec..d656f865 100644 --- a/README.md +++ b/README.md @@ -601,6 +601,7 @@ Options: library, 2. system library, 3. ~/Pictures/Photos Library.photoslibrary -V, --verbose Print verbose output. + --timestamp Add time stamp to verbose output --keyword KEYWORD Search for photos with keyword KEYWORD. If more than one keyword, treated as "OR", e.g. find photos matching any keyword @@ -1724,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.2' +{osxphotos_version} The osxphotos version, e.g. '0.45.3' {osxphotos_cmd_line} The full command line used to run osxphotos The following substitutions may result in multiple values. Thus if specified for @@ -3628,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.2'| +|{osxphotos_version}|The osxphotos version, e.g. '0.45.3'| |{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 363ee731..dadd96be 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: a1feb252fe59a24b2ab082e1fa698e73 +config: cf6ba426eed8ae7fdcc87f4fab23a946 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/_static/documentation_options.js b/docs/_static/documentation_options.js index 69f68925..9f54e845 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.2', + VERSION: '0.45.3', LANGUAGE: 'None', COLLAPSE_INDEX: false, BUILDER: 'html', diff --git a/docs/cli.html b/docs/cli.html index 57ec93ed..1aa73835 100644 --- a/docs/cli.html +++ b/docs/cli.html @@ -6,7 +6,7 @@ - osxphotos command line interface (CLI) — osxphotos 0.45.2 documentation + osxphotos command line interface (CLI) — osxphotos 0.45.3 documentation diff --git a/docs/genindex.html b/docs/genindex.html index 74ae1f2f..cd17ee1e 100644 --- a/docs/genindex.html +++ b/docs/genindex.html @@ -5,7 +5,7 @@ - Index — osxphotos 0.45.2 documentation + Index — osxphotos 0.45.3 documentation diff --git a/docs/index.html b/docs/index.html index 3567f107..0ab1025c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -6,7 +6,7 @@ - Welcome to osxphotos’s documentation! — osxphotos 0.45.2 documentation + Welcome to osxphotos’s documentation! — osxphotos 0.45.3 documentation diff --git a/docs/modules.html b/docs/modules.html index 275390ba..e1ccdbd4 100644 --- a/docs/modules.html +++ b/docs/modules.html @@ -6,7 +6,7 @@ - osxphotos — osxphotos 0.45.2 documentation + osxphotos — osxphotos 0.45.3 documentation diff --git a/docs/reference.html b/docs/reference.html index 220c0dc3..d0c1edba 100644 --- a/docs/reference.html +++ b/docs/reference.html @@ -6,7 +6,7 @@ - osxphotos package — osxphotos 0.45.2 documentation + osxphotos package — osxphotos 0.45.3 documentation diff --git a/docs/search.html b/docs/search.html index 30932650..f1cc8aad 100644 --- a/docs/search.html +++ b/docs/search.html @@ -5,7 +5,7 @@ - Search — osxphotos 0.45.2 documentation + Search — osxphotos 0.45.3 documentation diff --git a/osxphotos/_version.py b/osxphotos/_version.py index e8968012..2ba5f075 100644 --- a/osxphotos/_version.py +++ b/osxphotos/_version.py @@ -1,3 +1,3 @@ """ version info """ -__version__ = "0.45.2" +__version__ = "0.45.3" diff --git a/osxphotos/cli.py b/osxphotos/cli.py index 490db253..a1434804 100644 --- a/osxphotos/cli.py +++ b/osxphotos/cli.py @@ -79,9 +79,9 @@ from .sqlgrep import sqlgrep from .uti import get_preferred_uti_extension from .utils import ( expand_and_validate_filepath, + format_sec_to_hhmmss, load_function, normalize_fs_path, - format_sec_to_hhmmss, ) __all__ = [ @@ -133,6 +133,7 @@ __all__ = [ # global variable to control verbose output # set via --verbose/-V VERBOSE = False +VERBOSE_TIMESTAMP = False # used to show/hide hidden commands OSXPHOTOS_HIDDEN = not bool(os.getenv("OSXPHOTOS_SHOW_HIDDEN", default=False)) @@ -147,8 +148,10 @@ def verbose_(*args, **kwargs): """print output if verbose flag set""" if VERBOSE: styled_args = [] + timestamp = str(datetime.datetime.now()) + " -- " if VERBOSE_TIMESTAMP else "" for arg in args: if type(arg) == str: + arg = timestamp + arg if "error" in arg.lower(): arg = click.style(arg, fg=CLI_COLOR_ERROR) elif "warning" in arg.lower(): @@ -677,6 +680,7 @@ def cli(ctx, db, json_, debug): @cli.command(cls=ExportCommand) @DB_OPTION @click.option("--verbose", "-V", "verbose", is_flag=True, help="Print verbose output.") +@click.option("--timestamp", is_flag=True, help="Add time stamp to verbose output") @QUERY_OPTIONS @click.option( "--missing", @@ -1228,6 +1232,7 @@ def export( from_time, to_time, verbose, + timestamp, missing, update, ignore_signature, @@ -1374,7 +1379,9 @@ def export( ) global VERBOSE + global VERBOSE_TIMESTAMP VERBOSE = bool(verbose) + VERBOSE_TIMESTAMP = timestamp if load_config: try: