Remove ._ after track number. Overwriting safety

[torn.git] / torn

diff --git a/torn b/torn
index e1f1cfc0d5eeacaae75bcb55e37a79ee13d30410..741d929ff0e1bd017b712ef73003927fe931b242 100755 (executable)
--- 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;