X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fconvert-ly.py;h=2772acc7382c144590cb73ca2da6c3db58603059;hb=b806c0589ec9194e1fdd2e58eba8e65f4c0695dc;hp=7affd1bd255326f44dea783ead14fc295388a49e;hpb=dc8e9c050a98c809e66b10d9ae1d3df9d3b0190f;p=lilypond.git diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 7affd1bd25..2772acc738 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -1,14 +1,25 @@ #!@TARGET_PYTHON@ -# + # convert-ly.py -- Update old LilyPond input files (fix name?) +# converting rules are found in python/convertrules.py + +# This file is part of LilyPond, the GNU music typesetter. # -# source file of the GNU LilyPond music typesetter -# -# (c) 1998--2007 Han-Wen Nienhuys +# Copyright (C) 1998--2012 Han-Wen Nienhuys # Jan Nieuwenhuizen # -# converting rules are found in python/convertrules.py +# LilyPond is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# LilyPond is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # +# You should have received a copy of the GNU General Public License +# along with LilyPond. If not, see . import os import sys @@ -28,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 @@ -44,31 +57,25 @@ copyright = ('Jan Nieuwenhuizen ', program_name = os.path.basename (sys.argv[0]) program_version = '@TOPLEVEL_VERSION@' -error_file_write = ly.stderr_write +authors = ('Jan Nieuwenhuizen ', + 'Han-Wen Nienhuys ') -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 () ly.encoded_write (sys.stdout, ''' -Copyright (c) %s by +%s - Han-Wen Nienhuys - Jan Nieuwenhuizen +%s %s %s -''' ( '2001--2006', - _ ("Distributed under terms of the GNU General Public License."), - _ ('It comes with NO WARRANTY.'))) - +''' % ( _ ('Copyright (c) %s by') % '2001--2012', + ' '.join (authors), + _ ('Distributed under terms of the GNU General Public License.'), + _ ('It comes with NO WARRANTY.'))) def get_option_parser (): p = ly.get_option_parser (usage=_ ("%s [OPTION]... FILE") % 'convert-ly', @@ -94,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', @@ -105,6 +120,12 @@ def get_option_parser (): action='store_true', dest='force_current_version', default=False) + + p.add_option ('-d', '--diff-version-update', + help=_ ("only update \\version number if file is modified"), + action='store_true', + dest='diff_version_update', + default=False) p.add_option ("-s", '--show-rules', help=_ ("show rules [default: -f 0, -t %s]") % program_version, @@ -117,11 +138,14 @@ def get_option_parser (): action='store', dest="to_version", default='') - + p.add_option ('-w', '--warranty', help=_ ("show warranty and copyright"), + action='store_true', + ), p.add_option_group ('', - description=(_ ("Report bugs via") - + ''' http://post.gmane.org/post.php''' - '''?group=gmane.comp.gnu.lilypond.bugs\n''')) + description=( + _ ("Report bugs via %s") + % 'http://post.gmane.org/post.php' + '?group=gmane.comp.gnu.lilypond.bugs') + '\n') return p @@ -155,48 +179,56 @@ def show_rules (file, from_version, to_version): def do_conversion (str, from_version, to_version): """Apply conversions from FROM_VERSION to TO_VERSION. Return -tuple (LAST,STR), with the last succesful conversion and the resulting +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 succesful 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 '' -class FatalConversionError: +class FatalConversionError (Exception): pass -class UnknownVersion: +class UnknownVersion (Exception): pass +class InvalidVersion (Exception): + def __init__ (self, version): + 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') @@ -220,6 +252,9 @@ def do_one_file (infile_name): else: to_version = latest_version () + if len (from_version) != 3: + raise InvalidVersion (".".join ([str(n) for n in from_version])) + (last, result) = do_conversion (input, from_version, to_version) @@ -227,14 +262,26 @@ def do_one_file (infile_name): if global_options.force_current_version and last == to_version: last = str_to_tuple (program_version) + if global_options.diff_version_update: + if result == input: + # check the y in x.y.z (minor version number) + previous_stable = (last[0], 2*(last[1]/2), 0) + if ((last[0:2] != from_version[0:2]) and + (previous_stable > from_version)): + # previous stable version + last = previous_stable + else: + # make no (actual) change to the version number + last = from_version + newversion = r'\version "%s"' % tup_to_str (last) if lilypond_version_re.search (result): result = re.sub (lilypond_version_re_str, '\\' + 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: @@ -255,6 +302,9 @@ def do_options (): opt_parser = get_option_parser() (options, args) = opt_parser.parse_args () + if options.warranty: + warranty () + sys.exit (0) if options.from_version: options.from_version = str_to_tuple (options.from_version) @@ -279,21 +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 (_ ("cannot open file: `%s'") % 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 (_ ("cannot determine version for `%s'. 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 () + 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 ()