actions/mark
1
0
Fork 0
mirror of https://github.com/kovetskiy/mark.git synced 2026-05-02 05:12:35 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

trace level is very verbose now

Browse Source
This commit is contained in:
Egor Kovetskiy
2020-11-03 17:12:51 +03:00
parent b33512b2b1
commit ec4b258635
14 changed files with 83 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/mark/ancestry.go
View File

@@ -5,8 +5,8 @@ import (
"strings"
"github.com/kovetskiy/mark/pkg/confluence"
"github.com/kovetskiy/mark/pkg/log"
"github.com/reconquest/karma-go"
"github.com/reconquest/pkg/log"
)
func EnsureAncestry(

2
pkg/mark/attachment.go
View File

@@ -13,8 +13,8 @@ import (
"strings"
"github.com/kovetskiy/mark/pkg/confluence"
"github.com/kovetskiy/mark/pkg/log"
"github.com/reconquest/karma-go"
"github.com/reconquest/pkg/log"
)
const (

16
pkg/mark/includes/templates.go
View File

@@ -11,20 +11,14 @@ import (
"gopkg.in/yaml.v2"
"github.com/kovetskiy/mark/pkg/log"
"github.com/reconquest/karma-go"
"github.com/reconquest/pkg/log"
)
var (
reIncludeDirective = regexp.MustCompile(
// <!-- Include: <template path>
// <optional yaml data> -->
`(?s)` + // dot capture newlines
/**/ `<!--\s*Include:\s*(?P<template>\S+)\s*` +
/* */ `(\n(?P<config>.*?))?-->`,
)
)
// <!-- Include: <template path>
// <optional yaml data> -->
var reIncludeDirective = regexp.MustCompile(
`(?s)<!--\s*Include:\s*(?P<template>\S+)\s*(\n(?P<config>.*?))?-->`)
func LoadTemplate(
path string,

2
pkg/mark/macro/macro.go
View File

@@ -7,9 +7,9 @@ import (
"strings"
"text/template"
"github.com/kovetskiy/mark/pkg/log"
"github.com/kovetskiy/mark/pkg/mark/includes"
"github.com/reconquest/karma-go"
"github.com/reconquest/pkg/log"
"github.com/reconquest/regexputil-go"
"gopkg.in/yaml.v2"
)

2
pkg/mark/mark.go
View File

@@ -4,8 +4,8 @@ import (
"strings"
"github.com/kovetskiy/mark/pkg/confluence"
"github.com/kovetskiy/mark/pkg/log"
"github.com/reconquest/karma-go"
"github.com/reconquest/pkg/log"
)
func ResolvePage(

2
pkg/mark/markdown.go
View File

@@ -4,8 +4,8 @@ import (
"bytes"
"regexp"
"github.com/kovetskiy/mark/pkg/log"
"github.com/kovetskiy/mark/pkg/mark/stdlib"
"github.com/reconquest/pkg/log"
"github.com/russross/blackfriday"
)

2
pkg/mark/meta.go
View File

@@ -7,7 +7,7 @@ import (
"regexp"
"strings"
"github.com/kovetskiy/mark/pkg/log"
"github.com/reconquest/pkg/log"
)
const (

2
pkg/mark/stdlib/stdlib.go
View File

@@ -5,8 +5,8 @@ import (
"text/template"
"github.com/kovetskiy/mark/pkg/confluence"
"github.com/kovetskiy/mark/pkg/log"
"github.com/kovetskiy/mark/pkg/mark/macro"
"github.com/reconquest/pkg/log"
"github.com/reconquest/karma-go"
)