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
This commit is contained in:
Rhet Turnbull
2023-01-28 17:44:20 -08:00
committed by GitHub
parent 770d85759d
commit 0c293d0bf5
67 changed files with 919 additions and 735 deletions

View File

@@ -24,10 +24,8 @@ CompareValues = namedtuple(
def parse_inspect_output(output: str) -> List[InspectValues]:
"""Parse output of --inspect and return list of InspectValues named tuple"""
with open(output, "r") as f:
lines = f.readlines()
lines = [line for line in lines if line.strip()]
lines = [line for line in output.split("\n") if line.strip()]
# remove header
lines.pop(0)
values = []
@@ -40,9 +38,7 @@ def parse_inspect_output(output: str) -> List[InspectValues]:
def parse_compare_exif(output: str) -> List[CompareValues]:
"""Parse output of --compare-exif and return list of CompareValues named tuple"""
with open(output, "r") as f:
lines = f.readlines()
lines = [line for line in lines if line.strip()]
lines = [line for line in output.split("\n") if line.strip()]
# remove header
lines.pop(0)
values = []