Changeset 974

Timestamp:

12/04/07 05:23:12 (6 years ago)

Author:

paul

Message:

7HD: remove sd from 7HD

Location:

trunk

Files:

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

trunk/postprocessors/flag_aus_hdtv

@@ -13 +13 @@
 
 my $progname = "flag_aus_hdtv";
-my $version = "0.23";
+my $version = "0.24";
 
 $| = 1;
@@ -70 +70 @@
 my %stats;
 my $channels, my $reverse_channels, my $detailed_reverse_channels, my $opt_channels, my %channel_xmlid_to_opt_channel_xmlid;
-my $d, my $o, my $hd;
+my $d, my $ar, my $sd, my $hd;
 my $override_settings = { };
 my %amp = ( nbsp => ' ', qw{ amp & lt < gt > apos ' quot " } );
@@ -286 +286 @@
 
         foreach my $hdchannel (keys %$hd_to_sds) {
-                if (exists $channels->{$hdchannel}) {
+                if (defined $channels->{$hdchannel}) {
                         foreach my $sdchannel (@{$hd_to_sds->{$hdchannel}}) {
-                                if (exists $channels->{$sdchannel}) {
+                                if (defined $channels->{$sdchannel}) {
                                         # there can be only one SD channel for the 7HD channel
                                         $channel_xmlid_to_opt_channel_xmlid{$channels->{$sdchannel}} =
-                                                         $channels->{$hdchannel};
+                                                        $channels->{$hdchannel};
                                         print "  '$hdchannel' with xmlid '$channels->{$hdchannel}'" .
                                                         " populated with programs provided by " .
@@ -354 +354 @@
 
             if (defined $opt_channels->{$oldname."HD"}) {
-                if (exists $channel_xmlid_to_opt_channel_xmlid{$chanid}) {
+                if (defined $channel_xmlid_to_opt_channel_xmlid{$chanid}) {
                     print " - Skipping '${oldname}HD' treated as '${name}HD' with xmlid '" .
                             $opt_channels->{$oldname."HD"} . "' " .
@@ -629 +629 @@
 #print "process later high definition channel programmes - $this_title - $reverse_channels->{$this_chan}\n";
                 $prog->{video}->{quality} = "HDTV" unless (defined $opt->{notag});
-                $o->{$reverse_channels->{$this_chan}}->{Shepherd::Common::parse_xmltv_date($prog->{start})} = $prog;
+                $ar->{$reverse_channels->{$this_chan}}->{Shepherd::Common::parse_xmltv_date($prog->{start})} = $prog;
                 return;
+        }
+
+        # keep a copy of standard definition related to high definition channel programmes for program removal later
+        if (defined $channel_xmlid_to_opt_channel_xmlid{$this_chan} &&
+                        defined $detailed_reverse_channels->{$channel_xmlid_to_opt_channel_xmlid{$this_chan}}) {
+                $sd->{$detailed_reverse_channels->{$channel_xmlid_to_opt_channel_xmlid{$this_chan}}}->
+                                {Shepherd::Common::parse_xmltv_date($prog->{start})} = $prog;
         }
 
@@ -697 +704 @@
 sub write_hd    # currently doesn't fill any gaps between programs
 {
+        # remove from argument channel identical (time, title, sub-title) programs found on sd channel
+        foreach my $hdchannel (keys %$ar) {
+#print "removal for hdchannel $hdchannel\n";
+
+                my @aprogs = sort {$a <=> $b} keys %{$ar->{$hdchannel}};
+                my $aprog = $ar->{$hdchannel}->{shift @aprogs};
+
+                my @progs = sort {$a <=> $b} keys %{$sd->{$hdchannel}};
+                my $prog = $sd->{$hdchannel}->{shift @progs};
+                last if !defined $prog;
+                my $start = Shepherd::Common::parse_xmltv_date($prog->{start});
+                my $stop = Shepherd::Common::parse_xmltv_date($prog->{stop});
+#print "found programs\n";
+
+                while (defined $aprog) {
+                        my $astart = Shepherd::Common::parse_xmltv_date($aprog->{start});
+                        my $astop = Shepherd::Common::parse_xmltv_date($aprog->{stop});
+
+                        # skip any sd programs before this argument programs time
+                        while (defined $prog && $start < $astart) {
+#print "skip prog\n";
+                                $prog = $sd->{$hdchannel}->{shift @progs};
+                                last if !defined $prog;
+                                $start = Shepherd::Common::parse_xmltv_date($prog->{start});
+                                $stop = Shepherd::Common::parse_xmltv_date($prog->{stop});
+                        }
+                        last if !defined $prog;
+
+                        if ($astart == $start && $astop == $stop &&
+                                        (!defined $aprog->{title} || !defined $prog->{title} ||
+                                                $aprog->{title}->[0]->[0] eq $prog->{title}->[0]->[0]) &&
+                                        (!defined $aprog->{'sub-title'} || !defined $prog->{'sub-title'} ||
+                                                $aprog->{'sub-title'}->[0]->[0] eq $prog->{'sub-title'}->[0]->[0])) {
+#print "delete aprog\n";
+                                delete $ar->{$hdchannel}->{$astart};
+                        }
+
+                        $aprog = $ar->{$hdchannel}->{shift @aprogs};
+                }
+        }
+
         foreach my $xmlid (keys %$hd) {
 #print "processing channel xmlid $xmlid\n";
 
-                my ($argument, @arguments, $aprog);
+                my ($argument, @aprogs, $aprog);
 
                 # if an argument channel exists, sort the programs ready for inserting
@@ -708 +756 @@
 
                         print "  channel '";
-                        if (exists $detailed_reverse_channels->{$channel_xmlid_to_opt_channel_xmlid{$xmlid}}) {
+                        if (defined $detailed_reverse_channels->{$channel_xmlid_to_opt_channel_xmlid{$xmlid}}) {
                                 print $detailed_reverse_channels->{$channel_xmlid_to_opt_channel_xmlid{$xmlid}};
                         } else {
@@ -716 +764 @@
                                         " augmented with programs from channel '$argument'\n";
 
-                        if (defined $o->{$argument}) {
-                                @arguments = sort {$a <=> $b} keys %{$o->{$argument}};
-                                $aprog = $o->{$argument}->{shift @arguments};
+                        if (defined $ar->{$argument}) {
+                                @aprogs = sort {$a <=> $b} keys %{$ar->{$argument}};
+                                $aprog = $ar->{$argument}->{shift @aprogs};
                         }
 #print "first argument program at $aprog->{start}\n";
@@ -744 +792 @@
                                 }
 
-                                $aprog = $o->{$argument}->{shift @arguments};
+                                $aprog = $ar->{$argument}->{shift @aprogs};
                         }
 
@@ -761 +809 @@
 #print "wrote left over argument program $aprog->{title}->[0]->[0]\n";
 
-                        $aprog = $o->{$argument}->{shift @arguments};
+                        $aprog = $ar->{$argument}->{shift @aprogs};
                 }
         }

trunk/status

@@ -19 +19 @@
 postprocessor   imdb_augment_data   0.35
 postprocessor   tvdb_augment_data   0.11
-postprocessor   flag_aus_hdtv       0.23
+postprocessor   flag_aus_hdtv       0.24
 postprocessor   augment_timezone    0.17