Ticket #334: mythtv-mythlink-2.patch

contrib/mythlink.pl

@@ -41 +41 @@
     $replacement_char = $dreplacement_char;
     $space_char = $dspace_char;
 
-# Load the destination directory, if one was specified
+# Load the destination directory and other options, if specified
     GetOptions('dest|destination|path=s'    => \$dest,
                'format=s'                   => \$format,
                'sepchar|separator-char=s'   => \$separator_char,
@@ -219 +219 @@
 # Bad paths
     die "$dest is not a directory.\n" unless (-d $dest);
 
+# Prepare a database query
+    $sh = $dbh->prepare(q{SELECT basename, DATE_FORMAT(starttime, '%Y-%m-%d-%H-%i-%S'), DATE_FORMAT(endtime, '%Y-%m-%d-%H-%i-%S'), title, subtitle, description, recgroup, category, originalairdate FROM recorded})
+        or die "Unable to prepare query: ".$dbh->errstr."\n";
+
+# Create symlinks for the files on this machine
+
+# Query the desired info about the recordings
+    $sh->execute or die "Could not execute ($q):  $!\n\n";
+    $sh->bind_columns(\$basename,\$starttime,\$endtime,\$title,\$subtitle,\$description,\$recgroup,\$category,\$oad);
+
 # Delete any old links
     foreach my $file (<$dest/*>) {
         next unless (-l $file);
         unlink $file or die "Couldn't remove old symlink $file:  $!\n";
     }
 
-# Prepare a database query
-    $sh = $dbh->prepare('SELECT title, subtitle, description, recgroup, category, originalairdate FROM recorded WHERE chanid=? AND starttime=? AND endtime=?');
+# Iterate over all the recordings
+    while ($sh->fetchrow_arrayref) {
 
-# Create symlinks for the files on this machine
-    foreach my $file (<$video_dir/*.nuv>) {
-        next if ($file =~ /^ringbuf/);
-    # Pull out the various parts that make up the filename
-        my ($channel,
-            $syear, $smonth, $sday, $shour, $sminute, $ssecond,
-            $eyear, $emonth, $eday, $ehour, $eminute, $esecond) = $file =~/^$video_dir\/([a-z0-9]+)_(....)(..)(..)(..)(..)(..)_(....)(..)(..)(..)(..)(..)\.nuv$/i;
-    # Found a bad filename?
-        unless ($channel) {
-            print "Unknown filename format:  $file\n";
-            next;
-        }
-    # Query the desired info about this recording
-        $sh->execute($channel, "$syear$smonth$sday$shour$sminute$ssecond", "$eyear$emonth$eday$ehour$eminute$esecond")
-            or die "Could not execute ($q):  $!\n\n";
-        my ($title, $subtitle, $description, $recgroup, $category, $oad) = $sh->fetchrow_array;
+    # Verify the file exists on this host
+        my $file = $video_dir."/".$basename;
+        next unless (-e $file);
+
     # Format some fields we may be parsing below
         # Start time
+        my ($syear, $smonth, $sday, $shour, $sminute, $ssecond) = split(/\-/, $starttime, 6);
         my $meridian = ($shour > 12) ? 'AM' : 'PM';
         my $hour = ($shour > 12) ? $shour - 12 : $shour;
         if ($hour < 10) {
@@ -255 +254 @@
             $hour = 12;
         }
         # End time
+        my ($eyear, $emonth, $eday, $ehour, $eminute, $esecond) = split(/\-/, $endtime, 6);
         my $emeridian = ($ehour > 12) ? 'AM' : 'PM';
         my $ethour = ($ehour > 12) ? $ehour - 12 : $ehour;
         if ($ethour < 10) {