Changeset 943

Timestamp:

10/09/07 22:10:39 (6 years ago)

Author:

paul

Message:

rex: call print_stats, cache guide pages for 3 hours, put 'movie' last, use subrating sub, capture director writer country language, fix previously-shown aspect subtitles premiere quality, don't append to description
Common.pm: add subrating sub
southerncross_website: remove subrating sub

Location:

trunk

Files:

• grabbers/rex (modified) (13 diffs)
• grabbers/southerncross_website (modified) (3 diffs)
• references/Shepherd/Common.pm (modified) (2 diffs)
• status (modified) (2 diffs)

trunk/grabbers/rex

@@ -3 +3 @@
 # "Rex"
 
-my $version  = '3.5.10';
+my $version  = '3.6.0';
 
 # An Australian TV Guide Grabber (a.k.a. tv_grab_au)
@@ -92 +92 @@
 # 3.5.9   : Code change: use Shepherd::Common::read/write cache
 # 3.5.10  : Bugfix : don't exit on unknown option
+# 3.6.0   : Code change: use Shepherd::Common::print_stats
+#           Feature: cache guide pages for 3 hours, add subratings,
+#           Feature: capture director, writer, country, language
+#           Bugfix : fix previously-shown, aspect, subtitles, premiere, quality
 
 use strict;
@@ -212 +216 @@
 print stats(1);
 
+Shepherd::Common::print_stats($progname, $version, $runtime, %stats);
+
 exit 0;
 
@@ -242 +248 @@
       # Special bandwidth-saving URL for day 0
 
-      $guidedata = get_page($DATASOURCE_GUIDE_TODAY);
+      my $cacheid = $DATASOURCE_GUIDE_TODAY;
+      if ($cached->{$cacheid}) {
+        $guidedata = $cached->{$cacheid}->{data};
+      } else {
+        $guidedata = get_page($DATASOURCE_GUIDE_TODAY);
+        if ($guidedata) {
+          $cached->{$cacheid}->{data} = $guidedata;
+          $cached->{$cacheid}->{stop} = POSIX::strftime("%Y%m%d%H%M%S", localtime($runtime));
+          $cached->{$cacheid}->{title}[0][0] = $cacheid;
+        }
+      }
       parse_guide($guidedata, $date) if ($guidedata);
     }
@@ -251 +267 @@
       for (1 .. 4)
       {
-        $guidedata = get_page(url => $DATASOURCE_GUIDE,
-                        postvars => 
-                        [ 'action' => "sessionTimes",
-                          'region_id' => $rid,
-                          'date' => $date,
-                          'period' => $_,
-                          'submit' => 'submit'
-                        ]);
-        parse_guide($guidedata, $date, $_) if ($guidedata);
+        my $cacheid = "${DATASOURCE_GUIDE}?r=${rid}&d=${date}&p=$_";
+        if ($cached->{$cacheid}) {
+          $guidedata = $cached->{$cacheid}->{data};
+        } else {
+          $guidedata = get_page(url => $DATASOURCE_GUIDE,
+                        postvars =>
+                        [ 'action' => "sessionTimes",
+                          'region_id' => $rid,
+                          'date' => $date,
+                          'period' => $_,
+                          'submit' => 'submit'
+                        ]);
+          if ($guidedata) {
+            $cached->{$cacheid}->{data} = $guidedata;
+            $cached->{$cacheid}->{stop} = POSIX::strftime("%Y%m%d%H%M%S", localtime($runtime));
+            $cached->{$cacheid}->{title}[0][0] = $cacheid;
+          }
+        }
+        parse_guide($guidedata, $date, $_) if ($guidedata);
       }
     }
@@ -513 +539 @@
 sub clean_cache
 {
-    my $r = expand_date(localtime(time() - 3600)."");
+    my $r = expand_date(localtime(time() - 3*3600)."");
     my $c = 0;
     print "Removing cache items that finish earlier than $r.\n" if ($debug);
@@ -818 +844 @@
       if ($str and $str->as_text() =~ /movie/i)
       {
-        unshift (@extra, 'movie');
+        push (@extra, 'movie');
       }
 
@@ -837 +863 @@
           $_ = [ $_, 'advisory', undef ];
         }
-        $show->{'rating'} = [[ $1, 'ABA', undef],  @extra ];
+        my $sr = &Shepherd::Common::subrating($2);
+        $show->{'rating'} = [[ $sr ? "$1 $sr" : $1, 'ABA', undef],  @extra ];
       }
       else
@@ -848 +875 @@
       $show->{'credits'}{'actor'} = [ split(/, /, strip_whitespace($1)) ];
     }
+    elsif ($str =~ /Director: (.+)/)
+    {
+      $show->{'credits'}{'director'} = [ split(/, /, strip_whitespace($1)) ];
+    }
+    elsif ($str =~ /Writer: (.+)/)
+    {
+      $show->{'credits'}{'writer'} = [ split(/, /, strip_whitespace($1)) ];
+    }
     elsif ($str =~ /Year:\s*(\d+)/)
     {
       $show->{'date'} = strip_whitespace($1);
+    }
+    elsif ($str =~ /Country: (.+)/)
+    {
+      $show->{'country'} = [[ split(/, /, strip_whitespace($1)) ]];
+    }
+    elsif ($str =~ /Language: (.+)/)
+    {
+      $show->{'language'} = [ strip_whitespace($1) ];
     }
     elsif ($str =~ /Other:(.+)/)
@@ -856 +899 @@
       next unless (strip_whitespace($1));
       $str = $tag->as_HTML();
-      @extra = split(/<br \/>/, $tag->as_HTML());
+      @extra = split(/<br ?\/?>/, $tag->as_HTML());
       my (@to_add, %video);
       foreach my $bit (@extra)
@@ -866 +909 @@
         {
             $show->{'previously-shown'} = { };
-            next;   # Don't need this in the desc as well as it's
-                    # highlighted by MythTV
         }
         elsif ($bit eq 'Widescreen')
@@ -876 +917 @@
         {
             $show->{'subtitles'} = [ { 'type' => 'teletext' } ];
-            next;   # Just clutters up the desc
         }
-        elsif ($bit eq 'Premiere')
+        elsif ($bit eq 'Premiere' || $bit eq 'New Episode')
         {
             $show->{'premiere'} = [ $bit ];
@@ -888 +928 @@
         push (@to_add, $bit);
         $show->{'video'} = \%video if (%video);
-      }
-      foreach (@to_add)
-      {
-        if ($show->{'desc'})
-        {
-          $show->{'desc'}[0][0] .= " $_.";
-        }
-        else
-        {
-          $show->{'desc'} = [[ "$_.", $lang ]];
-        }
       }
     }

trunk/grabbers/southerncross_website

@@ -34 +34 @@
 
 my $progname = "southerncross_website";
-my $version = "0.14";
+my $version = "0.15";
 
 #use LWP::UserAgent;
@@ -682 +682 @@
         $post_desc .= $text;
         if ($rating) {
-          $rating .= " " . subrating($text);
+          $rating .= " " . &Shepherd::Common::subrating($text);
         } else {
-          $rating = subrating($text);
+          $rating = &Shepherd::Common::subrating($text);
         }
         &log("parse_page debug: verbose rating : $text") if $opt->{debug};
@@ -761 +761 @@
   return @categories;
 }
-
-# (Adult Themes)
-# (Some Violence, Adult Themes, Supernatural Themes)
-# (Drug References, Adult Themes)
-# (Very Coarse Language, Sexual References, Drug References, Adult Themes, Nudity)
-# (Some Violence)
-# (Drug Use, Strong Adult Themes)
-# (Some Violence, Adult Themes)
-# (Some Coarse Language)
-# (Sexual References)
-# (Mild Coarse Language, Sexual References)
-# (Sex Scenes, Adult Themes, Supernatural Themes)
-## (Qualifying - Sat)
-sub subrating
-{
-  my $string = shift;
-  my @subrating;
-
-  push(@subrating, "v") if $string =~ /Violence/i;
-  push(@subrating, "l") if $string =~ /Language/i;
-  push(@subrating, "s") if $string =~ /Sex/i;
-  push(@subrating, "d") if $string =~ /Drug/i;
-  push(@subrating, "a") if $string =~ /Adult/i;
-  push(@subrating, "n") if $string =~ /Nudity/i;
-  push(@subrating, "h") if $string =~ /Supernatural/i;
-
-  return join(",",@subrating);
-}

trunk/references/Shepherd/Common.pm

@@ -3 +3 @@
 # Shepherd::Common library
 
-my $version = '0.27';
+my $version = '0.28';
 
 #
@@ -770 +770 @@
 ##########################################################################
 
+# (Adult Themes)
+# (Some Violence, Adult Themes, Supernatural Themes)
+# (Drug References, Adult Themes)
+# (Very Coarse Language, Sexual References, Drug References, Adult Themes, Nudity)
+# (Some Violence)
+# (Drug Use, Strong Adult Themes)
+# (Some Violence, Adult Themes)
+# (Some Coarse Language)
+# (Sexual References)
+# (Mild Coarse Language, Sexual References)
+# (Sex Scenes, Adult Themes, Supernatural Themes)
+## (Qualifying - Sat)
+sub subrating
+{
+  my $string = shift;
+  my @subrating;
+
+  push(@subrating, "v") if $string =~ /Violence/i;
+  push(@subrating, "l") if $string =~ /Language/i;
+  push(@subrating, "s") if $string =~ /Sex/i;
+  push(@subrating, "d") if $string =~ /Drug/i;
+  push(@subrating, "a") if $string =~ /Adult/i;
+  push(@subrating, "n") if $string =~ /Nudity/i;
+  push(@subrating, "h") if $string =~ /Horror|Supernatural/i;
+
+  return join(",",@subrating);
+}
+
+##########################################################################
+
 sub log
 {

trunk/status

@@ -1 +1 @@
 application     shepherd            1.2.24
 reference       channel_list        6
-reference       Shepherd/Common.pm  0.27
+reference       Shepherd/Common.pm  0.28
 reference       Shepherd/MythTV.pm  0.6
 grabber         yahoo7widget        1.92
-grabber         rex                 3.5.10
+grabber         rex                 3.6.0
 grabber         abc_website         3.14
 grabber         sbsnews_website     0.18
@@ -12 +12 @@
 grabber         foxtel_swf          0.24
 grabber         channelnsw_gov      0.8
-grabber         southerncross_website   0.14
+grabber         southerncross_website   0.15
 grabber         ten_website         1.04
 grabber         selectv_website     0.02