Merge Kris' version, thanks for all the cleanups!
This includes rss feed generator for blogs. On top of his changes I added automatic blog detection for /blog/ directories
This commit is contained in:
uriel
parent
fcf439e785
commit
b83ce8cb52
@ -1,10 +1,11 @@
|
|||||||
#!/usr/local/plan9/bin/rc
|
#!/usr/local/plan9/bin/rc
|
||||||
path=(. ./bin $PLAN9/bin /bin/ /usr/bin)
|
path=(. ./bin $PLAN9/bin /bin/ /usr/bin)
|
||||||
ifs='/' { args = `{ echo -n $REQUEST_URI | sed -e 's/\?.*//' -e 's/[^a-zA-Z0-9_+\-\/]//g' } }
|
|
||||||
args=`{echo $args | tr -d '
|
|
||||||
'}
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
|
uri = `{echo -n $REQUEST_URI | sed 's/\?.*//; s/[^a-zA-Z0-9_+\-\/]//g'}
|
||||||
|
ifs='/' {
|
||||||
|
args = `{echo -n $uri}
|
||||||
|
}
|
||||||
|
cd ..
|
||||||
|
|
||||||
# default config
|
# default config
|
||||||
site=$SERVER_NAME
|
site=$SERVER_NAME
|
||||||
@ -16,87 +17,86 @@ siteSubTitle=''
|
|||||||
title=''
|
title=''
|
||||||
template=_default
|
template=_default
|
||||||
sidebar=sidebar
|
sidebar=sidebar
|
||||||
|
basedir=/gsoc/www
|
||||||
|
baseuri=http://$site
|
||||||
|
|
||||||
# Title
|
# Title
|
||||||
fn gentitle {
|
fn gentitle {
|
||||||
echo '<h1 class="headerTitle"><a href="/">'$"siteTitle' <span id="headerSubTitle">'$"siteSubTitle'</span></a></h1>'
|
echo '<h1 class="headerTitle"><a href="/">' ^ $"siteTitle ^ '<span id="headerSubTitle">' ^ $"siteSubTitle ^ '</span></a></h1>'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dirfilter = '/\/[._]/d; s,^\./,,; s,\.md$,,;'
|
||||||
|
|
||||||
# Sidebar
|
# Sidebar
|
||||||
fn menu {
|
fn menu {
|
||||||
ls -F $1 | grep -v '/_[^/]*' | sed -e 's,^./,,' -e 's,\.md$,,' | awk '
|
ls -F $1 | sed $dirfilter | awk -F/ '
|
||||||
BEGIN { print "<ul class=\"sidebar\">" }
|
BEGIN { print "<ul class=\"sidebar\">" }
|
||||||
END { print "</ul>" }
|
END { print "</ul>" }
|
||||||
/^([a-zA-Z0-9+_\-]+[\/*]?)+$/ && ! /index$/ {
|
/^([a-zA-Z0-9+_\-]+[\/*]?)+$/ && $NF != "index" {
|
||||||
isdir = match($0, "/$")
|
isdir = match($0, "/$")
|
||||||
sub("[*/]$", "") # The '*' makes no sense to me
|
sub("[*/]$", "")
|
||||||
|
|
||||||
d = ""
|
path = bname = $0
|
||||||
if(isdir)
|
|
||||||
d = "/"
|
|
||||||
bname = $0
|
|
||||||
sub("^(.*/)?([0-9]+_)?", "", bname)
|
sub("^(.*/)?([0-9]+_)?", "", bname)
|
||||||
gsub("_", " ", bname)
|
gsub("_", " ", bname)
|
||||||
|
|
||||||
bname = bname d
|
if(isdir) {
|
||||||
|
bname = bname "/"
|
||||||
|
path = $0 "/"
|
||||||
|
}
|
||||||
|
|
||||||
if(index(ENVIRON["REQUEST_URI"], "/" $0) == 1) {
|
if(index(ENVIRON["REQUEST_URI"], "/" path) == 1) {
|
||||||
if(isdir) {
|
if(isdir) {
|
||||||
print "<li><a href=\"/" $0 d "\" class=\"thisPage\">»<i> " bname "</i></a>"
|
print "<li><a href=\"/" path "\" class=\"thisPage\">»<i> " bname "</i></a>"
|
||||||
system("rc -c ''menu " $0 "''")
|
system("rc -c ''menu " path "''")
|
||||||
} else {
|
} else {
|
||||||
print "<li><a href=\"/" $0 d "\" class=\"thisPage\">»<i> " bname "</i></a>"
|
print "<li><a href=\"/" path "\" class=\"thisPage\">»<i> " bname "</i></a>"
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
print "<li><a href=\"/" $0 d "\">› " bname "</a>"
|
print "<li><a href=\"/" path "\">› " bname "</a>"
|
||||||
|
|
||||||
print "</li>"
|
print "</li>"
|
||||||
|
|
||||||
}'
|
}'
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn gensidebar {
|
fn gensidebar {
|
||||||
d=`{pwd}
|
@{
|
||||||
cd $sitedir
|
cd $sitedir
|
||||||
menu .
|
menu .
|
||||||
cd $d
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn sortedBlogPostList {
|
fn sortedBlogPostList {
|
||||||
|
# the /./ is added so we can sort -t. and order only the file name
|
||||||
ls $*^'/./' | grep '[0-9]+.*\.md$'| sort -r -t. +1
|
ls $*^'/./' | grep '[0-9]+.*\.md$'| sort -r -t. +1
|
||||||
}
|
}
|
||||||
|
|
||||||
# Body
|
# Body
|
||||||
fn genbody {
|
fn genbody {
|
||||||
if ( test -f $"body^'.md' ) {
|
if ( test -f $body.md )
|
||||||
cat $"body^'.md' | markdown.pl
|
markdown.pl < $body.md
|
||||||
}
|
if not if ( test -f $body.tpl )
|
||||||
if not if ( test -f $"body^'.tpl' )
|
template.awk $body.tpl | rc
|
||||||
template.awk $"body^'.tpl' | rc
|
if not if ( ~ $body */blog/index */blog//index && ~ $#blogDirs 0 )
|
||||||
if not {
|
blogDirs = `{basename -d $body}
|
||||||
if ( ~ $#blogDirs 0 ) {
|
if not if(~ $body */index && ~ $#blogDirs 0) {
|
||||||
if ( ~ $body */index ) {
|
echo '<h1>' `{basename `{basename -d $body}}'</h1>'
|
||||||
echo '<h1>' `{basename `{basename -d $body}}'</h1>'
|
echo '<ul>'
|
||||||
echo '<ul>'
|
ls -F `{ basename -d $body } | sed $dirfilter' s,^'$sitedir'/(.*),<li><a href="\1">\1</a></li>,'
|
||||||
ls -F `{ basename -d $body } |grep -v '/[_.][^/]*$' | sed -e 's,^./,,' -e 's,\.md$,,' -e 's,^'$sitedir'/([^/]*[/]?)+,<li><a href="\1">\1</a></li>,'
|
echo '</ul>'
|
||||||
echo '</ul>'
|
|
||||||
}
|
|
||||||
if not { template.awk inc/404.tpl | rc }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
if not if(~ $#blogDirs 0)
|
||||||
if (! ~ $#blogDirs 0 && ~ $body */index ) {
|
template.awk inc/404.tpl | rc
|
||||||
if ( ! ~ $#blogTitle 0 )
|
|
||||||
|
# Technically wrong. Will spit out blog entries after 404 for /blog/foo, for instance.
|
||||||
|
if(! ~ $#blogDirs 0) {
|
||||||
|
if ( ! ~ $blogTitle '' )
|
||||||
echo '<h1>'$"blogTitle'</h1>'
|
echo '<h1>'$"blogTitle'</h1>'
|
||||||
# the /./ is added so we can sort -t. and order only the file name
|
for ( f in `{ sortedBlogPostList $blogDirs } ) {
|
||||||
for ( i in `{ sortedBlogPostList $blogDirs } ) {
|
title=`{basename $f | sed 's/^[0-9\-]*_(.*)\.md$/\1/; s/_/ /g' }
|
||||||
t=`{basename $i|sed -e 's/^[0-9\-]*_(.*)\.md$/\1/' -e 's/_/ /g' }
|
du=`{ls -l $f}
|
||||||
du=`{ls -l $i }
|
echo '##' $title '*('By $du(4) Last mod: $du(7 8 9) ')*'
|
||||||
#echo '<h2>' $"t '<small style="font-size: 70%">by '$"$du(4)' (Last mod: '$du(7) $du(8) $du(9)')</small></h2>'
|
cat $f
|
||||||
echo '## ' $"t '*(By '$du(4)' Last mod: ' ( $du(7 8 9) ) ')*'
|
|
||||||
cat $i
|
|
||||||
echo
|
echo
|
||||||
} | markdown.pl
|
} | markdown.pl
|
||||||
}
|
}
|
||||||
@ -105,33 +105,93 @@ fn genbody {
|
|||||||
|
|
||||||
. etc/initrc
|
. etc/initrc
|
||||||
|
|
||||||
if (! ~ $#args 0 && ! ~ $args '') {
|
if (! ~ $args '') {
|
||||||
title=$args($#args)
|
title=$args($#args)
|
||||||
title=`{echo $title | sed 's/_/ /g' }
|
title=`{echo $title | sed 's/_/ /g' }
|
||||||
body=`{ echo -n $"args |sed 's, ,/,g' }
|
body=$uri
|
||||||
}
|
}
|
||||||
|
|
||||||
l=$sitedir
|
fpath=$sitedir
|
||||||
for ( i in / $args ) {
|
for ( i in '' $args ) {
|
||||||
l = $l'/'$i
|
fpath = $fpath/$i
|
||||||
if ( test -f $l/_config ) {
|
if ( test -f $fpath/_config )
|
||||||
. $l/_config
|
. $fpath/_config
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
template=$sitedir/$template.tpl
|
template=$sitedir/$template.tpl
|
||||||
if (! ~ $#sidebar 0) { sidebar=tpl/_inc/$sidebar.tpl }
|
body=$sitedir/$body
|
||||||
if (test -d $sitedir/$body) {
|
if (! ~ $#sidebar 0)
|
||||||
|
sidebar=tpl/_inc/$sidebar.tpl
|
||||||
|
if (test -d $body)
|
||||||
body=$body/index
|
body=$body/index
|
||||||
|
|
||||||
|
# RSS
|
||||||
|
fn statpost {
|
||||||
|
f = $1
|
||||||
|
uri = `{echo $f | sed 's,^'$basedir',,'}
|
||||||
|
title=`{basename $f | sed 's/^[0-9\-]*_(.*)\.md$/\1/; s/_/ /g' }
|
||||||
|
stat=`{stat -c '%Y %U' $f}
|
||||||
|
date=`{/bin/date -Rd @$stat(1)}
|
||||||
|
uri=$baseuri^`{cleanname `{echo -n $uri | sed 's/\.(md|tpl)//g'}}
|
||||||
|
by=$stat(2)
|
||||||
|
ifs=() {
|
||||||
|
summary=`{awk -v max'='1024 '{
|
||||||
|
nc += 1 + length;
|
||||||
|
if(nc > max) {
|
||||||
|
print substr($0, 1, nc - max) "..."
|
||||||
|
exit
|
||||||
|
}
|
||||||
|
print
|
||||||
|
}' $f | sed 's/\]\]>/Fucking goddamn XML garbage/g'}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
body=`{echo $sitedir/^$"body | sed 's, ,/,' }
|
|
||||||
|
|
||||||
|
fn template {
|
||||||
|
template.awk | rc |
|
||||||
|
awk '{
|
||||||
|
buf = buf $0"\n"
|
||||||
|
if(length(buf) > 8192) {
|
||||||
|
printf "%s", buf
|
||||||
|
buf = ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
END{ printf "%s", buf }'
|
||||||
|
}
|
||||||
|
|
||||||
|
if(! ~ $REQUEST_URI */index.rss) {
|
||||||
|
cat $headers $template | template
|
||||||
|
exit
|
||||||
|
}
|
||||||
|
|
||||||
template.awk $headers | rc
|
uri = `{echo $uri | sed 's/indexrss$//'}
|
||||||
template.awk $template | rc
|
uri=$baseuri$"uri
|
||||||
|
|
||||||
|
# Should be in a separate file.
|
||||||
|
cat <<'!' | template
|
||||||
|
Content-Type: text/xml; charset=utf-8
|
||||||
|
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<rss version="2.0">
|
||||||
|
<channel>
|
||||||
|
<title>%($siteTitle%)</title>
|
||||||
|
<link>%($uri%)</link>
|
||||||
|
<description>%($blogDesc%)</description>
|
||||||
|
<language>en-us</language>
|
||||||
|
<generator>Tom Duff's rc, and Kris Maglione's clever hackery</generator>
|
||||||
|
<webMaster>Uriel Mangado <uriel99@gmail.com></webMaster>
|
||||||
|
%{
|
||||||
|
for(f in `{sortedBlogPostList $blogDirs}) {
|
||||||
|
statpost $f
|
||||||
|
%} <item>
|
||||||
|
<title>%($title%)</title>
|
||||||
|
<author>%($by%)@noreply.cat-v.org</author>
|
||||||
|
<link>%($uri%)</link>
|
||||||
|
<guid isPermaLink="true">%($uri%)</guid>
|
||||||
|
<pubDate>%($date%)</pubDate>
|
||||||
|
<description><![CDATA[<pre>%($summary%)</pre>]]></description>
|
||||||
|
</item>
|
||||||
|
% }
|
||||||
|
</channel>
|
||||||
|
</rss>
|
||||||
|
!
|
||||||
|
|
||||||
# Debug junk
|
|
||||||
#echo '<pre>'
|
|
||||||
#env
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user