eget: add --show-progress option to display progress bar in quiet mode

eget

@@ -363,6 +363,10 @@ CHECKMIRRORS=''
 TARGETFILE=''
 FORCEIPV=''
 
+WGETSHOWPROGRESS=''
+CURLSHOWPROGRESS=''
+ARIA2SHOWPROGRESS=''
+AXELSHOWPROGRESS=''
 
 set_quiet()
 {
@@ -393,6 +397,7 @@ Usage: eget [options] http://somesite.ru/dir/na*.log
 Options:
     -q|--quiet                - quiet mode
     --verbose                 - verbose mode
+    --show-progress           - display progress bar even in quiet mode
     -k|--no-check-certificate - skip SSL certificate chain support
     --no-content-disposition  - skip Content-Disposition header
     -H|--header               - use <header> (X-Cache:1 for example)
@@ -472,6 +477,12 @@ while [ -n "$1" ] ; do
         --verbose)
             verbose="$1"
             ;;
+        --show-progress)
+            WGETSHOWPROGRESS='--show-progress'
+            CURLSHOWPROGRESS='--progress-bar'
+            ARIA2SHOWPROGRESS='--show-console-readout=true'
+            AXELSHOWPROGRESS='1'
+            ;;
         -k|--no-check-certificate)
             WGETNOSSLCHECK='--no-check-certificate'
             CURLNOSSLCHECK='-k'
@@ -1020,9 +1031,9 @@ esac
 __wget()
 {
     if [ -n "$WGETUSERAGENT" ] ; then
-        docmd $WGET $FORCEIPV $WGETQ $NOGLOB $WGETCOMPRESSED $WGETHEADER $WGETOUTPUTDIR $WGETNOSSLCHECK $WGETNODIRECTORIES $WGETCONTINUE $WGETTIMEOUT $WGETREADTIMEOUT $WGETRETRYCONNREFUSED $WGETTRIES $WGETLOADCOOKIES $WGETRUSTSERVERNAMES "$(eval echo "$WGETUSERAGENT")" $EGET_WGET_OPTIONS "$@"
+        docmd $WGET $FORCEIPV $WGETQ $WGETSHOWPROGRESS $NOGLOB $WGETCOMPRESSED $WGETHEADER $WGETOUTPUTDIR $WGETNOSSLCHECK $WGETNODIRECTORIES $WGETCONTINUE $WGETTIMEOUT $WGETREADTIMEOUT $WGETRETRYCONNREFUSED $WGETTRIES $WGETLOADCOOKIES $WGETRUSTSERVERNAMES "$(eval echo "$WGETUSERAGENT")" $EGET_WGET_OPTIONS "$@"
     else
-        docmd $WGET $FORCEIPV $WGETQ $NOGLOB $WGETCOMPRESSED $WGETHEADER $WGETOUTPUTDIR $WGETNOSSLCHECK $WGETNODIRECTORIES $WGETCONTINUE $WGETTIMEOUT $WGETREADTIMEOUT $WGETRETRYCONNREFUSED $WGETTRIES $WGETLOADCOOKIES $WGETRUSTSERVERNAMES $EGET_WGET_OPTIONS "$@"
+        docmd $WGET $FORCEIPV $WGETQ $WGETSHOWPROGRESS $NOGLOB $WGETCOMPRESSED $WGETHEADER $WGETOUTPUTDIR $WGETNOSSLCHECK $WGETNODIRECTORIES $WGETCONTINUE $WGETTIMEOUT $WGETREADTIMEOUT $WGETRETRYCONNREFUSED $WGETTRIES $WGETLOADCOOKIES $WGETRUSTSERVERNAMES $EGET_WGET_OPTIONS "$@"
     fi
 }
 
@@ -1220,9 +1231,9 @@ elif [ "$EGET_BACKEND" = "curl" ] ; then
 __curl()
 {
     if [ -n "$CURLUSERAGENT" ] ; then
-        docmd $CURL $FORCEIPV --fail -L $CURLQ $CURLCOMPRESSED $CURLHEADER $CURLOUTPUTDIR $CURLNOSSLCHECK $CURLCONTINUE $CURLMAXTIME $CURLRETRYCONNREFUSED $CURLRETRY $CURLCOOKIE $CURLTRUSTSERVERNAMES "$(eval echo "$CURLUSERAGENT")" $EGET_CURL_OPTIONS "$@"
+        docmd $CURL $FORCEIPV --fail -L $CURLQ $CURLSHOWPROGRESS $CURLCOMPRESSED $CURLHEADER $CURLOUTPUTDIR $CURLNOSSLCHECK $CURLCONTINUE $CURLMAXTIME $CURLRETRYCONNREFUSED $CURLRETRY $CURLCOOKIE $CURLTRUSTSERVERNAMES "$(eval echo "$CURLUSERAGENT")" $EGET_CURL_OPTIONS "$@"
     else
-        docmd $CURL $FORCEIPV --fail -L $CURLQ $CURLCOMPRESSED $CURLHEADER $CURLOUTPUTDIR $CURLNOSSLCHECK $CURLCONTINUE $CURLMAXTIME $CURLRETRYCONNREFUSED $CURLRETRY $CURLCOOKIE $CURLTRUSTSERVERNAMES $EGET_CURL_OPTIONS "$@"
+        docmd $CURL $FORCEIPV --fail -L $CURLQ $CURLSHOWPROGRESS $CURLCOMPRESSED $CURLHEADER $CURLOUTPUTDIR $CURLNOSSLCHECK $CURLCONTINUE $CURLMAXTIME $CURLRETRYCONNREFUSED $CURLRETRY $CURLCOOKIE $CURLTRUSTSERVERNAMES $EGET_CURL_OPTIONS "$@"
     fi
 }
 # put remote content to stdout
@@ -1284,7 +1295,7 @@ url_get_response()
 elif [ "$EGET_BACKEND" = "aria2" ] ; then
 __aria2()
 {
-    docmd $ARIA2 $ARIA2Q $ARIA2OUTPUTDIR $ARIA2CONTINUE $EGET_ARIA2_OPTIONS "$@"
+    docmd $ARIA2 $ARIA2Q $ARIA2SHOWPROGRESS $ARIA2OUTPUTDIR $ARIA2CONTINUE $EGET_ARIA2_OPTIONS "$@"
 }
 
 # put remote content to stdout
@@ -1338,10 +1349,13 @@ url_get_response()
 elif [ "$EGET_BACKEND" = "axel" ] ; then
 __axel()
 {
+    local AXELQ_LOCAL="$AXELQ"
+    # --show-progress overrides --quiet for axel
+    [ -n "$AXELSHOWPROGRESS" ] && AXELQ_LOCAL=''
     if [ -n "$AXELUSERAGENT" ] ; then
-        docmd $AXEL $FORCEIPV $AXELQ $AXELOUTPUTDIR $AXELCONTINUE $AXELTIMEOUT $AXELHEADER $AXELNOSSLCHECK "$(eval echo "$AXELUSERAGENT")" $EGET_AXEL_OPTIONS "$@"
+        docmd $AXEL $FORCEIPV $AXELQ_LOCAL $AXELOUTPUTDIR $AXELCONTINUE $AXELTIMEOUT $AXELHEADER $AXELNOSSLCHECK "$(eval echo "$AXELUSERAGENT")" $EGET_AXEL_OPTIONS "$@"
     else
-        docmd $AXEL $FORCEIPV $AXELQ $AXELOUTPUTDIR $AXELCONTINUE $AXELTIMEOUT $AXELHEADER $AXELNOSSLCHECK $EGET_AXEL_OPTIONS "$@"
+        docmd $AXEL $FORCEIPV $AXELQ_LOCAL $AXELOUTPUTDIR $AXELCONTINUE $AXELTIMEOUT $AXELHEADER $AXELNOSSLCHECK $EGET_AXEL_OPTIONS "$@"
     fi
 }