From dd4baa267dbdfe279aab5f4122305ac51c0c6a3d Mon Sep 17 00:00:00 2001 From: Horus3 Date: Mon, 15 Jun 2015 15:00:21 +0200 Subject: Fix css and some bugs. --- scanner.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'scanner.go') diff --git a/scanner.go b/scanner.go index 10be11b..53a6aeb 100644 --- a/scanner.go +++ b/scanner.go @@ -7,13 +7,14 @@ package main */ import "C" import ( + "html/template" "log" "strings" ) type Link struct { - Url string - Text string + Url template.URL + Text template.HTML IsDir bool } @@ -29,16 +30,16 @@ func getToken(input string) []Link { if token == C.TOKEN_URL { // flex reads the href attr - l.Url = C.GoString(C.yylval) + l.Url = template.URL(C.GoString(C.yylval)) - if strings.HasSuffix(l.Url, "/") { + if strings.HasSuffix(C.GoString(C.yylval), "/") { l.IsDir = true } } else if token == C.TOKEN_TEXT { // flex reads the link description - l.Text = C.GoString(C.yylval) + l.Text = template.HTML(C.GoString(C.yylval)) ls = append(ls, l) l = Link{} } else { -- cgit v1.2.3