Changeset 787 for grabbers/oztivo

Timestamp:

06/21/07 06:51:03 (6 years ago)

Author:

paul

Message:

oztivo: checks for messages and retries

Files:

• grabbers/oztivo (modified) (2 diffs)

grabbers/oztivo

@@ -3 +3 @@
 # OzTivo grabber
 
-my $version = '1.01';
+my $version = '1.02';
 
 # Requires configuration!
@@ -114 +114 @@
 if (!defined $raw_input) {
     my ($success, $status);
-    ($data, $success, $status) = Shepherd::Common::get_url(url => "http://$user:$pw\@minnie.tuhs.org/tivo-bin/xmlguide.pl", retries => 5, retry_delay => 20);
-    unless ($success)
-    {
-        if ($status =~ /401/)
-        {
-            print "Your OzTivo username and/or password may be incorrect!\n".
-                  "The username and password you supplied when configuring the oztivo grabber\n" .
-                  "must match your registration details on the OzTivo.com site.\n".
-                  "If this error persists, try reconfiguring: ".
-                  "  tv_grab_au --configure $progname\n";
-            print "Download failed: $status\n";
-        }
-        exit 5;
+    foreach my $tries (1 .. 3) {
+        ($data, $success, $status) = Shepherd::Common::get_url(
+                url => "http://$user:$pw\@minnie.tuhs.org/tivo-bin/xmlguide.pl",
+                retries => 5, retry_delay => 20);
+
+        unless ($success)
+        {
+            if ($status =~ /401/)
+            {
+                print "Your OzTivo username and/or password may be incorrect!\n".
+                        "The username and password you supplied when configuring the oztivo grabber\n" .
+                        "must match your registration details on the OzTivo.com site.\n".
+                        "If this error persists, try reconfiguring: ".
+                        "  tv_grab_au --configure $progname\n";
+            }
+            print "Download failed: $status\n";
+            exit 5;
+        }
+
+        my $bytes = do { use bytes; length($data) };
+        last if $bytes > 1000 or $data !~ /<message>/i;
+        $data =~ /<message>(.*?)<\/message>/si;
+        print "OzTivo message: $1\n";
+        exit 6 if $tries == 3;
+        my $sleep = int(30 + rand(30));
+        print "Sleeping for $sleep\n";
+        sleep($sleep);
     }
 
     if (defined $raw_output) {
-        open(F,">$raw_output") || die "could not write raw output to $raw_output: $!\n";
-        print F $data;
-        close(F);
-        print "Raw output saved in $raw_output.\n";
+        open(F,">$raw_output") || die "could not write raw output to $raw_output: $!\n";
+        print F $data;
+        close(F);
+        print "Raw output saved in $raw_output.\n";
     }
 } else {
     open(F,"<$raw_input") || die "could not read raw input from $raw_input: $!\n";
     while(<F>) {
-        $data .= $_;
+        $data .= $_;
     }
     close(F);