Changeset 929

Timestamp:

09/30/07 15:35:43 (6 years ago)

Author:

max

Message:

shepherd: Define scope of XMLTV::Ask calls (just for clarity)

Files:

• applications/shepherd (modified) (13 diffs)
• status (modified) (1 diff)

applications/shepherd

@@ -2 +2 @@
 
 my $progname = 'shepherd';
-my $version = '1.2.22';
+my $version = '1.2.23';
 
 # tv_grab_au
@@ -1853 +1853 @@
         printf(" (%3d) %s\n", $_, $REGIONS{$_});
     }
-    my $reg = ask_choice("Enter region code:", ($region || "94"), 
+    my $reg = &XMLTV::Ask::ask_choice("Enter region code:", ($region || "94"), 
                          '0', keys %REGIONS);
 
@@ -1962 +1962 @@
             print "Only one theme and icon not currently set, using: $chosen_theme\n";
         } else {
-            $chosen_theme = ask_choice("Choose theme:",
+            $chosen_theme = &XMLTV::Ask::ask_choice("Choose theme:",
                 ($curr_icon eq "none" ? $t->{ch}->{$ch}->{first_theme} : "current icon ($curr_icon)"), 
                 "current icon ($curr_icon)", "none", 
@@ -2159 +2159 @@
         printf(" (%3d) %s\n", $_, $REGIONS{$_});
     }
-    $region = ask_choice("Enter region code:", ($region || "94"),
+    $region = &XMLTV::Ask::ask_choice("Enter region code:", ($region || "94"),
                          keys %REGIONS);
 
@@ -2167 +2167 @@
           "Guided is easier; Advanced allows manual entering of XMLTV IDs.\n\n";
 
-    my $guided = ask_boolean("Would you like Guided channel selection?", 1);
+    my $guided = &XMLTV::Ask::ask_boolean("Would you like Guided channel selection?", 1);
 
     my $mchans = &configure_channels_guided if ($guided);
@@ -2199 +2199 @@
         $defaulttrans = $key if ((defined $pref_title_source) && ($transition{$key} eq $pref_title_source));
     }
-    my $pref = ask_choice("Transition from grabber?", $defaulttrans,
+    my $pref = &XMLTV::Ask::ask_choice("Transition from grabber?", $defaulttrans,
                           $def, keys %transition);
     $pref_title_source = $transition{$pref};
@@ -2209 +2209 @@
     my $str = "Create configuration file";
     $str .= " and update MythTV" if ($mchans);
-    unless(ask_boolean("\n$str?", 1))
+    unless(&XMLTV::Ask::ask_boolean("\n$str?", 1))
     {
         print "Aborting configuration.\n";
@@ -2233 +2233 @@
           "  \"ln -s $CWD/$progname /usr/bin/tv_grab_au\".\n\n";
 
-    unless (ask_boolean("\nGrab data now?"))
+    unless (&XMLTV::Ask::ask_boolean("\nGrab data now?"))
     {
         exit 0;
@@ -2251 +2251 @@
     print "\n* Guided Channel Selection *\n\n";
 
-    my $want_hdtv = ask_boolean("Do you have High-Definition (HDTV)?");
-    my $want_paytv = ask_boolean("\nDo you have PayTV?");
+    my $want_hdtv = &XMLTV::Ask::ask_boolean("Do you have High-Definition (HDTV)?");
+    my $want_paytv = &XMLTV::Ask::ask_boolean("\nDo you have PayTV?");
 
     my (@channellist, @hd_channellist, @paytv_channellist);
@@ -2276 +2276 @@
     if ($want_paytv)
     {
-        $want_paytv = ask_choice("Which PayTV provider do you have?", 
+        $want_paytv = &XMLTV::Ask::ask_choice("Which PayTV provider do you have?", 
                                  $want_paytv_channels || "Foxtel", 
                                  ("Foxtel", "SelecTV"));
@@ -2390 +2390 @@
           "write these channel mappings to MythTV.\n\n";
 
-    exit unless (ask_boolean("Is this table correct? ", 1));
+    exit unless (&XMLTV::Ask::ask_boolean("Is this table correct? ", 1));
 
     return $mythids;
@@ -2459 +2459 @@
           "then Shepherd will need to know the XMLTV IDs for the HD\n".
           "channels also.\n";
-    if (ask_boolean("\nDo you wish to include HDTV channels?")) 
+    if (&XMLTV::Ask::ask_boolean("\nDo you wish to include HDTV channels?")) 
     {
         my @hd_channellist = grep(!/ABC2|SBS News|31/i, @channellist);
@@ -2475 +2475 @@
     }
 
-    if (ask_boolean("\nDo you wish to include PayTV (e.g. Foxtel, SelecTV) channels?", defined $want_paytv_channels))
-    {
-        $want_paytv_channels = ask_choice("Which PayTV provider?", $want_paytv_channels || "Foxtel", ("Foxtel", "SelecTV"));
+    if (&XMLTV::Ask::ask_boolean("\nDo you wish to include PayTV (e.g. Foxtel, SelecTV) channels?", defined $want_paytv_channels))
+    {
+        $want_paytv_channels = &XMLTV::Ask::ask_choice("Which PayTV provider?", $want_paytv_channels || "Foxtel", ("Foxtel", "SelecTV"));
         my @paytv_channellist = &read_official_channels($want_paytv_channels);
         my $paytv = channel_selection("Pay TV", ".paytv.au", $old_opt_channels, @paytv_channellist);

status

@@ -1 @@
-application     shepherd            1.2.22
+application     shepherd            1.2.23
 reference       channel_list        6
 reference       Shepherd/Common.pm  0.26