Changeset 103

Timestamp:

10/19/06 07:09:40 (7 years ago)

Author:

lincoln

Message:

first pass at HDTV support in shepherd --configure

Files:

• grabbers/abc2_website (modified) (1 diff)
• grabbers/abc_website (modified) (1 diff)
• grabbers/d1 (modified) (1 diff)
• grabbers/jrobbo (modified) (1 diff)
• grabbers/oztivo (modified) (1 diff)
• grabbers/rex (modified) (1 diff)
• grabbers/yahoo7widget (modified) (1 diff)
• shepherd (modified) (8 diffs)
• status (modified) (1 diff)

grabbers/abc2_website

@@ -34 +34 @@
 my $script_start_time = [gettimeofday];
 my %stats;
-my $channels;
+my $channels, my $opt_channels;
 my $tv_guide;
 my $data_cache;

grabbers/abc_website

@@ -34 +34 @@
 my $script_start_time = [gettimeofday];
 my %stats;
-my $channels;
+my $channels, my $opt_channels;
 my $tv_guide;
 my $data_cache;

grabbers/d1

@@ -278 +278 @@
 
   # populate channels
-  my $channels;
+  my $channels, my $opt_channels;
   if (-r $opt_channels_file) {
         local (@ARGV, $/) = ($opt_channels_file);

grabbers/jrobbo

@@ -40 +40 @@
 # default settings
 my $opt = { };
-my $channels;
+my $channels, my $opt_channels;
 $opt->{channels_file} =         "";
 $opt->{outputfile} =            cwd() . "/output.xmltv";

grabbers/oztivo

@@ -32 +32 @@
 my $output_file = cwd() . "/output.xmltv";
 my $channels_file;
-my $channels;
+my $channels, $opt_channels;
 my @clist;
 my $ver;

grabbers/rex

@@ -108 +108 @@
 my $opt;
 my $channels = {};
+my $opt_channels = {};
 my %chanid;
 my $cached;

grabbers/yahoo7widget

@@ -35 +35 @@
 my $script_start_time = [gettimeofday];
 my %stats;
-my $channels;
+my $channels, my $opt_channels;
 my $tv_guide;
 

shepherd

@@ -3 +3 @@
 # "Shepherd"
 
-my $version = '0.2.15';
+my $version = '0.2.16';
 
 # A wrapper for various Aussie TV guide data grabbers
@@ -30 +30 @@
 # 0.2.14  : Changed online status file format
 # 0.2.15  : Intelli-random grabber ordering now kinda works
-
-#BEGIN { *CORE::GLOBAL::die = \&my_die; }
+# 0.2.16  : config logic for HD channels
+
+BEGIN { *CORE::GLOBAL::die = \&my_die; }
 
 use strict;
@@ -91 +92 @@
 my $region;
 my $channels;
+my $opt_channels;
 my $config_file =   "$CWD/$progname.conf";
 my $channels_file = "$CWD/channels.conf";
@@ -1236 +1238 @@
     return unless (fetch_file($rfile, $newfile));
 
-    if ($progtype ne "shepherd") {    
+    if ($progtype eq "grabber") {    
         # Fetch grabber config file
         $rfile .= ".conf";
@@ -1388 +1390 @@
         printf " #%d. %s%s\n",$components->{$proggy}->{order},$proggy,($components->{$proggy}->{disabled} ? " [disabled]" : "") unless $quiet;
     }
-
+    printf "\n" unless $quiet;
     $made_changes = 1;
 }
@@ -1542 +1544 @@
 sub write_channels_file
 {
-    write_file($channels_file, 'channels', [ $channels ], [ 'channels' ]);
+    write_file($channels_file, 'channels',
+        [ $channels,  $opt_channels ],
+        [ 'channels', 'opt_channels' ]);
 }
 
@@ -1651 +1655 @@
     }
 
-
-    print "\nRandomly selecting grabber order.\n\n";
-    set_order(0);
+    print "\nHigh Definition TV (HDTV)\n".
+          "Most Australian TV networks broadcast at least some\n".
+          "programmes in HDTV each week, but for the most part\n".
+          "either upsample SD to HD or play a rolling demonstration\n".
+          "HD clip when they don't have the programme in HD format.\n\n".
+          "If you have a HDTV capable system and are interested in\n".
+          "having Shepherd's postprocessors populate HDTV content\n".
+          "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?")) {
+        print "\nFor each channel you want guide data for, enter an XMLTV id\n" .
+              "of your choice (e.g. \"sevenhd.free.au\"). If you don't need\n" .
+              "guide data for this channel, just press Enter.\n\n";
+
+        $opt_channels = {};
+        foreach (@channellist)
+        {
+            next if (($_ =~ /ABC2/i) || ($_ =~ /SBS News/i) || ($_ =~ /31/));
+            $_ .= "HD";
+            $line = ask(" \"$_\"? ");
+            $opt_channels->{$_} = $line if ($line);
+        }
+    }
+
+
+    print "\nHave you been running a grabber previously?\n\n".
+          "Some data sources show the programme \"Spicks & Specks\"\n".
+          "with an '&', some show it as \"Spicks and Specks\" with 'and'.\n".
+          "It doesn't matter which way it is - other than if you have an existing\n".
+          "recording policy set one way or the other, it would be preferable\n".
+          "to not have to go and re-enter recording schedules.\n\n".
+          "Shepherd's \"reconciler\" is smart enough to work out many subtle\n".
+          "differences in title names and will automatically rename programmes\n".
+          "to match the same format as previously seen.\n\n".
+          "If you have been using a grabber in the past, if you let Shepherd\n".
+          "know what it is, it can use that to ask the reconciler to 'learn'\n".
+          "the subtle programme name changes between different grabbers,\n".
+          "hopefully resulting in consistent programme names, regardless of\n".
+          "the data source.\n\n".
+          "Were you using one of the following data sources previously?\n".
+          "If so, list it (or them) in order of preference.\n\n".
+          "Choose from: ";
+    print join(", ",query_grabbers());
+    print "\nProvide a comma-seperated list (in preference order) or leave blank\n".
+          "if you have no order preference.\n";
+    my $order = ask("Order? ");
+    set_order(1,$order);
 
     show_channels();
@@ -1723 +1771 @@
   print "Subscribed channels:\n";
   print "    $_ -> $channels->{$_}\n" for sort keys %$channels;
+  print "Optional (HDTV) channels:\n";
+  print "    $_ -> $opt_channels->{$_}\n" for sort keys %$opt_channels;
 }
 

status

@@ -1 @@
-shepherd:0.2.15:shepherd
-grabber:rex:3.3.4
-grabber:oztivo:0.7
-grabber:abc_website:1.55-r3
-grabber:abc2_website:1.55-r3
-grabber:yahoo7widget:1.54-r3
-grabber:jrobbo:0.03-r3
-grabber:d1:0.6.2.3-r3
+shepherd:0.2.16:shepherd
+grabber:rex:3.3.4-r2
+grabber:oztivo:0.7-r2
+grabber:abc_website:1.55-r4
+grabber:abc2_website:1.55-r4
+grabber:yahoo7widget:1.54-r4
+grabber:jrobbo:0.03-r4
+grabber:d1:0.6.2.3-r4
 reconciler:reconciler_mk2:0.07
 postprocessor:imdb_augment_data:0.03