diff options
| author | Shulhan <ms@kilabit.info> | 2020-11-04 00:25:58 +0700 |
|---|---|---|
| committer | Shulhan <ms@kilabit.info> | 2020-11-04 00:25:58 +0700 |
| commit | 7103abb50eddcb88ec394c13767341ab7944c03e (patch) | |
| tree | 009ef48302fda5e771ceb7bcddeb9e8d76f91ec7 | |
| parent | e2231815e7e5bc43f71f9b18224daa0886db50cd (diff) | |
| download | ciigo-7103abb50eddcb88ec394c13767341ab7944c03e.tar.xz | |
all: revert support for markdown
This program only support asciidoctor markup only.
| -rw-r--r-- | _example/index.adoc | 26 | ||||
| -rw-r--r-- | ciigo.go | 7 | ||||
| -rw-r--r-- | go.mod | 6 | ||||
| -rw-r--r-- | go.sum | 18 | ||||
| -rw-r--r-- | htmlgenerator.go | 25 |
5 files changed, 6 insertions, 76 deletions
diff --git a/_example/index.adoc b/_example/index.adoc index 81c3c9c..930d017 100644 --- a/_example/index.adoc +++ b/_example/index.adoc @@ -8,13 +8,9 @@ image:https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=whi image:https://goreportcard.com/badge/github.com/shuLhan/ciigo[Go Report Card, link={url-gocard}] `ciigo` is a library and a program to write static web server with embedded -files using generated markup format. - -Currently, ciigo support +files using https://asciidoctor.org/docs/what-is-asciidoc/[asciidoc] -and -https://commonmark.org/[markdown] -as markup format. +markup format. == ciigo as library @@ -34,8 +30,8 @@ markup files, as HTML files. $ ciigo [-template <file>] convert <dir> ---- -Scan the "dir" recursively to find markup files (.adoc or .md) and -convert them into HTML files. +Scan the "dir" recursively to find markup files (.adoc) and convert them into +HTML files. The template "file" is optional, default to embedded HTML template. ---- @@ -138,7 +134,7 @@ accessed by browser, Hello, world! ---- -Run `go generate` to convert all files with extension `.adoc` (or `.md`) +Run `go generate` to convert all files with extension `.adoc` into HTML and embed it into `./cmd/mysite/static.go` ---- @@ -207,15 +203,3 @@ Using symlink on ".adoc" file inside `content` directory is not supported yet. The source code for this software can be viewed at https://github.com/shuLhan/ciigo under custom link:/LICENSE[BSD license]. - - -== Credits - -This software is developed with helps from the following third party -libraries, - -* https://github.com/bytesparadise/libasciidoc[libasciidoc]. - https://raw.githubusercontent.com/bytesparadise/libasciidoc/master/LICENSE[License]. - -* https://github.com/yuin/goldmark[goldmark]. - https://raw.githubusercontent.com/yuin/goldmark/master/LICENSE[License]. @@ -26,7 +26,6 @@ const ( defDir = "." dirAssets = "assets" extAsciidoc = ".adoc" - extMarkdown = ".md" ) const ( @@ -39,14 +38,12 @@ const ( const ( markupKindUnknown byte = iota markupKindAsciidoc - markupKindMarkdown ) //nolint: gochecknoglobals var ( defExcludes = []string{ `.*\.adoc$`, - `.*\.md$`, `^\..*`, } ) @@ -139,7 +136,7 @@ func Serve(dir, address, htmlTemplate string) { } func isExtensionMarkup(ext string) bool { - return ext == extAsciidoc || ext == extMarkdown + return ext == extAsciidoc } // @@ -193,8 +190,6 @@ func markupKind(ext string) byte { switch ext { case extAsciidoc: return markupKindAsciidoc - case extMarkdown: - return markupKindMarkdown } return markupKindUnknown } @@ -3,15 +3,9 @@ module github.com/shuLhan/ciigo go 1.13 require ( - github.com/kr/text v0.2.0 // indirect - github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect github.com/shuLhan/asciidoctor-go v0.0.0-20201103171217-ebec994cda94 github.com/shuLhan/share v0.20.0 - github.com/yuin/goldmark v1.2.1 - github.com/yuin/goldmark-meta v0.0.0-20191126180153-f0638e958b60 golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0 // indirect - gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect - gopkg.in/yaml.v2 v2.3.0 // indirect ) //replace github.com/shuLhan/asciidoctor-go => ../asciidoctor-go @@ -1,19 +1,7 @@ -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/shuLhan/asciidoctor-go v0.0.0-20201103171217-ebec994cda94 h1:98N50waTQdHM0dz6/pfSJdvwOEao9tDwKubWTjYcft4= github.com/shuLhan/asciidoctor-go v0.0.0-20201103171217-ebec994cda94/go.mod h1:VhBdT7ve5XYza9pVB/xwwcJAtDYJwlrzq2mYEhMHjCw= github.com/shuLhan/share v0.20.0 h1:CNeT7Ky3kR4dAbxIOuuWmqaoGjBd2TlyY+qiPjSgLn0= github.com/shuLhan/share v0.20.0/go.mod h1:FqPloTQlDTAmMXxaWft/V5tPmxEHBJeyJMAzVm4/1og= -github.com/yuin/goldmark v1.1.7/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1 h1:ruQGxdhGHe7FWOJPT0mKs5+pD2Xs1Bm/kdGlHO04FmM= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark-meta v0.0.0-20191126180153-f0638e958b60 h1:gZucqLjL1eDzVWrXj4uiWeMbAopJlBR2mKQAsTGdPwo= -github.com/yuin/goldmark-meta v0.0.0-20191126180153-f0638e958b60/go.mod h1:i9VhcIHN2PxXMbQrKqXNueok6QNONoPjNMoj9MygVL0= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -29,9 +17,3 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U= -gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/htmlgenerator.go b/htmlgenerator.go index f55645f..73fd938 100644 --- a/htmlgenerator.go +++ b/htmlgenerator.go @@ -7,14 +7,9 @@ package ciigo import ( "fmt" "html/template" - "io/ioutil" "log" "os" - "github.com/yuin/goldmark" - meta "github.com/yuin/goldmark-meta" - mdparser "github.com/yuin/goldmark/parser" - "github.com/shuLhan/asciidoctor-go" ) @@ -23,7 +18,6 @@ import ( // type htmlGenerator struct { path string - mdg goldmark.Markdown tmpl *template.Template tmplSearch *template.Template } @@ -33,11 +27,6 @@ func newHTMLGenerator(file, content string) (htmlg *htmlGenerator) { htmlg = &htmlGenerator{ path: file, - mdg: goldmark.New( - goldmark.WithExtensions( - meta.Meta, - ), - ), } htmlg.tmpl = template.New("") @@ -95,20 +84,6 @@ func (htmlg *htmlGenerator) convert(fmarkup *fileMarkup, fhtml *fileHTML, force } fhtml.unpackAdocMetadata(doc) - - case markupKindMarkdown: - in, err := ioutil.ReadFile(fmarkup.path) - if err != nil { - log.Fatal("htmlGenerator.convert: " + err.Error()) - } - - ctx := mdparser.NewContext() - err = htmlg.mdg.Convert(in, &fhtml.rawBody, mdparser.WithContext(ctx)) - if err != nil { - log.Fatal(err) - } - - fmarkup.metadata = meta.Get(ctx) } if fhtml.rawBody.Len() == 0 { fmt.Println("skip") |
