optimisations + added EPUB support

Author: unkn0w

packt.sh

@@ -5,7 +5,14 @@
 source "packt.cfg"
 
 function log {
-    echo "$(date '+%d.%m.%Y. %H:%M:%S') $1" >> "$log"
+    echo "$(date '+%Y-%m-%d %H:%M:%S ') $1" >> "$log"
+    echo "$1"
+}
+
+function getBook {
+	curl -s -L --retry $rtry -A "$agent" -b "$cookie" -c "$cookie" "https://www.packtpub.com/ebook_download/$book/$1" > "$dldir/$title.$1"
+	cex=$?; test "$cex" -ne "0" && { log "curl exit error code: $cex"; exit; }
+	log "$1 downloaded"
 }
 
 # initial clean up
@@ -24,35 +31,24 @@ curl -s --retry $rtry -m $tout -A "$agent" -b "$cookie" -c "$cookie" https://www
 cex=$?; test "$cex" -ne "0" && { log "curl exit error code: $cex"; exit; }
 
 title=$(grep "dotd-title" -A 2 packt_daily.html | tail -1 | sed 's/^[^0-9A-Za-z]*//;s/[\t ]*<\/h2>$//')
-echo "Today's free e-book: $title"
 log "Today's free e-book: $title"
 
 # claim
 claim=$(grep -oE "freelearning-claim/[0-9]+/[0-9]+" packt_daily.html)
 curl -s --retry $rtry -m $tout -A "$agent" -b "$cookie" -c "$cookie" -H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8' -H 'Accept-Encoding: gzip, deflate' -H 'Accept-Language: en-US,en;q=0.5' -H 'Connection: keep-alive' -H 'Host: www.packtpub.com' -H 'Referer: https://www.packtpub.com/packt/offers/free-learning' "https://www.packtpub.com/$claim"
 cex=$?; test "$cex" -ne "0" && { log "curl exit error code: $cex"; exit; }
-echo "e-Book claimed"
 log "e-Book claimed"
 
 # download link
 book=$(echo $claim | sed 's/.*\/\([0-9]*\)\/.*/\1/')
 
-# PDF download
-curl -s -L --retry $rtry -A "$agent" -b "$cookie" -c "$cookie" "https://www.packtpub.com/ebook_download/$book/pdf" > "$dldir/$title.pdf"
-cex=$?; test "$cex" -ne "0" && { log "curl exit error code: $cex"; exit; }
-echo "PDF downloaded"
-log "PDF downloaded"
-
-# Mobi download
-curl -s -L --retry $rtry -A "$agent" -b "$cookie" -c "$cookie" "https://www.packtpub.com/ebook_download/$book/mobi" > "$dldir/$title.mobi"
-cex=$?; test "$cex" -ne "0" && { log "curl exit error code: $cex"; exit; }
-echo "Mobi downloaded"
-log "Mobi downloaded"
+getBook mobi
+getBook epub
+getBook pdf
 
 # Packt logout
 curl -s --retry $rtry -m $tout -A "$agent" -b "$cookie" -c "$cookie" https://www.packtpub.com/logout > packt_logout.html
 cex=$?; test "$cex" -ne "0" && { log "curl exit error code: $cex"; exit; }
-echo "Packt logout"
 log "Packt logout"
 
 rm -f $cookie packt*.html