Changeset 1236

Timestamp:

11/07/09 18:27:16 (4 years ago)

Author:

mbarry

Message:

Attempt to guess at likely channel matches during configuration. Code from Greg Frost.

Location:

trunk

Files:

• references/Shepherd/Configure.pm (modified) (4 diffs)
• status (modified) (1 diff)

trunk/references/Shepherd/Configure.pm

@@ -3 +3 @@
 package Shepherd::Configure;
 
-my $version = '0.17';
+my $version = '0.18';
 
 use strict;
@@ -261 +261 @@
         $longname .= " ($mch->{callsign})" if ($mch->{callsign} and lc($mch->{callsign}) ne lc($longname));
 
+        my $default_str = "";
+        my $default_index = 0;
+        my $guide_index = 0;
+
+        # Determine if the current xmltvid for the channel in the database
+        # corresponds to a shephed channel, and if it does, offer that as
+        # the default.
+
+        foreach (@table)
+        {
+            my $guide_xmltvid = $allchannels[$guide_index];
+            $guide_xmltvid = lc "$guide_xmltvid.shepherd.au";
+            $guide_xmltvid =~ s/ //g;
+
+            if ($guide_xmltvid eq $mch->{xmltvid})
+            {
+                $default_index = $guide_index;
+            }
+
+            $guide_index++;
+        }
+
+        if ($default_index == 0)
+        {
+            my $munged_callsign = &munge($mch->{callsign});
+            my $munged_name = &munge($mch->{name});
+
+            ++$default_index until
+            munge($table[$default_index]) eq $munged_callsign or
+            munge($table[$default_index]) eq $munged_name or
+            $default_index > $#table;
+        }
+
+        if ($default_index > $#table)
+        {
+            $default_str = "0 (no guide)";
+            $default_index = 0;
+        }
+        else
+        {
+            $default_str = "$table[$default_index]";
+            $default_index++;
+            $default_str = "$default_index ($default_str)"
+        }
+
         my $channum = $mch->{channum} || '-';
-        printf "MythTV channel %s: %s ? ",
-               $channum,
-               $longname;
+        printf "MythTV channel %s: %s [default=%s] ? ",
+               $channum,
+               $longname,
+               $default_str;
         my $inp = <STDIN>;
         chomp $inp;
@@ -282 +328 @@
             redo;
         }
-        elsif ($inp =~ /\d+/)
+
+        if ($inp eq "")
+        {
+            $inp = "$default_index";
+        }
+
+        if ($inp =~ /\d+/)
         {
             my $xmltvid = '';
@@ -1145 +1197 @@
 
 
+# Convert callsigns and channel names for matching.
+sub munge
+{
+    my $ret = $_[0];
+
+    # Convert to upercase.
+
+    $ret = uc($ret);
+
+    # Substitute numbers for words.
+
+    $ret =~s/12/TWELVE/g;
+    $ret =~s/11/ELEVEN/g;
+    $ret =~s/10/TEN/g;
+    $ret =~s/9/NINE/g;
+    $ret =~s/8/EIGHT/g;
+    $ret =~s/7/SEVEN/g;
+    $ret =~s/6/SIX/g;
+    $ret =~s/5/FIVE/g;
+    $ret =~s/4/FOUR/g;
+    $ret =~s/3/THREE/g;
+    $ret =~s/2/TWO/g;
+    $ret =~s/1/ONE/g;
+    $ret =~s/0/ZERO/g;
+
+    # Ignore "Digital"
+
+    $ret =~s/DIGITAL//g;
+
+    # Remove white space.
+
+    $ret =~s/[[:space:]]+//g;
+
+    # Make HDTV equivalent to HD
+
+    $ret =~s/HDTV/HD/g;
+
+    # Remove any non alphabetics.
+
+    $ret =~s/[^A-Z]//g;
+
+    return $ret;
+}
+
+
 # ------------------------------
 # -   Icons                    -

trunk/status

@@ -3 +3 @@
 reference       Shepherd/Common.pm  0.38
 reference       Shepherd/MythTV.pm  0.9
-reference       Shepherd/Configure.pm   0.17
+reference       Shepherd/Configure.pm   0.18
 grabber         rex                 5.0.0
 grabber         news                1.6