summaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2010-04-03 14:17:48 +0100
committerSimon McVittie <smcv@debian.org>2010-04-04 01:43:02 +0100
commit618bbaee3815daffe329fc1e2d77f04fcd8392b8 (patch)
treeba8d0e96f0f7183e21af884678fd95b7f6fbd8d9 /IkiWiki/Plugin
parent04a59b3c65e8e60805b6ed6d11d448b1d5babe64 (diff)
meta: generalize meta_title into meta(title); support author, updated, date
I've left meta_title in, undocumented, as a possible replacement for sort=title in IkiWiki 4.0 or something.
Diffstat (limited to 'IkiWiki/Plugin')
-rw-r--r--IkiWiki/Plugin/meta.pm58
1 files changed, 49 insertions, 9 deletions
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index cd7d0d127..c9fdbc934 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -122,6 +122,12 @@ sub preprocess (@) {
}
elsif ($key eq 'author') {
$pagestate{$page}{meta}{author}=$value;
+ if (exists $params{sort}) {
+ $pagestate{$page}{meta}{authorsort}=$params{sort};
+ }
+ else {
+ $pagestate{$page}{meta}{authorsort}=$value;
+ }
# fallthorough
}
elsif ($key eq 'authorurl') {
@@ -288,14 +294,31 @@ sub pagetemplate (@) {
}
}
-sub titlesort {
- my $key = $pagestate{$_[0]}{meta}{titlesort};
+sub get_sort_key {
+ my $page = $_[0];
+ my $meta = $_[1];
- if (defined $key) {
- return $key;
- }
+ # e.g. titlesort (also makes sense for author)
+ my $key = $pagestate{$page}{meta}{$meta . "sort"};
+ return $key if defined $key;
+
+ # e.g. title
+ $key = $pagestate{$page}{meta}{$meta};
+ return $key if defined $key;
- return pagetitle(IkiWiki::basename($_[0]));
+ # fall back to closer-to-core things
+ if ($meta eq 'title') {
+ return pagetitle(IkiWiki::basename($page));
+ }
+ elsif ($meta eq 'date') {
+ return $IkiWiki::pagectime{$page};
+ }
+ elsif ($meta eq 'updated') {
+ return $IkiWiki::pagemtime{$page};
+ }
+ else {
+ return '';
+ }
}
sub match {
@@ -350,10 +373,27 @@ sub match_copyright ($$;@) {
package IkiWiki::SortSpec;
+sub cmp_meta {
+ my $left = $_[0];
+ my $right = $_[1];
+ my $meta = $_[2];
+ error(gettext("sort=meta requires a parameter")) unless defined $meta;
+
+ if ($meta eq 'updated' || $meta eq 'date') {
+ return IkiWiki::Plugin::meta::get_sort_key($left, $meta)
+ <=>
+ IkiWiki::Plugin::meta::get_sort_key($right, $meta);
+ }
+
+ return IkiWiki::Plugin::meta::get_sort_key($left, $meta)
+ cmp
+ IkiWiki::Plugin::meta::get_sort_key($right, $meta);
+}
+
+# A prototype of how sort=title could behave in 4.0 or something
sub cmp_meta_title {
- IkiWiki::Plugin::meta::titlesort($_[0])
- cmp
- IkiWiki::Plugin::meta::titlesort($_[1])
+ $_[2] = 'title';
+ return cmp_meta(@_);
}
1