Refactor verbose 931 (#960)

* Began refactoring verbose code for #931

* Fixed tests for timewarp due to verbose refactor

* Updated test data

* More refactoring for #931

* Refactored queryoptions.py

* Refactored queryoptions.py

* Refactored queryoptions.py

* Refactored echo_error

* Refactored debug

* Refactored debug

* Refactored use of verbose in export

* Refactored use of verbose in export

* Refactred --verbose in add-locations and debug-dump

* Refactored --verbose for

* Refactored --verbose for osxphotos exportdb

* Refactored --verbose for osxphotos import

* Refactored --verbose for osxphotos orphans

* Refactored --verbose for osxphotos snap-diff

* Refactored --verbose for osxphotos sync

* Refactored --verbose for osxphotos timewarp

* Added default verbose() function to verbose

tests/test_cli_verbose.py

@@ -0,0 +1,116 @@
+"""Test verbose functions"""
+
+import re
+from io import StringIO
+
+
+from osxphotos.cli.verbose import (
+    get_verbose_level,
+    set_verbose_level,
+    verbose,
+    verbose_print,
+    _reset_verbose_globals,
+)
+
+
+def test_set_get_verbose_level(capsys):
+    """Test verbose_print"""
+    set_verbose_level(2)
+    assert get_verbose_level() == 2
+
+
+def test_verbose_print_no_rich(capsys):
+    """Test verbose_print"""
+    set_verbose_level(1)
+    verbose = verbose_print(1, False, False)
+    verbose("test")
+    captured = capsys.readouterr()
+    assert captured.out.strip() == "test"
+
+    verbose("test2", level=1)
+    captured = capsys.readouterr()
+    assert captured.out.strip() == "test2"
+
+    verbose("test3", level=2)
+    captured = capsys.readouterr()
+    assert captured.out.strip() == ""
+
+
+def test_verbose_print_rich(capsys):
+    """Test verbose with rich"""
+    set_verbose_level(1)
+    verbose = verbose_print(1, False, True)
+    verbose("test")
+    captured = capsys.readouterr()
+    assert captured.out.strip() == "test"
+
+    verbose("test2", level=1)
+    captured = capsys.readouterr()
+    assert captured.out.strip() == "test2"
+
+    verbose("test3", level=2)
+    captured = capsys.readouterr()
+    assert captured.out.strip() == ""
+
+
+def test_verbose_print_timestamp(capsys):
+    """Test verbose with timestamp"""
+    set_verbose_level(1)
+    verbose = verbose_print(1, True, False)
+    verbose("test")
+    captured = capsys.readouterr()
+
+    # regex to match timestamp in this format: 2023-01-25 06:40:18.216297
+    assert re.match(r"\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{6}", captured.out.strip())
+    assert captured.out.strip().endswith("test")
+
+    verbose("test2", level=1)
+    captured = capsys.readouterr()
+    assert re.match(r"\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{6}", captured.out.strip())
+    assert captured.out.strip().endswith("test2")
+
+    verbose("test3", level=2)
+    captured = capsys.readouterr()
+    assert captured.out.strip() == ""
+
+
+def test_verbose_print_file():
+    """Test verbose with file"""
+    set_verbose_level(1)
+    stream = StringIO()
+    verbose = verbose_print(1, False, False, file=stream)
+    verbose("test")
+    assert stream.getvalue().strip() == "test"
+
+
+def test_verbose_print_noop(capsys):
+    """Test verbose with noop"""
+    set_verbose_level(1)
+    verbose = verbose_print(0, False, False)
+    verbose("test")
+    captured = capsys.readouterr()
+    assert captured.out.strip() == ""
+
+
+def test_verbose(capsys):
+    """ "Test verbose()"""
+    # reset verbose module globals for testing
+    _reset_verbose_globals()
+    set_verbose_level(0)
+    verbose("test")
+    captured = capsys.readouterr()
+    assert captured.out.strip() == ""
+
+    set_verbose_level(1)
+    verbose("test")
+    captured = capsys.readouterr()
+    assert captured.out.strip() == "test"
+
+    verbose("test2", level=2)
+    captured = capsys.readouterr()
+    assert captured.out.strip() == ""
+
+    set_verbose_level(2)
+    verbose("test2", level=2)
+    captured = capsys.readouterr()
+    assert captured.out.strip() == "test2"