Fix for --load-config, #643

Updated README.md
Updated CHANGELOG.md [skip ci]
2022-02-27 09:50:25 -08:00 · 2022-02-26 23:25:16 -08:00 · 2022-02-26 23:03:07 -08:00 · 2022-02-26 22:57:25 -08:00 · 2022-02-26 22:49:39 -08:00 · 2022-02-26 22:49:18 -08:00
15 changed files with 1392 additions and 22 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,21 @@ 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.47.1](https://github.com/RhetTbull/osxphotos/compare/v0.47.0...v0.47.1)
+
+> 26 February 2022
+
+- Fixed entry point [`d275367`](https://github.com/RhetTbull/osxphotos/commit/d2753672f36a0c84b7be143a47cc85cd6c99cb6d)
+
+#### [v0.47.0](https://github.com/RhetTbull/osxphotos/compare/v0.46.6...v0.47.0)
+
+> 26 February 2022
+
+- CLI refactor [`#642`](https://github.com/RhetTbull/osxphotos/pull/642)
+- Updated docs [skip ci] [`6fae979`](https://github.com/RhetTbull/osxphotos/commit/6fae97906124c9284e382170e20c8ab9999105b0)
+- Fixed 3.10 in yaml [`3704fc4`](https://github.com/RhetTbull/osxphotos/commit/3704fc4a23e83ff2d16d6d221fb6c752dabcedca)
+- Dropped 3.7 [`7883fc1`](https://github.com/RhetTbull/osxphotos/commit/7883fc1911057df9a4c596375b498e85a73c1bec)
+
 #### [v0.46.6](https://github.com/RhetTbull/osxphotos/compare/v0.46.5...v0.46.6)

 > 26 February 2022
--- a/README.md
+++ b/README.md
--- 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: bb9ba387e732b6d2040728546fd3e66c
+config: bc3dce8a14bcd1b0c8a34e4d16f0011f
 tags: 645f666f9bcd5a90fca523b33c5a78b7
--- a/docs/_modules/index.html
+++ b/docs/_modules/index.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Overview: module code &#8212; osxphotos 0.47.0 documentation</title>
+    <title>Overview: module code &#8212; osxphotos 0.47.1 documentation</title>
    <link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="../_static/alabaster.css" />
    <script data-url_root="../" id="documentation_options" src="../_static/documentation_options.js"></script>
--- 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.47.0',
+    VERSION: '0.47.1',
    LANGUAGE: 'None',
    COLLAPSE_INDEX: false,
    BUILDER: 'html',
--- a/docs/cli.html
+++ b/docs/cli.html
@@ -6,7 +6,7 @@
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />

-    <title>osxphotos command line interface (CLI) &#8212; osxphotos 0.47.0 documentation</title>
+    <title>osxphotos command line interface (CLI) &#8212; osxphotos 0.47.1 documentation</title>
    <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
    <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
--- a/docs/genindex.html
+++ b/docs/genindex.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Index &#8212; osxphotos 0.47.0 documentation</title>
+    <title>Index &#8212; osxphotos 0.47.1 documentation</title>
    <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
    <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
--- a/docs/index.html
+++ b/docs/index.html
@@ -6,7 +6,7 @@
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />

-    <title>Welcome to osxphotos’s documentation! &#8212; osxphotos 0.47.0 documentation</title>
+    <title>Welcome to osxphotos’s documentation! &#8212; osxphotos 0.47.1 documentation</title>
    <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
    <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
--- a/docs/modules.html
+++ b/docs/modules.html
@@ -6,7 +6,7 @@
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />

-    <title>osxphotos &#8212; osxphotos 0.47.0 documentation</title>
+    <title>osxphotos &#8212; osxphotos 0.47.1 documentation</title>
    <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
    <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
--- a/docs/reference.html
+++ b/docs/reference.html
@@ -6,7 +6,7 @@
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />

-    <title>osxphotos package &#8212; osxphotos 0.47.0 documentation</title>
+    <title>osxphotos package &#8212; osxphotos 0.47.1 documentation</title>
    <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
    <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
--- a/docs/search.html
+++ b/docs/search.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Search &#8212; osxphotos 0.47.0 documentation</title>
+    <title>Search &#8212; osxphotos 0.47.1 documentation</title>
    <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
    
--- a/osxphotos/_version.py
+++ b/osxphotos/_version.py
@@ -1,3 +1,3 @@
 """ version info """

-__version__ = "0.47.0"
+__version__ = "0.47.2"
--- a/osxphotos/cli/export.py
+++ b/osxphotos/cli/export.py
@@ -870,7 +870,6 @@ def export(
        export_as_hardlink = cfg.export_as_hardlink
        export_by_date = cfg.export_by_date
        exportdb = cfg.exportdb
-        ramdb = cfg.ramdb
        external_edit = cfg.external_edit
        favorite = cfg.favorite
        filename_template = cfg.filename_template
@@ -937,6 +936,7 @@ def export(
        preview_suffix = cfg.preview_suffix
        query_eval = cfg.query_eval
        query_function = cfg.query_function
+        ramdb = cfg.ramdb
        regex = cfg.regex
        replace_keywords = cfg.replace_keywords
        report = cfg.report
@@ -957,6 +957,7 @@ def export(
        slow_mo = cfg.slow_mo
        strip = cfg.strip
        time_lapse = cfg.time_lapse
+        timestamp = cfg.timestamp
        title = cfg.title
        to_date = cfg.to_date
        to_time = cfg.to_time
@@ -971,7 +972,7 @@ def export(
        xattr_template = cfg.xattr_template

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

    verbose_(f"osxphotos version {__version__}")
--- a/setup.py
+++ b/setup.py
@@ -99,6 +99,6 @@ setup(
        "toml>=0.10.2,<0.11.0",
        "wurlitzer>=2.1.0,<3.0.0",
    ],
-    entry_points={"console_scripts": ["osxphotos=osxphotos.__main__:cli"]},
+    entry_points={"console_scripts": ["osxphotos=osxphotos.__main__:cli_main"]},
    include_package_data=True,
 )
--- a/utils/update_readme.py
+++ b/utils/update_readme.py
@@ -14,7 +14,7 @@ import re

 from click.testing import CliRunner

-from osxphotos.cli import help
+from osxphotos.cli import cli_main
 from osxphotos.phototemplate import (
    FILTER_VALUES,
    TEMPLATE_SUBSTITUTIONS,
@@ -55,7 +55,7 @@ TEMPLATE_SYSTEM_LINK_STOP = "<!-- OSXPHOTOS-TEMPLATE-SYSTEM-LINK:END -->"


 def generate_template_table():
-    """ generate template substitution table for README.md """
+    """generate template substitution table for README.md"""

    template_table = "| Substitution | Description |"
    template_table += "\n|--------------|-------------|"
@@ -68,21 +68,21 @@ def generate_template_table():


 def generate_help_text(command):
-    """ generate output of `osxphotos help command` """
+    """generate output of `osxphotos help command`"""
    runner = CliRunner()

    # get current help text
    with runner.isolated_filesystem():
-        result = runner.invoke(help, [command])
+        result = runner.invoke(cli_main, ["help", command])
        help_txt = result.output

    # running the help command above doesn't output the full "Usage" line
-    help_txt = help_txt.replace(f"Usage: {command}", f"Usage: osxphotos {command}")
+    help_txt = help_txt.replace(f"Usage: cli-main", f"Usage: osxphotos")
    return help_txt


 def replace_text(text, start_tag, stop_tag, replacement_text, prefix="", postfix=""):
-    """ replace text between start/stop tags with new text
+    """replace text between start/stop tags with new text

    Args:
        text: str, original text
@@ -108,13 +108,13 @@ def replace_text(text, start_tag, stop_tag, replacement_text, prefix="", postfix
        end = text.split(stop_tag)[1]
    except IndexError as e:
        # didn't find one of the delimiters
-        raise ValueError(f"Unable to parse input: {e}")
+        raise ValueError(f"Unable to parse input: {e}") from e

    return begin + start_tag + prefix + replacement_text + postfix + stop_tag + end


 def main():
-    """ update README.md """
+    """update README.md"""
    # update phototemplate.md with info on filters
    print(f"Updating {TEMPLATE_HELP}")
    filter_help = "\n".join(f"- {f}: {descr}" for f, descr in FILTER_VALUES.items())
Author	SHA1	Message	Date
Rhet Turnbull	feb9538d1c	Fix for --load-config, #643	2022-02-27 09:50:25 -08:00
Rhet Turnbull	b275280a1f	Updated README.md	2022-02-26 23:25:16 -08:00
Rhet Turnbull	924ef72446	Updated CHANGELOG.md [skip ci]	2022-02-26 23:03:07 -08:00
Rhet Turnbull	c95f682ca6	Updated docs [skip ci]	2022-02-26 22:57:25 -08:00
Rhet Turnbull	d2753672f3	Fixed entry point	2022-02-26 22:49:39 -08:00
Rhet Turnbull	8ee4ea46c5	Updated CHANGELOG.md [skip ci]	2022-02-26 22:49:18 -08:00