meta plugin: if uuid looks like it is in fact a UUID, prepend "urn:uuid" (otherwise...

[git.ikiwiki.info.git] / IkiWiki / Plugin / meta.pm

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 8e1b11859fdf4a3bd676d67d8c8a6211adb2c1b1..02c99e9f67db1e62327d7a8108f6c570f5e17fb5 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -84,6 +84,16 @@ sub preprocess (@) { #{{{
                $pagestate{$page}{meta}{description}=HTML::Entities::encode_numeric($value);
                # fallthrough
        }
+       elsif ($key eq 'uuid') {
+               my $abs = $value;
+
+               if ($abs =~ m/^[[:xdigit:]]{8}-[[:xdigit:]]{4}-[[:xdigit]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{12}$/) {
+                       $abs = lc "urn:uuid:$abs";
+               }
+
+               $pagestate{$page}{meta}{uuid}=HTML::Entities::encode_numeric($abs);
+               # fallthrough
+       }
        elsif ($key eq 'license') {
                push @{$metaheaders{$page}}, '<link rel="license" href="#page_license" />';
                $pagestate{$page}{meta}{license}=$value;
@@ -253,9 +263,7 @@ sub match { #{{{
        my $page=shift;
        
        # turn glob into a safe regexp
-       my $re=quotemeta(shift);
-       $re=~s/\\\*/.*/g;
-       $re=~s/\\\?/./g;
+       my $re=IkiWiki::glob2re(shift);
 
        my $val;
        if (exists $pagestate{$page}{meta}{$field}) {