qbit/werc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modified controller.

Browse Source
This commit is contained in:
kris 2007-06-04 05:26:58 +02:00
parent 50f40ac584
commit 86173667e1
1 changed files with 61 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
bin/controller.rc
View File

@ -1,9 +1,10 @@
#!/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/[^a-zA-Z0-9_+\-\/]//g' -e 's/\?.*//' } }
args=`{echo $args | tr -d ' uri = `{echo -n $REQUEST_URI | sed 's/\?.*//; s/[^a-zA-Z0-9_+\-\/]//g'}
'} ifs='/' {
args = `{echo -n $uri}
}
cd .. cd ..
@ -21,83 +22,80 @@ sidebar=sidebar
# 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; /\/_[^\/]*$/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 = ""
if(isdir)
d = "/"
bname = $0 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\">&raquo;<i> " bname "</i></a>" print "<li><a href=\"/" path "\" class=\"thisPage\">&raquo;<i> " bname "</i></a>"
system("rc -c ''menu " $0 "''") system("rc -c ''menu " path "''")
} else { } else {
print "<li><a href=\"/" $0 d "\" class=\"thisPage\">&raquo;<i> " bname "</i></a>" print "<li><a href=\"/" path "\" class=\"thisPage\">&raquo;<i> " bname "</i></a>"
} }
} else } else
print "<li><a href=\"/" $0 d "\">&rsaquo; " bname "</a>" print "<li><a href=\"/" path "\">&rsaquo; " 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 */index && ~ $#blogDirs 0) {
if not { echo '<h1>' `{basename `{basename -d $body}}'</h1>'
if ( ~ $#blogDirs 0 ) { echo '<ul>'
if ( ~ $body */index ) { ls -F `{ basename -d $body } | sed $dirfilter' s,^'$sitedir'/(.*),<li><a href="\1">\1</a></li>,'
echo '<h1>' `{basename `{basename -d $body}}'</h1>' echo '</ul>'
echo '<ul>'
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>'
}
if not { template.awk inc/404.tpl | rc }
}
} }
if not
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
} }
@ -106,33 +104,27 @@ 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 } echo body: $body; echo body: $sitedir/$body; ls $sitedir/$body
if (test -d $sitedir/$body) { body=$sitedir/$body
if (! ~ $#sidebar 0)
sidebar=tpl/_inc/$sidebar.tpl
if (test -d $body)
body=$body/index body=$body/index
}
body=`{echo $sitedir/^$"body | sed 's, ,/,' }
cat $headers $template | template.awk | rc
template.awk $headers | rc
template.awk $template | rc
# Debug junk
#echo '<pre>'
#env