X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=torn;h=b85b2697e33a5904abfe3d1cf5c52163c5b84a14;hb=eedef62e6154269b454c0a62012692ffdbc126ab;hp=e1f1cfc0d5eeacaae75bcb55e37a79ee13d30410;hpb=66b4184a4272f672eb4e865fa2bd7c6869a724d5;p=torn.git

diff --git a/torn b/torn
index e1f1cfc..b85b269 100755
--- a/torn
+++ b/torn
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 # torn - Musical files renaming with russian language transliteration
-# Copyright (C) 2007-2020 Sergey Matveev (stargrave@stargrave.org)
+# Copyright (C) 2007-2021 Sergey Matveev (stargrave@stargrave.org)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -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;