From: Andrew DeFaria Date: Fri, 15 Dec 2017 20:05:20 +0000 (-0800) Subject: Fixed up title handling X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;ds=sidebyside;h=6f95d8724d498f936cbba64f96bf565c04fd0cc5;p=songbook.git Fixed up title handling --- diff --git a/web/webchord.cgi b/web/webchord.cgi index 20140cc..e657db8 100755 --- a/web/webchord.cgi +++ b/web/webchord.cgi @@ -68,38 +68,30 @@ sub error { exit; } # error +sub getTitle ($) { + my ($song) = @_; + + return fileparse ($song, qr/\.pro/); +} # getTitle + sub musicFileExists ($) { my ($song) = @_; debug "ENTER musicFileExists ($song)"; - my $title = fileparse ($song, qr/\.pro/); + my $title = getTitle ($song); my $musicfile = "/opt/media/$title.mp3"; - if (-r $musicfile) { - debug "Exists!"; - - return $title; - } else { - debug "Could not find $musicfile"; - - return; - } # if + return -r $musicfile; } # musicFileExists sub updateMusicpath ($$) { my ($chopro, $song) = @_; - my $title = musicFileExists $song; - # If there's no corresponding music file then do nothing - return unless $title; + return unless musicFileExists $song; # If the .pro file already has musicpath then do nothing - if ($chopro =~ /\{musicpath:.*\}/) { - debug "$song already has musicpath"; - } # if - return if $chopro =~ /\{musicpath:.*\}/; # Otherwise append the musicpath @@ -118,6 +110,7 @@ sub updateMusicpath ($$) { } # unless my $songbase = '/sdcard'; + my $title = getTitle $song; print $songfile "{musicpath:$songbase/SongBook/Media/$title.mp3}\n"; @@ -158,7 +151,7 @@ sub chopro2html ($$) { END - $title = musicFileExists $song; + $title = getTitle $song; if ($title) { updateMusicpath $chopro, $song; @@ -254,7 +247,7 @@ END } # if } # if } # while - + print ""; } # chordpro2html