From 3c1099228207bf63eae3e97321376ec215121843 Mon Sep 17 00:00:00 2001
From: Amab <juanmi1982@gmail.com>
Date: Sat, 21 Jan 2023 16:22:23 +0100
Subject: [PATCH] Run wget on quiet mode

---
 scripts/calls.sh       | 16 ++++++++--------
 scripts/concessions.sh | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/scripts/calls.sh b/scripts/calls.sh
index aebe14f..4eafb82 100755
--- a/scripts/calls.sh
+++ b/scripts/calls.sh
@@ -13,21 +13,21 @@ APP=(wget jq tar gzip)
 function getCookies() {
 	echo "Getting cookies..."
 
-	wget -qO- --ca-certificate=AC_Componentes_Informaticos_SHA256.crt --keep-session-cookies --save-cookies $F_COOKIES --header "User-Agent: $USER_AGENT" 'https://www.infosubvenciones.es/' &> /dev/null
+	wget -q --ca-certificate=AC_Componentes_Informaticos_SHA256.crt --keep-session-cookies --save-cookies $F_COOKIES --header "User-Agent: $USER_AGENT" 'https://www.infosubvenciones.es/' &> /dev/null
 }
 
-function fetchConcessions() {
+function fetchCalls() {
 	local outputFile="page_$(printf %03d "$1").json"
 
-	echo "Downloading page $1..."
+	echo "Downloading page $1 of $2..."
 
 	if [ -z ${COOKIE+x} ]; then
-		wget --ca-certificate=AC_Componentes_Informaticos_SHA256.crt --keep-session-cookies --load-cookies $F_COOKIES --header "User-Agent: $USER_AGENT" -O "$outputFile" "https://www.infosubvenciones.es/bdnstrans/busqueda?type=convs&_search=false&nd=$ND&rows=$ROWS&page=$1&sidx=4&sord=asc";
+		wget -q --ca-certificate=AC_Componentes_Informaticos_SHA256.crt --keep-session-cookies --load-cookies $F_COOKIES --header "User-Agent: $USER_AGENT" -O "$outputFile" "https://www.infosubvenciones.es/bdnstrans/busqueda?type=convs&_search=false&nd=$ND&rows=$ROWS&page=$1&sidx=4&sord=asc";
 	else
-		wget --ca-certificate=AC_Componentes_Informaticos_SHA256.crt --keep-session-cookies --header "Cookie: $COOKIE" --header "User-Agent: $USER_AGENT" -O "$outputFile" "https://www.infosubvenciones.es/bdnstrans/busqueda?type=convs&_search=false&nd=$ND&rows=$ROWS&page=$1&sidx=4&sord=asc"
+		wget -q --ca-certificate=AC_Componentes_Informaticos_SHA256.crt --keep-session-cookies --header "Cookie: $COOKIE" --header "User-Agent: $USER_AGENT" -O "$outputFile" "https://www.infosubvenciones.es/bdnstrans/busqueda?type=convs&_search=false&nd=$ND&rows=$ROWS&page=$1&sidx=4&sord=asc"
 	fi
 }
-export -f fetchConcessions
+export -f fetchCalls
 
 function getNumPages() {
 	local page=1
@@ -35,7 +35,7 @@ function getNumPages() {
 
 	echo "Getting number of pages..."
 
-	fetchConcessions $page
+	fetchCalls $page $PAGES
 
 	PAGES=$(jq '.total' "$outputFile")
 	local records=$(jq '.records' "$outputFile")
@@ -51,7 +51,7 @@ function getNumPages() {
 function getAllCalls() {
 	echo "Downloading all calls..."
 
-	seq 2 "$PAGES" | xargs -I page -n 1 -P 5 bash -c "fetchConcessions page"
+	seq 2 "$PAGES" | xargs -I page -n 1 -P 5 bash -c "fetchCalls page $PAGES"
 }
 
 function convertJson2Csv() {
diff --git a/scripts/concessions.sh b/scripts/concessions.sh
index fc8978f..fbebcfd 100755
--- a/scripts/concessions.sh
+++ b/scripts/concessions.sh
@@ -14,18 +14,18 @@ APP=(wget jq csvgrep tar gzip)
 function getCookies() {
 	echo "Getting cookies..."
 
-	wget -qO- --ca-certificate=AC_Componentes_Informaticos_SHA256.crt --keep-session-cookies --save-cookies $F_COOKIES --header "User-Agent: $USER_AGENT" 'https://www.infosubvenciones.es/' &> /dev/null
+	wget -q --ca-certificate=AC_Componentes_Informaticos_SHA256.crt --keep-session-cookies --save-cookies $F_COOKIES --header "User-Agent: $USER_AGENT" 'https://www.infosubvenciones.es/' &> /dev/null
 }
 
 function fetchConcessions() {
 	local outputFile="page_$(printf %03d "$1").json"
 
-	echo "Downloading page $1..."
+	echo "Downloading page $1 of $2..."
 
 	if [ -z ${COOKIE+x} ]; then
-		wget --ca-certificate=AC_Componentes_Informaticos_SHA256.crt --keep-session-cookies --load-cookies $F_COOKIES --header "User-Agent: $USER_AGENT" -O "$outputFile" "https://www.infosubvenciones.es/bdnstrans/busqueda?type=concs&_search=false&nd=$ND&rows=$ROWS&page=$1&sidx=8&sord=asc";
+		wget -q --ca-certificate=AC_Componentes_Informaticos_SHA256.crt --keep-session-cookies --load-cookies $F_COOKIES --header "User-Agent: $USER_AGENT" -O "$outputFile" "https://www.infosubvenciones.es/bdnstrans/busqueda?type=concs&_search=false&nd=$ND&rows=$ROWS&page=$1&sidx=8&sord=asc";
 	else
-		wget --ca-certificate=AC_Componentes_Informaticos_SHA256.crt --keep-session-cookies --header "Cookie: $COOKIE" --header "User-Agent: $USER_AGENT" -O "$outputFile" "https://www.infosubvenciones.es/bdnstrans/busqueda?type=concs&_search=false&nd=$ND&rows=$ROWS&page=$1&sidx=8&sord=asc"
+		wget -q --ca-certificate=AC_Componentes_Informaticos_SHA256.crt --keep-session-cookies --header "Cookie: $COOKIE" --header "User-Agent: $USER_AGENT" -O "$outputFile" "https://www.infosubvenciones.es/bdnstrans/busqueda?type=concs&_search=false&nd=$ND&rows=$ROWS&page=$1&sidx=8&sord=asc"
 	fi
 }
 export -f fetchConcessions
@@ -36,7 +36,7 @@ function getNumPages() {
 
 	echo "Getting number of pages..."
 
-	fetchConcessions $page
+	fetchConcessions $page $PAGES
 
 	PAGES=$(jq '.total' "$outputFile")
 	local records=$(jq '.records' "$outputFile")
@@ -52,7 +52,7 @@ function getNumPages() {
 function getAllConcessions() {
 	echo "Downloading all concessions..."
 
-	seq 2 "$PAGES" | xargs -I page -n 1 -P 5 bash -c "fetchConcessions page"
+	seq 2 "$PAGES" | xargs -I page -n 1 -P 5 bash -c "fetchConcessions page $PAGES"
 }
 
 function convertJson2Csv() {