Changeset 967

Timestamp:

11/01/07 23:45:17 (6 years ago)

Author:

paul

Message:

flag_aus_hdtv: fix multiple for base channels (repeated programs on hd channels)

Location:

trunk

Files:

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

trunk/postprocessors/flag_aus_hdtv

@@ -13 +13 @@
 
 my $progname = "flag_aus_hdtv";
-my $version = "0.21";
+my $version = "0.22";
 
 $| = 1;
@@ -55 +55 @@
 
 my %stats;
-my $channels, my $opt_channels;
+my $channels, my $opt_channels, my %channel_xmlid_to_opt_channel_xmlid;
 my $d;
 my $override_settings = { };
@@ -265 +265 @@
         }
 
-        my ($shortchannels, $shortoptchannels);
+        my $shortchannels;
         while (my ($name, $chanid) = each %$channels)
         {
@@ -312 +312 @@
 
             push @{$shortchannels->{$name}}, $chanid;
-            push @{$shortoptchannels->{$name."HD"}}, $opt_channels->{$oldname."HD"}
+            $channel_xmlid_to_opt_channel_xmlid{$chanid} = $opt_channels->{$oldname."HD"}
                     if defined $opt_channels->{$oldname."HD"};
 
@@ -322 +322 @@
         }
         $channels = $shortchannels;
-        $opt_channels = $shortoptchannels;
 }
 
@@ -562 +561 @@
         my $this_chan = $prog->{channel};
         my $this_title;
-        my $hd_chan_base;
 
         $this_title = $prog->{title}->[0]->[0]
@@ -570 +568 @@
         goto NOMATCH if (!defined $this_chan);
         goto NOMATCH if (!defined $this_title);
-        goto NOMATCH if (!defined $d->{prog}->{$this_chan});
 
         # if programme is already marked as HDTV, just skip all of this
@@ -586 +583 @@
                         printf "  matched '$t' to '$this_title' (canonical match)\n" if (!defined $d->{seenprog}->{$this_title});
                         $stats{matched_prog}++;
-                        $hd_chan_base = $d->{prog}->{$this_chan}->{$t}->{chan}."HD";
                         goto MATCH;
                 }
@@ -606 +602 @@
                                 printf "  matched '$t' to '$this_title' (hd override)\n" if (!defined $d->{seenprog}->{$this_title});
                                 $stats{override_matched_prog}++;
-                                $hd_chan_base = $ch."HD";
                                 goto MATCH;
                         }
@@ -620 +615 @@
         $prog->{video}->{aspect} = "16:9"; # widescreen
 
-        if (!defined $opt_channels->{$hd_chan_base}) {
+        if (!defined $channel_xmlid_to_opt_channel_xmlid{$this_chan}) {
                 # no HD variant
                 $prog->{video}->{quality} = "HDTV" unless (defined $opt->{notag});
-
                 $writer->write_programme($prog);
                 $stats{rewrote_prog_as_hdtv_inplace}++;
         } else {
                 if ($opt->{action} =~ /copy/) {
+                        # SD channel
+                        delete $prog->{video}->{quality};
                         $writer->write_programme($prog);
                         $stats{rewrote_prog_as_hdtv_inplace}++;
@@ -634 +630 @@
                 # populate this programme in HD channel
                 $prog->{video}->{quality} = "HDTV" unless (defined $opt->{notag});
-                foreach (@{$opt_channels->{$hd_chan_base}}) {
-                        $prog->{channel} = $_;
-                        $writer->write_programme($prog);
-                        $stats{wrote_prog_into_hdtv_channel}++
-                }
+                $prog->{channel} = $channel_xmlid_to_opt_channel_xmlid{$this_chan};
+                $writer->write_programme($prog);
+                $stats{wrote_prog_into_hdtv_channel}++
         }
         return;

trunk/status

@@ -20 +20 @@
 postprocessor   imdb_augment_data   0.35
 postprocessor   tvdb_augment_data   0.11
-postprocessor   flag_aus_hdtv       0.21
+postprocessor   flag_aus_hdtv       0.22
 postprocessor   augment_timezone    0.17