X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=torn;h=36d8c8f10bee2e2b0eda96a315866f68481711db;hb=252fae71d79309d40494ffa22cecfe4e48ee87bc;hp=7c23866878536700457df14ac93e81f651f1b178;hpb=05c5d7ddae9dd75bf33743b14c4fd63d5077e166;p=torn.git

diff --git a/torn b/torn
index 7c23866..36d8c8f 100755
--- a/torn
+++ b/torn
@@ -1,17 +1,16 @@
 #!/usr/bin/env perl
-# torn - Musical files renaming with russian language translitting
-# Copyright (C) 2007-2016 Sergey Matveev (stargrave@stargrave.org)
+# torn - Musical files renaming with russian language transliteration
+# 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -26,7 +25,8 @@ files and rules to convert russian filenames to translit.
 =head1 USAGE
 
 Simply run this script in directory where you want files and/or
-directorires to be renamed.
+directories to be renamed. Directories are not transliterated by
+default, but you can use FORCE_DIR=1 environment variable.
 
 =head1 OVERVIEW
 
@@ -60,20 +60,24 @@ use Encode;
 
 binmode STDOUT, ":utf8";
 
-my $VERSION = "0.9";
+my $VERSION = "0.10";
 
 my $src;
 my $dst;
 my $src_filename;
 
-print "torn version $VERSION, Copyright (C) 2007-2016 Sergey Matveev
+if ($#ARGV >= 0) {
+    print "torn version $VERSION, Copyright (C) 2007-2021 Sergey Matveev
 torn comes with ABSOLUTELY NO WARRANTY.  This is free software,
-and you are welcome to redistribute it under certain conditions.\n\n";
+and you are welcome to redistribute it under certain conditions.\n
+Usage: just run inside the directory. Look for POD inside the script itself.\n";
+};
 
 opendir DIR, "." or die "Can not open directory\n";
 foreach (sort readdir DIR) {
     # Skip directory itself
     next if /^\.{1,2}$/;
+    next if -d and not $ENV{FORCE_DIR};
 
     $src_filename = $_;
     $src = decode "utf-8", $src_filename;
@@ -109,18 +113,18 @@ foreach (sort readdir DIR) {
     $dst =~ s/Ю/Ju/g;
 
     # Lowercase file extensions
-    if($dst =~ /^(.*)\.([^\.]+)$/){
+    if ($dst =~ /^(.*)\.([^\.]+)$/) {
         $dst = $1 . "." . lc $2;
     };
 
     # 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;