#!/usr/bin/perl -w
#
-# webcollage, Copyright (c) 1999-2012 by Jamie Zawinski <jwz@jwz.org>
+# webcollage, Copyright © 1999-2017 by Jamie Zawinski <jwz@jwz.org>
# This program decorates the screen with random images from the web.
# One satisfied customer described it as "a nonstop pop culture brainbath."
#
# To run this as a display mode with xscreensaver, add this to `programs':
#
-# webcollage -root
-# webcollage -root -filter 'vidwhacker -stdin -stdout'
+# webcollage --root
+# webcollage --root --filter 'vidwhacker --stdin --stdout'
#
#
-# You can see this in action at http://www.jwz.org/webcollage/ --
+# You can see this in action at https://www.jwz.org/webcollage/ --
# it auto-reloads about once a minute. To make a page similar to
# that on your own system, do this:
#
-# webcollage -size '800x600' -imagemap $HOME/www/webcollage/index
+# webcollage --size '800x600' --imagemap $HOME/www/webcollage/index
+#
+#
+# Requires that either the provided "webcollage-helper" program or
+# ImageMagick's "convert" be available on $PATH.
#
#
# If you have the "driftnet" program installed, webcollage can display a
# Driftnet is available here: http://www.ex-parrot.com/~chris/driftnet/
# Use it like so:
#
-# webcollage -root -driftnet
+# webcollage --root --driftnet
#
# Driftnet is the Unix implementation of the MacOS "EtherPEG" program.
#use diagnostics;
-use Socket;
require Time::Local;
require POSIX;
use Fcntl ':flock'; # import LOCK_* constants
use POSIX qw(strftime);
-
-use bytes; # Larry can take Unicode and shove it up his ass sideways.
- # Perl 5.8.0 causes us to start getting incomprehensible
- # errors about UTF-8 all over the place without this.
+use LWP::UserAgent;
my $progname = $0; $progname =~ s@.*/@@g;
-my $version = q{ $Revision: 1.158 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
-my $copyright = "WebCollage $version, Copyright (c) 1999-2011" .
+my ($version) = ('$Revision: 1.181 $' =~ m/\s(\d[.\d]+)\s/s);
+my $copyright = "WebCollage $version, Copyright (c) 1999-2017" .
" Jamie Zawinski <jwz\@jwz.org>\n" .
- " http://www.jwz.org/webcollage/\n";
+ " https://www.jwz.org/webcollage/\n";
+
+
+
+my @search_methods = (
+ # Google is rate-limiting us now, so this works ok from
+ # a short-running screen saver, but not as a batch job.
+ # I haven't found a workaround.
+ #
+ 5, "googlephotos", \&pick_from_google_image_photos,
+ 3, "googleimgs", \&pick_from_google_images,
+ 3, "googlenums", \&pick_from_google_image_numbers,
+
+ # So let's try Bing instead. No rate limiting yet!
+ #
+ 13, "bingphotos", \&pick_from_bing_image_photos,
+ 11, "bingimgs", \&pick_from_bing_images,
+ 10, "bingnums", \&pick_from_bing_image_numbers,
+
+ 20, "flickr_recent", \&pick_from_flickr_recent,
+ 15, "flickr_random", \&pick_from_flickr_random,
+ 6, "livejournal", \&pick_from_livejournal_images,
+ 11, "imgur", \&pick_from_imgur,
+ # Tumblr doesn't have an "or" search, so this isn't great.
+ 3, "tumblr", \&pick_from_tumblr,
-my @search_methods = ( 24, "googlephotos", \&pick_from_google_image_photos,
- 13, "googleimgs", \&pick_from_google_images,
- 13, "googlenums", \&pick_from_google_image_numbers,
- 16, "flickr_recent", \&pick_from_flickr_recent,
- 13, "flickr_random", \&pick_from_flickr_random,
- 10, "twitpic", \&pick_from_twitpic_images,
- 8, "livejournal", \&pick_from_livejournal_images,
- 3, "yahoorand", \&pick_from_yahoo_random_link,
+ # I ran out of usable access tokens, May 2017
+ # 0, "instagram", \&pick_from_instagram,
- # This one doesn't work very well: too many non-img links.
- 0, "twitter", \&pick_from_twitter_images,
+ # No longer exists, as of Apr 2014
+ # 0, "yahoorand", \&pick_from_yahoo_random_link,
+
+ # Twitter destroyed their whole API in 2013.
+ # 0, "twitpic", \&pick_from_twitpic_images,
+ # 0, "twitter", \&pick_from_twitter_images,
# This is a cute way to search for a certain webcams.
# Not included in default methods, since these images
my %cookies = (
"www.altavista.com" => "AV_ALL=1", # request uncensored searches
"web.altavista.com" => "AV_ALL=1",
-
- # log in as "cipherpunk"
- "www.nytimes.com" => 'NYT-S=18cHMIlJOn2Y1bu5xvEG3Ufuk6E1oJ.' .
- 'FMxWaQV0igaB5Yi/Q/guDnLeoL.pe7i1oakSb' .
- '/VqfdUdb2Uo27Vzt1jmPn3cpYRlTw9',
-
"ircimages.com" => 'disclaimer=1',
);
# If this is set, it's a helper program to use for pasting images together:
-# this is a lot faster and more efficient than using PPM pipelines, which is
-# what we do if this program doesn't exist. (We check for "webcollage-helper"
-# on $PATH at startup, and set this variable appropriately.)
+# this is somewhat faster than using ImageMagick.
#
my $webcollage_helper = undef;
+my $convert_cmd = 'convert';
-
-# If we have the webcollage-helper program, then it will paste the images
-# together with transparency! 0.0 is invisible, 1.0 is totally opaque.
-#
-my $opacity = 0.85;
+my $opacity = 0.85; # Opacity when pasting images together.
# Some sites have managed to poison the search engines. These are they.
"pics.livejournal.com" => 1,
"tinypic.com" => 1,
"flickr.com" => 1,
+ "staticflickr.com" => 1,
"pbase.com" => 1,
"blogger.com" => 1,
"multiply.com" => 1,
"ljplus.ru" => 1,
"yandex.ru" => 1,
"imgur.com" => 1,
+ "tumblr.com" => 1,
"yfrog.com" => 1,
+ "cdninstagram.com" => 1,
+ "gstatic.com" => 1,
"yimg.com" => 1, # This is where dailynews.yahoo.com stores
"eimg.com" => 1, # its images, so pick_from_yahoo_news_text()
# For decoding HTML-encoded character entities to URLs.
+# In This Modern World, probably we should use HTML::Entities instead.
#
my %entity_table = (
"apos" => '\'',
- "quot" => '"', "amp" => '&', "lt" => '<', "gt" => '>',
- "nbsp" => ' ', "iexcl" => '¡', "cent" => '¢', "pound" => '£',
- "curren" => '¤', "yen" => '¥', "brvbar" => '¦', "sect" => '§',
- "uml" => '¨', "copy" => '©', "ordf" => 'ª', "laquo" => '«',
- "not" => '¬', "shy" => '', "reg" => '®', "macr" => '¯',
- "deg" => '°', "plusmn" => '±', "sup2" => '²', "sup3" => '³',
- "acute" => '´', "micro" => 'µ', "para" => '¶', "middot" => '·',
- "cedil" => '¸', "sup1" => '¹', "ordm" => 'º', "raquo" => '»',
- "frac14" => '¼', "frac12" => '½', "frac34" => '¾', "iquest" => '¿',
- "Agrave" => 'À', "Aacute" => 'Á', "Acirc" => 'Â', "Atilde" => 'Ã',
- "Auml" => 'Ä', "Aring" => 'Å', "AElig" => 'Æ', "Ccedil" => 'Ç',
- "Egrave" => 'È', "Eacute" => 'É', "Ecirc" => 'Ê', "Euml" => 'Ë',
- "Igrave" => 'Ì', "Iacute" => 'Í', "Icirc" => 'Î', "Iuml" => 'Ï',
- "ETH" => 'Ð', "Ntilde" => 'Ñ', "Ograve" => 'Ò', "Oacute" => 'Ó',
- "Ocirc" => 'Ô', "Otilde" => 'Õ', "Ouml" => 'Ö', "times" => '×',
- "Oslash" => 'Ø', "Ugrave" => 'Ù', "Uacute" => 'Ú', "Ucirc" => 'Û',
- "Uuml" => 'Ü', "Yacute" => 'Ý', "THORN" => 'Þ', "szlig" => 'ß',
- "agrave" => 'à', "aacute" => 'á', "acirc" => 'â', "atilde" => 'ã',
- "auml" => 'ä', "aring" => 'å', "aelig" => 'æ', "ccedil" => 'ç',
- "egrave" => 'è', "eacute" => 'é', "ecirc" => 'ê', "euml" => 'ë',
- "igrave" => 'ì', "iacute" => 'í', "icirc" => 'î', "iuml" => 'ï',
- "eth" => 'ð', "ntilde" => 'ñ', "ograve" => 'ò', "oacute" => 'ó',
- "ocirc" => 'ô', "otilde" => 'õ', "ouml" => 'ö', "divide" => '÷',
- "oslash" => 'ø', "ugrave" => 'ù', "uacute" => 'ú', "ucirc" => 'û',
- "uuml" => 'ü', "yacute" => 'ý', "thorn" => 'þ', "yuml" => 'ÿ',
+ "quot" => '"', "amp" => '&', "lt" => '<',
+ "gt" => '>', "nbsp" => ' ', "iexcl" => '',
+ "cent" => "\xA2", "pound" => "\xA3", "curren" => "\xA4",
+ "yen" => "\xA5", "brvbar" => "\xA6", "sect" => "\xA7",
+ "uml" => "\xA8", "copy" => "\xA9", "ordf" => "\xAA",
+ "laquo" => "\xAB", "not" => "\xAC", "shy" => "\xAD",
+ "reg" => "\xAE", "macr" => "\xAF", "deg" => "\xB0",
+ "plusmn" => "\xB1", "sup2" => "\xB2", "sup3" => "\xB3",
+ "acute" => "\xB4", "micro" => "\xB5", "para" => "\xB6",
+ "middot" => "\xB7", "cedil" => "\xB8", "sup1" => "\xB9",
+ "ordm" => "\xBA", "raquo" => "\xBB", "frac14" => "\xBC",
+ "frac12" => "\xBD", "frac34" => "\xBE", "iquest" => "\xBF",
+ "Agrave" => "\xC0", "Aacute" => "\xC1", "Acirc" => "\xC2",
+ "Atilde" => "\xC3", "Auml" => "\xC4", "Aring" => "\xC5",
+ "AElig" => "\xC6", "Ccedil" => "\xC7", "Egrave" => "\xC8",
+ "Eacute" => "\xC9", "Ecirc" => "\xCA", "Euml" => "\xCB",
+ "Igrave" => "\xCC", "Iacute" => "\xCD", "Icirc" => "\xCE",
+ "Iuml" => "\xCF", "ETH" => "\xD0", "Ntilde" => "\xD1",
+ "Ograve" => "\xD2", "Oacute" => "\xD3", "Ocirc" => "\xD4",
+ "Otilde" => "\xD5", "Ouml" => "\xD6", "times" => "\xD7",
+ "Oslash" => "\xD8", "Ugrave" => "\xD9", "Uacute" => "\xDA",
+ "Ucirc" => "\xDB", "Uuml" => "\xDC", "Yacute" => "\xDD",
+ "THORN" => "\xDE", "szlig" => "\xDF", "agrave" => "\xE0",
+ "aacute" => "\xE1", "acirc" => "\xE2", "atilde" => "\xE3",
+ "auml" => "\xE4", "aring" => "\xE5", "aelig" => "\xE6",
+ "ccedil" => "\xE7", "egrave" => "\xE8", "eacute" => "\xE9",
+ "ecirc" => "\xEA", "euml" => "\xEB", "igrave" => "\xEC",
+ "iacute" => "\xED", "icirc" => "\xEE", "iuml" => "\xEF",
+ "eth" => "\xF0", "ntilde" => "\xF1", "ograve" => "\xF2",
+ "oacute" => "\xF3", "ocirc" => "\xF4", "otilde" => "\xF5",
+ "ouml" => "\xF6", "divide" => "\xF7", "oslash" => "\xF8",
+ "ugrave" => "\xF9", "uacute" => "\xFA", "ucirc" => "\xFB",
+ "uuml" => "\xFC", "yacute" => "\xFD", "thorn" => "\xFE",
+ "yuml" => "\xFF",
# HTML 4 entities that do not have 1:1 Latin1 mappings.
- "bull" => "*", "hellip"=> "...", "prime" => "'", "Prime" => "\"",
- "frasl" => "/", "trade" => "[tm]", "larr" => "<-", "rarr" => "->",
- "harr" => "<->", "lArr" => "<=", "rArr" => "=>", "hArr" => "<=>",
- "empty" => "Ø", "minus" => "-", "lowast"=> "*", "sim" => "~",
- "cong" => "=~", "asymp" => "~", "ne" => "!=", "equiv" => "==",
- "le" => "<=", "ge" => ">=", "lang" => "<", "rang" => ">",
- "loz" => "<>", "OElig" => "OE", "oelig" => "oe", "Yuml" => "Y",
- "circ" => "^", "tilde" => "~", "ensp" => " ", "emsp" => " ",
- "thinsp"=> " ", "ndash" => "-", "mdash" => "--", "lsquo" => "`",
- "rsquo" => "'", "sbquo" => "'", "ldquo" => "\"", "rdquo" => "\"",
- "bdquo" => "\"", "lsaquo"=> "<", "rsaquo"=> ">",
+ "bull" => "*", "hellip"=> "...", "prime" => "'", "Prime" => "\"",
+ "frasl" => "/", "trade" => "[tm]", "larr" => "<-", "rarr" => "->",
+ "harr" => "<->", "lArr" => "<=", "rArr" => "=>", "hArr" => "<=>",
+ "empty" => "\xD8", "minus" => "-", "lowast"=> "*", "sim" => "~",
+ "cong" => "=~", "asymp" => "~", "ne" => "!=", "equiv" => "==",
+ "le" => "<=", "ge" => ">=", "lang" => "<", "rang" => ">",
+ "loz" => "<>", "OElig" => "OE", "oelig" => "oe", "Yuml" => "Y",
+ "circ" => "^", "tilde" => "~", "ensp" => " ", "emsp" => " ",
+ "thinsp"=> " ", "ndash" => "-", "mdash" => "--", "lsquo" => "`",
+ "rsquo" => "'", "sbquo" => "'", "ldquo" => "\"", "rdquo" => "\"",
+ "bdquo" => "\"", "lsaquo"=> "<", "rsaquo"=> ">",
);
my $verbose_load = 0; # diagnostics about loading of URLs
my $verbose_filter = 0; # diagnostics about page selection/rejection
my $verbose_net = 0; # diagnostics about network I/O
-my $verbose_pbm = 0; # diagnostics about PBM pipelines
+my $verbose_decode = 0; # diagnostics about img conversion pipelines
my $verbose_http = 0; # diagnostics about all HTTP activity
my $verbose_exec = 0; # diagnostics about executing programs
if (!defined($timeout)) { $timeout = $http_timeout; }
if ($timeout > $http_timeout) { $timeout = $http_timeout; }
- if ($timeout <= 0) {
- LOG (($verbose_net || $verbose_load), "timed out for $url");
- return ();
- }
+ my $user_agent = "$progname/$version";
+
+ if ($url =~ m@^https?://www\.altavista\.com/@s ||
+ $url =~ m@^https?://random\.yahoo\.com/@s ||
+ $url =~ m@^https?://[^./]+\.google\.com/@s ||
+ $url =~ m@^https?://www\.livejournal\.com/@s) {
+ # block this, you turkeys.
+ $user_agent = 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.7)' .
+ ' Gecko/20070914 Firefox/2.0.0.7';
+ }
+
+ my $ua = LWP::UserAgent->new ( agent => $user_agent,
+ keep_alive => 0,
+ env_proxy => 0,
+ );
+ $ua->proxy ('http', $http_proxy) if $http_proxy;
+ $ua->default_header ('Referer' => $referer) if $referer;
+ $ua->default_header ('Accept' => '*/*');
+ $ua->timeout($timeout) if $timeout;
+
+ if (0) {
+ $ua->add_handler ("request_send",
+ sub($$$) {
+ my ($req, $ua, $h) = @_;
+ print "\n>>[[\n"; $req->dump; print "\n]]\n";
+ return;
+ });
+ $ua->add_handler ("response_data",
+ sub($$$$) {
+ my ($req, $ua, $h, $data) = @_;
+ #print "\n<<[[\n"; print $data; print "\n]]\n";
+ return 1;
+ });
+ $ua->add_handler ("request_done",
+ sub($$$) {
+ my ($req, $ua, $h) = @_;
+ print "\n<<[[\n"; $req->dump; print "\n]]\n";
+ return;
+ });
+ }
+
+ if ($verbose_http) {
+ LOG (1, " ==> GET $url");
+ LOG (1, " ==> User-Agent: $user_agent");
+ LOG (1, " ==> Referer: $referer") if $referer;
+ }
+
+ my $res = $ua->get ($url);
+
+ my $http = ($res ? $res->status_line : '') || '';
+ my $head = ($res ? $res->headers() : '') || '';
+ $head = $head->as_string() if $head;
+ my $body = ($res && $res->is_success ? $res->decoded_content : '') || '';
LOG ($verbose_net, "get_document_1 $url " . ($referer ? $referer : ""));
- if (! ($url =~ m@^http://@i)) {
- LOG ($verbose_net, "not an HTTP URL: $url");
- return ();
+ $head =~ s/\r\n/\n/gs;
+ $head =~ s/\r/\n/gs;
+ if ($verbose_http) {
+ foreach (split (/\n/, $head)) {
+ LOG ($verbose_http, " <== $_");
+ }
}
- my ($url_proto, $dummy, $serverstring, $path) = split(/\//, $url, 4);
- $path = "" unless $path;
+ my @L = split(/\r\n|\r|\n/, $body);
+ my $lines = @L;
+ LOG ($verbose_http,
+ " <== [ body ]: $lines lines, " . length($body) . " bytes");
- if (!$url_proto || !$serverstring) {
- LOG (($verbose_net || $verbose_load), "unparsable URL: $url");
+ if (!$http) {
+ LOG (($verbose_net || $verbose_load), "null response: $url");
return ();
}
- my ($them,$port) = split(/:/, $serverstring);
- $port = 80 unless $port;
-
- my $them2 = $them;
- my $port2 = $port;
- if ($http_proxy) {
- $serverstring = $http_proxy if $http_proxy;
- $serverstring =~ s@^[a-z]+://@@;
- ($them2,$port2) = split(/:/, $serverstring);
- $port2 = 80 unless $port2;
- }
-
- my ($remote, $iaddr, $paddr, $proto, $line);
- $remote = $them2;
- if ($port2 =~ /\D/) { $port2 = getservbyname($port2, 'tcp') }
- if (!$port2) {
- LOG (($verbose_net || $verbose_load), "unrecognised port in $url");
- return ();
- }
- $iaddr = inet_aton($remote);
- if (!$iaddr) {
- LOG (($verbose_net || $verbose_load), "host not found: $remote");
- return ();
- }
- $paddr = sockaddr_in($port2, $iaddr);
-
-
- my $head = "";
- my $body = "";
-
- @_ =
- eval {
- local $SIG{ALRM} = sub {
- LOG (($verbose_net || $verbose_load), "timed out ($timeout) for $url");
- die "alarm\n";
- };
- alarm $timeout;
-
- $proto = getprotobyname('tcp');
- if (!socket(S, PF_INET, SOCK_STREAM, $proto)) {
- LOG (($verbose_net || $verbose_load), "socket: $!");
- return ();
- }
- if (!connect(S, $paddr)) {
- LOG (($verbose_net || $verbose_load), "connect($serverstring): $!");
- return ();
- }
-
- select(S); $| = 1; select(STDOUT);
-
- my $cookie = $cookies{$them};
-
- my $user_agent = "$progname/$version";
-
- if ($url =~ m@^http://www\.altavista\.com/@ ||
- $url =~ m@^http://random\.yahoo\.com/@ ||
- $url =~ m@^http://images\.google\.com/@ ||
- $url =~ m@^http://www\.google\.com/@) {
- # block this, you turkeys.
- $user_agent = "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.7)" .
- " Gecko/20070914 Firefox/2.0.0.7";
-
- # 28-Jun-2007: Google Images now emits the entire page in JS if
- # you claim to be Gecko. They also still block "webcollage".
- # They serve non-JS for unrecognised agents, so let's try this...
- $user_agent = "NoJavascriptPlease/1.0"
- if ($url =~ m@^http://[a-z]+\.google\.com/@);
- }
-
- my $hdrs = "GET " . ($http_proxy ? $url : "/$path") . " HTTP/1.0\r\n" .
- "Host: $them\r\n" .
- "User-Agent: $user_agent\r\n";
- if ($referer) {
- $hdrs .= "Referer: $referer\r\n";
- }
- if ($cookie) {
- my @cc = split(/\r?\n/, $cookie);
- $hdrs .= "Cookie: " . join('; ', @cc) . "\r\n";
- }
- $hdrs .= "\r\n";
-
- foreach (split('\r?\n', $hdrs)) {
- LOG ($verbose_http, " ==> $_");
- }
- print S $hdrs;
- my $http = <S> || "";
-
- # Kludge: the Yahoo Random Link is now returning as its first
- # line "Status: 301" instead of "HTTP/1.0 301 Found". Fix it...
- #
- $http =~ s@^Status:\s+(\d+)\b@HTTP/1.0 $1@i;
-
- $_ = $http;
- s/[\r\n]+$//s;
- LOG ($verbose_http, " <== $_");
-
- while (<S>) {
- $head .= $_;
- s/[\r\n]+$//s;
- last if m@^$@;
- LOG ($verbose_http, " <== $_");
-
- if (m@^Set-cookie:\s*([^;\r\n]+)@i) {
- set_cookie($them, $1)
- }
- }
-
- my $lines = 0;
- while (<S>) {
- $body .= $_;
- $lines++;
- }
-
- LOG ($verbose_http,
- " <== [ body ]: $lines lines, " . length($body) . " bytes");
-
- close S;
-
- if (!$http) {
- LOG (($verbose_net || $verbose_load), "null response: $url");
- return ();
- }
-
- $SIG{ALRM} = 'DEFAULT'; # seem to be suffering a race?
- return ( $http, $head, $body );
- };
- die if ($@ && $@ ne "alarm\n"); # propagate errors
-
- if ($@ && $@ ne "alarm\n") {
- print STDERR blurb() . "DIE " . join(" ", $@) . "\n";
- die;
- }
-
- if ($@) {
- # timed out
- $head = undef;
- $body = undef;
- $suppress_audit = 1;
- return ();
- } else {
- # didn't
- alarm 0;
- return @_;
- }
+ return ( $http, $head, $body );
}
$url = $location;
if ($url =~ m@^/@) {
- $referer =~ m@^(http://[^/]+)@i;
+ $referer =~ m@^(https?://[^/]+)@i;
$url = $1 . $url;
} elsif (! ($url =~ m@^[a-z]+:@i)) {
$_ = $referer;
- s@[^/]+$@@g if m@^http://[^/]+/@i;
- $_ .= "/" if m@^http://[^/]+$@i;
+ s@[^/]+$@@g if m@^https?://[^/]+/@i;
+ $_ .= "/" if m@^https?://[^/]+$@i;
$url = $_ . $url;
}
# if there's at least one slash after the host, take off the last
# pathname component
- if ( m@^http://[^/]+/@io ) {
+ if ( m@^https?://[^/]+/@io ) {
$base =~ s@[^/]+$@@go;
}
# if there are no slashes after the host at all, put one on the end.
- if ( m@^http://[^/]+$@io ) {
+ if ( m@^https?://[^/]+$@io ) {
$base .= "/";
}
if ( m@^/@o ) {
my $site;
- ( $site = $base ) =~ s@^(http://[^/]*).*@$1@gio;
+ ( $site = $base ) =~ s@^(https?://[^/]*).*@$1@gio;
$_ = "$site$link";
} elsif ( ! m@^[^/:?]+:@ ) {
$_ = "$base$link";
}
# skip non-http
- if ( ! m@^http://@io ) {
+ if ( ! m@^https?://@io ) {
next;
}
# and the image.
sub pick_image_from_rss($$) {
- my ( $url, $body ) = @_;
- my @suitable = ($body =~ m/<enclosure url="(.*?)"/g);
+ my ($url, $body) = @_;
+
+ my ($base) = ($body =~ m@<link>([^<>]+)</link>@si); # root link
+
+ my @items = ($body =~ m@<item\b[^<>]*>(.*?)</item>@gsi);
+ return unless @items;
+
+ my $n = @items;
+ my $i = int(rand($n));
+ my $item = $items[$i];
- my ($base) = ($body =~ m@<link>([^<>]+)</link>@i);
+ $base = $1 if ($item =~ m@<link>([^<>]+)</link>@si); # item link
$base = $url unless $base;
+
+ ($url) = ($item =~ m/<enclosure\b[^<>]*\burl="(.*?)"/si);
+ return unless $url;
- # pick a random element of the table
- if (@suitable) {
- my $i = int(rand(scalar @suitable));
- my $url = $suitable[$i];
- LOG ($verbose_load, "picked image " .($i+1) . "/" .
- ($#suitable+1) . ": $url");
- return ($base, $url);
- }
- return;
+ LOG ($verbose_load, "picked image $i/$n: $url");
+ return ($base, $url);
}
\f
s/(<A )/\n$1/gi;
foreach (split(/\n/)) {
$href_count++;
- my ($u) = m@<A\s.*\bHREF\s*=\s*([^>]+)>@i;
+ my ($u) = m@<A\s.*?\bHREF\s*=\s*([\"\'][^\"\'<>]+)@i;
next unless $u;
+ my ($u2) = m@<IMG\s.*\bSRC\s*=\s*[\"\']([^\"\'<>]+)@i;
- if ($u =~ m/^\"([^\"]*)\"/) { $u = $1; } # quoted string
- elsif ($u =~ m/^([^\s]*)\s/) { $u = $1; } # or token
+ if (m/\bm="\{(.*?)\}"/s) { # Bing info is inside JSON crud
+ my $json = html_unquote($1);
+ my ($href) = ($json =~ m/\b(?:surl|purl)\"?:\s*"(.*?)"/s);
+ my ($img) = ($json =~ m/\b(?:imgurl|murl)\"?:\s*"(.*?)"/s);
+ $u = "$img\t$href" if ($img && $href);
+
+ } elsif ($u2 && $u2 =~ m@://[^/]*\.gstatic\.com/@s) { $u = $u2;
+ $u =~ s/^\"|\"$//s;
+
+ } elsif ($u =~ m/^\"([^\"]*)\"/) { $u = $1 # quoted string
+ } elsif ($u =~ m/^([^\s]*)\s/) { $u = $1; # or token
+ }
if ( $rejected_urls{$u} ) {
LOG ($verbose_filter, " pre-rejecting candidate: $u");
my (@urls) = @_;
my @urls2 = ();
foreach (@urls) {
- my ($h) = m@^http://([^/: \t\r\n]+)@i;
+ my ($h) = m@^https?://([^/: \t\r\n]+)@i;
next unless defined($h);
}
\f
-############################################################################
+#############################################################################
+##
+## Pick images from random pages returned by the Yahoo Random Link
+##
+#############################################################################
+#
+## yahoorand
+#my $yahoo_random_link = "http://random.yahoo.com/fast/ryl";
#
-# Pick images from random pages returned by the Yahoo Random Link
#
-############################################################################
-
-# yahoorand
-my $yahoo_random_link = "http://random.yahoo.com/fast/ryl";
-
-
# Picks a random page; picks a random image on that page;
# returns two URLs: the page containing the image, and the image.
# Returns () if nothing found this time.
#
-sub pick_from_yahoo_random_link($) {
- my ($timeout) = @_;
-
- print STDERR "\n\n" if ($verbose_load);
- LOG ($verbose_load, "URL: $yahoo_random_link");
-
- $last_search = $yahoo_random_link; # for warnings
-
- $suppress_audit = 1;
-
- my ( $base, $body ) = get_document ($yahoo_random_link, undef, $timeout);
- if (!$base || !$body) {
- $body = undef;
- return;
- }
-
- LOG ($verbose_load, "redirected to: $base");
-
- my $img = pick_image_from_body ($base, $body);
- $body = undef;
-
- if ($img) {
- return ($base, $img);
- } else {
- return ();
- }
-}
+#sub pick_from_yahoo_random_link($) {
+# my ($timeout) = @_;
+#
+# print STDERR "\n\n" if ($verbose_load);
+# LOG ($verbose_load, "URL: $yahoo_random_link");
+#
+# $last_search = $yahoo_random_link; # for warnings
+#
+# $suppress_audit = 1;
+#
+# my ( $base, $body ) = get_document ($yahoo_random_link, undef, $timeout);
+# if (!$base || !$body) {
+# $body = undef;
+# return;
+# }
+#
+# LOG ($verbose_load, "redirected to: $base");
+#
+# my $img = pick_image_from_body ($base, $body);
+# $body = undef;
+#
+# if ($img) {
+# return ($base, $img);
+# } else {
+# return ();
+# }
+#}
\f
############################################################################
next unless ($u =~ s/^.*\*\*(http%3a.*$)/$1/gsi);
$u = url_unquote($u);
- next unless ($u =~ m@^http://@i); # skip non-HTTP or relative URLs
+ next unless ($u =~ m@^https?://@i); # skip non-HTTP or relative URLs
next if ($u =~ m@[/.]altavista\.com\b@i); # skip altavista builtins
next if ($u =~ m@[/.]yahoo\.com\b@i); # yahoo and av in cahoots?
next if ($u =~ m@[/.]doubleclick\.net\b@i); # you cretins
my @candidates = ();
my %referers;
foreach my $u (@subpages) {
- next if ($u =~ m@[/.]google\.com\b@i); # skip google builtins (most links)
+ next if ($u =~ m@[/.]google\.com\b@i); # skip google builtins (most links)
next unless ($u =~ m@jpg/image.jpg\?r=@i); # All pics contain this
LOG ($verbose_filter, " candidate: $u");
#
############################################################################
-
-my $google_images_url = "http://images.google.com/images" .
- "?site=images" . # photos
- "&btnG=Search" . # graphics
- "&safe=off" . # no screening
- "&imgsafe=off" .
- "&q=";
+my $google_images_url = 'https://www.google.com/search' .
+ '?source=lnms&tbm=isch&tbs=isz:l&q=';
# googleimgs
sub pick_from_google_images($;$$) {
$words = random_word(); # only one word for Google
}
- my $page = (int(rand(9)) + 1);
- my $num = 20; # 20 images per page
- my $search_url = $google_images_url . $words;
-
- if ($page > 1) {
- $search_url .= "&start=" . $page*$num; # page number
- $search_url .= "&num=" . $num; #images per page
- }
+ my $off = int(rand(40));
+ my $search_url = $google_images_url . $words . "&start=" . $off;
my ($search_hit_count, @subpages) =
pick_from_search_engine ($timeout, $search_url, $words);
my @candidates = ();
- my %referers;
foreach my $u (@subpages) {
- next unless ($u =~ m@imgres\?imgurl@i); # All pics start with this
- next if ($u =~ m@[/.]google\.com\b@i); # skip google builtins
-
$u = html_unquote($u);
- if ($u =~ m@^/imgres\?imgurl=(.*?)&imgrefurl=(.*?)\&@) {
- my $ref = $2;
- my $img = $1;
- $img = "http://$img" unless ($img =~ m/^http:/i);
-
- $ref = url_decode($ref);
- $img = url_decode($img);
-
- LOG ($verbose_filter, " candidate: $ref");
- push @candidates, $img;
- $referers{$img} = $ref;
- }
+ # next if ($u =~ m@^https?://[^.]*\.(google|youtube)\.com/@s);
+ next unless ($u =~ m@^https?://[^/]*\.gstatic\.com@s);
+ LOG ($verbose_filter, " candidate: $u");
+ push @candidates, $u;
}
@candidates = depoison (@candidates);
return () if ($#candidates < 0);
my $i = int(rand($#candidates+1));
my $img = $candidates[$i];
- my $ref = $referers{$img};
- LOG ($verbose_load, "picked image " . ($i+1) . ": $img (on $ref)");
- return ($ref, $img);
+ LOG ($verbose_load, "picked image " . ($i+1) . ": $img");
+ return ($img, $img);
}
# Google Image Search.
# By jwz, inspired by the excellent Random Personal Picture Finder
# at http://www.diddly.com/random/
+# May 2017: Commented out a bunch of formats that have fallen out of favor.
#
############################################################################
# Common digital camera file name formats, as described at
# http://www.diddly.com/random/about.html
#
- sub { sprintf ("dcp%05d.jpg", int(rand(4000))); }, # Kodak
+# sub { sprintf ("dcp%05d.jpg", int(rand(4000))); }, # Kodak
sub { sprintf ("dsc%05d.jpg", int(rand(4000))); }, # Nikon
sub { sprintf ("dscn%04d.jpg", int(rand(4000))); }, # Nikon
- sub { sprintf ("mvc-%03d.jpg", int(rand(999))); }, # Sony Mavica
- sub { sprintf ("mvc%05d.jpg", int(rand(9999))); }, # Sony Mavica
- sub { sprintf ("P101%04d.jpg", int(rand(9999))); }, # Olympus w/ date=101
- sub { sprintf ("P%x%02d%04d.jpg", # Olympus
- int(rand(0xC)), int(rand(30))+1,
- rand(9999)); },
+# sub { sprintf ("mvc-%03d.jpg", int(rand(999))); }, # Sony Mavica
+# sub { sprintf ("mvc%05d.jpg", int(rand(9999))); }, # Sony Mavica
+# sub { sprintf ("P101%04d.jpg", int(rand(9999))); }, # Olympus w/ date=101
+# sub { sprintf ("P%x%02d%04d.jpg", # Olympus
+# int(rand(0xC)), int(rand(30))+1,
+# rand(9999)); },
sub { sprintf ("IMG_%03d.jpg", int(rand(999))); }, # ?
- sub { sprintf ("IMAG%04d.jpg", int(rand(9999))); }, # RCA and Samsung
- sub { my $n = int(rand(9999)); # Canon
- sprintf ("1%02d-%04d.jpg", int($n/100), $n); },
- sub { my $n = int(rand(9999)); # Canon
- sprintf ("1%02d-%04d_IMG.jpg",
- int($n/100), $n); },
+# sub { sprintf ("IMAG%04d.jpg", int(rand(9999))); }, # RCA and Samsung
+# sub { my $n = int(rand(9999)); # Canon
+# sprintf ("1%02d-%04d.jpg", int($n/100), $n); },
+# sub { my $n = int(rand(9999)); # Canon
+# sprintf ("1%02d-%04d_IMG.jpg",
+# int($n/100), $n); },
sub { sprintf ("IMG_%04d.jpg", int(rand(9999))); }, # Canon
sub { sprintf ("dscf%04d.jpg", int(rand(9999))); }, # Fuji Finepix
- sub { sprintf ("pdrm%04d.jpg", int(rand(9999))); }, # Toshiba PDR
- sub { sprintf ("IM%06d.jpg", int(rand(9999))); }, # HP Photosmart
- sub { sprintf ("EX%06d.jpg", int(rand(9999))); }, # HP Photosmart
+# sub { sprintf ("pdrm%04d.jpg", int(rand(9999))); }, # Toshiba PDR
+# sub { sprintf ("IM%06d.jpg", int(rand(9999))); }, # HP Photosmart
+# sub { sprintf ("EX%06d.jpg", int(rand(9999))); }, # HP Photosmart
# sub { my $n = int(rand(3)); # Kodak DC-40,50,120
# sprintf ("DC%04d%s.jpg", int(rand(9999)),
# $n == 0 ? 'S' : $n == 1 ? 'M' : 'L'); },
sub { sprintf ("pict%04d.jpg", int(rand(9999))); }, # Minolta Dimage
- sub { sprintf ("P%07d.jpg", int(rand(9999))); }, # Kodak DC290
+# sub { sprintf ("P%07d.jpg", int(rand(9999))); }, # Kodak DC290
# sub { sprintf ("%02d%02d%04d.jpg", # Casio QV3000, QV4000
# int(rand(12))+1, int(rand(31))+1,
# int(rand(999))); },
# int(rand(12))+1, int(rand(31))+1,
# int(rand(999))); },
sub { sprintf ("IMGP%04d.jpg", int(rand(9999))); }, # Pentax Optio S
- sub { sprintf ("PANA%04d.jpg", int(rand(9999))); }, # Panasonic vid still
+# sub { sprintf ("PANA%04d.jpg", int(rand(9999))); }, # Panasonic vid still
sub { sprintf ("HPIM%04d.jpg", int(rand(9999))); }, # HP Photosmart
- sub { sprintf ("PCDV%04d.jpg", int(rand(9999))); }, # ?
+# sub { sprintf ("PCDV%04d.jpg", int(rand(9999))); }, # ?
);
my $i = int(rand($#photomakers + 1));
my $fn = $photomakers[$i];
my $file = &$fn;
- my $words .= $file . "%20filetype:jpg";
+ #$file .= "%20filetype:jpg";
- pick_from_google_images ($timeout, $words);
+ pick_from_google_images ($timeout, $file);
}
+\f
+############################################################################
+#
+# Pick images by feeding random words into Google Image Search.
+# By the way: fuck Microsoft.
+#
+############################################################################
+
+my $bing_images_url = "http://www.bing.com/images/async?q=";
+
+
+# bingimgs
+sub pick_from_bing_images($;$$) {
+ my ($timeout, $words, $max_page) = @_;
+
+ if (!defined($words)) {
+ $words = random_word(); # only one word for Bing
+ }
+
+ my $off = int(rand(300));
+ my $search_url = $bing_images_url . $words . "&first=" . $off;
+
+ my ($search_hit_count, @subpages) =
+ pick_from_search_engine ($timeout, $search_url, $words);
+
+ my @candidates = ();
+ my %referers;
+ foreach my $u (@subpages) {
+ my ($img, $ref) = ($u =~ m/^(.*?)\t(.*)$/s);
+ next unless $img;
+ LOG ($verbose_filter, " candidate: $ref");
+ push @candidates, $img;
+ $referers{$img} = $ref;
+ }
+
+ @candidates = depoison (@candidates);
+ return () if ($#candidates < 0);
+ my $i = int(rand($#candidates+1));
+ my $img = $candidates[$i];
+ my $ref = $referers{$img};
+
+ LOG ($verbose_load, "picked image " . ($i+1) . ": $img (on $ref)");
+ return ($ref, $img);
+}
+
+
+
+\f
+############################################################################
+#
+# Pick images by feeding random numbers into Bing Image Search.
+#
+############################################################################
+
+# bingnums
+sub pick_from_bing_image_numbers($) {
+ my ($timeout) = @_;
+
+ my $max = 9999;
+ my $number = int(rand($max));
+
+ $number = sprintf("%04d", $number)
+ if (rand() < 0.3);
+
+ pick_from_bing_images ($timeout, "$number");
+}
+
+\f
+############################################################################
+#
+# Pick images by feeding random numbers into Bing Image Search.
+#
+############################################################################
+
+# bingphotos
+sub pick_from_bing_image_photos($) {
+ my ($timeout) = @_;
+
+ my $i = int(rand($#photomakers + 1));
+ my $fn = $photomakers[$i];
+ my $file = &$fn;
+
+ pick_from_bing_images ($timeout, $file);
+}
\f
############################################################################
next unless ($u =~ s/^.*\*\*(http%3a.*$)/$1/gsi);
$u = url_unquote($u);
- next unless ($u =~ m@^http://@i); # skip non-HTTP or relative URLs
+ next unless ($u =~ m@^https?://@i); # skip non-HTTP or relative URLs
next if ($u =~ m@[/.]altavista\.com\b@i); # skip altavista builtins
next if ($u =~ m@[/.]yahoo\.com\b@i); # yahoo and av in cahoots?
# next unless ($u =~ m@/director.asp\?.*\btarget=([^&]+)@);
# $u = url_decode($1);
- next unless ($u =~ m@^http://@i); # skip non-HTTP or relative URLs
+ next unless ($u =~ m@^https?://@i); # skip non-HTTP or relative URLs
next if ($u =~ m@[/.]hotbot\.com\b@i); # skip hotbot builtins
next if ($u =~ m@[/.]lycos\.com\b@i); # skip hotbot builtins
next if ($u =~ m@[/.]inktomi\.com\b@i); # skip hotbot builtins
# Lycos plays redirection games.
# (not any more?)
-# next unless ($u =~ m@^http://click.lycos.com/director.asp
+# next unless ($u =~ m@^https?://click.lycos.com/director.asp
# .*
# \btarget=([^&]+)
# .*
# @x);
# $u = url_decode($1);
- next unless ($u =~ m@^http://@i); # skip non-HTTP or relative URLs
+ next unless ($u =~ m@^https?://@i); # skip non-HTTP or relative URLs
next if ($u =~ m@[/.]hotbot\.com\b@i); # skip lycos builtins
next if ($u =~ m@[/.]lycos\.com\b@i); # skip lycos builtins
next if ($u =~ m@[/.]terralycos\.com\b@i); # skip lycos builtins
foreach my $u (@subpages) {
# de-redirectize the URLs
- $u =~ s@^http://rds\.yahoo\.com/.*-http%3A@http:@s;
+ $u =~ s@^https?://rds\.yahoo\.com/.*-http%3A@http:@s;
# only accept URLs on Yahoo's news site
- next unless ($u =~ m@^http://dailynews\.yahoo\.com/@i ||
- $u =~ m@^http://story\.news\.yahoo\.com/@i);
+ next unless ($u =~ m@^https?://dailynews\.yahoo\.com/@i ||
+ $u =~ m@^https?://story\.news\.yahoo\.com/@i);
next unless ($u =~ m@&u=/@);
LOG ($verbose_filter, " candidate: $u");
$last_search = $livejournal_img_url; # for warnings
my ( $base, $body ) = get_document ($livejournal_img_url, undef, $timeout);
- return () unless $body;
+
+ # Often the document comes back empty. If so, just use the cache.
+ # return () unless $body;
+ $body = '' unless defined($body);
$body =~ s/\n/ /gs;
$body =~ s/(<recent-image)\b/\n$1/gsi;
if ($u =~ m/^\"([^\"]*)\"/) { $u = $1; } # quoted string
elsif ($u =~ m/^([^\s]*)\s/) { $u = $1; } # or token
- next unless ($u =~ m/^http:/i);
- next if ($u =~ m@^http://(searchirc\.com\|ircimages\.com)@i);
+ next unless ($u =~ m/^https?:/i);
+ next if ($u =~ m@^https?://(searchirc\.com\|ircimages\.com)@i);
next unless ($u =~ m@[.](gif|jpg|jpeg|pjpg|pjpeg|png)$@i);
LOG ($verbose_http, " HREF: $u");
# Parsing JSON is a pain in the ass. So we halfass it as usual.
$body =~ s/^\[|\]$//s;
$body =~ s/(\[.*?\])/{ $_ = $1; s@\},@\} @gs; $_; }/gsexi;
- my @items = split (/},{/, $body);
+ my @items = split (/\},\{/, $body);
foreach (@items) {
my ($name) = m@"screen_name":"([^\"]+)"@si;
my ($img) = m@"media_url":"([^\"]+)"@si;
#
############################################################################
-my $flickr_img_url = "http://www.flickr.com/photos/";
+my $flickr_img_url = "http://www.flickr.com/explore/";
# Like LiveJournal, the Flickr page of images tends to update slowly,
# so remember the last N entries on it and randomly select from those.
$last_search .= "?start=$start" if ($start > 0);
my ( $base, $body ) = get_document ($last_search, undef, $timeout);
- return () unless $body;
- $body =~ s/[\r\n]/ /gs;
- $body =~ s/(<a)\b/\n$1/gsi;
+ # If the document comes back empty. just use the cache.
+ # return () unless $body;
+ $body = '' unless defined($body);
my $count = 0;
my $count2 = 0;
- foreach (split (/\n/, $body)) {
- my ($page, $thumb) = m@<A \s [^<>]* \b HREF=\"([^<>\"]+)\" [^<>]* > \s*
- <IMG \s [^<>]* \b SRC=\"([^<>\"]+)\" @xsi;
- next unless defined ($thumb);
- $page = html_unquote ($page);
- $thumb = html_unquote ($thumb);
- next unless ($thumb =~ m@^http://farm\d*\.static\.?flickr\.com/@);
+ if ($body =~ m@{ *"_data": \[ ( .*? \} ) \]@six) {
+ $body = $1;
+ } else {
+ LOG ($verbose_load, "flickr unparsable: $last_search");
+ return ();
+ }
+
+ $body =~ s/[\r\n]/ /gs;
+ $body =~ s/(\},) *(\{)/$1\n$2/gs; # "_flickrModelRegistry"
+
+ foreach my $chunk (split (/\n/, $body)) {
+ my ($img) = ($chunk =~ m@"displayUrl": *"(.*?)"@six);
+ next unless defined ($img);
+ $img =~ s/\\//gs;
+ $img = "//" unless ($img =~ m@^/@s);
+ $img = "http:$img" unless ($img =~ m/^http/s);
- my $base = "http://www.flickr.com/";
- $page =~ s@^/@$base@;
- $thumb =~ s@^/@$base@;
+ my ($user) = ($chunk =~ m/"pathAlias": *"(.*?)"/si);
+ next unless defined ($user);
- my $img = $thumb;
- $img =~ s/_[a-z](\.[a-z\d]+)$/$1/si; # take off "thumb" suffix
+ my ($id) = ($img =~ m@/\d+/(\d+)_([\da-f]+)_@si);
+ my ($page) = "https://www.flickr.com/photos/$user/$id/";
+
+ # $img =~ s/_[a-z](\.[a-z\d]+)$/$1/si; # take off "thumb" suffix
$count++;
next if ($flickr_cache{$img}); # already have it
#
############################################################################
-my $flickr_rss_base = ("http://www.flickr.com/services/feeds/photos_public.gne".
+my $flickr_rss_base = ("http://www.flickr.com/services/feeds/" .
+ "photos_public.gne" .
"?format=rss_200_enc&tagmode=any&tags=");
# Picks a random RSS feed; picks a random image from that feed;
return ($base, $img);
}
+\f
+############################################################################
+#
+# Pick random images from Instagram.
+#
+############################################################################
+
+my $instagram_url_base = "https://api.instagram.com/v1/media/popular";
+
+# instagram_random
+sub pick_from_instagram($) {
+ my $timeout = shift;
+
+ # Liberated access tokens.
+ # jsdo.it search for: instagram client_id
+ # Google search for: instagram "&client_id=" site:jsfiddle.net
+ my @tokens = (#'b59fbe4563944b6c88cced13495c0f49', # gramfeed.com
+ #'fa26679250df49c48a33fbcf30aae989', # instac.at
+ #'d9494686198d4dfeb954979a3e270e5e', # iconosquare.com
+ #'793ef48bb18e4197b61afce2d799b81c', # jsdo.it
+ #'67b8a3e0073449bba70600d0fc68e6cb', # jsdo.it
+ #'26a098e0df4d4b9ea8b4ce6c505b7742', # jsdo.it
+ #'2437cbcd906a4c10940f990d283d3cd5', # jsdo.it
+ #'191c7d7d5312464cbd92134f36ffdab5', # jsdo.it
+ #'acfec809437b4340b2c38f66503af774', # jsdo.it
+ #'e9f77604a3a24beba949c12d18130988', # jsdo.it
+ #'2cd7bcf68ae346529770073d311575b3', # jsdo.it
+ #'830c600fe8d742e2ab3f3b94f9bb22b7', # jsdo.it
+ #'55865a0397ad41e5997dd95ef4df8da1', # jsdo.it
+ #'192a5742f3644ea8bed1d25e439286a8', # jsdo.it
+ #'38ed1477e7a44595861b8842cdb8ba23', # jsdo.it
+ #'e52f79f645f54488ad0cc47f6f55ade6', # jsfiddle.net
+ );
+
+ my $tok = $tokens[int(rand($#tokens+1))];
+ $last_search = $instagram_url_base . "?client_id=" . $tok;
+
+ print STDERR "\n\n" if ($verbose_load);
+ LOG ($verbose_load, "URL: $last_search");
+
+ my ( $base, $body ) = get_document ($last_search, undef, $timeout);
+ if (!$base || !$body) {
+ $body = undef;
+ return;
+ }
+
+ $body =~ s/("link")/\001$1/gs;
+ my @chunks = split(/\001/, $body);
+ shift @chunks;
+ my @urls = ();
+ foreach (@chunks) {
+ s/\\//gs;
+ my ($url) = m/"link":\s*"(.*?)"/s;
+ my ($img) = m/"standard_resolution":\{"url":\s*"(.*?)"/s;
+ ($img) = m/"url":\s*"(.*?)"/s unless $url;
+ next unless ($url && $img);
+ push @urls, [ $url, $img ];
+ }
+
+ if ($#urls < 0) {
+ LOG ($verbose_load, "no images on $last_search");
+ return ();
+ }
+
+ my $i = int(rand($#urls+1));
+ my ($url, $img) = @{$urls[$i]};
+
+ LOG ($verbose_load, "picked image " .($i+1) . "/" . ($#urls+1) . ": $url");
+ return ($url, $img);
+}
+
+\f
+############################################################################
+#
+# Pick images from Imgur.
+#
+############################################################################
+
+my $imgur_base = 'http://imgur.com/search?qs=thumb&q_any=';
+
+sub pick_from_imgur($) {
+ my $timeout = shift;
+
+ my $words = random_words('%20');
+ $last_search = $imgur_base . $words;
+
+ $_ = $words;
+ s/%20/ /g;
+
+ print STDERR "\n\n" if ($verbose_load);
+ LOG ($verbose_load, "words: $_");
+ LOG ($verbose_load, "URL: $last_search");
+
+ $suppress_audit = 1;
+
+ my ( $base, $body ) = get_document ($last_search, undef, $timeout);
+ if (!$base || !$body) {
+ $body = undef;
+ return;
+ }
+
+ my @imgs = ($body =~ m@\bHREF=[\"\']([^\'\"<>]*/gallery/[^\'\"<>]+)@gsi);
+ return () unless @imgs;
+
+ my $n = @imgs;
+ my $i = int(rand($n));
+ my $page = $imgs[$i];
+ $page =~ s/[?&].*$//s;
+ $page = "http://imgur.com$page" if ($page =~ m@^/@s);
+
+ my ($id) = ($page =~ m@([^/?&]+)$@s);
+ my $img = "http://i.imgur.com/$id.jpg";
+
+ LOG ($verbose_load, "picked image " .($i+1) . "/$n: $img");
+
+ return ($page, $img);
+}
+
+\f
+############################################################################
+#
+# Pick images from Tumblr.
+#
+############################################################################
+
+my $tumblr_base = 'https://www.tumblr.com/search/';
+
+sub pick_from_tumblr($) {
+ my $timeout = shift;
+
+ # Tumblr doesn't have an "or" search, which means our vocabulary is
+ # a bit too extensive to work well...
+
+ my $words = random_word();
+ $last_search = $tumblr_base . $words;
+
+ print STDERR "\n\n" if ($verbose_load);
+ LOG ($verbose_load, "words: $words");
+ LOG ($verbose_load, "URL: $last_search");
+
+ $suppress_audit = 1;
+
+ my ( $base, $body ) = get_document ($last_search, undef, $timeout);
+ if (!$base || !$body) {
+ $body = undef;
+ return;
+ }
+
+ my @imgs0 = ($body =~ m@<IMG\b([^<>]*)>@gsi);
+ return () unless @imgs0;
+ my @imgs;
+ foreach my $img (@imgs0) {
+ my ($src) = ($img =~ m@\bsrc=[\"\'](.*?)[\"\']@si);
+ my ($href) = ($img =~ m@\bdata-pin-url=[\"\'](.*?)[\"\']@si);
+ next unless ($src && $href);
+ next if ($src =~ m/^data:/s);
+ foreach ($src, $href) { $_ = "http://www.tumblr.com$_" if (m@^/@s); }
+ push @imgs, [$href, $src];
+ }
+ return () unless @imgs;
+
+ my $n = @imgs;
+ my $i = int(rand($n));
+ my $page = $imgs[$i]->[0];
+ my $img = $imgs[$i]->[1];
+
+ LOG ($verbose_load, "picked image " .($i+1) . "/$n: $img");
+
+ return ($page, $img);
+}
+
\f
############################################################################
#
error ("$id: $file not in $local_dir?")
unless ($file =~ m@^\Q$local_dir@o);
- open (my $in, '<', $file) || error ("$id: $file: $!");
+ open (my $in, '<:raw', $file) || error ("$id: $file: $!");
local $/ = undef; # read entire file
my $body = <$in>;
close ($in) || error ("$id: $file: $!");
return unless ($verbose_warnings);
$_ = $url;
- my ($site) = m@^http://([^ \t\n\r/:]+)@;
+ my ($site) = m@^https?://([^ \t\n\r/:]+)@;
return unless defined ($site);
if ($base eq $driftnet_magic || $base eq $local_magic) {
}
+# Given the raw body of a PNM document, returns the dimensions of the image.
+#
+sub pnm_size($) {
+ my ($body) = @_;
+ return () unless ($body =~ m/^P[1-6]\r?\n(\d+) +(\d+)\r?\n/s);
+ return ($1, $2);
+}
+
+
# Given the raw body of a GIF, JPEG, or PNG document, returns the dimensions
# of the image.
#
($w, $h) = jpeg_size ($body);
if ($w && $h) { return ($w, $h); }
return png_size ($body);
+ if ($w && $h) { return ($w, $h); }
+ return pnm_size ($body);
}
sub which($) {
my ($prog) = @_;
foreach (split (/:/, $ENV{PATH})) {
- if (-x "$_/$prog") {
- return $prog;
+ my $path = "$_/$prog";
+ if (-x $path) {
+ return $path;
}
}
return undef;
#
##############################################################################
-my $image_ppm = sprintf ("%s/webcollage-%08x.ppm",
- ($ENV{TMPDIR} ? $ENV{TMPDIR} : "/tmp"),
- rand(0xFFFFFFFF));
-my $image_tmp1 = sprintf ("%s/webcollage-1-%08x.ppm",
- ($ENV{TMPDIR} ? $ENV{TMPDIR} : "/tmp"),
- rand(0xFFFFFFFF));
-my $image_tmp2 = sprintf ("%s/webcollage-2-%08x.ppm",
- ($ENV{TMPDIR} ? $ENV{TMPDIR} : "/tmp"),
- rand(0xFFFFFFFF));
+my ($image_png, $image_tmp1, $image_tmp2);
+{
+ my $seed = rand(0xFFFFFFFF);
+ $image_png = sprintf ("%s/webcollage-%08x",
+ ($ENV{TMPDIR} ? $ENV{TMPDIR} : "/tmp"),
+ $seed);
+ $image_tmp1 = $image_png . '-1.png';
+ $image_tmp2 = $image_png . '-2.png';
+ $image_png .= '.png';
+}
+
my $filter_cmd = undef;
my $post_filter_cmd = undef;
my $delay = 2;
sub x_cleanup() {
- unlink $image_ppm, $image_tmp1, $image_tmp2;
+ unlink $image_png, $image_tmp1, $image_tmp2;
unlink $imagemap_html_tmp, $imagemap_jpg_tmp
if (defined ($imagemap_html_tmp));
}
}
-# Given the URL of a GIF, JPEG, or PNG image, and the body of that image,
-# writes a PPM to the given output file. Returns the width/height of the
-# image if successful.
-#
-sub image_to_pnm($$$) {
- my ($url, $body, $output) = @_;
- my ($cmd, $cmd2, $w, $h);
-
- if ((@_ = gif_size ($body))) {
- ($w, $h) = @_;
- $cmd = "giftopnm";
- } elsif ((@_ = jpeg_size ($body))) {
- ($w, $h) = @_;
- $cmd = "djpeg";
- } elsif ((@_ = png_size ($body))) {
- ($w, $h) = @_;
- $cmd = "pngtopnm";
- } else {
- LOG (($verbose_pbm || $verbose_load),
- "not a GIF, JPG, or PNG" .
- (($body =~ m@<(base|html|head|body|script|table|a href)\b@i)
- ? " (looks like HTML)" : "") .
- ": $url");
- $suppress_audit = 1;
- return ();
- }
-
- $cmd2 = "exec $cmd"; # yes, this really is necessary. if we don't
- # do this, the process doesn't die properly.
- if (!$verbose_pbm) {
- #
- # We get a "giftopnm: got a 'Application Extension' extension"
- # warning any time it's an animgif.
- #
- # Note that "giftopnm: EOF / read error on image data" is not
- # always a fatal error -- sometimes the image looks fine anyway.
- #
- $cmd2 .= " 2>/dev/null";
- }
-
- # There exist corrupted GIF and JPEG files that can make giftopnm and
- # djpeg lose their minds and go into a loop. So this gives those programs
- # a small timeout -- if they don't complete in time, kill them.
- #
- my $pid;
- @_ = eval {
- my $timed_out;
-
- local $SIG{ALRM} = sub {
- LOG ($verbose_pbm,
- "timed out ($cvt_timeout) for $cmd on \"$url\" in pid $pid");
- kill ('TERM', $pid) if ($pid);
- $timed_out = 1;
- $body = undef;
- };
-
- if (($pid = open (my $pipe, "| $cmd2 > $output"))) {
- $timed_out = 0;
- alarm $cvt_timeout;
- print $pipe $body;
- $body = undef;
- close $pipe;
-
- LOG ($verbose_exec, "awaiting $pid");
- waitpid ($pid, 0);
- LOG ($verbose_exec, "$pid completed");
-
- my $size = (stat($output))[7];
- $size = -1 unless defined($size);
- if ($size < 5) {
- LOG ($verbose_pbm, "$cmd on ${w}x$h \"$url\" failed ($size bytes)");
- return ();
- }
-
- LOG ($verbose_pbm, "created ${w}x$h $output ($cmd)");
- return ($w, $h);
- } else {
- print STDERR blurb() . "$cmd failed: $!\n";
- return ();
- }
- };
- die if ($@ && $@ ne "alarm\n"); # propagate errors
- if ($@) {
- # timed out
- $body = undef;
- return ();
- } else {
- # didn't
- alarm 0;
- $body = undef;
- return @_;
- }
-}
-
-
-# Same as the "ppmmake" command: creates a solid-colored PPM.
-# Does not understand the rgb.txt color names except "black" and "white".
+# Creates a solid-colored PNG.
#
-sub ppmmake($$$$) {
+sub pngmake($$$$) {
my ($outfile, $bgcolor, $w, $h) = @_;
- my ($r, $g, $b);
- if ($bgcolor =~ m/^\#?([\dA-F][\dA-F])([\dA-F][\dA-F])([\dA-F][\dA-F])$/i ||
- $bgcolor =~ m/^\#?([\dA-F])([\dA-F])([\dA-F])$/i) {
- ($r, $g, $b) = (hex($1), hex($2), hex($3));
- } elsif ($bgcolor =~ m/^black$/i) {
- ($r, $g, $b) = (0, 0, 0);
- } elsif ($bgcolor =~ m/^white$/i) {
- ($r, $g, $b) = (0xFF, 0xFF, 0xFF);
+ my @cmd;
+ if ($webcollage_helper) {
+ @cmd = ($webcollage_helper, $bgcolor, $w, $h, $outfile);
} else {
- error ("unparsable color name: $bgcolor");
+ @cmd = ($convert_cmd, '-size', "${w}x${h}", "xc:$bgcolor", $outfile);
+ }
+
+ my $rc = nontrapping_system (@cmd);
+ if ($rc != 0) {
+ LOG(0, "failed to create $bgcolor image: \"$outfile\"");
+ exit(1);
}
-
- my $pixel = pack('CCC', $r, $g, $b);
- my $bits = "P6\n$w $h\n255\n" . ($pixel x ($w * $h));
-
- open (my $out, '>', $outfile) || error ("$outfile: $!");
- print $out $bits;
- close $out;
}
}
-my $ppm_to_root_window_cmd = undef;
+my $png_to_root_window_cmd = undef;
-sub x_or_pbm_output($) {
+sub x_or_image_output($) {
my ($window_id) = @_;
- # Check for our helper program, to see whether we need to use PPM pipelines.
+ # Adjust the PATH for OS X 10.10.
+ #
+ $_ = $0;
+ s:/[^/]*$::;
+ s/([^a-zA-Z0-9._\-+\/])/\\$1/g;
+ $ENV{PATH} = "$_:$ENV{PATH}";
+
+ # Check for our helper program, to see whether we need to use imagemagick.
#
$_ = "webcollage-helper";
- if (defined ($webcollage_helper) || which ($_)) {
- $webcollage_helper = $_ unless (defined($webcollage_helper));
- LOG ($verbose_pbm, "found \"$webcollage_helper\"");
- $webcollage_helper .= " -v";
+
+ if (! defined ($webcollage_helper)) {
+# $webcollage_helper = which ($_);
+ }
+
+ if (defined ($webcollage_helper)) {
+ LOG ($verbose_decode, "found \"$webcollage_helper\"");
} else {
- LOG (($verbose_pbm || $verbose_load), "no $_ program");
+ LOG (($verbose_decode || $verbose_load), "no $_ program");
}
if ($cocoa_p && !defined ($webcollage_helper)) {
error ("webcollage-helper not found in Cocoa-mode!");
}
+ if (!$cocoa_p && defined ($webcollage_helper)) {
+ foreach ($image_png, $image_tmp1, $image_tmp2) {
+ s/\.png$/.jpg/si;
+ }
+ }
# make sure the various programs we execute exist, right up front.
#
my @progs = ();
- if (!defined($webcollage_helper)) {
- # Only need these others if we don't have the helper.
- @progs = (@progs,
- "giftopnm", "pngtopnm", "djpeg",
- "pnmpaste", "pnmscale", "pnmcut");
- }
+ push @progs, $convert_cmd unless defined($webcollage_helper);
foreach (@progs) {
which ($_) || error "$_ not found on \$PATH.";
# find a root-window displayer program.
#
if (!$no_output_p) {
- $ppm_to_root_window_cmd = pick_root_displayer();
+ $png_to_root_window_cmd = pick_root_displayer();
}
if (defined ($window_id)) {
error ("-window-id only works if xscreensaver-getimage is installed")
- unless ($ppm_to_root_window_cmd =~ m/^xscreensaver-getimage\b/);
+ unless ($png_to_root_window_cmd =~ m/^xscreensaver-getimage\b/);
error ("unparsable window id: $window_id")
unless ($window_id =~ m/^\d+$|^0x[\da-f]+$/i);
- $ppm_to_root_window_cmd =~ s/--?root\b/$window_id/ ||
- error ("unable to munge displayer: $ppm_to_root_window_cmd");
+ $png_to_root_window_cmd =~ s/--?root\b/$window_id/ ||
+ error ("unable to munge displayer: $png_to_root_window_cmd");
}
if (!$img_width || !$img_height) {
# Create the sold-colored base image.
#
- LOG ($verbose_pbm, "creating base image: ${img_width}x${img_height}");
- $_ = ppmmake ($image_ppm, $bgcolor, $img_width, $img_height);
+ LOG ($verbose_decode, "creating base image: ${img_width}x${img_height}");
+ $_ = pngmake ($image_png, $bgcolor, $img_width, $img_height);
# Paste the default background image in the middle of it.
#
if ($bgimage) {
- my ($iw, $ih);
-
- my $body = "";
- open (my $imgf, '<', $bgimage) || error "couldn't open $bgimage: $!";
+ open (my $in, '<:raw', $bgimage) || error ("$bgimage: $!");
local $/ = undef; # read entire file
- $body = <$imgf>;
- close ($imgf);
-
- my $cmd;
- if ((@_ = gif_size ($body))) {
- ($iw, $ih) = @_;
- $cmd = "giftopnm |";
-
- } elsif ((@_ = jpeg_size ($body))) {
- ($iw, $ih) = @_;
- $cmd = "djpeg |";
-
- } elsif ((@_ = png_size ($body))) {
- ($iw, $ih) = @_;
- $cmd = "pngtopnm |";
-
- } elsif ($body =~ m/^P\d\n(\d+) (\d+)\n/) {
- $iw = $1;
- $ih = $2;
- $cmd = "";
-
- } else {
- error "$bgimage is not a GIF, JPEG, PNG, or PPM.";
- }
-
- my $x = int (($img_width - $iw) / 2);
- my $y = int (($img_height - $ih) / 2);
- LOG ($verbose_pbm,
- "pasting $bgimage (${iw}x$ih) into base image at $x,$y");
-
- $cmd .= "pnmpaste - $x $y $image_ppm > $image_tmp1";
- open ($imgf, "| $cmd") || error "running $cmd: $!";
- print $imgf $body;
- $body = undef;
- close ($imgf);
- LOG ($verbose_exec, "subproc exited normally.");
- rename ($image_tmp1, $image_ppm) ||
- error "renaming $image_tmp1 to $image_ppm: $!";
+ my $body = <$in>;
+ close ($in) || error ("$bgimage: $!");
+ paste_image ('init', $image_png, $body, 'init', 1);
}
clearlog();
}
}
-sub paste_image($$$$) {
- my ($base, $img, $body, $source) = @_;
+sub paste_image($$$$;$) {
+ my ($base, $img, $body, $source, $init_p) = @_;
$current_state = "paste";
$suppress_audit = 0;
- LOG ($verbose_pbm, "got $img (" . length($body) . ")");
+ LOG ($verbose_decode, "got $img (" . length($body) . ")");
- my ($iw, $ih);
-
- # If we are using the webcollage-helper, then we do not need to convert this
- # image to a PPM. But, if we're using a filter command, we still must, since
- # that's what the filters expect (webcollage-helper can read PPMs, so that's
- # fine.)
- #
- if (defined ($webcollage_helper) &&
- !defined ($filter_cmd)) {
-
- ($iw, $ih) = image_size ($body);
- if (!$iw || !$ih) {
- LOG (($verbose_pbm || $verbose_load),
- "not a GIF, JPG, or PNG" .
- (($body =~ m@<(base|html|head|body|script|table|a href)>@i)
- ? " (looks like HTML)" : "") .
- ": $img");
- $suppress_audit = 1;
- $body = undef;
- return 0;
- }
-
- open (my $out, '>', $image_tmp1) || error ("writing $image_tmp1: $!");
- (print $out $body) || error ("writing $image_tmp1: $!");
- close ($out) || error ("writing $image_tmp1: $!");
+ my ($iw, $ih) = image_size ($body);
+ if (!$iw || !$ih) {
+ LOG (($verbose_decode || $verbose_load),
+ "not a GIF, JPG, or PNG" .
+ (($body =~ m@<(base|html|head|body|script|table|a href)>@i)
+ ? " (looks like HTML)" : "") .
+ ": $img");
+ $suppress_audit = 1;
+ $body = undef;
+ return 0;
+ }
- } else {
- ($iw, $ih) = image_to_pnm ($img, $body, $image_tmp1);
+ if ($iw <= 0 || $ih <= 0 || $iw > 9999 || $ih > 9999) {
+ LOG (($verbose_decode || $verbose_load),
+ "ludicrous image dimensions: $iw x $ih (" . length($body) .
+ "): $img");
$body = undef;
- if (!$iw || !$ih) {
- LOG ($verbose_pbm, "unable to make PBM from $img");
- return 0;
- }
+ return 0;
}
- record_success ($load_method, $img, $base);
+ open (my $out, '>:raw', $image_tmp1) || error ("writing $image_tmp1: $!");
+ (print $out $body) || error ("writing $image_tmp1: $!");
+ close ($out) || error ("writing $image_tmp1: $!");
+ record_success ($load_method, $img, $base);
my $ow = $iw; # used only for error messages
my $oh = $ih;
# don't just tack this onto the front of the pipeline -- we want it to
# be able to change the size of the input image.
#
- if ($filter_cmd) {
- LOG ($verbose_pbm, "running $filter_cmd");
+ if ($filter_cmd && !$init_p) {
+ LOG ($verbose_decode, "running $filter_cmd");
+
+ # #### Historically, $filter_cmd read and write PPM files.
+ # This is doing PNG or JPEG now. I'll bet nobody uses this.
my $rc = nontrapping_system "($filter_cmd) < $image_tmp1 >$image_tmp2";
if ($rc != 0) {
- LOG(($verbose_pbm || $verbose_load), "failed command: \"$filter_cmd\"");
- LOG(($verbose_pbm || $verbose_load), "failed URL: \"$img\" (${ow}x$oh)");
+ LOG(($verbose_decode || $verbose_load),
+ "failed command: \"$filter_cmd\"");
+ LOG(($verbose_decode || $verbose_load),
+ "failed URL: \"$img\" (${ow}x$oh)");
return;
}
rename ($image_tmp2, $image_tmp1);
# re-get the width/height in case the filter resized it.
- open (my $imgf, '<', $image_tmp1) || return 0;
- $_ = <$imgf>;
- $_ = <$imgf>;
- ($iw, $ih) = m/^(\d+) (\d+)$/;
- close ($imgf);
+ open (my $imgf, '<:raw', $image_tmp1) || return 0;
+ my $b = '';
+ sysread ($imgf, $b, 10240);
+ close $imgf;
+ ($iw, $ih) = image_size ($b);
return 0 unless ($iw && $ih);
}
my $target_w = $img_width; # max rectangle into which the image must fit
my $target_h = $img_height;
- my $cmd = "";
my $scale = 1.0;
-
- # Usually scale the image to fit on the screen -- but sometimes scale it
- # to fit on half or a quarter of the screen. (We do this by reducing the
- # size of the target rectangle.) Note that the image is not merely scaled
- # to fit; we instead cut the image in half repeatedly until it fits in the
- # target rectangle -- that gives a wider distribution of sizes.
- #
- if (rand() < 0.3) { $target_w /= 2; $target_h /= 2; } # reduce target rect
- if (rand() < 0.3) { $target_w /= 2; $target_h /= 2; }
-
- if ($iw > $target_w || $ih > $target_h) {
- while ($iw > $target_w ||
- $ih > $target_h) {
- $iw = int($iw / 2);
- $ih = int($ih / 2);
- $scale /= 2;
- }
- if ($iw <= 10 || $ih <= 10) {
- LOG ($verbose_pbm, "scaling to ${iw}x$ih would have been bogus.");
- return 0;
- }
-
- LOG ($verbose_pbm, "scaling to ${iw}x$ih ($scale)");
-
- $cmd .= " | pnmscale -xsize $iw -ysize $ih";
- }
-
-
- my $src = $image_tmp1;
-
my $crop_x = 0; # the sub-rectangle of the image
my $crop_y = 0; # that we will actually paste.
my $crop_w = $iw;
my $crop_h = $ih;
+ my $x = 0;
+ my $y = 0;
- # The chance that we will randomly crop out a section of an image starts
- # out fairly low, but goes up for images that are very large, or images
- # that have ratios that make them look like banners (we try to avoid
- # banner images entirely, but they slip through when the IMG tags didn't
- # have WIDTH and HEIGHT specified.)
- #
- my $crop_chance = 0.2;
- if ($iw > $img_width * 0.4 || $ih > $img_height * 0.4) {
- $crop_chance += 0.2;
- }
- if ($iw > $img_width * 0.7 || $ih > $img_height * 0.7) {
- $crop_chance += 0.2;
- }
- if ($min_ratio && ($iw * $min_ratio) > $ih) {
- $crop_chance += 0.7;
- }
+ if (!$init_p) {
- if ($crop_chance > 0.1) {
- LOG ($verbose_pbm, "crop chance: $crop_chance");
- }
+ # Usually scale the image to fit on the screen -- but sometimes scale it
+ # to fit on half or a quarter of the screen. (We do this by reducing the
+ # size of the target rectangle.) Note that the image is not merely scaled
+ # to fit; we instead cut the image in half repeatedly until it fits in the
+ # target rectangle -- that gives a wider distribution of sizes.
+ #
+ if (rand() < 0.3) { $target_w /= 2; $target_h /= 2; } # reduce target rect
+ if (rand() < 0.3) { $target_w /= 2; $target_h /= 2; }
+
+ if ($iw > $target_w || $ih > $target_h) {
+ while ($iw > $target_w ||
+ $ih > $target_h) {
+ $iw = int($iw / 2);
+ $ih = int($ih / 2);
+ $scale /= 2;
+ }
+ if ($iw <= 10 || $ih <= 10) {
+ LOG ($verbose_decode, "scaling ${ow}x${oh} to ${iw}x$ih" .
+ " would have been bogus.");
+ return 0;
+ }
+
+ $crop_w = $iw;
+ $crop_h = $ih;
+
+ LOG ($verbose_decode, "scaling ${ow}x${oh} to ${iw}x$ih ($scale)");
+ }
- if (rand() < $crop_chance) {
- my $ow = $crop_w;
- my $oh = $crop_h;
+ my $src = $image_tmp1;
- if ($crop_w > $min_width) {
- # if it's a banner, select the width linearly.
- # otherwise, select a bell.
- my $r = (($min_ratio && ($iw * $min_ratio) > $ih)
- ? rand()
- : bellrand());
- $crop_w = $min_width + int ($r * ($crop_w - $min_width));
- $crop_x = int (rand() * ($ow - $crop_w));
+ # The chance that we will randomly crop out a section of an image starts
+ # out fairly low, but goes up for images that are very large, or images
+ # that have ratios that make them look like banners (we try to avoid
+ # banner images entirely, but they slip through when the IMG tags didn't
+ # have WIDTH and HEIGHT specified.)
+ #
+ my $crop_chance = 0.2;
+ if ($iw > $img_width * 0.4 || $ih > $img_height * 0.4) {
+ $crop_chance += 0.2;
}
- if ($crop_h > $min_height) {
- # height always selects as a bell.
- $crop_h = $min_height + int (bellrand() * ($crop_h - $min_height));
- $crop_y = int (rand() * ($oh - $crop_h));
+ if ($iw > $img_width * 0.7 || $ih > $img_height * 0.7) {
+ $crop_chance += 0.2;
+ }
+ if ($min_ratio && ($iw * $min_ratio) > $ih) {
+ $crop_chance += 0.7;
}
- if ($crop_x != 0 || $crop_y != 0 ||
- $crop_w != $iw || $crop_h != $ih) {
- LOG ($verbose_pbm,
- "randomly cropping to ${crop_w}x$crop_h \@ $crop_x,$crop_y");
+ if ($crop_chance > 0.1) {
+ LOG ($verbose_decode, "crop chance: $crop_chance");
}
- }
- # Where the image should logically land -- this might be negative.
- #
- my $x = int((rand() * ($img_width + $crop_w/2)) - $crop_w*3/4);
- my $y = int((rand() * ($img_height + $crop_h/2)) - $crop_h*3/4);
+ if (rand() < $crop_chance) {
- # if we have chosen to paste the image outside of the rectangle of the
- # screen, then we need to crop it.
- #
- if ($x < 0 ||
- $y < 0 ||
- $x + $crop_w > $img_width ||
- $y + $crop_h > $img_height) {
+ my $ow = $crop_w;
+ my $oh = $crop_h;
- LOG ($verbose_pbm,
- "cropping for effective paste of ${crop_w}x$crop_h \@ $x,$y");
+ if ($crop_w > $min_width) {
+ # if it's a banner, select the width linearly.
+ # otherwise, select a bell.
+ my $r = (($min_ratio && ($iw * $min_ratio) > $ih)
+ ? rand()
+ : bellrand());
+ $crop_w = $min_width + int ($r * ($crop_w - $min_width));
+ $crop_x = int (rand() * ($ow - $crop_w));
+ }
+ if ($crop_h > $min_height) {
+ # height always selects as a bell.
+ $crop_h = $min_height + int (bellrand() * ($crop_h - $min_height));
+ $crop_y = int (rand() * ($oh - $crop_h));
+ }
- if ($x < 0) { $crop_x -= $x; $crop_w += $x; $x = 0; }
- if ($y < 0) { $crop_y -= $y; $crop_h += $y; $y = 0; }
+ # Clip it to the actual post-scaling image size.
+ if ($crop_x + $crop_w > $iw) { $crop_w = $iw - $crop_x; }
+ if ($crop_y + $crop_h > $ih) { $crop_h = $ih - $crop_y; }
+ if ($crop_x < 0) { $crop_w += $crop_x; $crop_x = 0; }
+ if ($crop_y < 0) { $crop_h += $crop_y; $crop_y = 0; }
- if ($x + $crop_w >= $img_width) { $crop_w = $img_width - $x - 1; }
- if ($y + $crop_h >= $img_height) { $crop_h = $img_height - $y - 1; }
- }
+ if ($crop_x != 0 || $crop_y != 0 ||
+ $crop_w != $iw || $crop_h != $ih) {
+ LOG ($verbose_decode,
+ "randomly cropping to ${crop_w}x$crop_h \@ $crop_x,$crop_y");
+ }
+ }
- # If any cropping needs to happen, add pnmcut.
- #
- if ($crop_x != 0 || $crop_y != 0 ||
- $crop_w != $iw || $crop_h != $ih) {
- $iw = $crop_w;
- $ih = $crop_h;
- $cmd .= " | pnmcut $crop_x $crop_y $iw $ih";
- LOG ($verbose_pbm, "cropping to ${crop_w}x$crop_h \@ $crop_x,$crop_y");
- }
+ # Where the image should logically land -- this might be negative.
+ #
+ $x = int((rand() * ($img_width + $crop_w/2)) - $crop_w*3/4);
+ $y = int((rand() * ($img_height + $crop_h/2)) - $crop_h*3/4);
- LOG ($verbose_pbm, "pasting ${iw}x$ih \@ $x,$y in $image_ppm");
+ # if we have chosen to paste the image outside of the rectangle of the
+ # screen, then we need to crop it.
+ #
+ if ($x < 0 ||
+ $y < 0 ||
+ $x + $crop_w > $img_width ||
+ $y + $crop_h > $img_height) {
- $cmd .= " | pnmpaste - $x $y $image_ppm";
+ LOG ($verbose_decode,
+ "cropping for effective paste of ${crop_w}x${crop_h} \@ $x,$y");
- $cmd =~ s@^ *\| *@@;
+ if ($x < 0) { $crop_x -= $x; $crop_w += $x; $x = 0; }
+ if ($y < 0) { $crop_y -= $y; $crop_h += $y; $y = 0; }
- if (defined ($webcollage_helper)) {
- $cmd = "$webcollage_helper $image_tmp1 $image_ppm " .
- "$scale $opacity " .
- "$crop_x $crop_y $x $y " .
- "$iw $ih";
- $_ = $cmd;
+ if ($x + $crop_w >= $img_width) { $crop_w = $img_width - $x - 1; }
+ if ($y + $crop_h >= $img_height) { $crop_h = $img_height - $y - 1; }
+ }
- } else {
- # use a PPM pipeline
- $_ = "($cmd)";
- $_ .= " < $image_tmp1 > $image_tmp2";
- }
+ # If any cropping needs to happen, add pnmcut.
+ #
+ if ($crop_x != 0 || $crop_y != 0 ||
+ $crop_w != $iw || $crop_h != $ih) {
+ $iw = $crop_w;
+ $ih = $crop_h;
+ LOG ($verbose_decode, "cropping to ${crop_w}x$crop_h \@ " .
+ "$crop_x,$crop_y");
+ }
- if ($verbose_pbm) {
- $_ = "($_) 2>&1 | sed s'/^/" . blurb() . "/'";
- } else {
- $_ .= " 2> /dev/null";
+ LOG ($verbose_decode, "pasting ${iw}x$ih \@ $x,$y in $image_png");
}
- my $rc = nontrapping_system ($_);
-
- if (defined ($webcollage_helper) && -z $image_ppm) {
- LOG (1, "failed command: \"$cmd\"");
+ my @cmd;
+ if (defined ($webcollage_helper)) {
+ @cmd = ($webcollage_helper,
+ $image_tmp1, $image_png,
+ $scale, $opacity,
+ $crop_x, $crop_y, $x, $y,
+ $iw, $ih);
+ } else {
+ @cmd = ($convert_cmd,
+ $image_png,
+ '(',
+ $image_tmp1 . '[0]',
+ '-scale', sprintf("%.2f%%", 100 * $scale),
+ '-crop', "${iw}x${ih}+${crop_x}+${crop_y}",
+ '-geometry', "+${x}+${y}",
+
+ ($init_p ? () :
+ (
+ # Blurry edges with rounded corners
+ '-alpha', 'set',
+ '-virtual-pixel', 'transparent',
+ '-channel', 'A',
+ '-blur', '0x12',
+ '-level', '50%,100%',
+
+ # Overall transparency
+ '-evaluate', 'multiply', $opacity,
+
+ '+channel',
+ )),
+ ')',
+ '-composite',
+ '+repage',
+ '-strip',
+ $image_png);
+ }
+
+ #### $verbose_decode should mean 2>/dev/null
+
+ my $rc = nontrapping_system (@cmd);
+
+ if (-z $image_png) {
+ LOG (1, "failed command: \"@cmd\"");
print STDERR "\naudit log:\n\n\n";
print STDERR ("#" x 78) . "\n";
- print STDERR blurb() . "$image_ppm has zero size\n";
+ print STDERR blurb() . "$image_png has zero size\n";
showlog();
print STDERR "\n\n";
exit (1);
}
if ($rc != 0) {
- LOG (($verbose_pbm || $verbose_load), "failed command: \"$cmd\"");
- LOG (($verbose_pbm || $verbose_load), "failed URL: \"$img\" (${ow}x$oh)");
+ LOG (($verbose_decode || $verbose_load), "failed command: \"@cmd\"");
+ LOG (($verbose_decode || $verbose_load),
+ "failed URL: \"$img\" (${ow}x$oh)");
return;
}
- if (!defined ($webcollage_helper)) {
- rename ($image_tmp2, $image_ppm) || return;
- }
-
- my $target = "$image_ppm";
+ my $target = "$image_png";
# don't just tack this onto the end of the pipeline -- we don't want it
- # to end up in $image_ppm, because we don't want the results to be
+ # to end up in $image_png, because we don't want the results to be
# cumulative.
#
if ($post_filter_cmd) {
- my $cmd;
+ # #### Historically, $post_filter_cmd read and write PPM files.
+ # This is doing PNG or JPEG now. I'll bet nobody uses this.
$target = $image_tmp1;
- if (!defined ($webcollage_helper)) {
- $cmd = "($post_filter_cmd) < $image_ppm > $target";
- } else {
- # Blah, my scripts need the JPEG data, but some other folks need
- # the PPM data -- what to do? Ignore the problem, that's what!
-# $cmd = "djpeg < $image_ppm | ($post_filter_cmd) > $target";
- $cmd = "($post_filter_cmd) < $image_ppm > $target";
- }
-
+ my $cmd = "($post_filter_cmd) < $image_png > $target";
$rc = nontrapping_system ($cmd);
if ($rc != 0) {
- LOG ($verbose_pbm, "filter failed: \"$post_filter_cmd\"\n");
+ LOG ($verbose_decode, "filter failed: \"$post_filter_cmd\"\n");
return;
}
}
if (!$no_output_p) {
my $tsize = (stat($target))[7];
if ($tsize > 200) {
- $cmd = "$ppm_to_root_window_cmd $target";
+ my $cmd = "$png_to_root_window_cmd $target";
# xv seems to hate being killed. it tends to forget to clean
# up after itself, and leaves windows around and colors allocated.
$rc = nontrapping_system ($cmd);
if ($rc != 0) {
- LOG (($verbose_pbm || $verbose_load), "display failed: \"$cmd\"");
+ LOG (($verbose_decode || $verbose_load), "display failed: \"$cmd\"");
return;
}
} else {
- LOG ($verbose_pbm, "$target size is $tsize");
+ LOG ($verbose_decode, "$target size is $tsize");
}
}
- $source .= "-" . stats_of($source);
- print STDOUT "image: ${iw}x${ih} @ $x,$y $base $source\n"
- if ($verbose_imgmap);
- if ($imagemap_base) {
- update_imagemap ($base, $x, $y, $iw, $ih,
- $image_ppm, $img_width, $img_height);
+ if (defined($source)) {
+ $source .= "-" . stats_of($source);
+ print STDOUT "image: ${iw}x${ih} @ $x,$y $base $source\n"
+ if ($verbose_imgmap);
+ if ($imagemap_base) {
+ update_imagemap ($base, $x, $y, $iw, $ih,
+ $image_png, $img_width, $img_height);
+ }
}
clearlog();
sub update_imagemap($$$$$$$$) {
- my ($url, $x, $y, $w, $h, $image_ppm, $image_width, $image_height) = @_;
+ my ($url, $x, $y, $w, $h, $image_png, $image_width, $image_height) = @_;
$current_state = "imagemap";
my $max_areas = 200;
$url = html_quote ($url);
- my $x2 = $x + $w;
- my $y2 = $y + $h;
- my $area = "<AREA SHAPE=RECT COORDS=\"$x,$y,$x2,$y2\" HREF=\"$url\">";
- unshift @imagemap_areas, $area; # put one on the front
- if ($#imagemap_areas >= $max_areas) {
- pop @imagemap_areas; # take one off the back.
- }
-
- LOG ($verbose_pbm, "area: $x,$y,$x2,$y2 (${w}x$h)");
+ push @imagemap_areas, [$x, $y, $w, $h, $url];
+ shift @imagemap_areas if (@imagemap_areas > $max_areas);
+ LOG ($verbose_decode, "area: $x,$y,$w,$h");
my $map_name = $imagemap_base;
$map_name =~ s@^.*/@@;
my $imagemap_html = $imagemap_base . ".html";
my $imagemap_jpg = $imagemap_base . ".jpg";
+ my $imagemap_jpg2 = $imagemap_jpg;
+ $imagemap_jpg2 =~ s@^.*/@@gs;
if (!defined ($imagemap_html_tmp)) {
$imagemap_html_tmp = $imagemap_html . sprintf (".%08x", rand(0xffffffff));
local $/ = undef; # read entire file
$template_html = <$in>;
close $in;
- LOG ($verbose_pbm, "read template $imagemap_html");
+ LOG ($verbose_decode, "read template $imagemap_html");
}
- if ($template_html =~ m/^\s*$/s) {
- $template_html = ("<MAP NAME=\"$map_name\"></MAP>\n" .
- "<IMG SRC=\"$imagemap_base.jpg\"" .
- " USEMAP=\"$map_name\">\n");
- LOG ($verbose_pbm, "created dummy template");
+ if (! ($template_html =~ m/\.webcollage_box\b/s)) { # missing or old
+ $template_html =
+ '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+ <HEAD>
+ <BASE TARGET="_new">
+ <meta HTTP-EQUIV="Refresh" content="60" />
+ <TITLE>WebCollage</TITLE>
+ <STYLE TYPE="text/css">
+ <!--
+ body { color: #FFF; max-width: 100%; }
+ .webcollage_date, .webcollage_size {
+ display: block; margin-top: 4px; font-size: 7pt; color: #888;
+ }
+ .webcollage_date { float: left; }
+ .webcollage_size { float: right; }
+
+ .webcollage_frame {
+ overflow: hidden;
+ position: relative;
+ padding-bottom: 56.25%;
+ padding-bottom: 75%; /* 4:3 aspect ratio */
+ border: 1px solid #888;
+ background: #000;
+ }
+
+ .webcollage_box {
+ position: absolute; top: 0; left: 0;
+ border: 0; margin: 0; padding: 0;
+ width: 100%;
+ height: 100%;
+ }
+
+ .webcollage_box > img { width: 100%; height: 100%; border: 0; }
+
+ .webcollage_frame > a {
+ display: block;
+ position: absolute;
+ border-radius: 16px;
+ }
+
+ .webcollage_frame > a:hover {
+ background: rgba(1,1,1,.25);
+ }
+ -->
+ </STYLE>
+ </HEAD>
+ <BODY>
+ <DIV CLASS="webcollage_frame">
+ </DIV>
+ </BODY>
+</HTML>
+';
+
+ LOG ($verbose_decode, "created dummy template");
}
}
# Write the jpg to a tmp file
#
{
- my $cmd;
- if (defined ($webcollage_helper)) {
- $cmd = "cp -p $image_ppm $imagemap_jpg_tmp";
+ my @cmd;
+ if (defined($webcollage_helper)) {
+ @cmd = ('cp', '-p', $image_png, $imagemap_jpg_tmp);
} else {
- $cmd = "cjpeg < $image_ppm > $imagemap_jpg_tmp";
+ @cmd = ($convert_cmd, $image_png, 'jpeg:' . $imagemap_jpg_tmp);
}
- my $rc = nontrapping_system ($cmd);
+ my $rc = nontrapping_system (@cmd);
if ($rc != 0) {
- error ("imagemap jpeg failed: \"$cmd\"\n");
+ error ("imagemap jpeg failed: \"@cmd\"\n");
}
}
#
{
my $body = $template_html;
- my $areas = join ("\n\t", @imagemap_areas);
- my $map = ("<MAP NAME=\"$map_name\">\n\t$areas\n</MAP>");
- my $img = ("<IMG SRC=\"$imagemap_base.jpg\" " .
- "BORDER=0 " .
- "WIDTH=$image_width HEIGHT=$image_height " .
- "USEMAP=\"#$map_name\">");
- $body =~ s@(<MAP\s+NAME=\"[^\"]*\"\s*>).*?(</MAP>)@$map@is;
- $body =~ s@<IMG\b[^<>]*\bUSEMAP\b[^<>]*>@$img@is;
+ my $img = (" <DIV CLASS=\"webcollage_box\">" .
+ "<IMG SRC=\"$imagemap_jpg2\">" .
+ "</DIV>\n");
+ foreach my $a (@imagemap_areas) {
+ my ($x, $y, $w, $h, $u) = @$a;
+ $x /= $img_width / 100;
+ $y /= $img_height / 100;
+ $w /= $img_width / 100;
+ $h /= $img_height / 100;
+ foreach ($x, $y, $w, $h) { $_ = sprintf("%.1f%%", $_); }
+ $u = html_quote($u);
+ $img .= (" <A HREF=\"$u\" STYLE=\"" .
+ "left:$x;top:$y;width:$w;height:$h\"/>\n");
+ }
+
+ $img = ("<DIV CLASS=\"webcollage_frame\">\n" .
+ $img .
+ " </DIV>\n");
+ $body =~ s@<DIV \s+ CLASS=[\"\']webcollage_frame[\"\']>
+ .*? </DIV> .*? </DIV>@$img@sex ||
+ error ("$imagemap_html_tmp: unable to splice image");
+
# if there are magic webcollage spans in the html, update those too.
#
$body =~ s@(<SPAN\s+CLASS=\"webcollage_size\">).*?(</SPAN>)@$1$size$2@si;
}
- open (my $out, '>', $imagemap_html_tmp) || error ("$imagemap_html_tmp: $!");
- (print $out $body) || error ("$imagemap_html_tmp: $!");
- close ($out) || error ("$imagemap_html_tmp: $!");
- LOG ($verbose_pbm, "wrote $imagemap_html_tmp");
+ open (my $out, '>', $imagemap_html_tmp) || error("$imagemap_html_tmp: $!");
+ (print $out $body) || error("$imagemap_html_tmp: $!");
+ close ($out) || error("$imagemap_html_tmp: $!");
+ LOG ($verbose_decode, "wrote $imagemap_html_tmp");
}
# Rename the two tmp files to the real files
#
rename ($imagemap_html_tmp, $imagemap_html) ||
error "renaming $imagemap_html_tmp to $imagemap_html";
- LOG ($verbose_pbm, "wrote $imagemap_html");
- rename ($imagemap_jpg_tmp, $imagemap_jpg) ||
- error "renaming $imagemap_jpg_tmp to $imagemap_jpg";
- LOG ($verbose_pbm, "wrote $imagemap_jpg");
+ LOG ($verbose_decode, "wrote $imagemap_html");
+
+ if ($imagemap_jpg_tmp ne $image_png) {
+ rename ($imagemap_jpg_tmp, $imagemap_jpg) ||
+ error "renaming $imagemap_jpg_tmp to $imagemap_jpg";
+ LOG ($verbose_decode, "wrote $imagemap_jpg");
+ }
}
#
sub set_proxy() {
- if (! $http_proxy) {
+ if (! defined($http_proxy)) {
# historical suckage: the environment variable name is lower case.
$http_proxy = $ENV{http_proxy} || $ENV{HTTP_PROXY};
}
if (defined ($http_proxy)) {
- if ($http_proxy && $http_proxy =~ m@^http://([^/]*)/?$@ ) {
+ if ($http_proxy && $http_proxy =~ m@^https?://([^/]*)/?$@ ) {
# historical suckage: allow "http://host:port" as well as "host:port".
$http_proxy = $1;
}
}
}
+ delete $ENV{http_proxy};
+ delete $ENV{HTTP_PROXY};
+ delete $ENV{https_proxy};
+ delete $ENV{HTTPS_PROXY};
+ delete $ENV{PERL_LWP_ENV_PROXY};
+
if ($http_proxy) {
+ $http_proxy = 'http://' . $http_proxy;
LOG ($verbose_net, "proxy server: $http_proxy");
+ } else {
+ $http_proxy = undef; # for --proxy ''
}
}
$SIG{KILL} = \&signal_cleanup;
$SIG{TERM} = \&signal_cleanup;
- # Need this so that if giftopnm dies, we don't die.
+ # Need this so that if subprocess filters die, we don't die.
$SIG{PIPE} = 'IGNORE';
}
my $root_p = 0;
my $window_id = undef;
- while ($_ = $ARGV[0]) {
- shift @ARGV;
- if ($_ eq "-display" ||
- $_ eq "-displ" ||
- $_ eq "-disp" ||
- $_ eq "-dis" ||
- $_ eq "-dpy" ||
- $_ eq "-d") {
+ while ($#ARGV >= 0) {
+ $_ = shift @ARGV;
+ if (m/^--?d(i(s(p(l(a(y)?)?)?)?)?)?$/s) {
$ENV{DISPLAY} = shift @ARGV;
- } elsif ($_ eq "-root") {
+ } elsif (m/^--?root$/s) {
$root_p = 1;
- } elsif ($_ eq "-window-id" || $_ eq "--window-id") {
+ } elsif (m/^--?window-id$/s) {
$window_id = shift @ARGV;
$root_p = 1;
- } elsif ($_ eq "-no-output") {
+ } elsif (m/^--?no-output$/s) {
$no_output_p = 1;
- } elsif ($_ eq "-urls-only") {
+ } elsif (m/^--?urls(-only)?$/s) {
$urls_only_p = 1;
$no_output_p = 1;
- } elsif ($_ eq "-cocoa") {
+ } elsif (m/^--?cocoa$/s) {
$cocoa_p = 1;
- } elsif ($_ eq "-imagemap") {
+ } elsif (m/^--?imagemap$/s) {
$imagemap_base = shift @ARGV;
$no_output_p = 1;
- } elsif ($_ eq "-verbose") {
+ } elsif (m/^--?verbose$/s) {
$verbose++;
} elsif (m/^-v+$/) {
$verbose += length($_)-1;
- } elsif ($_ eq "-delay") {
+ } elsif (m/^--?delay$/s) {
$delay = shift @ARGV;
- } elsif ($_ eq "-timeout") {
+ } elsif (m/^--?timeout$/s) {
$http_timeout = shift @ARGV;
- } elsif ($_ eq "-filter") {
+ } elsif (m/^--?filter$/s) {
$filter_cmd = shift @ARGV;
- } elsif ($_ eq "-filter2") {
+ } elsif (m/^--?filter2$/s) {
$post_filter_cmd = shift @ARGV;
- } elsif ($_ eq "-background" || $_ eq "-bg") {
+ } elsif (m/^--?(background|bg)$/s) {
$background = shift @ARGV;
- } elsif ($_ eq "-size") {
+ } elsif (m/^--?size$/s) {
$_ = shift @ARGV;
if (m@^(\d+)x(\d+)$@) {
$img_width = $1;
$img_height = $2;
} else {
- error "argument to \"-size\" must be of the form \"640x400\"";
+ error "argument to \"--size\" must be of the form \"640x400\"";
}
- } elsif ($_ eq "-proxy" || $_ eq "-http-proxy") {
+ } elsif (m/^--?(http-)?proxy$/s) {
$http_proxy = shift @ARGV;
- } elsif ($_ eq "-dictionary" || $_ eq "-dict") {
+ } elsif (m/^--?dict(ionary)?$/s) {
$dict = shift @ARGV;
- } elsif ($_ eq "-opacity") {
+ } elsif (m/^--?opacity$/s) {
$opacity = shift @ARGV;
error ("opacity must be between 0.0 and 1.0")
if ($opacity <= 0 || $opacity > 1);
- } elsif ($_ eq "-driftnet" || $_ eq "--driftnet") {
+ } elsif (m/^--?driftnet$/s) {
@search_methods = ( 100, "driftnet", \&pick_from_driftnet );
if (! ($ARGV[0] =~ m/^-/)) {
$driftnet_cmd = shift @ARGV;
} else {
$driftnet_cmd = $default_driftnet_cmd;
}
- } elsif ($_ eq "-directory" || $_ eq "--directory") {
+ } elsif (m/^--?dir(ectory)?$/s) {
@search_methods = ( 100, "local", \&pick_from_local_dir );
if (! ($ARGV[0] =~ m/^-/)) {
$local_dir = shift @ARGV;
} else {
error ("local directory path must be set")
}
- } elsif ($_ eq "-fps") {
+ } elsif (m/^--?fps$/s) {
# -fps only works on MacOS, via "webcollage-cocoa.m".
# Ignore it if passed to this script in an X11 context.
- } elsif ($_ eq "-debug" || $_ eq "--debug") {
+ } elsif (m/^--?debug$/s) {
my $which = shift @ARGV;
my @rest = @search_methods;
my $ok = 0;
}
error "no such search method as \"$which\"" unless ($ok);
LOG (1, "DEBUG: using only \"$which\"");
+ $report_performance_interval = 30;
} else {
+ print STDERR "unknown option: $_\n\n";
print STDERR "$copyright\nusage: $progname " .
- "[-root] [-display dpy] [-verbose] [-debug which]\n" .
- "\t\t [-timeout secs] [-delay secs] [-size WxH]\n" .
- "\t\t [-no-output] [-urls-only] [-imagemap filename]\n" .
- "\t\t [-background color] [-opacity f]\n" .
- "\t\t [-filter cmd] [-filter2 cmd]\n" .
- "\t\t [-dictionary dictionary-file] [-http-proxy host[:port]]\n" .
- "\t\t [-driftnet [driftnet-program-and-args]]\n" .
- "\t\t [-directory local-image-directory]\n" .
+ "[--root] [--display dpy] [--verbose] [--debug which]\n" .
+ "\t\t [--timeout secs] [--delay secs] [--size WxH]\n" .
+ "\t\t [--no-output] [--urls-only] [--imagemap filename]\n" .
+ "\t\t [--background color] [--opacity f]\n" .
+ "\t\t [--filter cmd] [--filter2 cmd]\n" .
+ "\t\t [--dictionary dictionary-file] [--http-proxy host[:port]]\n" .
+ "\t\t [--driftnet [driftnet-program-and-args]]\n" .
+ "\t\t [--directory local-image-directory]\n" .
"\n";
exit 1;
}
if (!$root_p && !$no_output_p && !$cocoa_p) {
print STDERR $copyright;
- error "the -root argument is mandatory (for now.)";
+ error "the --root argument is mandatory (for now.)";
}
if (!$no_output_p && !$cocoa_p && !$ENV{DISPLAY}) {
$verbose_load = 1;
$verbose_filter = 1;
$verbose_net = 1;
- $verbose_pbm = 1;
+ $verbose_decode = 1;
} elsif ($verbose == 6) {
$verbose_imgmap = 1;
$verbose_load = 1;
$verbose_filter = 1;
$verbose_net = 1;
- $verbose_pbm = 1;
+ $verbose_decode = 1;
$verbose_http = 1;
} elsif ($verbose >= 7) {
$verbose_load = 1;
$verbose_filter = 1;
$verbose_net = 1;
- $verbose_pbm = 1;
+ $verbose_decode = 1;
$verbose_http = 1;
$verbose_exec = 1;
}
}
if ($imagemap_base && !($img_width && $img_height)) {
- error ("-size WxH is required with -imagemap");
+ error ("--size WxH is required with --imagemap");
}
if (defined ($local_dir)) {
if ($urls_only_p) {
url_only_output ();
} else {
- x_or_pbm_output ($window_id);
+ x_or_image_output ($window_id);
}
}
projects / xscreensaver / blobdiff