danog/gojekyll
1
0
Fork 0
mirror of https://github.com/danog/gojekyll.git synced 2024-11-30 10:29:02 +01:00
Code Issues Projects Releases Wiki Activity

Implement highlight (disabled), avatar

Browse Source
This commit is contained in:
Oliver Steele 2017-06-30 17:34:14 -04:00
parent 7e50bb1de1
commit f2d3896f54
3 changed files with 77 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
liquid/engine.go
View File

@ -11,7 +11,7 @@ import (
type Engine interface {
Parse([]byte) (liquid.Template, error)
ParseAndRender([]byte, map[string]interface{}) ([]byte, error)
DefineTag(string, func(string) (func(io.Writer, chunks.Context) error, error))
DefineTag(string, func(string) (func(io.Writer, chunks.RenderContext) error, error))
}
// Wrapper is a wrapper around the Liquid engine.
@ -38,7 +38,7 @@ func NewEngine() *Wrapper {
}
// DefineTag is in the Engine interface.
func (e *Wrapper) DefineTag(name string, f func(string) (func(io.Writer, chunks.Context) error, error)) {
func (e *Wrapper) DefineTag(name string, f func(string) (func(io.Writer, chunks.RenderContext) error, error)) {
e.engine.DefineTag(name, f)
}

42
liquid/tags.go
View File

@ -3,6 +3,8 @@ package liquid
import (
"fmt"
"io"
"os"
"os/exec"
"regexp"
"strings"
@ -12,10 +14,42 @@ import (
func (e *Wrapper) addJekyllTags() {
e.engine.DefineTag("link", e.linkTag)
e.engine.DefineTag("include", e.includeTag)
// TODO unimplemented
e.engine.DefineTag("post_url", emptyTag)
e.engine.DefineStartTag("highlight", highlightTag)
}
func (e *Wrapper) linkTag(filename string) (func(io.Writer, chunks.Context) error, error) {
return func(w io.Writer, _ chunks.Context) error {
func emptyTag(_ string) (func(io.Writer, chunks.RenderContext) error, error) {
return func(w io.Writer, _ chunks.RenderContext) error { return nil }, nil
}
func highlightTag(w io.Writer, ctx chunks.RenderContext) error {
args, err := ctx.ParseTagArgs()
if err != nil {
return err
}
cargs := []string{}
if args != "" {
cargs = append(cargs, "-l"+args)
}
s, err := ctx.InnerString()
if err != nil {
return err
}
if true {
_, err = w.Write([]byte(s))
return err
}
cmd := exec.Command("pygmentize", cargs...)
cmd.Stdin = strings.NewReader(s)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
return cmd.Run()
}
func (e *Wrapper) linkTag(filename string) (func(io.Writer, chunks.RenderContext) error, error) {
return func(w io.Writer, _ chunks.RenderContext) error {
url, found := e.linkHandler(filename)
if !found {
return fmt.Errorf("missing link filename: %s", filename)
@ -25,7 +59,7 @@ func (e *Wrapper) linkTag(filename string) (func(io.Writer, chunks.Context) erro
}, nil
}
func (e *Wrapper) includeTag(line string) (func(io.Writer, chunks.Context) error, error) {
func (e *Wrapper) includeTag(line string) (func(io.Writer, chunks.RenderContext) error, error) {
// TODO string escapes
includeLinePattern := regexp.MustCompile(`^\S+(?:\s+\S+=("[^"]+"|'[^']'|[^'"\s]+))*$`)
includeParamPattern := regexp.MustCompile(`\b(\S+)=("[^"]+"|'[^']'|[^'"\s]+)(?:\s|$)`)
@ -45,7 +79,7 @@ func (e *Wrapper) includeTag(line string) (func(io.Writer, chunks.Context) error
}
params[k] = paramSpec{v, eval}
}
return func(w io.Writer, ctx chunks.Context) error {
return func(w io.Writer, ctx chunks.RenderContext) error {
include := map[string]interface{}{}
for k, v := range params {
if v.eval {

47
plugins/plugins.go
View File

@ -33,8 +33,8 @@ func warnUnimplemented(name string) {
fmt.Printf("warning: gojekyll does not emulate the %s plugin. Some tags have been stubbed to prevent errors.\n", name)
}
func emptyTag(lexer string) (func(io.Writer, chunks.Context) error, error) {
return func(w io.Writer, _ chunks.Context) error { return nil }, nil
func emptyTag(lexer string) (func(io.Writer, chunks.RenderContext) error, error) {
return func(w io.Writer, _ chunks.RenderContext) error { return nil }, nil
}
func init() {
@ -60,15 +60,42 @@ func init() {
// registerPlugin("jemoji")
}
const avatarTemplate = `<img class="avatar avatar-small" src="https://avatars3.githubusercontent.com/{username}?v=3&amp;s=40" alt="{username}" srcset="https://avatars3.githubusercontent.com/{username}?v=3&amp;s=40 1x, https://avatars3.githubusercontent.com/{username}?v=3&amp;s=80 2x, https://avatars3.githubusercontent.com/{username}?v=3&amp;s=120 3x, https://avatars3.githubusercontent.com/{username}?v=3&amp;s=160 4x" width="40" height="40" />`
// this template is from the plugin documentation
const avatarTemplate = `<img class="avatar avatar-small" src="https://avatars3.githubusercontent.com/{user}?v=3&amp;s=40" alt="{user}" srcset="https://avatars3.githubusercontent.com/{user}?v=3&amp;s=40 1x, https://avatars3.githubusercontent.com/{user}?v=3&amp;s=80 2x, https://avatars3.githubusercontent.com/{user}?v=3&amp;s=120 3x, https://avatars3.githubusercontent.com/{user}?v=3&amp;s=160 4x" width="40" height="40" />`
func avatarTag(filename string) (func(io.Writer, chunks.Context) error, error) {
username := "osteele" // TODO replace with real name
size := 40
return func(w io.Writer, _ chunks.Context) error {
s := strings.Replace(avatarTemplate, "40", fmt.Sprintf("%s", size), -1)
s = strings.Replace(s, "{username}", username, -1)
_, err := w.Write([]byte(s))
func avatarTag(_ string) (func(io.Writer, chunks.RenderContext) error, error) {
return func(w io.Writer, ctx chunks.RenderContext) error {
var (
user string
size = "40"
)
args, err := ctx.ParseTagArgs()
fmt.Sprintln("args", args)
if err != nil {
fmt.Println("err", err)
return err
}
for _, arg := range strings.Fields(args) {
split := strings.SplitN(arg, "=", 2)
if len(split) == 1 {
split = []string{"user", arg}
}
switch split[0] {
case "user":
user = split[1]
case "size":
size = split[1]
default:
return fmt.Errorf("unknown avatar argument: %s", split[0])
}
}
if user == "" {
return fmt.Errorf("parse error in avatar tag parameters %s", args)
}
s := strings.Replace(avatarTemplate, "40", fmt.Sprint(size), -1)
s = strings.Replace(s, "{user}", user, -1)
fmt.Println(args, "->", user, size)
_, err = w.Write([]byte(s))
return err
}, nil
}