diff --git a/webroot/channel.shs b/webroot/channel.shs index 425648a..bc20e80 100644 --- a/webroot/channel.shs +++ b/webroot/channel.shs @@ -28,8 +28,9 @@ IFS=$'\n' video_title=($(jq -r '.entries[].title' <<< $data)) video_id=($(jq -r '.entries[].id' <<< $data)) -strings[subscribe]="

$title

Subscribe!
" - +#strings[subscribe]="

$title

Subscribe!
" +strings[subscribe]='

'"$(html_encode "$title")'s channel"'

' +echo uwu > /dev/stderr for (( i=0; i<${#video_id[@]}; i++ )); do strings[videos]+="
${video_title[$i]}

" done diff --git a/webroot/watch.shs b/webroot/watch.shs index f00ce0c..6487543 100755 --- a/webroot/watch.shs +++ b/webroot/watch.shs @@ -39,17 +39,18 @@ if [[ "${get_data[v]}" ]]; then source templates/head.sh fi else + cd temp video=$(haruhi-dl --ie-key Youtube --write-pages --cookies "${cfg[_cookies]}" -J "http://youtube.com/watch?v=${get_data[v]}") if [[ $video == '' ]]; then # okay who did this random_hash=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 24 | head -n 1) - video=$(haruhi-dl --ie-key Youtube --write-pages --cookies ${cfg[_cookies]} -J "http://youtube.com/watch?v=${get_data[v]}" 2> temp/output$random_hash.log) + video=$(haruhi-dl --ie-key Youtube --write-pages --cookies ${cfg[_cookies]} -J "http://youtube.com/watch?v=${get_data[v]}" 2> output$random_hash.log) if [[ $video == '' ]]; then # seriously WHO DID THIS if [[ "${cfg[regionlock_proxy]}" == true ]]; then # retrying w/ proxy! - video=$(haruhi-dl --ie-key Youtube --write-pages --cookies ${cfg[_cookies]} --proxy "${cfg[regionlock_proxy_url]}" -J "http://youtube.com/watch?v=${get_data[v]}" 2> temp/output$random_hash.log) + video=$(haruhi-dl --ie-key Youtube --write-pages --cookies ${cfg[_cookies]} --proxy "${cfg[regionlock_proxy_url]}" -J "http://youtube.com/watch?v=${get_data[v]}" 2> output$random_hash.log) fi - output=$(cat temp/output$random_hash.log) - rm temp/output$random_hash.log + output=$(cat output$random_hash.log) + rm output$random_hash.log if [[ $video == '' ]]; then if [[ $output == 'ERROR: Video unavailable' ]]; then strings[error]='Video unavailable' @@ -58,6 +59,7 @@ if [[ "${get_data[v]}" ]]; then else strings[error]='Unexpected error has occured' fi + cd .. source templates/head.sh source "${cfg[namespace]}/templates/header.shs" render strings "${cfg[namespace]}/templates/themes/${cfg[template]}/watch_error.t" @@ -65,6 +67,7 @@ if [[ "${get_data[v]}" ]]; then fi fi fi + cd .. #echo "http://youtube.com/watch?v=${get_data[v]}" > /dev/stderr strings[channel_id]=$(jq -r '.channel_url' <<< "$video" | sed -s 's/http:\/\/www.youtube.com\/channel\///') strings[uploader]=$(jq -r '.uploader' <<< "$video")