From afa9708403415e05b5b30fd3c316fec14d2dcb60 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Thu, 24 Mar 2016 21:35:10 +0100
Subject: impressive-display: Do portrait check and page merging for downloaded
 and local PDFs.

---
 impressive-display/bin/impressive-display | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/impressive-display/bin/impressive-display b/impressive-display/bin/impressive-display
index 74df774..951a015 100755
--- a/impressive-display/bin/impressive-display
+++ b/impressive-display/bin/impressive-display
@@ -182,11 +182,6 @@ function download_pdffile {
 		creds="-u $PDF_URL_CREDS"
 	fi
 	curl $creds "$PDF_URL" 1> impressive-pdffile.pdf 2>/dev/null
-
-	if which pdfnup 1>/dev/null  && pdf_is_portrait impressive-pdffile.pdf; then
-		pdfnup impressive-pdffile.pdf 1>/dev/null 2>/dev/null
-		mv impressive-pdffile-nup.pdf impressive-pdffile-display.pdf
-	fi
 }
 
 # do an initial PDF retrieval..
@@ -212,7 +207,7 @@ if [ -n "$PDF_URL" ]; then
 
 	fi
 
-	pdffile=$WORKDIR/impressive-pdffile-display.pdf
+	pdffile=$WORKDIR/impressive-pdffile.pdf
 
 elif [ -n "$PDF_FILE" ]; then
 
@@ -224,12 +219,21 @@ elif [ -n "$PDF_FILE" ]; then
 		PDF_FILE=${PDF_FILE/.gz/}
 		gunzip $WORKDIR/$(basename $PDF_FILE).gz
 	fi
-	mv $WORKDIR/$(basename $PDF_FILE) "$WORKDIR/impressive-pdffile-display.pdf"
+	mv $WORKDIR/$(basename $PDF_FILE) "$WORKDIR/impressive-pdffile.pdf"
 
-	pdffile="$WORKDIR/impressive-pdffile-display.pdf"
+	pdffile="$WORKDIR/impressive-pdffile.pdf"
 
 fi
 
+if which pdfnup 1>/dev/null  && pdf_is_portrait "$WORKDIR/impressive-pdffile.pdf"; then
+	pdfnup "$WORKDIR/impressive-pdffile.pdf" 1>/dev/null 2>/dev/null
+	mv "$WORKDIR/impressive-pdffile-nup.pdf" "$WORKDIR/impressive-pdffile-display.pdf"
+else
+	mv "$WORKDIR/impressive-pdffile.pdf" "$WORKDIR/impressive-pdffile-display.pdf"
+fi
+pdffile="$WORKDIR/impressive-pdffile-display.pdf"
+
+
 if [ -n "$pdffile" ]; then
 
 	fade_options="--transition None"
-- 
cgit v1.2.3