diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index b8fbeea..6a0d4f4 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -133,17 +133,17 @@ try_download_game () { try_download () { PW_DOWNLOAD_FILE_NAME="$(basename $1)" set -o pipefail - wget -c -O "$2" --read-timeout 300 --retry-connrefused --timeout 3 --tries 2 --no-dns-cache --no-cache \ - --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "$1" 2>&1 | \ - tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ - zenity --progress --percentage=0 --title="Download ${PW_DOWNLOAD_FILE_NAME}" --text=Starting... --auto-close --width=500 --height=90 + curl -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -L "$1" -o "$2" 2>&1 | \ + tr '\r' '\n' | sed -u -e 's/#//g' -e 's/ //g' -e 's/\.[[:digit:]]%//' | \ + "${pw_yad_v12_3}" --progress --percentage=0 --text="Download ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \ + --auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90 if [ "${PIPESTATUS[0]}" != 0 ] ; then print_error "Failed to download ${PW_DOWNLOAD_FILE_NAME} from GitHub." print_info "Try download ${PW_DOWNLOAD_FILE_NAME} from FTP" - wget -c -O "$2" --read-timeout 300 --retry-connrefused --timeout 3 --tries 2 --no-dns-cache --no-cache \ - --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" --ftp-user=anonymous "ftp://171.22.215.18/archives/${PW_DOWNLOAD_FILE_NAME}" 2>&1 | \ - tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ - zenity --progress --percentage=0 --title="Try download ${PW_DOWNLOAD_FILE_NAME} from FTP" --text=Starting... --auto-close --width=500 --height=90 + curl -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -L "ftp://171.22.215.18/archives/${PW_DOWNLOAD_FILE_NAME}" -o "$2" 2>&1 | \ + tr '\r' '\n' | sed -u -e 's/#//g' -e 's/ //g' -e 's/\.[[:digit:]]%//' | \ + "${pw_yad_v12_3}" --progress --percentage=0 --text="Download ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \ + --auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90 if [ "${PIPESTATUS[0]}" != 0 ] ; then print_error "Failed to download ${PW_DOWNLOAD_FILE_NAME} from FTP." return 1 @@ -154,11 +154,12 @@ try_download () { } try_download_to_path () { + PW_DOWNLOAD_FILE_NAME="$(basename $1)" set -o pipefail - wget --directory-prefix="$2" --read-timeout 300 --retry-connrefused --timeout 4 --tries 2 --no-dns-cache --no-cache \ - --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "$1" 2>&1 | \ - tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ - zenity --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --width=500 --height=90 + curl -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -L "$1" -o "$2/$PW_DOWNLOAD_FILE_NAME" 2>&1 | \ + tr '\r' '\n' | sed -u -e 's/#//g' -e 's/ //g' -e 's/\.[[:digit:]]%//' | \ + "${pw_yad_v12_3}" --progress --percentage=0 --text="Download ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \ + --auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90 if [ "${PIPESTATUS[0]}" != 0 ] ; then print_error "Failed to download $1." return 1 @@ -168,8 +169,7 @@ try_download_to_path () { } try_download_silent () { - wget -O "$2" --read-timeout 300 --retry-connrefused --timeout 4 --tries 2 --no-dns-cache --no-cache \ - --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "$1" + curl -sS -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -L "$1" -o "$2" if [ "${PIPESTATUS[0]}" != 0 ] ; then print_error "Failed to download $1. Skipping." try_remove_file "$2"