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_debug.py

@@ -7,14 +7,29 @@ from osxphotos.debug import is_debug, set_debug
 
 
 def test_debug_enable():
+    """test set_debug()"""
     set_debug(True)
-    logger = osxphotos._get_logger()
-    assert logger.isEnabledFor(logging.DEBUG)
+    assert osxphotos.logger.isEnabledFor(logging.DEBUG)
     assert is_debug()
 
 
 def test_debug_disable():
+    """test set_debug()"""
     set_debug(False)
-    logger = osxphotos._get_logger()
-    assert not logger.isEnabledFor(logging.DEBUG)
+    assert not osxphotos.logger.isEnabledFor(logging.DEBUG)
     assert not is_debug()
+
+
+def test_debug_print_true(caplog):
+    """test debug()"""
+    set_debug(True)
+    logger = osxphotos.logger
+    logger.debug("test debug")
+    assert "test debug" in caplog.text
+
+
+def test_debug_print_false(caplog):
+    set_debug(False)
+    logger = osxphotos.logger
+    logger.debug("test debug")
+    assert caplog.text == ""