Ticket #874: mythrename-sub.diff

mythrename.pl

@@ -22 +22 @@
     use File::Path;
 
 # Some variables we'll use here
-    our ($dest, $format, $usage, $underscores, $live);
+    our ($dest, $format, $usage, $underscores, $live, $sub);
     our ($dformat, $dseparator, $dreplacement, $separator, $replacement);
     our ($db_host, $db_user, $db_name, $db_pass, $video_dir, $verbose);
     our ($hostname, $dbh, $sh, $sh2, $q, $q2, $count);
@@ -44 +44 @@
                'format=s'                     => \$format,
                'live'                         => \$live,
                'separator=s'                  => \$separator,
+               'sub'                          => \$sub,
                'replacement=s'                => \$replacement,
                'usage|help|h'                 => \$usage,
                'underscores'                  => \$underscores,
@@ -66 +67 @@
 
     /var/video/show_names/
 
+--sub
+
+    Only takes effect with --link option. If you would like to make subdirectories
+    per title, specify --sub. In the future you will be able to pick the field
+    to sub on. Any titles with spaces in the name will have the spaces changed to
+    underscores to simplify deleting.
+
+    default:  off
+
 --live
 
     Include live tv recordings, affects both linking and renaming. This assumes
-    that recgroup = "LiveTV" for live tv recordings.
+    that recgroup = "LiveTV" for live tv recordings. Take care that you include
+    the time in your format if you channel surf alot, otherwise you may get
+    errors when it tries to link to the same file twice.
 
     default: do not link/rename live tv recordings
 
@@ -231 +243 @@
         $dest ||= "$video_dir/show_names";
     # Alert the user
         if (defined($verbose)) {
+            print "------------------------------------------------------------\n";
             print "Link destination directory:  $dest\n";
+            print "------------------------------------------------------------\n";
         }
     # Create nonexistent paths
         unless (-e $dest) {
@@ -240 +254 @@
     # Bad path
         die "$dest is not a directory.\n" unless (-d $dest);
     # Delete any old links
-        foreach my $file (<$dest/*>) {
-            next unless (-l $file);
-            unlink $file or die "Couldn't remove old symlink $file:  $!\n";
+        foreach my $deldir (<$dest/*>) {
+            if (-d $deldir) {
+               if (defined($verbose)) {
+                    print "Deleting subdirectory $deldir\n";
+               }
+                rmtree($deldir);
+            }
+            foreach my $delfile (<$deldir/*>) {
+                if (-l $delfile) {
+                   if (defined($verbose)) {
+                        print "Removing symlink $delfile\n";
+                   }
+                    unlink $delfile or die "Couldn't remove old symlink $delfile:  $!\n";
+                }
+            }
         }
+        if (defined($verbose)) {
+            print "------------------------------------------------------------\n";
+        }
     }
 
 # Prepare a database queries
@@ -352 +381 @@
         $name =~ s/(?:(?:$safe_sep)+\s*)+(?=[^\d\s])/$separator /sg;
         $name =~ s/^($safe_sep|$safe_rep|\ )+//s;
         $name =~ s/($safe_sep|$safe_rep|\ )+$//s;
+        if (defined($sub)) {
+            # Remove spaces from titles to simplify unlinking (I'm lazy)
+            $title = $fields{'T'};
+            $title =~ s/\s/\_/sg;
+        }
     # Underscores?
         if ($underscores) {
             $name =~ tr/ /_/s;
@@ -374 +408 @@
                 $name .= ".$count";
             }
             $name .= $suffix;
-        # Create the link
-            symlink "$video_dir/".$info{'basename'}, "$dest/$name"
-                or die "Can't create symlink $dest/$name:  $!\n";
-            if (defined($verbose)) {
-                print "$dest/$name\n";
+                if (defined($verbose)) {
+                    print "Trying to link $dest/$name\n";
+                }
+        # Sub destination
+            if (defined($sub)) {
+            # Double-check the destination
+                my $subdir = "$dest/$title";
+            # Alert the user
+                if (defined($verbose)) {
+                    print "Link destination sub-directory:  $subdir\n";
+                }
+            # Create nonexistent paths
+                unless (-e $subdir) {
+                    mkpath($subdir, 0, 0755) or die "Failed to create $subdir:  $!\n";
+                }
+            # Bad path
+                die "$subdir is not a directory.\n" unless (-d $subdir);
+                symlink "$video_dir/".$info{'basename'}, "$subdir/$name"
+                    or die "Can't create symlink $subdir/$name:  $!\n";
+                if (defined($verbose)) {
+                    print "Created link $subdir/$name\n";
+                }
+            } else {
+
+            # Create the link
+                symlink "$video_dir/".$info{'basename'}, "$dest/$name"
+                    or die "Can't create symlink $dest/$name:  $!\n";
+                if (defined($verbose)) {
+                    print "$dest/$name\n";
+                }
             }
         }
     # Rename the file
@@ -407 +466 @@
                 }
             }
         }
+        if (defined($verbose)) {
+            print "------------------------------------------------------------\n";
+        }
     }
 
     $sh->finish;