1 files changed, 56 insertions, 1 deletions

diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm
index 77acecda..15b5fd3e 100644
--- a/lib/PublicInbox/Hval.pm
+++ b/lib/PublicInbox/Hval.pm
@@ -8,16 +8,28 @@ use strict;
 use warnings;
 use Encode qw(find_encoding);
 use PublicInbox::MID qw/mid_clean mid_escape/;
+use URI::Escape qw(uri_escape_utf8);
 use base qw/Exporter/;
-our @EXPORT_OK = qw/ascii_html/;
+our @EXPORT_OK = qw/ascii_html utf8_html to_attr from_attr/;
 
 # for user-generated content (UGC) which may have excessively long lines
 # and screw up rendering on some browsers.  This is the only CSS style
 # feature we use.
 use constant STYLE => '<style>pre{white-space:pre-wrap}</style>';
 
+my $enc_utf8 = find_encoding('UTF-8');
 my $enc_ascii = find_encoding('us-ascii');
 
+sub utf8 {
+        my ($class, $raw, $href) = @_;
+
+        $raw = $enc_utf8->decode($raw);
+        bless {
+                raw => $raw,
+                href => defined $href ? $href : $raw,
+        }, $class;
+}
+
 sub new {
         my ($class, $raw, $href) = @_;
 
@@ -71,7 +83,19 @@ sub ascii_html {
         $enc_ascii->encode($s, Encode::HTMLCREF);
 }
 
+sub utf8_html {
+        my ($raw) = @_;
+        ascii_html($enc_utf8->decode($raw));
+}
+
 sub as_html { ascii_html($_[0]->{raw}) }
+sub as_href { ascii_html(uri_escape_utf8($_[0]->{href})) }
+
+sub as_path {
+        my $p = uri_escape_utf8($_[0]->{href});
+        $p =~ s!%2[fF]!/!g;
+        ascii_html($p);
+}
 
 sub raw {
         if (defined $_[1]) {
@@ -86,4 +110,35 @@ sub prurl {
         index($u, '//') == 0 ? "$env->{'psgi.url_scheme'}:$u" : $u;
 }
 
+# convert a filename (or any string) to HTML attribute
+
+my %ESCAPES = map { chr($_) => sprintf('::%02x', $_) } (0..255);
+$ESCAPES{'/'} = ':'; # common
+
+sub to_attr ($) {
+        my ($str) = @_;
+
+        # git would never do this to us:
+        die "invalid filename: $str" if index($str, '//') >= 0;
+
+        my $first = '';
+        if ($str =~ s/\A([^A-Ya-z])//ms) { # start with a letter
+                  $first = sprintf('Z%02x', ord($1));
+        }
+        $str =~ s/([^A-Za-z0-9_\.\-])/$ESCAPES{$1}/egms;
+        $first . $str;
+}
+
+# reverse the result of to_attr
+sub from_attr ($) {
+        my ($str) = @_;
+        my $first = '';
+        if ($str =~ s/\AZ([a-f0-9]{2})//ms) {
+                $first = chr(hex($1));
+        }
+        $str =~ s!::([a-f0-9]{2})!chr(hex($1))!egms;
+        $str =~ tr!:!/!;
+        $first . $str;
+}
+
 1;