diff --git a/templates/header.shs b/templates/header.shs
index 9e4bede..c762cad 100644
--- a/templates/header.shs
+++ b/templates/header.shs
@@ -1,18 +1,74 @@
#!/bin/bash
+##inherited from HTTP.sh's /templates/head.sh so that BashTube won't light on fire when I merge it LMAO ~luna
+echo '
+
+
+
'
+
+if [[ "${meta[title]}" != "" ]]; then echo "
$(html_encode "${meta[title]}") - ${cfg[title]} "; else echo "
${cfg[title]} "; fi
+if [[ "${meta[author]}" != "" ]]; then echo "
"; fi
+if [[ "${meta[description]}" != "" ]]; then echo "
"; fi
+if [[ "${meta[keywords]}" != "" ]]; then echo "
"; fi
+if [[ "${meta[refresh]}" != "" ]]; then echo "
"; fi
+if [[ "${meta[redirect]}" != "" ]]; then echo "
"; fi
+if [[ "${meta[css]}" != "" ]]; then echo "
"; fi
+if [[ "${meta[title]}" != "" ]]; then echo "
"; fi
+#if [[ "${meta[og:type]}" != "" ]]; then echo "
"; fi
+if [[ "${cfg[url]}" != "" ]]; then echo "
"; fi
+#if [[ "${meta[og:image}" != "" ]]; then echo "
"; fi
+if [[ "${meta[lang]}" != "" ]]; then echo "
"; fi
+if [[ "${meta[description]}" != "" ]]; then echo "
"; fi
+if [[ "${meta[unsafe]}" != "" ]]; then echo "${meta[unsafe]}"; fi
+
+#the CSS part has been moved to /app/webroot/css/style.css :3
+#echo "
+#"
+
+
+
declare -A strings_
-echo "
-
"
+#echo "
+#
"
+
+if [[ ${cfg[template]} == 'default-v2' ]]; then
+ echo "
+
"
+else
+ echo "
"
+
+ if ! session_verify "${cookies[sh_session]}"; then
+ echo "
Log in |
Register "
+ else
+ echo "Logged in as ${cookies[username]} |
Log out |
Your feed |
Your favourites "
+ fi
+fi
# TODO: move this to a *real* template
# we'll need to figure out conditional templates first tho
-if ! session_verify "${cookies[sh_session]}"; then
- echo "
Log in |
Register "
-else
- echo "Logged in as ${cookies[username]} |
Log out |
Your feed |
Your favourites "
-fi
if [[ "$query_nice" != '' ]]; then
strings_[query_nice]="$query_nice"
@@ -20,4 +76,4 @@ else
strings_[query_nice]=''
fi
-render strings_ "${cfg[namespace]}/templates/themes/default/elements/top.html"
+render strings_ "${cfg[namespace]}/templates/themes/${cfg[template]}/elements/top.html"
diff --git a/templates/themes/default-v2/channel.html b/templates/themes/default-v2/channel.html
new file mode 100644
index 0000000..32b66ee
--- /dev/null
+++ b/templates/themes/default-v2/channel.html
@@ -0,0 +1,7 @@
+
{{.subscribe}}
+{{.err}}
+{{start ?sub}}
Subscribe to {{.uploader}}! {{end ?sub}}
+{{start ?unsub}}
Unsubscribe from {{.uploader}}! {{end ?unsub}}
+{{start _videos}}
+
+{{end _videos}}
diff --git a/templates/themes/default-v2/elements/item.html b/templates/themes/default-v2/elements/item.html
new file mode 100644
index 0000000..618a7d6
--- /dev/null
+++ b/templates/themes/default-v2/elements/item.html
@@ -0,0 +1,4 @@
+
+ | ${.runtime} seconds | ${.views} views
+Uploaded by
${.channel}
diff --git a/templates/themes/default-v2/elements/top.html b/templates/themes/default-v2/elements/top.html
new file mode 100644
index 0000000..456ceac
--- /dev/null
+++ b/templates/themes/default-v2/elements/top.html
@@ -0,0 +1,6 @@
+
+
+
diff --git a/templates/themes/default-v2/fav.html b/templates/themes/default-v2/fav.html
new file mode 100644
index 0000000..9159af3
--- /dev/null
+++ b/templates/themes/default-v2/fav.html
@@ -0,0 +1,15 @@
+
Your favourites
+{{_info}}
+{{_fav}}
+{{start ?fav}}
+ {{start _fav}}
+
+ {{end _fav}}
+{{else ?fav}}
+ Meow? no faves?
+{{end ?fav}}
diff --git a/templates/themes/default-v2/feed.html b/templates/themes/default-v2/feed.html
new file mode 100644
index 0000000..922551c
--- /dev/null
+++ b/templates/themes/default-v2/feed.html
@@ -0,0 +1,17 @@
+
Your Feed
+
+You can unclutter your feed by going to your
subscribed channels .
+
+{{start ?feed}}
+ {{start _feed}}
+
+ {{end _feed}}
+{{else ?feed}}
+ Eh. something went wrong. Check if you're logged in and if you
subscribe to anyone :p
+{{end ?feed}}
diff --git a/templates/themes/default-v2/index.html b/templates/themes/default-v2/index.html
new file mode 100644
index 0000000..0dc8038
--- /dev/null
+++ b/templates/themes/default-v2/index.html
@@ -0,0 +1,16 @@
+
All user's favourites:
+
+{{start ?favourites}}
+ {{start _favourites}}
+
+ {{end _favourites}}
+{{else ?favourites}}
+ No favourite videos found :(
+{{end ?favourites}}
+
diff --git a/templates/themes/default-v2/login.html b/templates/themes/default-v2/login.html
new file mode 100644
index 0000000..a037f01
--- /dev/null
+++ b/templates/themes/default-v2/login.html
@@ -0,0 +1,9 @@
+
Log in...
+
+{{.reason}}
diff --git a/templates/themes/default-v2/playlist.html b/templates/themes/default-v2/playlist.html
new file mode 100644
index 0000000..99dd566
--- /dev/null
+++ b/templates/themes/default-v2/playlist.html
@@ -0,0 +1,6 @@
+{{start _playlist}}
+
+
+{{end _playlist}}
diff --git a/templates/themes/default-v2/register.html b/templates/themes/default-v2/register.html
new file mode 100644
index 0000000..06f36a8
--- /dev/null
+++ b/templates/themes/default-v2/register.html
@@ -0,0 +1,10 @@
+
Register
+
+(please make sure that you're connecting over SSL)
+{{.reason}}
diff --git a/templates/themes/default-v2/search.html b/templates/themes/default-v2/search.html
new file mode 100644
index 0000000..7b8248e
--- /dev/null
+++ b/templates/themes/default-v2/search.html
@@ -0,0 +1,8 @@
+{{start _results}}
+
+
+
+ | {{.runtime}} seconds | {{.views}} views
+Uploaded by
{{.channel}}
+
+{{end _results}}
diff --git a/templates/themes/default-v2/subscribe.html b/templates/themes/default-v2/subscribe.html
new file mode 100644
index 0000000..b796569
--- /dev/null
+++ b/templates/themes/default-v2/subscribe.html
@@ -0,0 +1,10 @@
+
Your subscriptions
+{{start ?sub}}
+ {{start _sub}}
+
+ {{end _sub}}
+{{else ?sub}}
+ Meow? no subs 🥺?
+{{end ?sub}}
diff --git a/templates/themes/default-v2/watch.html b/templates/themes/default-v2/watch.html
new file mode 100644
index 0000000..afc0a63
--- /dev/null
+++ b/templates/themes/default-v2/watch.html
@@ -0,0 +1,57 @@
+{{@player}}
+
+
+
Description :
+
+
Recommended
+
+{{start _recommended}}
+
+
+
+{{end _recommended}}
+
Comments
+
+
+
+
+{{start ?playlist}}
+
Playlist
+
+
+ {{start _playlist}}
+
+
+
+ {{end _playlist}}
+{{end ?playlist}}
diff --git a/templates/themes/default-v2/watch_error.html b/templates/themes/default-v2/watch_error.html
new file mode 100644
index 0000000..bea24e1
--- /dev/null
+++ b/templates/themes/default-v2/watch_error.html
@@ -0,0 +1,2 @@
+
You just liked $title! "
fi
-if [[ ${cfg[template]} == 'default' ]]; then
- source templates/head.sh
+if [[ ${cfg[template]} != 'retro' ]]; then
+ #source templates/head.sh
+ source "${cfg[namespace]}/templates/header.shs"
fi
nested_declare fav
@@ -31,7 +35,6 @@ done
[[ ${fav_[id]} != '' ]] && strings[?sub]=true
strings[_fav]="fav"
+strings[_info]="info"
-
-source "${cfg[namespace]}/templates/header.shs"
render strings "${cfg[namespace]}/templates/themes/${cfg[template]}/fav.html"
diff --git a/webroot/feed.shs b/webroot/feed.shs
index bd21b9c..6db59a7 100644
--- a/webroot/feed.shs
+++ b/webroot/feed.shs
@@ -1,7 +1,8 @@
#!/bin/bash
-if [[ ${cfg[template]} == 'default' ]]; then
- source templates/head.sh
+if [[ ${cfg[template]} != 'retro' ]]; then
+ #source templates/head.sh
+ source "${cfg[namespace]}/templates/header.shs"
fi
declare -A strings
@@ -36,5 +37,4 @@ if session_verify "${cookies[sh_session]}"; then
strings[_feed]="feed"
fi
-source "${cfg[namespace]}/templates/header.shs"
render strings "${cfg[namespace]}/templates/themes/${cfg[template]}/feed.html"
diff --git a/webroot/index.shs b/webroot/index.shs
index bf1701a..45f7073 100755
--- a/webroot/index.shs
+++ b/webroot/index.shs
@@ -1,5 +1,5 @@
#!/bin/bash
-source templates/head.sh
+#source templates/head.sh
source ${cfg[namespace]}/templates/header.shs
declare -A strings
diff --git a/webroot/login.shs b/webroot/login.shs
index b926b70..f8ba791 100755
--- a/webroot/login.shs
+++ b/webroot/login.shs
@@ -14,7 +14,8 @@ if [[ ${post_data[login]} != '' && ${post_data[password]} != '' ]]; then
fi
fi
-source templates/head.sh
+#source templates/head.sh
+source "${cfg[namespace]}/templates/header.shs"
if [[ $status == 1 && $reason != '' ]]; then
strings[reason]="$reason"
diff --git a/webroot/logout.shs b/webroot/logout.shs
index ec730f7..a1eed01 100755
--- a/webroot/logout.shs
+++ b/webroot/logout.shs
@@ -4,9 +4,10 @@ declare -A strings
logout
meta[redirect]='/'
-source templates/head.sh
+#source templates/head.sh
+source "${cfg[namespace]}/templates/header.shs"
-if [[ ${cfg[template]} == 'default' ]]; then
+if [[ ${cfg[template]} != 'retro' ]]; then
echo "Logged out successully. Redirecting.."
fi
diff --git a/webroot/playlist.shs b/webroot/playlist.shs
index 4c02b4a..4952826 100644
--- a/webroot/playlist.shs
+++ b/webroot/playlist.shs
@@ -3,9 +3,10 @@ title=$(curl -s "https://www.youtube.com/feeds/videos.xml?playlist_id=${get_data
declare -A strings
-if [[ ${cfg[template]} == 'default' ]]; then
+if [[ ${cfg[template]} != 'retro' ]]; then
meta[title]="$title"
- source templates/head.sh
+ #source templates/head.sh
+ source "${cfg[namespace]}/templates/header.shs"
fi
if [[ "${get_data[list]}" ]]; then
@@ -29,5 +30,4 @@ done
strings[_playlist]="list"
-source "${cfg[namespace]}/templates/header.shs"
render strings "${cfg[namespace]}/templates/themes/${cfg[template]}/playlist.html"
diff --git a/webroot/register.shs b/webroot/register.shs
index 4668b8c..c37d7a5 100755
--- a/webroot/register.shs
+++ b/webroot/register.shs
@@ -10,7 +10,8 @@ if [[ ${post_data[login]} != '' && ${post_data[password]} != '' ]]; then
fi
fi
-source templates/head.sh
+#source templates/head.sh
+source "${cfg[namespace]}/templates/header.shs"
if [[ $status == 1 && $reason != '' ]]; then
strings[reason]="$reason"
diff --git a/webroot/search.shs b/webroot/search.shs
index d8f09a3..174402e 100755
--- a/webroot/search.shs
+++ b/webroot/search.shs
@@ -3,9 +3,10 @@ source "${cfg[namespace]}/code/common.sh"
declare -A meow
-if [[ ${cfg[template]} == 'default' ]]; then
+if [[ ${cfg[template]} != 'retro' ]]; then
meta[title]="youtube but not really"
- source templates/head.sh
+ #source templates/head.sh
+ source "${cfg[namespace]}/templates/header.shs"
fi
#https://www.youtube.com/results?search_query=oooo
@@ -48,5 +49,4 @@ fi
# strings[results]="Could not fetch search results"
#fi
-source "${cfg[namespace]}/templates/header.shs"
render meow "${cfg[namespace]}/templates/themes/${cfg[template]}/search.html"
diff --git a/webroot/subscribe.shs b/webroot/subscribe.shs
index 4f59d39..17fc521 100644
--- a/webroot/subscribe.shs
+++ b/webroot/subscribe.shs
@@ -6,11 +6,13 @@ if session_verify ${cookies[sh_session]} && [[ ${get_data[id]} != '' ]]; then
title=$(curl https://www.youtube.com/feeds/videos.xml?channel_id=${get_data[id]} | grep title | head -n 1 | sed -s 's/
//;s/<\/title>//')
if [[ $((grep -PF ":$title$" | grep "$(echo ${cookies[username]} | sed -E "s/\r//")") <<< storage/subscribed) == '' ]]; then
echo "$(session_get_username ${cookies[sh_session]}):${get_data[id]}:$title" >> storage/subscribed
+ strings[_sub]="<span style='color:#f80'>You successfully subscribed to $(title)!</span><br><br>"
fi
fi
-if [[ ${cfg[template]} == 'default' ]]; then
- source templates/head.sh
+if [[ ${cfg[template]} != 'retro' ]]; then
+ #source templates/head.sh
+ source "${cfg[namespace]}/templates/header.shs"
fi
nested_declare channels
@@ -39,5 +41,5 @@ if [[ ! ${strings[subscribe]} ]]; then
strings[subscribe]="You are not logged in or you do not have any subscribed channels"
fi
-source "${cfg[namespace]}/templates/header.shs"
+#source "${cfg[namespace]}/templates/header.shs"
render strings "${cfg[namespace]}/templates/themes/${cfg[template]}/subscribe.html"
diff --git a/webroot/unfav.shs b/webroot/unfav.shs
index 6ed4337..2f5cf44 100644
--- a/webroot/unfav.shs
+++ b/webroot/unfav.shs
@@ -7,4 +7,5 @@ if session_verify ${cookies[sh_session]} && [[ ${get_data[v]} != '' ]]; then
fi
meta[redirect]='fav.shs'
-source templates/head.sh
+#source templates/head.sh
+source "${cfg[namespace]}/templates/header.shs"
\ No newline at end of file
diff --git a/webroot/unsubscribe.shs b/webroot/unsubscribe.shs
index ae2bf4f..be5fce0 100644
--- a/webroot/unsubscribe.shs
+++ b/webroot/unsubscribe.shs
@@ -7,4 +7,5 @@ if session_verify "${cookies[sh_session]}" && [[ "${get_data[id]}" != '' ]]; the
fi
meta[redirect]='subscribe.shs'
-source templates/head.sh
+#source templates/head.sh
+source "${cfg[namespace]}/templates/header.shs"
\ No newline at end of file
diff --git a/webroot/watch.shs b/webroot/watch.shs
index 6c9804d..2462034 100755
--- a/webroot/watch.shs
+++ b/webroot/watch.shs
@@ -36,9 +36,10 @@ if [[ "${get_data[v]}" ]]; then
if [[ "${r[host]}" == "${cfg[flash_host]}" ]]; then
url='http://f.sakamoto.pl/videoplayback_.flv'
fi
- if [[ ${cfg[template]} == 'default' ]]; then
+ if [[ ${cfg[template]} != 'retro' ]]; then
meta[title]="${strings[title]}"
- source templates/head.sh
+ #source templates/head.sh
+ source "${cfg[namespace]}/templates/header.shs"
fi
else
cd temp
@@ -62,7 +63,9 @@ if [[ "${get_data[v]}" ]]; then
strings[error]='Unexpected error has occured'
fi
cd ..
- source templates/head.sh
+ echo "BBBBBBB ${cfg[template]}" > /dev/stderr
+
+ #source templates/head.sh
source "${cfg[namespace]}/templates/header.shs"
render strings "${cfg[namespace]}/templates/themes/${cfg[template]}/watch_error.html"
return
@@ -73,7 +76,7 @@ if [[ "${get_data[v]}" ]]; then
strings[channel_id]=$(jq -r '.channel_url' <<< "$video" | sed -s 's/.*\/channel\///')
strings[uploader]=$(jq -r '.uploader' <<< "$video")
strings[title]=$(jq -r '.title' <<< "$video")
- if [[ ${cfg[template]} == 'default' ]]; then
+ if [[ ${cfg[template]} != 'retro' ]]; then
meta[title]="${strings[title]}"
meta[description]="$(jq -r '.description' <<< "$video")"
meta[unsafe]="
@@ -89,7 +92,8 @@ if [[ "${get_data[v]}" ]]; then
"thumbnail": .thumbnails[-1].url,
"duration": ("PT" + (.duration | tostring) + "S"),
}' <<< "$video" | sed 's/</\</g;s/>/\>/g;')"'</script>'
- source templates/head.sh
+ #source templates/head.sh
+ source "${cfg[namespace]}/templates/header.shs"
fi
formats=$(jq -c '[.formats[] | select(.protocol == "https") | {"format_id":.format_id,"url":.url,"ext":.ext,"width":.width,"height":.height,"format_note":.format_note,"acodec":.acodec,"vcodec":.vcodec,"abr":.abr,"fps":.fps}]' <<< "$video")
@@ -226,13 +230,14 @@ if [[ "${get_data[v]}" ]]; then
strings[comments_list]='An error ocurred during fetching comments.'
fi
- [[ "${cfg[template]}" == "default" ]] && source "${cfg[namespace]}/templates/header.shs"
+ [[ "${cfg[template]}" != "retro" ]] && source "${cfg[namespace]}/templates/header.shs"
strings[@player]="$player_render"
strings[@header]="$(cat "${cfg[namespace]}/templates/themes/${cfg[template]}/elements/top.html")"
strings[@footer]="$(cat "${cfg[namespace]}/templates/themes/${cfg[template]}/elements/footer.html")"
render strings "${cfg[namespace]}/templates/themes/${cfg[template]}/watch.html"
else
- source templates/head.sh
+ #source templates/head.sh
+ source "${cfg[namespace]}/templates/header.shs"
echo "pls add ?v param i'm still WiP"
fi
