From 123dc147b52457fc8bac02672f1516a71c232dd2 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 4 Mar 2011 16:26:20 +0100
Subject: [PATCH] Midi2ly: output file name cleanups.
---
scripts/midi2ly.py | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py
index 6aa331ab8e..3267285117 100644
--- a/scripts/midi2ly.py
+++ b/scripts/midi2ly.py
@@ -1099,30 +1099,33 @@ def do_options ():
def main ():
files = do_options ()
+ exts = ['.midi', '.mid', '.MID']
for f in files:
g = f
- g = strip_extension (g, '.midi')
- g = strip_extension (g, '.mid')
- g = strip_extension (g, '.MID')
- (outdir, outbase) = ('','')
+ for e in exts:
+ g = strip_extension (g, e)
+ if not os.path.exists (f):
+ for e in exts:
+ n = g + e
+ if os.path.exists (n):
+ f = n
+ break
if not global_options.output:
outdir = '.'
outbase = os.path.basename (g)
- o = os.path.join (outdir, outbase + '-midi.ly')
- elif global_options.output[-1] == os.sep:
+ o = outbase + '-midi.ly'
+ elif (global_options.output[-1] == os.sep
+ or os.path.isdir (global_options.output)):
outdir = global_options.output
outbase = os.path.basename (g)
- os.path.join (outdir, outbase + '-gen.ly')
+ o = os.path.join (outdir, outbase + '-midi.ly')
else:
o = global_options.output
(outdir, outbase) = os.path.split (o)
- if outdir != '.' and outdir != '':
- try:
- os.mkdir (outdir, 0777)
- except OSError:
- pass
+ if outdir and outdir != '.' and not os.path.exists (outdir):
+ os.mkdir (outdir, 0777)
convert_midi (f, o)
--
2.39.5