Ticket #1204: mythrename-verb.diff

mythrename.pl

@@ -159 +159 @@
         exit;
     }
 
+sub vprint {
+       $msg = $_[0];
+        if (defined($verbose)) {
+            print "$msg\n";
+        }
+}
+
 # Check the separator and replacement characters for illegal characters
     if ($separator =~ /(?:[\/\\:*?<>|"])/) {
         die "The separator cannot contain any of the following characters:  /\\:*?<>|\"\n";
@@ -244 +251 @@
     # Double-check the destination
         $dest ||= "$video_dir/show_names";
     # Alert the user
-        if (defined($verbose)) {
-            print "Link destination directory:  $dest\n";
-        }
+        vprint "Link destination directory:  $dest";
     # Create nonexistent paths
         unless (-e $dest) {
             mkpath($dest, 0, 0755) or die "Failed to create $dest:  $!\n";
@@ -404 +409 @@
             }
             symlink "$video_dir/".$info{'basename'}, "$dest/$name"
                 or die "Can't create symlink $dest/$name:  $!\n";
-            if (defined($verbose)) {
-                print "$dest/$name\n";
-            }
+            vprint "$dest/$name";
         }
     # Rename the file
         else {
@@ -429 +432 @@
                     $rows = $sh2->execute($info{'basename'}, $info{'chanid'}, $info{'starttime'});
                     die "Couldn't restore original basename in database for ".$info{'basename'}.":  ($q2)\n" unless ($rows == 1);
                 }
-                if (defined($verbose)) {
-                    print $info{'basename'}."\t-> $name\n";
-                }
+                vprint $info{'basename'}."\t-> $name";
             }
         }
     }