Changeset 66

Timestamp:

10/12/06 21:27:51 (7 years ago)

Author:

max

Message:

Rex version bump.

Files:

• grabbers/rex (modified) (16 diffs)
• status (modified) (1 diff)

grabbers/rex

@@ -3 +3 @@
 # "Rex"
 
-my $version  = '3.2.2';
+my $version  = '3.3.1';
 
 # An Australian TV Guide Grabber (a.k.a. tv_grab_au)
@@ -57 +57 @@
 # 3.1.0   : Feature: --ready option
 # 3.2.0   : Feature: gzip compression, report KB downloaded
-# 3.2.1   : Bugfix : handle failed downloads better
+# 3.2.1   : Bugfix : handle failed downloads properly
 # 3.2.2   : Bugfix : no empty sub-titles in cache; no output buffering
+# 3.3.0   : Feature: categorize HDTV, premieres, repeats, original airdates,
+#                    and widescreen broadcats correctly in XMLTV (not all
+#                    (supported by MythTV, alas)
+# 3.3.1   : Bugfix : stop dumping cache items unnecessarily
 
 use strict;
@@ -126 +130 @@
 help() if ($opt->{help});
 
-read_channels_file() if ($opt->{channels_file});
-
-setup_javascript();
-
 set_defaults();
+
+read_channels_file();
 
 if ($opt->{test})
@@ -146 +148 @@
 }
 
-#Date_Init("TZ=$opt->{TZ}"); # explicitly Set Timezone
-
 if ($debug or $opt->{show_config})
 {
@@ -161 +161 @@
   exit 0;
 }
+
+setup_javascript();
 
 # ---------------------------------------------------------------------------
@@ -260 +262 @@
       {
         $shows{$pid} = $show;
+        $cached->{$pid} = $show;
         $count_detail++;
       }
@@ -352 +355 @@
   return if ($opt->{test} or $opt->{nowrite_cache});
   print "Saving cache.\n";
-  Storable::store(\%shows, $cache_file);
+  Storable::store($cached, $cache_file);
 }
 
@@ -470 +473 @@
   {
     print "Retrieved " . keys(%$cached) . " cached items from file.\n";
+    clean_cache();
   }
   else
@@ -476 +480 @@
     print "Not using cache.\n";
   }
+}
+
+sub clean_cache
+{
+    my $r = expand_date(localtime()."");
+    my $c = 0;
+    print "Removing cache items that finish earlier than $r.\n" if ($debug);
+    foreach (keys %$cached)
+    {
+        if (Date_Cmp($r, $cached->{$_}->{stop}) == 1)
+        {
+            print "Removing $cached->{$_}->{title}[0][0].\n" if ($debug);
+            delete $cached->{$_};
+            $c++;
+        }
+    }
+    print "Removed $c stale items from cache.\n";
 }
 
@@ -763 +784 @@
           $_ = [ $_, 'advisory', undef ];
         }
-        $show->{'rating'} = [[ $1, 'CTVA', undef],  @extra ];
+        $show->{'rating'} = [[ $1, 'ABA', undef],  @extra ];
       }
       else
       {
-        $show->{'rating'} = [[ $1, "CTVA", undef]];
+        $show->{'rating'} = [[ $1, "ABA", undef]];
       }
     }
@@ -774 +795 @@
       $show->{'credits'}{'actor'} = [ split(/, /, strip_whitespace($1)) ];
     }
-    elsif ($str =~ /Year:(\d+)/)
-    {
-#      $show->{'date'} = strip_whitespace($1);
+    elsif ($str =~ /Year:\s*(\d+)/)
+    {
+      $show->{'date'} = strip_whitespace($1);
     }
     elsif ($str =~ /Other:(.+)/)
@@ -782 +803 @@
       next unless (strip_whitespace($1));
       $str = $tag->as_HTML();
-      @extra = split(/<br>/, $tag->as_HTML());
-      my @to_add;
+      @extra = split(/<br \/>/, $tag->as_HTML());
+      my (@to_add, %video);
       foreach my $bit (@extra)
       {
@@ -789 +810 @@
         $bit = strip_whitespace($bit);
         next unless ($bit);
+        if ($bit eq 'Repeat')
+        {
+            $show->{'previously-shown'} = { };
+            next;   # Don't need this in the desc as well as it's
+                    # highlighted by MythTV
+        }
+        elsif ($bit eq 'Widescreen')
+        {
+            $video{'aspect'} = '16:9';
+        }
+        elsif ($bit eq 'Closed Captions')
+        {
+            $show->{'subtitles'} = [ { 'type' => 'teletext' } ];
+            next;   # Just clutters up the desc
+        }
+        elsif ($bit eq 'Premiere')
+        {
+            $show->{'premiere'} = [ [ $bit, $lang ] ];
+        }
+        elsif ($bit eq 'High Definition')
+        {
+            $video{'quality'} = 'HDTV';
+        }
         push (@to_add, $bit);
+        $show->{'video'} = \%video if (%video);
       }
       foreach (@to_add)
@@ -846 +891 @@
     else
     {
-        print "Unable to read channels file.\n";
+        print "Unable to read config file.\n";
     }
 }
@@ -852 +897 @@
 sub get_command_line_options
 {
-  GetOptions( 'config-file=s'   => \$opt->{configfile},
-              'help'            => \$opt->{help},
+  GetOptions( 'help'            => \$opt->{help},
               'debug'           => \$debug,
               'days=i'          => \$opt->{days},
@@ -951 +995 @@
 {
   my $t = shift;
-
   $t =~ s/\./:/;
   my $ret = ParseDate($t);

status

@@ -1 +1 @@
 shepherd:0.2.10:shepherd
-rex:3.2.2:grabber
+rex:3.3.1:grabber
 oztivo:0.6:grabber
 abc_website:1.55-r2:grabber