X-Git-Url: http://www.git.stargrave.org/?p=torn.git;a=blobdiff_plain;f=torn;fp=torn;h=741d929ff0e1bd017b712ef73003927fe931b242;hp=e1f1cfc0d5eeacaae75bcb55e37a79ee13d30410;hb=2a907c39e7baa6822f3e96b840a90b9b6a0c0dba;hpb=66b4184a4272f672eb4e865fa2bd7c6869a724d5 diff --git a/torn b/torn index e1f1cfc..741d929 100755 --- a/torn +++ b/torn @@ -59,7 +59,7 @@ use Encode; binmode STDOUT, ":utf8"; -my $VERSION = "0.9"; +my $VERSION = "0.10"; my $src; my $dst; @@ -117,13 +117,13 @@ foreach (sort readdir DIR) { }; # Change looking of track numbers - # And renaming itself - if($dst =~ /^(\d+)\-(.+)$/){ - print "$src -> $1.$2\n"; - rename $src_filename, "$1.$2"; - } else { - print "$src -> $dst\n"; - rename $src_filename, $dst; + if ($dst =~ /^(\d+)[-.]_*(.+)$/) { + $dst = "$1.$2"; }; + + next if ($src_filename eq $dst); + print "$src -> $dst\n"; + die "\"$dst\" exists" if -e $dst; + rename $src_filename, $dst; }; closedir DIR;