20210330 - This is 1.2.0 - Fixing #1

Author: yafp

CHANGELOG.md

@@ -1,4 +1,8 @@
 # changelog
+## Version 1.2.0 (20210330)
+* Added check for updates - see #1
+* Added dependecy check for ffmpeg
+
 ## Version 1.1.0 (20210327)
 * Added output after processing finished
 * Minor changes to status output

README.md

@@ -12,7 +12,10 @@ ydownl.sh is a simple youtube-dl bash script which can be used to extract audio
 The following packages are required:
 
 * youtube-dl
+* ffmpeg
 * zenity
+* curl
+* sed
 
 ## usage
 `./ydownl.sh https://www.youtube.com/watch?v=Y52M28WQu2s`

ydownl.sh

@@ -16,9 +16,11 @@
 # ------------------------------------------------------------------------------
 # DEFINE CONSTANTS - DON'T TOUCH
 # ------------------------------------------------------------------------------
-SCRIPTNAME="ydownl.sh"
-SCRIPTVERSION="1.1.0"
-SCRIPTDEMOURL="https://www.youtube.com/watch?v=Y52M28WQu2s"
+SCRIPT_NAME="ydownl.sh"
+SCRIPT_VERSION="1.2.0"
+SCRIPT_LATEST="https://github.com/yafp/ydownl.sh/releases/latest"
+SCRIPT_DEMO_URL="https://www.youtube.com/watch?v=Y52M28WQu2s"
+
 
 
 # ------------------------------------------------------------------------------
@@ -80,7 +82,7 @@ function reset() {
 }
 
 function showHeader() {
-	printf " ${bold}${lime_yellow}%s${normal} - ${bold}%s ${normal}\n" "$SCRIPTNAME" "$SCRIPTVERSION"
+	printf " ${bold}${lime_yellow}%s${normal} - ${bold}%s ${normal}\n" "$SCRIPT_NAME" "$SCRIPT_VERSION"
 	printf " ${bold}----------------------------------------------------------${normal}\n"
 }
 
@@ -89,8 +91,8 @@ function showNotification() {
 	then
 		printf "Notifications using notify-send is not supported - skipping ...\n"
 	else
-		#notify-send -u low -t 0 "$SCRIPTNAME" "$1"
-		zenity --info --text="$1" --title="$SCRIPTNAME" --width="$CONFIG_ZENITY_WIDTH" --height="$CONFIG_ZENITY_HEIGHT" --timeout="$CONFIG_ZENITY_TIMEOUT"
+		#notify-send -u low -t 0 "$SCRIPT_NAME" "$1"
+		zenity --info --text="$1" --title="$SCRIPT_NAME" --width="$CONFIG_ZENITY_WIDTH" --height="$CONFIG_ZENITY_HEIGHT" --timeout="$CONFIG_ZENITY_TIMEOUT"
 	fi
 }
 
@@ -106,6 +108,24 @@ function checkIfExists() {
 	fi
 }
 
+function checkVersion() {
+  SCRIPT_LATEST_VERSION=`curl --silent "https://api.github.com/repos/yafp/ydownl.sh/releases/latest" | # Get latest release from GitHub api
+    grep '"tag_name":' |                                            # Get tag line
+    sed -E 's/.*"([^"]+)".*/\1/' `                                  # Pluck JSON value
+
+
+  #printf "Your version: $SCRIPT_VERSION\n"
+  #printf "Latest version: $SCRIPT_LATEST_VERSION\n"
+
+
+	if [ "$SCRIPT_LATEST_VERSION" == "$SCRIPT_VERSION" ]
+	then
+        printf "${green}[  OK  ]${normal} Your current version $SCRIPT_VERSION is up-to-date\n"
+    else
+    	printf "${powder_blue}[ INFO ]${normal} Your version is outdated. $SCRIPT_LATEST_VERSION is available under: $SCRIPT_LATEST\n"
+	fi
+}
+
 
 # ------------------------------------------------------------------------------
 # SCRIPT
@@ -114,18 +134,22 @@ reset # clear the screen
 initColors # initialize the color and font formating variables
 showHeader # show the script header
 checkIfExists "youtube-dl"
+checkIfExists "ffmpeg"
 checkIfExists "zenity"
+checkIfExists "curl"
+checkIfExists "sed"
+checkVersion
 
 # Check if a parameter was supplied - if not stop execution
 if [ -z "$1" ]
 then
 	printf "${yellow}[ WARN ]${normal} no URL detected. Starting input dialog\n"
 
 	# start input dialog to handle the missing url
-	URL=$(zenity --entry --width="$CONFIG_ZENITY_WIDTH" --height="$CONFIG_ZENITY_HEIGHT" --title="$SCRIPTNAME" --text="Please insert an URL:")
+	URL=$(zenity --entry --width="$CONFIG_ZENITY_WIDTH" --height="$CONFIG_ZENITY_HEIGHT" --title="$SCRIPT_NAME" --text="Please insert an URL:")
 	if [ -z "$URL" ]
 	then
-    	printf "${red}[ FAIL ]${normal} no URL provided. Usage: ./%s %s\n\n" "$SCRIPTNAME" "$SCRIPTDEMOURL"
+    	printf "${red}[ FAIL ]${normal} no URL provided. Usage: ./%s %s\n\n" "$SCRIPT_NAME" "$SCRIPT_DEMO_URL"
     	exit 1
 	fi
 else
@@ -139,7 +163,7 @@ if curl --output /dev/null --silent --head --fail "$URL"; then
 	printf "\nStart processing the following url:\n\t${bold}%s${normal}\n\n" "$URL"
 
 	# start downloading (alt: youtube-dlc)
-	youtube-dl -f bestaudio --extract-audio --restrict-filenames --write-description --newline --console-title --audio-format "$CONFIG_YTDL_AUDIOFORMAT" --audio-quality $CONFIG_YTDL_AUDIOQUALITY -o "%(playlist_index)s %(playlist)s - %(title)s.%(ext)s" $URL
+	youtube-dl -f bestaudio --extract-audio --restrict-filenames --write-description --newline --console-title --audio-format "$CONFIG_YTDL_AUDIOFORMAT" --audio-quality $CONFIG_YTDL_AUDIOQUALITY -o "%(playlist_index)s-%(playlist)s---%(title)s.%(ext)s" $URL
 	printf "\n${green}[  OK  ]${normal} Finished processing the URL: $URL\n\n"
 	showNotification "Finished downloading\n\t<a href='$URL'>$URL</a>"
 else