Updated the README.md with usage. Code needs cleanup.

5 files changed, 130 insertions, 65 deletions

diff --git a/.README.md.swp b/.README.md.swp
new file mode 100644
index 0000000..aab92eb
--- /dev/null
+++ b/.README.md.swp
diff --git a/.randopitons.sh.swp b/.randopitons.sh.swp
new file mode 100644
index 0000000..0b01a5a
--- /dev/null
+++ b/.randopitons.sh.swp
diff --git a/README.md b/README.md
index c4feb0c..0731c3e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,27 @@
 # randopitons
-Work in progress.
-Currently have issues with file downloading and some errors handling.
+Hello !
+Here's a bash script for downloading hitchiking files from [https://randopitons.re](https://randopitons.re)
+You will need to make an account on the website before using the script (as these credentials are needed).
+
+## Installation
+
+If you have git installed on your computer, you can clone it by doing:
+```bash
+git clone https://github.com/MIQUELLIONEL/randopitons
+cd randopitons
+```
+Then `bash randopitons.sh` followed by options.
+
+## Usage
+The following options are mandatory:
+`--username/-u "your-username-or-email@randopitons.re"`: After that, you will be prompted for your password (it won't display it as you type so don't worry, it's for protecting you     from curious peoples looking at you screen (a.k.a shouldersurfing).
+
+Facultative:
+`--maptype/-mp maptype`: Can be used to specify a particular filetype to download between the 3 choices available. See \"-lm\" for more info
+`--list-regions/-lr`: Display the list of available regions.
+`--list-maptype/-lm`: Display the list of available maptypes.
+`--region/-r "string"`: Will download the matching regions from the string.
+`--all/-a`: Will download all the files from all regions
 
 # LICENSE
 
@@ -18,4 +39,4 @@ Currently have issues with file downloading and some errors handling.
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. You just DO WHAT THE FUCK YOU WANT TO.
-```
+``` 
diff --git a/randopitons.sh b/randopitons.sh
index 2373fbd..3b58664 100644
--- a/randopitons.sh
+++ b/randopitons.sh
@@ -1,70 +1,85 @@
-#!/bin/bash
-# ANSI color codes
-RS="\e[0m"    # reset
-HC="\e[1m"    # hicolor
-UL="\e[4m"    # underline
-BLNK='\e[5m'  #Blink (wtf)
-INV="\e[7m"   # inverse background and foreground
-FBLK="\e[30m" # foreground black
-FRED="\e[31m" # foreground red
-FGRN="\e[32m" # foreground green
-FYEL="\e[33m" # foreground yellow
-FBLE="\e[34m" # foreground blue
-FMAG="\e[35m" # foreground magenta
-FCYN="\e[36m" # foreground cyan
-FWHT="\e[37m" # foreground white
-BBLK="\e[40m" # background black
-BRED="\e[41m" # background red
-BGRN="\e[42m" # background green
-BYEL="\e[43m" # background yellow
-BBLE="\e[44m" # background blue
-BMAG="\e[45m" # background magenta
-BCYN="\e[46m" # background cyan
-BWHT="\e[47m" # background white
-BLD="\e[1m" # BOLD text
-# ANSI color codes
+#!/usr/bin/env bash
+# Bash3 Boilerplate. Copyright (c) 2014, kvz.io
+
+
+#set -o errexit
+#set -o pipefail
+#set -o nounset
+set -o xtrace
+
+# Set magic variables for current file & dir
+__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+__file="${__dir}/$(basename "${BASH_SOURCE[0]}")"
+__base="$(basename ${__file} .sh)"
+__root="$(cd "$(dirname "${__dir}")" && pwd)" # <-- change this as it depends on your app
+
 
 #https://stackoverflow.com/questions/4813092/how-to-read-entire-line-from-bash
 #so we don't use a while loop
 IFS=$'\n'
 
-tellusage()
+_tellusage()
+{
+	echo -e "${BLD}PURPOSE:${RS} With this script, you will be able to download gpx,trk and kml files for hitchiking on the Reunion Isle.\n
+${BLD}USAGE$RS: . ./randopitons.sh option1 option2 option3
+The following options are mandatory:
+	--username/-u \"your-username-or-email@randopitons.re\": After that, you will be prompted for your password (it won't display it as you type so don't worry, it's for protecting you from curious peoples looking at you screen (a.k.a shouldersurfing).
+
+Facultative:
+	--maptype/-mp maptype: Can be used to specify a particular filetype to download between the 3 choices available. See \"-lm\" for more info
+	--list-regions/-lr: Display the list of available regions.
+	--list-maptype/-lm: Display the list of available maptypes.
+	--region/-r \"string\": Will download the matching regions from the string.
+	--all/-a: Will download all the files from all regions."
+
+}
+
+_credentials()
 {
-echo -e "${BLD}PURPOSE:${RS} With this script, you will be able to download gpx,trk and kml traces for hitchiking on the Reunion Isle.\n
-${BLD}USAGE$RS: randopitons.sh -u \"username@mymail.com\" -mp maptype. You can supply the -a flag to the previous example to download all regions \n
-${BLD}MAPTYPE FORMAT:$RS gpx, trk or kml"
 
+	echo -e "\nYour username is $RDPUSER. (You can press CTRL+C to cancel the script if this info is incorrect)."
+	echo -e "\nPassword (for randopitons.re): "
+	read -s RDPUSERPASS
 }
 
-credentials()
+_logincheck()
 {
-RDPUSER=$1
-echo -e "\nYour username is $RDPUSER. (You can press CTRL+C if this info is incorrect."
-echo -e "\nPassword (for randopitons.re): "
-read -s RDPUSERPASS
+	LOGINTEST=$(wget -qO- --save-cookies ${__dir}/cookiejar.txt --keep-session-cookies --post-data="mail=${RDPUSER}&password=${RDPUSERPASS}" --delete-after https://randopitons.re/connexion | grep "L'adresse mail ou le mot de passe ne correspondent pas.")
+	if [ -z "$LOGINTEST" ];then
+		echo "Login is successful."
+		LOGINOK=true
+		mkdir ${__dir}/randopfiles
+	else
+		echo "Login is not successful."
+		LOGINOK=false
+		rm  ${__dir}/cookiejar.txt
+		exit
+	fi
 }
 
-if [ -s "./regions.txt" ];then
+#Filechecks
+if [ -s "${__dir}/regions.txt" ];then
 	echo "Region file is already there. OK"
 else
 	echo "Region file doesn't exist, we will create it."
-	echo -e "Cirque de Cilaos\nCirque de Mafate\nCirque de Salazie\nEst\nNord\nOuest\nSud\nVolcan\nAilleurs\nAll">regions.txt
+	echo -e "Cirque de Cilaos\nCirque de Mafate\nCirque de Salazie\nEst\nNord\nOuest\nSud\nVolcan\nAilleurs\nAll">${__dir}/regions.txt
 fi
 
-if [ -s "./webregions.txt" ];then
+if [ -s "${__dir}/webregions.txt" ];then
 	echo "Webegion file is already there. OK"
 else
 	echo "Webregion file doesn't exist, we will create it."
-	echo -e "cirque-cilaos\ncirque-mafate\ncirque-salazie\nest\nnord\nouest\nsud\nvolcan\nailleurs">webregions.txt
-fi
+	echo -e "cirque-cilaos\ncirque-mafate\ncirque-salazie\nest\nnord\nouest\nsud\nvolcan\nailleurs">${__dir}/webregions.txt
+	fi
 
+REGIONS=$(cat ${__dir}/regions.txt)
 MAPTYPE="gpx"
-RDPHOME=$HOME"/Randopitons"
 RDPUSER=
 RDPUSERPASS=
+LOGINOK=
 
 if [ "$1" = "" ];then
-	tellusage
+	_tellusage
 fi
 
 while [ "$1" != "" ]; do
@@ -72,42 +87,63 @@ while [ "$1" != "" ]; do
     case $1 in
         -u | --username )  
 		shift
-                credentials
-                ;;
+		RDPUSER="$1"
+                _credentials
+		_logincheck
+		
+		;;
 
         -mp | --maptype )	
 		shift
-		MAPTYPE=$1cl
+		MAPTYPE="$1"
 		while [ $MAPTYPE != "gpx" -a $MAPTYPE != "trk" -a $MAPTYPE != "kml" ]
 		do	
-			echo -e $BLNK$HC$BRED"${FYEL}\nMaptype supplied is not correct$RS"
-			echo -e "Which map filetype you want to set : ${BLD}gpx(default),trk or kml ?$RS$RS$RS"
+			echo -e "\nMaptype supplied is not correct"
+			echo -e "Which map filetype you want to set : ${BLD}gpx(default),trk or kml ?$RS"
 			read -N 3 MAPTYPE
 		done
 		echo -e $HC$FGRN"\nThe $MAPTYPE maptype is a valid choice !"$RS
 		;;
+	-lr | --list-regions)
+		echo -e "Here's a list:\n$REGIONS"
+		;;
+	-lm | --list-maptype)
+		echo "These are the valid maptypes:gpx\nkml\ntrk"
+		;;
 	-r | --region )
 		shift
-		matching=`grep -iE "$1" regions.txt`
-		webmatching=`grep -iE "$1" webregions.txt`
-		if [ "$1" != "" ];then
-			echo -e "Your region choice was '$1'\n See what matched :"
-		else
-			echo -e $HC$FCYN"$matching"$RS
+		matching=$(grep -iE "$1" ${__dir}/regions.txt)
+		if [ "$1" = "" -o "$matching" = "" ];then
+			echo "Nothing matched or you entered an empty value."
+			_tellusage
 		fi
+
+		echo -e "Your region choice was '$1'\n See what matched :"
+		echo -e $HC$FCYN"$matching"$RS
+		webmatching=$(echo $matching | sed 's/ de /\-/g' | tr '[:upper:]' '[:lower:]')
+		FILENBRS=$(wget -qO- https://randopitons.re/randonnees/region/${webmatching} | grep "<tr rid" | cut -d \" -f2)
+		for nbr in $FILENBRS;do
+			wget --content-disposition --load-cookies ${__dir}/cookiejar.txt "https://randopitons.re/randonnee/${nbr}/trace/${MAPTYPE}"
+		done
 		;;
 	-a | --all )
-		echo -e "\nThis will download all the hitchiking routes from all regions.\nIf no maptype is specified (with -mp or --maptype), it will default to .gpx filetype.\n${BLD}Pausing for 5 seconds before launching it.$RS"
+			echo -e "\nThis will download all the hitchiking routes from all regions.\nIf no maptype is specified (with -mp or --maptype), it will default to .gpx filetype.\n${BLD}Pausing for 5 seconds before launching it.$RS"
+			sleep 5	
+			while read linefromfile; do
+  				mkdir "${linefromfile}"
+				cd "${linefromfile}"
+				WEBREGION=$(echo ${linefromfile} | sed 's/ de /\-/g' | tr '[:upper:]' '[:lower:]')
+				FILENBRS=$(wget -qO- https://randopitons.re/randonnees/region/${WEBREGION} | grep "<tr rid" | cut -d \" -f2)
+				for nbr in $FILENBRS;do
+					wget --content-disposition --load-cookies ${__dir}/cookiejar.txt "https://randopitons.re/randonnee/${nbr}/trace/${MAPTYPE}"
+				done
+			done <${__dir}/regions.txt
+		
 		;;
 
-#	-h | --help )           tellusage
-#                               exit
-#                               ;;
-        * )                     tellusage
-                                exit 1
+	-h | --help )           _tellusage
+                               ;;
+        * )                     _tellusage
     esac
     shift
 done
-
-
-# echo -e "\n purz"
diff --git a/webregions.txt b/webregions.txt
index ccdf539..2479442 100644
--- a/webregions.txt
+++ b/webregions.txt
@@ -1 +1,9 @@
-cirque-cilaos\ncirque-mafate\ncirque-salazie\nest\nnord\nouest\nsud\nvolcan\nailleurs
+cirque-cilaos
+cirque-mafate
+cirque-salazie
+est
+nord
+ouest
+sud
+volcan
+ailleurs