X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fljlatest;h=bca6387a4aee0264e9dfe5530255501804a96cf3;hb=2d04c4f22466851aedb6ed0f2919d148f726b889;hp=2af69a2f2921f0bca8fe8947b762aa9c0e5b88a6;hpb=bbd0773f2adde4927a6196361d4061e70bf48cd9;p=xscreensaver

diff --git a/hacks/ljlatest b/hacks/ljlatest
index 2af69a2f..bca6387a 100755
--- a/hacks/ljlatest
+++ b/hacks/ljlatest
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright © 2003 Jamie Zawinski <jwz@jwz.org>
+# Copyright © 2003, 2004 Jamie Zawinski <jwz@jwz.org>
 #
 # Permission to use, copy, modify, distribute, and sell this software and its
 # documentation for any purpose is hereby granted without fee, provided that
@@ -27,7 +27,7 @@ use Text::Wrap qw(wrap);
 use bytes;  # Larry can take Unicode and shove it up his ass sideways.
 
 my $progname = $0; $progname =~ s@.*/@@g;
-my $version = q{ $Revision: 1.8 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
+my $version = q{ $Revision: 1.10 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
 
 my $verbose = 0;
 
@@ -275,27 +275,38 @@ sub lj_latest {
 
   $|=1;  # unbuffer stdout
 
-  if ($verbose) {
-    $_ = $url;
-    s@^[a-z]+:/+([^/?\#]+).*$@$1@;
-    my $host = $_;
-    print STDOUT "Contacting $host...";
-  }
+  $_ = $url;
+  s@^[a-z]+:/+([^/?\#]+).*$@$1@;
+  my $host = $_;
+
+  print STDOUT "Contacting $host..." if ($verbose);
 
   my ($http, $head, $body) = get_document ($url);
-  print STDOUT "\n\n" if ($verbose);
 
-#  $body = `cat /tmp/last`;
-#  if (1) {
-#    local *OUT;
-#    open OUT, ">/tmp/last";
-#    print OUT "$http\n$head\n$body\n";
-#    close OUT;
-#  }
+  if (!$body) {
+    print STDOUT "$progname: no response from $host\n";
+    return;
+  }
+
+  print STDOUT "\n\n" if ($verbose);
 
   $body =~ s/(<item\b)/\001\001$1/gsi;
+  my @items = split (/\001\001/, $body);
+
+  # Let's skip forward in the stream by a random amount, so that if
+  # two copies of ljlatest are running at the same time (e.g., on a
+  # multi-headed machine), they get different text.  (Put the items
+  # that we take off the front back on the back.)
+  #
+  if ($#items > 10) {
+    my $n = int (rand ($#items - 5));
+    while ($n-- > 0) {
+      push @items, (shift @items);
+    }
+  }
+
   my $i = 0;
-  foreach (split (/\001\001/, $body)) {
+  foreach (@items) {
     next unless m/^<item\b/i;
     last if (defined ($count) && $i >= $count);