Changeset 927

Timestamp:

09/29/07 03:54:33 (6 years ago)

Author:

paul

Message:

flag_aus_hdtv: allow multiple for base channels, closes ticket #60

Files:

• postprocessors/flag_aus_hdtv (modified) (7 diffs)
• status (modified) (1 diff)

postprocessors/flag_aus_hdtv

@@ -13 +13 @@
 
 my $progname = "flag_aus_hdtv";
-my $version = "0.20";
+my $version = "0.21";
 
 $| = 1;
@@ -74 +74 @@
 my @xmltv_version = split(/\./,$XMLTV::VERSION);
 if (($xmltv_version[0] <= 0) && ($xmltv_version[1] <= "5") && ($xmltv_version[2] <= "43")) {
-        print " - XMLTV version ".$XMLTV::VERSION." too old to support HDTV flags. Disabling HDTV flags.";
+        print " - XMLTV version ".$XMLTV::VERSION." too old to support HDTV flags. Disabling HDTV flags.\n";
         $opt->{notag} = 1;
         $stats{disabled_hdtv_flag}++;
@@ -265 +265 @@
         }
 
-        my $shortchannels;
+        my ($shortchannels, $shortoptchannels);
         while (my ($name, $chanid) = each %$channels)
         {
@@ -311 +311 @@
             }
 
-            $shortchannels->{$name} = $chanid;
-            $opt_channels->{$name."HD"} = $opt_channels->{$oldname."HD"} if $oldname ne $name and $opt_channels->{$oldname."HD"};
-            
-            #print "$oldname -> $name = $chanid\n";
-            #print "$oldname HD + $name HD = " . $opt_channels->{$oldname."HD"} . "\n" if $oldname ne $name and $opt_channels->{$oldname."HD"};
+            push @{$shortchannels->{$name}}, $chanid;
+            push @{$shortoptchannels->{$name."HD"}}, $opt_channels->{$oldname."HD"}
+                    if defined $opt_channels->{$oldname."HD"};
+
+            if ($name ne $oldname) {
+                print "  '$oldname' treated as '$name' with xmlid '$chanid'\n";
+                print "  '${oldname}HD' treated as '${name}HD' with xmlid '" . $opt_channels->{$oldname."HD"} . "'\n"
+                        if defined $opt_channels->{$oldname."HD"};
+            }
         }
         $channels = $shortchannels;
+        $opt_channels = $shortoptchannels;
 }
 
@@ -457 +462 @@
                                         if ($hd == 1) {
                                                 #print "HD Channel $this_chan $dayname \"$show\"\n" if $opt->{debug};
-                                                my $xmlid = $channels->{$this_chan};
-                                                $d->{prog}->{$xmlid}->{$show}->{chan} = $this_chan;
-                                                $d->{prog}->{$xmlid}->{$show}->{days}->{$dayname} = 1;
+                                                foreach my $xmlid (@{$channels->{$this_chan}}) {
+                                                        $d->{prog}->{$xmlid}->{$show}->{chan} = $this_chan;
+                                                        $d->{prog}->{$xmlid}->{$show}->{days}->{$dayname} = 1;
+
+                                                }
                                                 $stats{parsed_hd_progs}++;
                                         } else {
@@ -586 +593 @@
         # see if title matches something in our override table
         foreach my $ch (keys %{($hdoverride)}) {
-                next if ($channels->{$ch} ne $this_chan);
+                my $found = 0;
+                foreach my $xmlid (@{$channels->{$ch}}) {
+                        if ($xmlid eq $this_chan) {
+                                $found = 1;
+                                last;
+                        }
+                }
+                next if !$found;
                 foreach my $t (@{($hdoverride->{$ch})}) {
                         if (canonicalizeTitles_match($t,$this_title)) {
@@ -619 +633 @@
 
                 # populate this programme in HD channel
-                $prog->{channel} = $opt_channels->{$hd_chan_base};
                 $prog->{video}->{quality} = "HDTV" unless (defined $opt->{notag});
-                $writer->write_programme($prog);
-                $stats{wrote_prog_into_hdtv_channel}++
+                foreach (@{$opt_channels->{$hd_chan_base}}) {
+                        $prog->{channel} = $_;
+                        $writer->write_programme($prog);
+                        $stats{wrote_prog_into_hdtv_channel}++
+                }
         }
         return;

status

@@ -18 +18 @@
 postprocessor   imdb_augment_data   0.35
 postprocessor   tvdb_augment_data   0.11
-postprocessor   flag_aus_hdtv       0.20
+postprocessor   flag_aus_hdtv       0.21
 postprocessor   augment_timezone    0.17