diff --git a/vimeo_downloader.sh b/vimeo_downloader.sh index 1598979..7ec1c43 100755 --- a/vimeo_downloader.sh +++ b/vimeo_downloader.sh @@ -4,6 +4,7 @@ # # Copyright (C) 2008, 2010 Denver Gingerich # Copyright (C) 2009 Jori Hamalainen +# Copyright (C) 2012 John Slade (http://jtes.net) # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -22,21 +23,25 @@ if [ $# -ne 1 ]; then echo "Vimeo Downloader v0.3.1" echo "by Denver Gingerich (http://ossguy.com/)" echo " with script improvements by Jori Hamalainen" + echo " updated for new Vimeo site by John Slade" echo echo "Usage: $0 " exit 1 fi VIMEO_ID=`echo $1 | awk -F / '{print $NF}'` +# Set the user agent ID to use +USER_AGENT="Mozilla/5.0" + which wget if [ $? -eq 0 ]; then echo "Using wget..." - GET_CMD="wget -O -" + GET_CMD="wget -U \"${USER_AGENT}\" -O -" else which curl if [ $? -eq 0 ]; then echo "Using curl..." - GET_CMD="curl -L" + GET_CMD="curl -L -A ${USER_AGENT} " else echo "Could not find wget or curl" exit 2 @@ -52,33 +57,39 @@ else USING_PERL=0 fi -VIDEO_XML=`${GET_CMD} http://www.vimeo.com/moogaloop/load/clip:${VIMEO_ID}` +VIDEO_XML=`${GET_CMD} http://vimeo.com/${VIMEO_ID}` if [ $USING_PERL -eq 1 ]; then - REQUEST_SIGNATURE=`echo $VIDEO_XML | perl -p -e 's:^.*?\(.*?)\.*$:$1:g'` - REQUEST_SIGNATURE_EXPIRES=`echo $VIDEO_XML | perl -p -e 's:^.*?\(.*?)\.*$:$1:g'` - CAPTION=`echo $VIDEO_XML | perl -p -e 's:^.*?\(.*?)\.*$:$1:g'` - ISHD=`echo $VIDEO_XML | perl -p -e 's:^.*?\(.*?)\.*$:$1:g'` + REQUEST_SIGNATURE=`echo $VIDEO_XML | perl -e '@text_in = ; if (join(" ", @text_in) =~ /"signature":"(.*?)"/i ){ print "$1\n"; }'` + REQUEST_SIGNATURE_EXPIRES=`echo $VIDEO_XML | perl -e '@text_in = ; if (join(" ", @text_in) =~ /"timestamp":(\d*?),/i ){ print "$1\n"; }'` + CAPTION=`echo $VIDEO_XML | perl -p -e '/^.*?\.*$/; $_=$1; s/[^\w.]/-/g;'` + ISHD=`echo $VIDEO_XML | perl -p -e '/^.*?\.*$/; $_=lc($1)||"sd";'` - if [ ${ISHD} -eq 1 ]; then - ISHD="hd" - else - ISHD="sd" - fi - - # caption can contain bad characters (like '/') so don't use it for now - #FILENAME="${CAPTION}-(${ISHD}${VIMEO_ID}).flv" - - FILENAME="${VIMEO_ID}-${ISHD}.flv" + FILENAME="${CAPTION}-(${ISHD}-${VIMEO_ID}).flv" else + + # TODO update the sed code to work with the new site format + echo "This version requires perl - exiting" + exit 2 + REQUEST_SIGNATURE=`echo $VIDEO_XML | sed -e 's/^.*\([^<]*\)<.*$/\1/g'` REQUEST_SIGNATURE_EXPIRES=`echo $VIDEO_XML | sed -e 's/^.*\([^<]*\)<.*$/\1/g'` ISHD="sd" FILENAME=${VIMEO_ID}.flv fi -echo "\nDownloading video ${VIMEO_ID} to ${FILENAME}...\nRequest_signature=${REQUEST_SIGNATURE}\nRequest_signature_expires=${REQUEST_SIGNATURE_EXPIRES}\n" -axel -n 10 -a "http://www.vimeo.com/moogaloop/play/clip:${VIMEO_ID}/${REQUEST_SIGNATURE}/${REQUEST_SIGNATURE_EXPIRES}/?q=${ISHD}" -o "${FILENAME}" +echo +echo "Downloading video ${VIMEO_ID} to ${FILENAME}..." +echo "Request_signature=${REQUEST_SIGNATURE}" +echo "Request_signature_expires=${REQUEST_SIGNATURE_EXPIRES}" +echo "Quality=${QUALITY}" +echo + +EXEC_CMD="${GET_CMD} http://player.vimeo.com/play_redirect?clip_id=${VIMEO_ID}&sig=${REQUEST_SIGNATURE}&time=${REQUEST_SIGNATURE_EXPIRES}&quality=${ISHD}&codecs=H264,VP8,VP6&type=moogaloop_local&embed_location=" +echo "Executing ${EXEC_CMD}" +${EXEC_CMD} > "${FILENAME}" + +echo echo "Video ${VIMEO_ID} saved to ${FILENAME}" echo `file "${FILENAME}"` echo