X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fconvert-ly.py;h=2772acc7382c144590cb73ca2da6c3db58603059;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=c0c7ee3e354fdee020bfeeb971cf92f91be57ec0;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index c0c7ee3e35..2772acc738 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -5,7 +5,7 @@ # This file is part of LilyPond, the GNU music typesetter. # -# Copyright (C) 1998--2011 Han-Wen Nienhuys +# Copyright (C) 1998--2012 Han-Wen Nienhuys # Jan Nieuwenhuizen # # LilyPond is free software: you can redistribute it and/or modify @@ -39,6 +39,8 @@ import convertrules lilypond_version_re_str = '\\\\version *\"([0-9.]+)"' lilypond_version_re = re.compile (lilypond_version_re_str) +lilypond_version_strict_re_str = '\\\\version *\"([0-9]+[.][0-9]+[.][0-9]+)"' +lilypond_version_strict_re = re.compile (lilypond_version_strict_re_str) help_summary = ( _ ('''Update LilyPond input to newer version. By default, update from the @@ -58,16 +60,8 @@ program_version = '@TOPLEVEL_VERSION@' authors = ('Jan Nieuwenhuizen ', 'Han-Wen Nienhuys ') -error_file_write = ly.stderr_write - -def warning (s): - ly.stderr_write (program_name + ": " + _ ("warning: %s") % s + '\n') - -def error (s): - ly.stderr_write (program_name + ": " + _ ("error: %s") % s + '\n') - -def identify (port=sys.stderr): - ly.encoded_write (port, '%s (GNU LilyPond) %s\n' % (program_name, program_version)) +def identify (): + ly.progress ('%s (GNU LilyPond) %s\n' % (program_name, program_version)) def warranty (): identify () @@ -78,7 +72,7 @@ def warranty (): %s %s -''' % ( _ ('Copyright (c) %s by') % '2001--2011', +''' % ( _ ('Copyright (c) %s by') % '2001--2012', ' '.join (authors), _ ('Distributed under terms of the GNU General Public License.'), _ ('It comes with NO WARRANTY.'))) @@ -107,6 +101,14 @@ def get_option_parser (): p.add_option ('-e', '--edit', help=_ ("edit in place"), action='store_true') + p.add_option ("-l", "--loglevel", + help=_ ("Print log messages according to LOGLEVEL " + "(NONE, ERROR, WARNING, PROGRESS (default), DEBUG)"), + metavar=_ ("LOGLEVEL"), + action='callback', + callback=ly.handle_loglevel_option, + type='string') + p.add_option ('-n', '--no-version', help=_ ("do not add \\version command if missing"), action='store_true', @@ -181,32 +183,37 @@ tuple (LAST,STR), with the last successful conversion and the resulting string.""" conv_list = get_conversions (from_version, to_version) - error_file_write (_ ("Applying conversion: ")) - + ly.progress (_ ("Applying conversion: "), newline = False) + last_conversion = () try: + if not conv_list: + last_conversion = to_version for x in conv_list: - error_file_write (tup_to_str (x[0])) if x != conv_list[-1]: - error_file_write (', ') + ly.progress (tup_to_str (x[0]), newline = False) + ly.progress (', ', newline = False) + else: + ly.progress (tup_to_str (x[0])) str = x[1] (str) last_conversion = x[0] except convertrules.FatalConversionError: - error_file_write ('\n' - + _ ("Error while converting") - + '\n' - + _ ("Stopping at last successful rule") - + '\n') + ly.error (_ ("Error while converting") + + '\n' + + _ ("Stopping at last successful rule")) return (last_conversion, str) def guess_lilypond_version (input): - m = lilypond_version_re.search (input) + m = lilypond_version_strict_re.search (input) if m: return m.group (1) + m = lilypond_version_re.search (input) + if m: + raise InvalidVersion (m.group (1)) else: return '' @@ -221,8 +228,7 @@ class InvalidVersion (Exception): self.version = version def do_one_file (infile_name): - ly.stderr_write (_ ("Processing `%s\'... ") % infile_name) - sys.stderr.write ('\n') + ly.progress (_ ("Processing `%s\'... ") % infile_name, True) if infile_name: infile = open (infile_name, 'r') @@ -274,8 +280,8 @@ def do_one_file (infile_name): '\\' + newversion, result) elif not global_options.skip_version_add: result = newversion + '\n' + result - - error_file_write ('\n') + + ly.progress ('\n') if global_options.edit: try: @@ -323,28 +329,27 @@ def main (): show_rules (sys.stdout, global_options.from_version, global_options.to_version) sys.exit (0) - identify (sys.stderr) + identify () for f in files: if f == '-': f = '' elif not os.path.isfile (f): - error (_ ("%s: Unable to open file") % f) + ly.error (_ ("%s: Unable to open file") % f) if len (files) == 1: sys.exit (1) continue try: do_one_file (f) except UnknownVersion: - error (_ ("%s: Unable to determine version. Skipping") % f) + ly.error (_ ("%s: Unable to determine version. Skipping") % f) except InvalidVersion: # Compat code for 2.x and 3.0 syntax ("except .. as v" doesn't # work in python 2.4!): t, v, b = sys.exc_info () - error (_ ("%s: Invalid version string `%s' \n" - "Valid version strings consist of three numbers, " - "separated by dots, e.g. `2.8.12'") % (f, v.version) ) + ly.error (_ ("%s: Invalid version string `%s' \n" + "Valid version strings consist of three numbers, " + "separated by dots, e.g. `2.8.12'") % (f, v.version) ) - sys.stderr.write ('\n') main ()