update download URLs, fallback to wget when torrent fails (jwngr#309)

Replaced the deprecated mirror site https://dumps.wikimedia.your.org/ with https://dumps.wikimedia.org/ and enhanced the fallback to wget since the torrent link is also deprecated and redirects to another link.

Author: MrElyazid

scripts/buildDatabase.sh

@@ -9,7 +9,7 @@ export LC_ALL=C
 # By default, the latest Wikipedia dump will be downloaded. If a download date in the format
 # YYYYMMDD is provided as the first argument, it will be used instead.
 if [[ $# -eq 0 ]]; then
-  DOWNLOAD_DATE=$(wget -q -O- https://dumps.wikimedia.your.org/enwiki/ | grep -Po '\d{8}' | sort | tail -n1)
+  DOWNLOAD_DATE=$(wget -q -O- https://dumps.wikimedia.org/enwiki/ | grep -Po '\d{8}' | sort | tail -n1)
 else
   if [ ${#1} -ne 8 ]; then
     echo "[ERROR] Invalid download date provided: $1"
@@ -22,8 +22,8 @@ fi
 ROOT_DIR=`pwd`
 OUT_DIR="dump"
 
-DOWNLOAD_URL="https://dumps.wikimedia.your.org/enwiki/$DOWNLOAD_DATE"
-TORRENT_URL="https://tools.wmflabs.org/dump-torrents/enwiki/$DOWNLOAD_DATE"
+DOWNLOAD_URL="https://dumps.wikimedia.org/enwiki/$DOWNLOAD_DATE"
+TORRENT_URL="https://dump-torrents.toolforge.org/enwiki/$DOWNLOAD_DATE"
 
 SHA1SUM_FILENAME="enwiki-$DOWNLOAD_DATE-sha1sums.txt"
 REDIRECTS_FILENAME="enwiki-$DOWNLOAD_DATE-redirect.sql.gz"
@@ -51,8 +51,10 @@ function download_file() {
     if [ $1 != sha1sums ] && command -v aria2c > /dev/null; then
       echo "[INFO] Downloading $1 file via torrent"
       time aria2c --summary-interval=0 --console-log-level=warn --seed-time=0 \
-        "$TORRENT_URL/$2.torrent"
-    else
+        "$TORRENT_URL/$2.torrent" 2>&1 | grep -v "ERROR\|Exception" || true
+    fi
+    
+    if [ ! -f $2 ]; then
       echo "[INFO] Downloading $1 file via wget"
       time wget --progress=dot:giga "$DOWNLOAD_URL/$2"
     fi