X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=createpdf.pl;h=f33bbc5f6c95443fda34ef5168f6a22d7b5eb324;hb=8a306b3d0f351d8fa0efc3b8cc9b4fde45c08c0a;hp=34cd9f425ccddc682e2bd77c904a8d1deb884f27;hpb=54684462f793d5b2e76052ab3ff5246972bdc204;p=webpdf

diff --git a/createpdf.pl b/createpdf.pl
index 34cd9f4..f33bbc5 100755
--- a/createpdf.pl
+++ b/createpdf.pl
@@ -29,6 +29,7 @@ $ENV{"HOME"} = $pdfweb::config::homedir;
 my $cgi = CGI->new;
 my $filename = $cgi->param('input');
 my $file = $cgi->upload('input');
+my $url = $cgi->param('url');
 
 # It kind of sucks that we just can't get the temporary file name from
 # CGI.pm, but OK, here goes :-)
@@ -54,7 +55,14 @@ if ($cgi->param('preset') eq 'screen') {
 	$psopts = "";
 }
 
-if ($filename =~ /(.*)\.(?:e?ps|pdf)$/i) {
+if ($url =~ /^http/i) {
+	$outname = "web.pdf";
+
+	# Render through Gecko
+	$ENV{'DISPLAY'} = $pdfweb::config::xserver;
+	system("gnome-web-print", $url, "$pdfweb::config::outputdir/$pdf_filename.ps");
+	system("gs $pdfopts -dCompatbilityLevel=1.4 -dNOPAUSE -dPATCH -sDEVICE=pdfwrite -dSAFER -sOutputFile=output/$pdf_filename -c '.setpdfwrite $psopts' -f - < $pdfweb::config::outputdir/$pdf_filename.ps >&2");
+} elsif ($filename =~ /(.*)\.(?:e?ps|pdf)$/i) {
 	$outname = "$1.pdf";
 
 	# Yay, just a round through GhostScript
@@ -70,7 +78,7 @@ if ($filename =~ /(.*)\.(?:e?ps|pdf)$/i) {
 	$outname = "$1.pdf";
 
 	# Run through ImageMagick first of all, then gs
-	open PIPE, "| convert $2:- ps:- | gs $pdfopts -dCompatbilityLevel=1.4 -dNOPAUSE -dPATCH -sDEVICE=pdfwrite -dSAFER -sOutputFile=output/$pdf_filename -c '.setpdfwrite $psopts' -f - >&2"
+	open PIPE, "| convert $2:- pdf:- | gs $pdfopts -dCompatbilityLevel=1.4 -dNOPAUSE -dPATCH -sDEVICE=pdfwrite -dSAFER -sOutputFile=output/$pdf_filename -c '.setpdfwrite $psopts' -f - >&2"
                 or die "convert: $!";
 
 	my ($buf, $ret);
@@ -106,7 +114,15 @@ if ($filename =~ /(.*)\.(?:e?ps|pdf)$/i) {
 	# Create PostScript from OOo :-)
 	system("/usr/lib/openoffice/program/soffice -display $pdfweb::config::xserver -headless -pt pdf $pdfweb::config::outputdir/$pdf_filename.$ext");
 
-	system("gs $pdfopts -dCompatbilityLevel=1.4 -dNOPAUSE -dPATCH -sDEVICE=pdfwrite -dSAFER -sOutputFile=output/$pdf_filename -c '.setpdfwrite $psopts' -f - < output/$pdf_filename.pdf >&2");
+	# This is quite hideous -- it looks like OO.o calls the file something slightly
+	# different depending on the time format, phase of the moon or something... So
+	# we try both.
+	my $inp_ps = "output/$pdf_filename.$ext.pdf";
+	if (! -r $inp_ps) {
+		$inp_ps = "output/$pdf_filename.pdf";
+	}
+
+	system("gs $pdfopts -dCompatbilityLevel=1.4 -dNOPAUSE -dPATCH -sDEVICE=pdfwrite -dSAFER -sOutputFile=output/$pdf_filename -c '.setpdfwrite $psopts' -f - < $inp_ps >&2");
 } elsif ($filename =~ /(.*)\.(c|cc|cpp|cs|h|py|rb|pl|diff|patch|js|php[1-5]?|hs|f|f90|java|css|sql|l|y|s?ml|sh|awk|m|v)$/i) {
 	$outname = "$1.pdf";
 	my $ext = $2;
@@ -137,6 +153,22 @@ EOF
 	exit;
 }
 
+# Make a thumbnail from the finished PDF, for later reference. (Output to
+# stdout is so we make sure we get only the first page; it's the simplest
+# hack I can find offhand. :-) )
+system("convert -resize 192x192 output/$pdf_filename png:- > output/$pdf_filename.png");
+open DESC, ">output/$pdf_filename.desc";
+
+if ($url =~ /^http/i) {
+	$url =~ tr/\n//d;
+	print DESC "$url\n";
+} else {
+	$filename =~ tr/\n//d;
+	print DESC "$filename\n";
+}
+
+close DESC;
+	
 my $size = -s "output/$pdf_filename";
 
 (my $sanitized_outname = $outname) =~ tr/a-zA-Z0-9. -/_/c;