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

Merge c19130fe9a into 0609c59676

Browse source
This commit is contained in:
Alex 2021-09-02 04:13:11 -04:00 • committed by GitHub
commit d092b2b30d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
scour/scour.py
View file

@ -3970,6 +3970,10 @@ _option_group_optimization.add_option("--no-renderer-workaround",
_options_parser.add_option_group(_option_group_optimization) _options_parser.add_option_group(_option_group_optimization)
_option_group_document = optparse.OptionGroup(_options_parser, "SVG document") _option_group_document = optparse.OptionGroup(_options_parser, "SVG document")
_option_group_document.add_option("--allow-file-overwrite",
action="store_true", dest="allow_file_overwrite", default=False,
help="Allow file overwrite in case of input and output are the same")
_option_group_document.add_option("--strip-xml-prolog", _option_group_document.add_option("--strip-xml-prolog",
action="store_true", dest="strip_xml_prolog", default=False, action="store_true", dest="strip_xml_prolog", default=False,
help="won't output the XML prolog (<?xml ?>)") help="won't output the XML prolog (<?xml ?>)")
@ -4062,8 +4066,9 @@ def parse_args(args=None, ignore_additional_args=False):
_options_parser.error("Invalid value for --indent, see --help") _options_parser.error("Invalid value for --indent, see --help")
if options.indent_depth < 0: if options.indent_depth < 0:
_options_parser.error("Value for --nindent should be positive (or zero), see --help") _options_parser.error("Value for --nindent should be positive (or zero), see --help")
if options.infilename and options.outfilename and options.infilename == options.outfilename: if not options.allow_file_overwrite and options.infilename \
_options_parser.error("Input filename is the same as output filename") and options.outfilename and options.infilename == options.outfilename:
_options_parser.error("Input filename is the same as output filename, use --allow-file-overwrite")
return options return options
@ -4092,6 +4097,10 @@ def maybe_gziped_file(filename, mode="r"):
def getInOut(options): def getInOut(options):
if options.infilename and options.outfilename and options.infilename == options.outfilename:
file = maybe_gziped_file(options.infilename, "r+b")
return [file, file]
if options.infilename: if options.infilename:
infile = maybe_gziped_file(options.infilename, "rb") infile = maybe_gziped_file(options.infilename, "rb")
# GZ: could catch a raised IOError here and report # GZ: could catch a raised IOError here and report
@ -4150,6 +4159,9 @@ def start(options, input, output):
# do the work # do the work
in_string = input.read() in_string = input.read()
out_string = scourString(in_string, options, stats=stats).encode("UTF-8") out_string = scourString(in_string, options, stats=stats).encode("UTF-8")
if input is output:
input.seek(0)
input.truncate()
output.write(out_string) output.write(out_string)
# Close input and output files (but do not attempt to close stdin/stdout!) # Close input and output files (but do not attempt to close stdin/stdout!)