marcus/scour
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

turn down log noise; improve logging

Browse source
This commit is contained in:
Tobias Oberstein 2016-01-29 09:25:43 +01:00
parent 939dd160bc
commit 170f8c7baa
1 changed files with 28 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

47
scour/scour.py
View file

@ -56,6 +56,7 @@ import sys
import xml.dom.minidom import xml.dom.minidom
import re import re
import math import math
import time
from scour.svg_regex import svg_parser from scour.svg_regex import svg_parser
from scour.svg_transform import svg_transform_parser from scour.svg_transform import svg_transform_parser
import optparse import optparse
@ -67,7 +68,7 @@ from six.moves import range
try: try:
from decimal import Decimal, InvalidOperation, getcontext from decimal import Decimal, InvalidOperation, getcontext
except ImportError: except ImportError:
print("Scour requires Python 2.4.", file=sys.stderr) print("Scour requires at least Python 2.6+ or Python 3.3+.")
# Import Psyco if available # Import Psyco if available
try: try:
@ -76,6 +77,12 @@ try:
except ImportError: except ImportError:
pass pass
# select the most precise walltime measurement function available on the platform
if sys.platform.startswith('win'):
walltime = time.clock
else:
walltime = time.time
from scour import __version__ from scour import __version__
APP = u'scour' APP = u'scour'
@ -3181,6 +3188,9 @@ _options_parser.add_option("-o",
_options_parser.add_option("-q", "--quiet", _options_parser.add_option("-q", "--quiet",
action="store_true", dest="quiet", default=False, action="store_true", dest="quiet", default=False,
help="suppress non-error output") help="suppress non-error output")
_options_parser.add_option("-v", "--verbose",
action="store_true", dest="verbose", default=False,
help="verbose log output (eg report processed elements and such)")
_options_parser.add_option("--indent", _options_parser.add_option("--indent",
action="store", type="string", dest="indent_type", default="space", action="store", type="string", dest="indent_type", default="space",
help="indentation of the output: none, space, tab (default: %default)") help="indentation of the output: none, space, tab (default: %default)")
@ -3279,19 +3289,9 @@ def generateDefaultOptions():
return Struct(**d) return Struct(**d)
def start(options, input, output): def start(options, input, output):
if sys.platform == "win32":
from time import clock as get_tick
else:
# GZ: is this different from time.time() in any way?
def get_tick():
return os.times()[0]
start = get_tick() start = walltime()
if not options.quiet:
print("%s %s\n%s" % (APP, VER, COPYRIGHT), file=sys.stderr)
# do the work # do the work
in_string = input.read() in_string = input.read()
@ -3302,20 +3302,24 @@ def start(options, input, output):
input.close() input.close()
output.close() output.close()
end = get_tick() end = walltime()
# GZ: not using globals would be good too # run-time in ms
if not options.quiet: duration = int(round((end - start) * 1000.))
print(' File:', input.name, os.linesep + \
' Time taken:', str(end-start) + 's', os.linesep + \
getReport(), file=sys.stderr)
oldsize = len(in_string) oldsize = len(in_string)
newsize = len(out_string) newsize = len(out_string)
sizediff = (newsize / oldsize) * 100 sizediff = (newsize / oldsize) * 100.
print(' Original file size:', oldsize, 'bytes;', \
'new file size:', newsize, 'bytes (' + str(sizediff)[:5] + '%)', file=sys.stderr)
if not options.quiet:
print('Scour processed file "{}" in {} ms: {}/{} bytes orig/new -> {:.1f}%'.format(
input.name,
duration,
oldsize,
newsize,
sizediff))
if options.verbose:
print(getReport())
def run(): def run():
@ -3323,6 +3327,5 @@ def run():
start(options, input, output) start(options, input, output)
if __name__ == '__main__': if __name__ == '__main__':
run() run()