borgmatic-collective/borgmatic
borgmatic-collective
/
borgmatic
14
58
Fork 41
Code Issues 55 Pull Requests 2 Actions Packages Releases 122 Activity

Limit argument range for --verbose, make default log level more explicit. #93

Merged
witten merged 1 commits from :explicit_default_logging into master 2018-09-18 05:31:28 +00:00
Conversation 2 Commits 1 Files Changed 3 +7 -3
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
borgmatic/commands/borgmatic.py
View File

@ -92,6 +92,8 @@ def parse_arguments(*arguments):
parser.add_argument( parser.add_argument(
'-v', '--verbosity', '-v', '--verbosity',
type=int, type=int,
choices=range(0,3),
witten commented 2018-09-15 22:34:56 +00:00
Outdated
Review
Copy Link

At first I forgot that the end of range() is non-inclusive, and thought you were adding a new super-debug log level. But then I figured it out. :)

At first I forgot that the end of `range()` is non-inclusive, and thought you were adding a new super-debug log level. But then I figured it out. :)
default=0,
help='Display verbose progress (1 for some, 2 for lots)', help='Display verbose progress (1 for some, 2 for lots)',
) )

6
borgmatic/tests/integration/commands/test_borgmatic.py
View File

@ -14,7 +14,7 @@ def test_parse_arguments_with_no_arguments_uses_defaults():
assert parser.config_paths == config_paths assert parser.config_paths == config_paths
assert parser.excludes_filename == None assert parser.excludes_filename == None
assert parser.verbosity is None assert parser.verbosity is 0
assert parser.json is False assert parser.json is False
@ -25,7 +25,7 @@ def test_parse_arguments_with_path_arguments_overrides_defaults():
assert parser.config_paths == ['myconfig'] assert parser.config_paths == ['myconfig']
assert parser.excludes_filename == 'myexcludes' assert parser.excludes_filename == 'myexcludes'
assert parser.verbosity is None assert parser.verbosity is 0
def test_parse_arguments_with_multiple_config_paths_parses_as_list(): def test_parse_arguments_with_multiple_config_paths_parses_as_list():
@ -34,7 +34,7 @@ def test_parse_arguments_with_multiple_config_paths_parses_as_list():
parser = module.parse_arguments('--config', 'myconfig', 'otherconfig') parser = module.parse_arguments('--config', 'myconfig', 'otherconfig')
assert parser.config_paths == ['myconfig', 'otherconfig'] assert parser.config_paths == ['myconfig', 'otherconfig']
assert parser.verbosity is None assert parser.verbosity is 0
def test_parse_arguments_with_verbosity_flag_overrides_default(): def test_parse_arguments_with_verbosity_flag_overrides_default():

2
borgmatic/verbosity.py
View File

@ -1,6 +1,7 @@
import logging import logging
VERBOSITY_WARNING = 0
VERBOSITY_SOME = 1 VERBOSITY_SOME = 1
VERBOSITY_LOTS = 2 VERBOSITY_LOTS = 2
witten commented 2018-09-15 22:33:06 +00:00
Outdated
Review
Copy Link

Minor code style thing: I generally try to avoid manually lining up operators like this across lines with spacing. So I think I'd prefer this alterative if you don't mind:

VERBOSITY_WARNING = 0
VERBOSITY_SOME = 1
VERBOSITY_LOTS = 2
Minor code style thing: I generally try to avoid manually lining up operators like this across lines with spacing. So I think I'd prefer this alterative if you don't mind: ``` VERBOSITY_WARNING = 0 VERBOSITY_SOME = 1 VERBOSITY_LOTS = 2 ```
witten commented 2018-09-15 22:36:18 +00:00
Outdated
Review
Copy Link

I'm inspired by PEP-8 on this topic, by the way: https://www.python.org/dev/peps/pep-0008/#pet-peeves (scroll down to the last example in that section).

I'm inspired by PEP-8 on this topic, by the way: [https://www.python.org/dev/peps/pep-0008/#pet-peeves](https://www.python.org/dev/peps/pep-0008/#pet-peeves) (scroll down to the last example in that section).
@ -10,6 +11,7 @@ def verbosity_to_log_level(verbosity):
Given a borgmatic verbosity value, return the corresponding Python log level. Given a borgmatic verbosity value, return the corresponding Python log level.
''' '''
return { return {
VERBOSITY_WARNING: logging.WARNING,
VERBOSITY_SOME: logging.INFO, VERBOSITY_SOME: logging.INFO,
VERBOSITY_LOTS: logging.DEBUG, VERBOSITY_LOTS: logging.DEBUG,
}.get(verbosity, logging.WARNING) }.get(verbosity, logging.WARNING)