diff options
| author | Shulhan <ms@kilabit.info> | 2022-05-19 17:35:22 +0700 |
|---|---|---|
| committer | Shulhan <ms@kilabit.info> | 2022-05-19 17:35:22 +0700 |
| commit | 1e520d2258d655b856026d7a53d4d4e2320533ff (patch) | |
| tree | 0504d241a8e3a554192acc52a4d9cd5280ce5796 | |
| parent | 3e6990a67851f6dd8dc130d058323b807ca4e3d9 (diff) | |
| download | ciigo-1e520d2258d655b856026d7a53d4d4e2320533ff.tar.xz | |
all: reformat all files using latest goimports
While at it, replace any use of ioutil with os/io package.
| -rw-r--r-- | ciigo.go | 16 | ||||
| -rw-r--r-- | cmd/ciigo-example/main.go | 2 | ||||
| -rw-r--r-- | cmd/ciigo-example/static.go | 12 | ||||
| -rw-r--r-- | cmd/ciigo/main.go | 4 | ||||
| -rw-r--r-- | convert_options.go | 2 | ||||
| -rw-r--r-- | embed_options.go | 2 | ||||
| -rw-r--r-- | filehtml.go | 2 | ||||
| -rw-r--r-- | htmlgenerator.go | 11 | ||||
| -rw-r--r-- | serve_options.go | 2 | ||||
| -rw-r--r-- | server.go | 6 | ||||
| -rw-r--r-- | watcher.go | 10 | ||||
| -rw-r--r-- | watcher_test.go | 2 |
12 files changed, 9 insertions, 62 deletions
@@ -1,13 +1,11 @@ // SPDX-FileCopyrightText: 2019 M. Shulhan <ms@kilabit.info> // SPDX-License-Identifier: GPL-3.0-or-later -// // Package ciigo is a program to write static web server with embedded files // using the asciidoc markup languages. // // For more information see the README file at the page repository // https://sr.ht/~shulhan/ciigo. -// package ciigo import ( @@ -31,7 +29,7 @@ const ( metadataStylesheet = "stylesheet" ) -//nolint: gochecknoglobals +// nolint: gochecknoglobals var ( defExcludes = []string{ `.*\.adoc$`, @@ -39,12 +37,10 @@ var ( } ) -// // Convert all markup files inside directory "dir" recursively into HTML // files using ConvertOptions HtmlTemplate file as base template. // If HtmlTemplate is empty it will default to use embedded HTML template. // See template_index_html.go for template format. -// func Convert(opts *ConvertOptions) (err error) { var ( logp = "Convert" @@ -76,7 +72,6 @@ func Convert(opts *ConvertOptions) (err error) { return nil } -// // GoEmbed generate a static Go file that embed all files inside Root except // the one that being excluded explicitly by ConvertOptions Exclude. // @@ -87,7 +82,6 @@ func Convert(opts *ConvertOptions) (err error) { // If HtmlTemplate option is empty it default to use embedded HTML // template. // See template_index_html.go for template format. -// func GoEmbed(opts *EmbedOptions) (err error) { var ( logp = "GoEmbed" @@ -148,10 +142,8 @@ func GoEmbed(opts *EmbedOptions) (err error) { return nil } -// // Serve the content at directory "dir" using HTTP server at specific // "address". -// func Serve(opts *ServeOptions) (err error) { var ( logp = "Serve" @@ -177,7 +169,6 @@ func Serve(opts *ServeOptions) (err error) { return nil } -// // Watch any changes on markup files on directory Root recursively and // changes on the HTML template file. // If there is new or modified markup files it will convert them into HTML @@ -186,7 +177,6 @@ func Serve(opts *ServeOptions) (err error) { // If the HTML template file modified, it will re-convert all markup files. // If the HTML template file deleted, it will replace them with internal, // default HTML template. -// func Watch(opts *ConvertOptions) (err error) { var ( logp = "Watch" @@ -220,10 +210,8 @@ func Watch(opts *ConvertOptions) (err error) { return nil } -// // isHtmlTemplateNewer will return true if HtmlTemplate is not defined or // newer than embedded GoFileName. -// func isHtmlTemplateNewer(opts *EmbedOptions) bool { var ( logp = "isHtmlTemplateNewer" @@ -262,10 +250,8 @@ func isExtensionMarkup(ext string) bool { return ext == extAsciidoc } -// // listFileMarkups find any markup files inside the content directory, // recursively. -// func listFileMarkups(dir string, excRE []*regexp.Regexp) ( fileMarkups map[string]*fileMarkup, err error, ) { diff --git a/cmd/ciigo-example/main.go b/cmd/ciigo-example/main.go index acc8146..9329dfe 100644 --- a/cmd/ciigo-example/main.go +++ b/cmd/ciigo-example/main.go @@ -1,10 +1,8 @@ // SPDX-FileCopyrightText: 2019 Shulhan <ms@kilabit.info> // SPDX-License-Identifier: GPL-3.0-or-later -// // Program ciigo-example provide an example on how to build a binary that // include the static, generated .go file. -// package main import ( diff --git a/cmd/ciigo-example/static.go b/cmd/ciigo-example/static.go index 6bbd04c..f4bfe76 100644 --- a/cmd/ciigo-example/static.go +++ b/cmd/ciigo-example/static.go @@ -51,12 +51,12 @@ func generate__example_custom_css() *memfs.Node { Path: "/custom.css", ContentType: "text/css; charset=utf-8", GenFuncName: "generate__example_custom_css", - Content: []byte("\x2F\x2F\x20\x53\x50\x44\x58\x2D\x46\x69\x6C\x65\x43\x6F\x70\x79\x72\x69\x67\x68\x74\x54\x65\x78\x74\x3A\x20\x32\x30\x32\x30\x20\x53\x68\x75\x6C\x68\x61\x6E\x20\x3C\x6D\x73\x40\x6B\x69\x6C\x61\x62\x69\x74\x2E\x69\x6E\x66\x6F\x3E\x0A\x2F\x2F\x20\x53\x50\x44\x58\x2D\x4C\x69\x63\x65\x6E\x73\x65\x2D\x49\x64\x65\x6E\x74\x69\x66\x69\x65\x72\x3A\x20\x47\x50\x4C\x2D\x33\x2E\x30\x2D\x6F\x72\x2D\x6C\x61\x74\x65\x72\x0A\x0A\x68\x31\x20\x7B\x0A\x09\x63\x6F\x6C\x6F\x72\x3A\x20\x73\x69\x65\x6E\x6E\x61\x3B\x0A\x7D\x0A"), + Content: []byte("\x2F\x2A\x2A\x0A\x20\x2A\x20\x53\x50\x44\x58\x2D\x46\x69\x6C\x65\x43\x6F\x70\x79\x72\x69\x67\x68\x74\x54\x65\x78\x74\x3A\x20\x32\x30\x32\x30\x20\x53\x68\x75\x6C\x68\x61\x6E\x20\x3C\x6D\x73\x40\x6B\x69\x6C\x61\x62\x69\x74\x2E\x69\x6E\x66\x6F\x3E\x0A\x20\x2A\x20\x53\x50\x44\x58\x2D\x4C\x69\x63\x65\x6E\x73\x65\x2D\x49\x64\x65\x6E\x74\x69\x66\x69\x65\x72\x3A\x20\x47\x50\x4C\x2D\x33\x2E\x30\x2D\x6F\x72\x2D\x6C\x61\x74\x65\x72\x0A\x20\x2A\x2F\x0A\x0A\x68\x31\x20\x7B\x0A\x09\x63\x6F\x6C\x6F\x72\x3A\x20\x73\x69\x65\x6E\x6E\x61\x3B\x0A\x7D\x0A"), } node.SetMode(420) - node.SetModTimeUnix(1646410152, 426744758) + node.SetModTimeUnix(1648394124, 944614377) node.SetName("custom.css") - node.SetSize(127) + node.SetSize(135) return node } @@ -96,12 +96,12 @@ func generate__example_index_css() *memfs.Node { Path: "/index.css", ContentType: "text/css; charset=utf-8", GenFuncName: "generate__example_index_css", - Content: []byte("\x2F\x2F\x20\x53\x50\x44\x58\x2D\x46\x69\x6C\x65\x43\x6F\x70\x79\x72\x69\x67\x68\x74\x54\x65\x78\x74\x3A\x20\x32\x30\x32\x30\x20\x53\x68\x75\x6C\x68\x61\x6E\x20\x3C\x6D\x73\x40\x6B\x69\x6C\x61\x62\x69\x74\x2E\x69\x6E\x66\x6F\x3E\x0A\x2F\x2F\x20\x53\x50\x44\x58\x2D\x4C\x69\x63\x65\x6E\x73\x65\x2D\x49\x64\x65\x6E\x74\x69\x66\x69\x65\x72\x3A\x20\x47\x50\x4C\x2D\x33\x2E\x30\x2D\x6F\x72\x2D\x6C\x61\x74\x65\x72\x0A\x0A\x62\x6F\x64\x79\x20\x7B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x3A\x20\x30\x3B\x0A\x09\x66\x6F\x6E\x74\x2D\x66\x61\x6D\x69\x6C\x79\x3A\x20\x41\x72\x69\x61\x6C\x2C\x20\x73\x61\x6E\x73\x2D\x73\x65\x72\x69\x66\x3B\x0A\x09\x62\x61\x63\x6B\x67\x72\x6F\x75\x6E\x64\x2D\x63\x6F\x6C\x6F\x72\x3A\x20\x23\x66\x66\x66\x3B\x0A\x09\x6C\x69\x6E\x65\x2D\x68\x65\x69\x67\x68\x74\x3A\x20\x31\x2E\x33\x3B\x0A\x09\x74\x65\x78\x74\x2D\x61\x6C\x69\x67\x6E\x3A\x20\x63\x65\x6E\x74\x65\x72\x3B\x0A\x09\x63\x6F\x6C\x6F\x72\x3A\x20\x23\x32\x32\x32\x3B\x0A\x7D\x0A\x70\x72\x65\x20\x7B\x0A\x09\x66\x6F\x6E\x74\x2D\x66\x61\x6D\x69\x6C\x79\x3A\x20\x4D\x65\x6E\x6C\x6F\x2C\x20\x6D\x6F\x6E\x6F\x73\x70\x61\x63\x65\x3B\x0A\x09\x66\x6F\x6E\x74\x2D\x73\x69\x7A\x65\x3A\x20\x30\x2E\x38\x37\x35\x72\x65\x6D\x3B\x0A\x09\x6C\x69\x6E\x65\x2D\x68\x65\x69\x67\x68\x74\x3A\x20\x31\x2E\x34\x3B\x0A\x09\x6F\x76\x65\x72\x66\x6C\x6F\x77\x2D\x78\x3A\x20\x61\x75\x74\x6F\x3B\x0A\x09\x62\x61\x63\x6B\x67\x72\x6F\x75\x6E\x64\x3A\x20\x23\x65\x66\x65\x66\x65\x66\x3B\x0A\x09\x70\x61\x64\x64\x69\x6E\x67\x3A\x20\x30\x2E\x36\x32\x35\x72\x65\x6D\x3B\x0A\x09\x62\x6F\x72\x64\x65\x72\x2D\x72\x61\x64\x69\x75\x73\x3A\x20\x30\x2E\x33\x31\x32\x35\x72\x65\x6D\x3B\x0A\x7D\x0A\x61\x20\x7B\x0A\x09\x63\x6F\x6C\x6F\x72\x3A\x20\x23\x33\x37\x35\x65\x61\x62\x3B\x0A\x09\x74\x65\x78\x74\x2D\x64\x65\x63\x6F\x72\x61\x74\x69\x6F\x6E\x3A\x20\x6E\x6F\x6E\x65\x3B\x0A\x7D\x0A\x61\x3A\x68\x6F\x76\x65\x72\x20\x7B\x0A\x09\x74\x65\x78\x74\x2D\x64\x65\x63\x6F\x72\x61\x74\x69\x6F\x6E\x3A\x20\x75\x6E\x64\x65\x72\x6C\x69\x6E\x65\x3B\x0A\x7D\x0A\x0A\x70\x2C\x0A\x6C\x69\x20\x7B\x0A\x09\x6D\x61\x78\x2D\x77\x69\x64\x74\x68\x3A\x20\x35\x30\x72\x65\x6D\x3B\x0A\x09\x77\x6F\x72\x64\x2D\x77\x72\x61\x70\x3A\x20\x62\x72\x65\x61\x6B\x2D\x77\x6F\x72\x64\x3B\x0A\x7D\x0A\x70\x2C\x0A\x70\x72\x65\x2C\x0A\x75\x6C\x2C\x0A\x6F\x6C\x20\x7B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x3A\x20\x31\x2E\x32\x35\x72\x65\x6D\x3B\x0A\x7D\x0A\x0A\x68\x31\x2C\x0A\x68\x32\x2C\x0A\x68\x33\x2C\x0A\x68\x34\x20\x7B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x3A\x20\x31\x2E\x32\x35\x72\x65\x6D\x20\x30\x20\x31\x2E\x32\x35\x72\x65\x6D\x3B\x0A\x09\x70\x61\x64\x64\x69\x6E\x67\x3A\x20\x30\x3B\x0A\x09\x63\x6F\x6C\x6F\x72\x3A\x20\x23\x33\x37\x35\x65\x61\x62\x3B\x0A\x09\x66\x6F\x6E\x74\x2D\x77\x65\x69\x67\x68\x74\x3A\x20\x62\x6F\x6C\x64\x3B\x0A\x7D\x0A\x68\x31\x20\x7B\x0A\x09\x66\x6F\x6E\x74\x2D\x73\x69\x7A\x65\x3A\x20\x31\x2E\x37\x35\x72\x65\x6D\x3B\x0A\x09\x6C\x69\x6E\x65\x2D\x68\x65\x69\x67\x68\x74\x3A\x20\x31\x3B\x0A\x7D\x0A\x68\x31\x20\x2E\x74\x65\x78\x74\x2D\x6D\x75\x74\x65\x64\x20\x7B\x0A\x09\x63\x6F\x6C\x6F\x72\x3A\x20\x23\x37\x37\x37\x3B\x0A\x7D\x0A\x68\x32\x20\x7B\x0A\x09\x63\x6C\x65\x61\x72\x3A\x20\x72\x69\x67\x68\x74\x3B\x0A\x09\x66\x6F\x6E\x74\x2D\x73\x69\x7A\x65\x3A\x20\x31\x2E\x32\x35\x72\x65\x6D\x3B\x0A\x09\x62\x61\x63\x6B\x67\x72\x6F\x75\x6E\x64\x3A\x20\x23\x65\x30\x65\x62\x66\x35\x3B\x0A\x09\x70\x61\x64\x64\x69\x6E\x67\x3A\x20\x30\x2E\x35\x72\x65\x6D\x3B\x0A\x09\x6C\x69\x6E\x65\x2D\x68\x65\x69\x67\x68\x74\x3A\x20\x31\x2E\x32\x35\x3B\x0A\x09\x66\x6F\x6E\x74\x2D\x77\x65\x69\x67\x68\x74\x3A\x20\x6E\x6F\x72\x6D\x61\x6C\x3B\x0A\x09\x6F\x76\x65\x72\x66\x6C\x6F\x77\x3A\x20\x61\x75\x74\x6F\x3B\x0A\x09\x6F\x76\x65\x72\x66\x6C\x6F\x77\x2D\x77\x72\x61\x70\x3A\x20\x62\x72\x65\x61\x6B\x2D\x77\x6F\x72\x64\x3B\x0A\x7D\x0A\x68\x32\x20\x61\x20\x7B\x0A\x09\x66\x6F\x6E\x74\x2D\x77\x65\x69\x67\x68\x74\x3A\x20\x62\x6F\x6C\x64\x3B\x0A\x7D\x0A\x68\x33\x20\x7B\x0A\x09\x66\x6F\x6E\x74\x2D\x73\x69\x7A\x65\x3A\x20\x31\x2E\x32\x35\x72\x65\x6D\x3B\x0A\x09\x6C\x69\x6E\x65\x2D\x68\x65\x69\x67\x68\x74\x3A\x20\x31\x2E\x32\x35\x3B\x0A\x09\x6F\x76\x65\x72\x66\x6C\x6F\x77\x3A\x20\x61\x75\x74\x6F\x3B\x0A\x09\x6F\x76\x65\x72\x66\x6C\x6F\x77\x2D\x77\x72\x61\x70\x3A\x20\x62\x72\x65\x61\x6B\x2D\x77\x6F\x72\x64\x3B\x0A\x7D\x0A\x68\x33\x2C\x0A\x68\x34\x20\x7B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x3A\x20\x31\x2E\x32\x35\x72\x65\x6D\x20\x30\x2E\x33\x31\x32\x35\x72\x65\x6D\x3B\x0A\x7D\x0A\x68\x34\x20\x7B\x0A\x09\x66\x6F\x6E\x74\x2D\x73\x69\x7A\x65\x3A\x20\x31\x72\x65\x6D\x3B\x0A\x7D\x0A\x0A\x68\x32\x20\x3E\x20\x73\x70\x61\x6E\x2C\x0A\x68\x33\x20\x3E\x20\x73\x70\x61\x6E\x20\x7B\x0A\x09\x66\x6C\x6F\x61\x74\x3A\x20\x72\x69\x67\x68\x74\x3B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x3A\x20\x30\x20\x32\x35\x70\x78\x20\x30\x20\x30\x3B\x0A\x09\x66\x6F\x6E\x74\x2D\x77\x65\x69\x67\x68\x74\x3A\x20\x6E\x6F\x72\x6D\x61\x6C\x3B\x0A\x09\x63\x6F\x6C\x6F\x72\x3A\x20\x23\x35\x32\x37\x39\x63\x37\x3B\x0A\x7D\x0A\x0A\x64\x6C\x20\x7B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x3A\x20\x31\x2E\x32\x35\x72\x65\x6D\x3B\x0A\x7D\x0A\x64\x64\x20\x7B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x3A\x20\x30\x20\x30\x20\x30\x20\x31\x2E\x32\x35\x72\x65\x6D\x3B\x0A\x7D\x0A\x64\x6C\x2C\x0A\x64\x64\x20\x7B\x0A\x09\x66\x6F\x6E\x74\x2D\x73\x69\x7A\x65\x3A\x20\x30\x2E\x38\x37\x35\x72\x65\x6D\x3B\x0A\x7D\x0A\x0A\x2F\x2A\x2A\x0A\x20\x2A\x20\x43\x75\x73\x74\x6F\x6D\x20\x63\x6C\x61\x73\x73\x65\x73\x20\x66\x6F\x72\x20\x70\x61\x67\x65\x73\x0A\x20\x2A\x2F\x0A\x0A\x2E\x74\x6F\x70\x62\x61\x72\x20\x7B\x0A\x09\x62\x61\x63\x6B\x67\x72\x6F\x75\x6E\x64\x3A\x20\x23\x65\x30\x65\x62\x66\x35\x3B\x0A\x09\x68\x65\x69\x67\x68\x74\x3A\x20\x34\x72\x65\x6D\x3B\x0A\x09\x6F\x76\x65\x72\x66\x6C\x6F\x77\x3A\x20\x68\x69\x64\x64\x65\x6E\x3B\x0A\x7D\x0A\x0A\x2E\x74\x6F\x70\x62\x61\x72\x20\x2E\x74\x6F\x70\x2D\x68\x65\x61\x64\x69\x6E\x67\x2C\x0A\x2E\x74\x6F\x70\x62\x61\x72\x20\x2E\x6D\x65\x6E\x75\x20\x7B\x0A\x09\x70\x61\x64\x64\x69\x6E\x67\x3A\x20\x31\x2E\x33\x31\x33\x72\x65\x6D\x20\x30\x3B\x0A\x09\x66\x6F\x6E\x74\x2D\x73\x69\x7A\x65\x3A\x20\x31\x2E\x32\x35\x72\x65\x6D\x3B\x0A\x09\x66\x6F\x6E\x74\x2D\x77\x65\x69\x67\x68\x74\x3A\x20\x6E\x6F\x72\x6D\x61\x6C\x3B\x0A\x7D\x0A\x0A\x2E\x74\x6F\x70\x62\x61\x72\x20\x2E\x74\x6F\x70\x2D\x68\x65\x61\x64\x69\x6E\x67\x20\x7B\x0A\x09\x66\x6C\x6F\x61\x74\x3A\x20\x6C\x65\x66\x74\x3B\x0A\x7D\x0A\x2E\x74\x6F\x70\x62\x61\x72\x20\x2E\x74\x6F\x70\x2D\x68\x65\x61\x64\x69\x6E\x67\x20\x61\x20\x7B\x0A\x09\x63\x6F\x6C\x6F\x72\x3A\x20\x23\x32\x32\x32\x3B\x0A\x09\x74\x65\x78\x74\x2D\x64\x65\x63\x6F\x72\x61\x74\x69\x6F\x6E\x3A\x20\x6E\x6F\x6E\x65\x3B\x0A\x7D\x0A\x0A\x2E\x74\x6F\x70\x62\x61\x72\x20\x2E\x6D\x65\x6E\x75\x20\x7B\x0A\x09\x66\x6C\x6F\x61\x74\x3A\x20\x72\x69\x67\x68\x74\x3B\x0A\x7D\x0A\x2E\x74\x6F\x70\x62\x61\x72\x20\x2E\x6D\x65\x6E\x75\x20\x61\x20\x7B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x3A\x20\x30\x2E\x36\x32\x35\x72\x65\x6D\x20\x30\x2E\x31\x32\x35\x72\x65\x6D\x3B\x0A\x09\x70\x61\x64\x64\x69\x6E\x67\x3A\x20\x30\x2E\x36\x32\x35\x72\x65\x6D\x3B\x0A\x09\x63\x6F\x6C\x6F\x72\x3A\x20\x77\x68\x69\x74\x65\x3B\x0A\x09\x62\x61\x63\x6B\x67\x72\x6F\x75\x6E\x64\x3A\x20\x23\x33\x37\x35\x65\x61\x62\x3B\x0A\x09\x62\x6F\x72\x64\x65\x72\x3A\x20\x30\x2E\x30\x36\x32\x35\x72\x65\x6D\x20\x73\x6F\x6C\x69\x64\x20\x23\x33\x37\x35\x65\x61\x62\x3B\x0A\x09\x62\x6F\x72\x64\x65\x72\x2D\x72\x61\x64\x69\x75\x73\x3A\x20\x35\x70\x78\x3B\x0A\x7D\x0A\x2E\x74\x6F\x70\x62\x61\x72\x20\x2E\x6D\x65\x6E\x75\x20\x66\x6F\x72\x6D\x20\x7B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x2D\x6C\x65\x66\x74\x3A\x20\x30\x2E\x36\x32\x35\x72\x65\x6D\x3B\x0A\x7D\x0A\x2E\x70\x61\x67\x65\x20\x7B\x0A\x09\x77\x69\x64\x74\x68\x3A\x20\x31\x30\x30\x25\x3B\x0A\x7D\x0A\x0A\x2E\x70\x61\x67\x65\x20\x3E\x20\x2E\x63\x6F\x6E\x74\x61\x69\x6E\x65\x72\x2C\x0A\x2E\x74\x6F\x70\x62\x61\x72\x20\x3E\x20\x2E\x63\x6F\x6E\x74\x61\x69\x6E\x65\x72\x20\x7B\x0A\x09\x74\x65\x78\x74\x2D\x61\x6C\x69\x67\x6E\x3A\x20\x6C\x65\x66\x74\x3B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x2D\x6C\x65\x66\x74\x3A\x20\x61\x75\x74\x6F\x3B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x2D\x72\x69\x67\x68\x74\x3A\x20\x61\x75\x74\x6F\x3B\x0A\x09\x70\x61\x64\x64\x69\x6E\x67\x3A\x20\x30\x20\x31\x2E\x32\x35\x72\x65\x6D\x3B\x0A\x7D\x0A\x0A\x2E\x63\x6F\x6E\x74\x61\x69\x6E\x65\x72\x20\x2E\x6D\x65\x74\x61\x20\x7B\x0A\x09\x66\x6F\x6E\x74\x2D\x73\x74\x79\x6C\x65\x3A\x20\x69\x74\x61\x6C\x69\x63\x3B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x3A\x20\x31\x2E\x32\x35\x72\x65\x6D\x3B\x0A\x7D\x0A\x0A\x2E\x66\x6F\x6F\x74\x65\x72\x20\x7B\x0A\x09\x74\x65\x78\x74\x2D\x61\x6C\x69\x67\x6E\x3A\x20\x63\x65\x6E\x74\x65\x72\x3B\x0A\x09\x63\x6F\x6C\x6F\x72\x3A\x20\x23\x36\x36\x36\x3B\x0A\x09\x66\x6F\x6E\x74\x2D\x73\x69\x7A\x65\x3A\x20\x30\x2E\x38\x37\x35\x72\x65\x6D\x3B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x3A\x20\x32\x2E\x35\x72\x65\x6D\x20\x30\x3B\x0A\x7D\x0A"), + Content: []byte("\x2F\x2A\x2A\x0A\x20\x2A\x20\x53\x50\x44\x58\x2D\x46\x69\x6C\x65\x43\x6F\x70\x79\x72\x69\x67\x68\x74\x54\x65\x78\x74\x3A\x20\x32\x30\x32\x30\x20\x53\x68\x75\x6C\x68\x61\x6E\x20\x3C\x6D\x73\x40\x6B\x69\x6C\x61\x62\x69\x74\x2E\x69\x6E\x66\x6F\x3E\x0A\x20\x2A\x20\x53\x50\x44\x58\x2D\x4C\x69\x63\x65\x6E\x73\x65\x2D\x49\x64\x65\x6E\x74\x69\x66\x69\x65\x72\x3A\x20\x47\x50\x4C\x2D\x33\x2E\x30\x2D\x6F\x72\x2D\x6C\x61\x74\x65\x72\x0A\x20\x2A\x2F\x0A\x0A\x62\x6F\x64\x79\x20\x7B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x3A\x20\x30\x3B\x0A\x09\x66\x6F\x6E\x74\x2D\x66\x61\x6D\x69\x6C\x79\x3A\x20\x41\x72\x69\x61\x6C\x2C\x20\x73\x61\x6E\x73\x2D\x73\x65\x72\x69\x66\x3B\x0A\x09\x62\x61\x63\x6B\x67\x72\x6F\x75\x6E\x64\x2D\x63\x6F\x6C\x6F\x72\x3A\x20\x23\x66\x66\x66\x3B\x0A\x09\x6C\x69\x6E\x65\x2D\x68\x65\x69\x67\x68\x74\x3A\x20\x31\x2E\x33\x3B\x0A\x09\x74\x65\x78\x74\x2D\x61\x6C\x69\x67\x6E\x3A\x20\x63\x65\x6E\x74\x65\x72\x3B\x0A\x09\x63\x6F\x6C\x6F\x72\x3A\x20\x23\x32\x32\x32\x3B\x0A\x7D\x0A\x70\x72\x65\x20\x7B\x0A\x09\x66\x6F\x6E\x74\x2D\x66\x61\x6D\x69\x6C\x79\x3A\x20\x4D\x65\x6E\x6C\x6F\x2C\x20\x6D\x6F\x6E\x6F\x73\x70\x61\x63\x65\x3B\x0A\x09\x66\x6F\x6E\x74\x2D\x73\x69\x7A\x65\x3A\x20\x30\x2E\x38\x37\x35\x72\x65\x6D\x3B\x0A\x09\x6C\x69\x6E\x65\x2D\x68\x65\x69\x67\x68\x74\x3A\x20\x31\x2E\x34\x3B\x0A\x09\x6F\x76\x65\x72\x66\x6C\x6F\x77\x2D\x78\x3A\x20\x61\x75\x74\x6F\x3B\x0A\x09\x62\x61\x63\x6B\x67\x72\x6F\x75\x6E\x64\x3A\x20\x23\x65\x66\x65\x66\x65\x66\x3B\x0A\x09\x70\x61\x64\x64\x69\x6E\x67\x3A\x20\x30\x2E\x36\x32\x35\x72\x65\x6D\x3B\x0A\x09\x62\x6F\x72\x64\x65\x72\x2D\x72\x61\x64\x69\x75\x73\x3A\x20\x30\x2E\x33\x31\x32\x35\x72\x65\x6D\x3B\x0A\x7D\x0A\x61\x20\x7B\x0A\x09\x63\x6F\x6C\x6F\x72\x3A\x20\x23\x33\x37\x35\x65\x61\x62\x3B\x0A\x09\x74\x65\x78\x74\x2D\x64\x65\x63\x6F\x72\x61\x74\x69\x6F\x6E\x3A\x20\x6E\x6F\x6E\x65\x3B\x0A\x7D\x0A\x61\x3A\x68\x6F\x76\x65\x72\x20\x7B\x0A\x09\x74\x65\x78\x74\x2D\x64\x65\x63\x6F\x72\x61\x74\x69\x6F\x6E\x3A\x20\x75\x6E\x64\x65\x72\x6C\x69\x6E\x65\x3B\x0A\x7D\x0A\x0A\x70\x2C\x0A\x6C\x69\x20\x7B\x0A\x09\x6D\x61\x78\x2D\x77\x69\x64\x74\x68\x3A\x20\x35\x30\x72\x65\x6D\x3B\x0A\x09\x77\x6F\x72\x64\x2D\x77\x72\x61\x70\x3A\x20\x62\x72\x65\x61\x6B\x2D\x77\x6F\x72\x64\x3B\x0A\x7D\x0A\x70\x2C\x0A\x70\x72\x65\x2C\x0A\x75\x6C\x2C\x0A\x6F\x6C\x20\x7B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x3A\x20\x31\x2E\x32\x35\x72\x65\x6D\x3B\x0A\x7D\x0A\x0A\x68\x31\x2C\x0A\x68\x32\x2C\x0A\x68\x33\x2C\x0A\x68\x34\x20\x7B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x3A\x20\x31\x2E\x32\x35\x72\x65\x6D\x20\x30\x20\x31\x2E\x32\x35\x72\x65\x6D\x3B\x0A\x09\x70\x61\x64\x64\x69\x6E\x67\x3A\x20\x30\x3B\x0A\x09\x63\x6F\x6C\x6F\x72\x3A\x20\x23\x33\x37\x35\x65\x61\x62\x3B\x0A\x09\x66\x6F\x6E\x74\x2D\x77\x65\x69\x67\x68\x74\x3A\x20\x62\x6F\x6C\x64\x3B\x0A\x7D\x0A\x68\x31\x20\x7B\x0A\x09\x66\x6F\x6E\x74\x2D\x73\x69\x7A\x65\x3A\x20\x31\x2E\x37\x35\x72\x65\x6D\x3B\x0A\x09\x6C\x69\x6E\x65\x2D\x68\x65\x69\x67\x68\x74\x3A\x20\x31\x3B\x0A\x7D\x0A\x68\x31\x20\x2E\x74\x65\x78\x74\x2D\x6D\x75\x74\x65\x64\x20\x7B\x0A\x09\x63\x6F\x6C\x6F\x72\x3A\x20\x23\x37\x37\x37\x3B\x0A\x7D\x0A\x68\x32\x20\x7B\x0A\x09\x63\x6C\x65\x61\x72\x3A\x20\x72\x69\x67\x68\x74\x3B\x0A\x09\x66\x6F\x6E\x74\x2D\x73\x69\x7A\x65\x3A\x20\x31\x2E\x32\x35\x72\x65\x6D\x3B\x0A\x09\x62\x61\x63\x6B\x67\x72\x6F\x75\x6E\x64\x3A\x20\x23\x65\x30\x65\x62\x66\x35\x3B\x0A\x09\x70\x61\x64\x64\x69\x6E\x67\x3A\x20\x30\x2E\x35\x72\x65\x6D\x3B\x0A\x09\x6C\x69\x6E\x65\x2D\x68\x65\x69\x67\x68\x74\x3A\x20\x31\x2E\x32\x35\x3B\x0A\x09\x66\x6F\x6E\x74\x2D\x77\x65\x69\x67\x68\x74\x3A\x20\x6E\x6F\x72\x6D\x61\x6C\x3B\x0A\x09\x6F\x76\x65\x72\x66\x6C\x6F\x77\x3A\x20\x61\x75\x74\x6F\x3B\x0A\x09\x6F\x76\x65\x72\x66\x6C\x6F\x77\x2D\x77\x72\x61\x70\x3A\x20\x62\x72\x65\x61\x6B\x2D\x77\x6F\x72\x64\x3B\x0A\x7D\x0A\x68\x32\x20\x61\x20\x7B\x0A\x09\x66\x6F\x6E\x74\x2D\x77\x65\x69\x67\x68\x74\x3A\x20\x62\x6F\x6C\x64\x3B\x0A\x7D\x0A\x68\x33\x20\x7B\x0A\x09\x66\x6F\x6E\x74\x2D\x73\x69\x7A\x65\x3A\x20\x31\x2E\x32\x35\x72\x65\x6D\x3B\x0A\x09\x6C\x69\x6E\x65\x2D\x68\x65\x69\x67\x68\x74\x3A\x20\x31\x2E\x32\x35\x3B\x0A\x09\x6F\x76\x65\x72\x66\x6C\x6F\x77\x3A\x20\x61\x75\x74\x6F\x3B\x0A\x09\x6F\x76\x65\x72\x66\x6C\x6F\x77\x2D\x77\x72\x61\x70\x3A\x20\x62\x72\x65\x61\x6B\x2D\x77\x6F\x72\x64\x3B\x0A\x7D\x0A\x68\x33\x2C\x0A\x68\x34\x20\x7B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x3A\x20\x31\x2E\x32\x35\x72\x65\x6D\x20\x30\x2E\x33\x31\x32\x35\x72\x65\x6D\x3B\x0A\x7D\x0A\x68\x34\x20\x7B\x0A\x09\x66\x6F\x6E\x74\x2D\x73\x69\x7A\x65\x3A\x20\x31\x72\x65\x6D\x3B\x0A\x7D\x0A\x0A\x68\x32\x20\x3E\x20\x73\x70\x61\x6E\x2C\x0A\x68\x33\x20\x3E\x20\x73\x70\x61\x6E\x20\x7B\x0A\x09\x66\x6C\x6F\x61\x74\x3A\x20\x72\x69\x67\x68\x74\x3B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x3A\x20\x30\x20\x32\x35\x70\x78\x20\x30\x20\x30\x3B\x0A\x09\x66\x6F\x6E\x74\x2D\x77\x65\x69\x67\x68\x74\x3A\x20\x6E\x6F\x72\x6D\x61\x6C\x3B\x0A\x09\x63\x6F\x6C\x6F\x72\x3A\x20\x23\x35\x32\x37\x39\x63\x37\x3B\x0A\x7D\x0A\x0A\x64\x6C\x20\x7B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x3A\x20\x31\x2E\x32\x35\x72\x65\x6D\x3B\x0A\x7D\x0A\x64\x64\x20\x7B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x3A\x20\x30\x20\x30\x20\x30\x20\x31\x2E\x32\x35\x72\x65\x6D\x3B\x0A\x7D\x0A\x64\x6C\x2C\x0A\x64\x64\x20\x7B\x0A\x09\x66\x6F\x6E\x74\x2D\x73\x69\x7A\x65\x3A\x20\x30\x2E\x38\x37\x35\x72\x65\x6D\x3B\x0A\x7D\x0A\x0A\x2F\x2A\x2A\x0A\x20\x2A\x20\x43\x75\x73\x74\x6F\x6D\x20\x63\x6C\x61\x73\x73\x65\x73\x20\x66\x6F\x72\x20\x70\x61\x67\x65\x73\x0A\x20\x2A\x2F\x0A\x0A\x2E\x74\x6F\x70\x62\x61\x72\x20\x7B\x0A\x09\x62\x61\x63\x6B\x67\x72\x6F\x75\x6E\x64\x3A\x20\x23\x65\x30\x65\x62\x66\x35\x3B\x0A\x09\x68\x65\x69\x67\x68\x74\x3A\x20\x34\x72\x65\x6D\x3B\x0A\x09\x6F\x76\x65\x72\x66\x6C\x6F\x77\x3A\x20\x68\x69\x64\x64\x65\x6E\x3B\x0A\x7D\x0A\x0A\x2E\x74\x6F\x70\x62\x61\x72\x20\x2E\x74\x6F\x70\x2D\x68\x65\x61\x64\x69\x6E\x67\x2C\x0A\x2E\x74\x6F\x70\x62\x61\x72\x20\x2E\x6D\x65\x6E\x75\x20\x7B\x0A\x09\x70\x61\x64\x64\x69\x6E\x67\x3A\x20\x31\x2E\x33\x31\x33\x72\x65\x6D\x20\x30\x3B\x0A\x09\x66\x6F\x6E\x74\x2D\x73\x69\x7A\x65\x3A\x20\x31\x2E\x32\x35\x72\x65\x6D\x3B\x0A\x09\x66\x6F\x6E\x74\x2D\x77\x65\x69\x67\x68\x74\x3A\x20\x6E\x6F\x72\x6D\x61\x6C\x3B\x0A\x7D\x0A\x0A\x2E\x74\x6F\x70\x62\x61\x72\x20\x2E\x74\x6F\x70\x2D\x68\x65\x61\x64\x69\x6E\x67\x20\x7B\x0A\x09\x66\x6C\x6F\x61\x74\x3A\x20\x6C\x65\x66\x74\x3B\x0A\x7D\x0A\x2E\x74\x6F\x70\x62\x61\x72\x20\x2E\x74\x6F\x70\x2D\x68\x65\x61\x64\x69\x6E\x67\x20\x61\x20\x7B\x0A\x09\x63\x6F\x6C\x6F\x72\x3A\x20\x23\x32\x32\x32\x3B\x0A\x09\x74\x65\x78\x74\x2D\x64\x65\x63\x6F\x72\x61\x74\x69\x6F\x6E\x3A\x20\x6E\x6F\x6E\x65\x3B\x0A\x7D\x0A\x0A\x2E\x74\x6F\x70\x62\x61\x72\x20\x2E\x6D\x65\x6E\x75\x20\x7B\x0A\x09\x66\x6C\x6F\x61\x74\x3A\x20\x72\x69\x67\x68\x74\x3B\x0A\x7D\x0A\x2E\x74\x6F\x70\x62\x61\x72\x20\x2E\x6D\x65\x6E\x75\x20\x61\x20\x7B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x3A\x20\x30\x2E\x36\x32\x35\x72\x65\x6D\x20\x30\x2E\x31\x32\x35\x72\x65\x6D\x3B\x0A\x09\x70\x61\x64\x64\x69\x6E\x67\x3A\x20\x30\x2E\x36\x32\x35\x72\x65\x6D\x3B\x0A\x09\x63\x6F\x6C\x6F\x72\x3A\x20\x77\x68\x69\x74\x65\x3B\x0A\x09\x62\x61\x63\x6B\x67\x72\x6F\x75\x6E\x64\x3A\x20\x23\x33\x37\x35\x65\x61\x62\x3B\x0A\x09\x62\x6F\x72\x64\x65\x72\x3A\x20\x30\x2E\x30\x36\x32\x35\x72\x65\x6D\x20\x73\x6F\x6C\x69\x64\x20\x23\x33\x37\x35\x65\x61\x62\x3B\x0A\x09\x62\x6F\x72\x64\x65\x72\x2D\x72\x61\x64\x69\x75\x73\x3A\x20\x35\x70\x78\x3B\x0A\x7D\x0A\x2E\x74\x6F\x70\x62\x61\x72\x20\x2E\x6D\x65\x6E\x75\x20\x66\x6F\x72\x6D\x20\x7B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x2D\x6C\x65\x66\x74\x3A\x20\x30\x2E\x36\x32\x35\x72\x65\x6D\x3B\x0A\x7D\x0A\x2E\x70\x61\x67\x65\x20\x7B\x0A\x09\x77\x69\x64\x74\x68\x3A\x20\x31\x30\x30\x25\x3B\x0A\x7D\x0A\x0A\x2E\x70\x61\x67\x65\x20\x3E\x20\x2E\x63\x6F\x6E\x74\x61\x69\x6E\x65\x72\x2C\x0A\x2E\x74\x6F\x70\x62\x61\x72\x20\x3E\x20\x2E\x63\x6F\x6E\x74\x61\x69\x6E\x65\x72\x20\x7B\x0A\x09\x74\x65\x78\x74\x2D\x61\x6C\x69\x67\x6E\x3A\x20\x6C\x65\x66\x74\x3B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x2D\x6C\x65\x66\x74\x3A\x20\x61\x75\x74\x6F\x3B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x2D\x72\x69\x67\x68\x74\x3A\x20\x61\x75\x74\x6F\x3B\x0A\x09\x70\x61\x64\x64\x69\x6E\x67\x3A\x20\x30\x20\x31\x2E\x32\x35\x72\x65\x6D\x3B\x0A\x7D\x0A\x0A\x2E\x63\x6F\x6E\x74\x61\x69\x6E\x65\x72\x20\x2E\x6D\x65\x74\x61\x20\x7B\x0A\x09\x66\x6F\x6E\x74\x2D\x73\x74\x79\x6C\x65\x3A\x20\x69\x74\x61\x6C\x69\x63\x3B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x3A\x20\x31\x2E\x32\x35\x72\x65\x6D\x3B\x0A\x7D\x0A\x0A\x2E\x66\x6F\x6F\x74\x65\x72\x20\x7B\x0A\x09\x74\x65\x78\x74\x2D\x61\x6C\x69\x67\x6E\x3A\x20\x63\x65\x6E\x74\x65\x72\x3B\x0A\x09\x63\x6F\x6C\x6F\x72\x3A\x20\x23\x36\x36\x36\x3B\x0A\x09\x66\x6F\x6E\x74\x2D\x73\x69\x7A\x65\x3A\x20\x30\x2E\x38\x37\x35\x72\x65\x6D\x3B\x0A\x09\x6D\x61\x72\x67\x69\x6E\x3A\x20\x32\x2E\x35\x72\x65\x6D\x20\x30\x3B\x0A\x7D\x0A"), } node.SetMode(420) - node.SetModTimeUnix(1646410152, 426744758) + node.SetModTimeUnix(1648394111, 854563175) node.SetName("index.css") - node.SetSize(2167) + node.SetSize(2175) return node } diff --git a/cmd/ciigo/main.go b/cmd/ciigo/main.go index dccc72b..0f19f55 100644 --- a/cmd/ciigo/main.go +++ b/cmd/ciigo/main.go @@ -1,11 +1,10 @@ // SPDX-FileCopyrightText: 2019 Shulhan <ms@kilabit.info> // SPDX-License-Identifier: GPL-3.0-or-later -// // ciigo is a CLI to convert, embed, and/or serve a directory that contains // markup files, as HTML files. // -// Usage +// # Usage // // The following section describe how to use ciigo CLI. // @@ -27,7 +26,6 @@ // Serve all files inside directory "dir" using HTTP server, watch changes on // markup files and convert them to HTML files. // If the address is not set, its default to ":8080". -// package main import ( diff --git a/convert_options.go b/convert_options.go index d6bc855..554b6e8 100644 --- a/convert_options.go +++ b/convert_options.go @@ -13,9 +13,7 @@ const ( DefaultRoot = "." ) -// // ConvertOptions define the options to use on Convert function. -// type ConvertOptions struct { // Root directory where its content will be embedded into Go source // code. diff --git a/embed_options.go b/embed_options.go index e35610a..f21d801 100644 --- a/embed_options.go +++ b/embed_options.go @@ -5,9 +5,7 @@ package ciigo import "github.com/shuLhan/share/lib/memfs" -// // EmbedOptions define the options for calling GoEmbed function. -// type EmbedOptions struct { ConvertOptions memfs.EmbedOptions diff --git a/filehtml.go b/filehtml.go index b12f639..96c6e21 100644 --- a/filehtml.go +++ b/filehtml.go @@ -12,9 +12,7 @@ import ( "git.sr.ht/~shulhan/asciidoctor-go" ) -// // fileHtml represent an HTML metadata for header and its body. -// type fileHtml struct { Title string EmbeddedCSS *template.CSS diff --git a/htmlgenerator.go b/htmlgenerator.go index 9275067..c2e0b01 100644 --- a/htmlgenerator.go +++ b/htmlgenerator.go @@ -6,7 +6,6 @@ package ciigo import ( "fmt" "html/template" - "io/ioutil" "os" "path/filepath" @@ -14,9 +13,7 @@ import ( "github.com/shuLhan/share/lib/memfs" ) -// // htmlGenerator provide a template to write full HTML file. -// type htmlGenerator struct { tmpl *template.Template tmplSearch *template.Template @@ -40,7 +37,7 @@ func newHTMLGenerator(mfs *memfs.MemFS, htmlTemplate string, devel bool) ( } else if mfs == nil || devel { htmlg.htmlTemplate = filepath.Clean(htmlTemplate) - bhtml, err := ioutil.ReadFile(htmlg.htmlTemplate) + bhtml, err := os.ReadFile(htmlg.htmlTemplate) if err != nil { return nil, fmt.Errorf("%s: %s: %w", logp, htmlg.htmlTemplate, err) } @@ -71,9 +68,7 @@ func newHTMLGenerator(mfs *memfs.MemFS, htmlTemplate string, devel bool) ( return htmlg, nil } -// // convert the markup into HTML. -// func (htmlg *htmlGenerator) convert(fmarkup *fileMarkup) (err error) { doc, err := asciidoctor.Open(fmarkup.path) if err != nil { @@ -91,9 +86,7 @@ func (htmlg *htmlGenerator) convert(fmarkup *fileMarkup) (err error) { return htmlg.write(fmarkup.fhtml) } -// // convertFileMarkups convert markup files into HTML. -// func (htmlg *htmlGenerator) convertFileMarkups(fileMarkups map[string]*fileMarkup, isForce bool) { logp := "convertFileMarkups" for _, fmarkup := range fileMarkups { @@ -128,9 +121,7 @@ func (htmlg *htmlGenerator) htmlTemplateUseInternal() (err error) { return nil } -// // write the HTML file. -// func (htmlg *htmlGenerator) write(fhtml *fileHtml) (err error) { f, err := os.Create(fhtml.path) if err != nil { diff --git a/serve_options.go b/serve_options.go index 45cb0b3..29ff41f 100644 --- a/serve_options.go +++ b/serve_options.go @@ -9,9 +9,7 @@ const ( defAddress = ":8080" ) -// // ServeOptions contains the options to use on Serve function. -// type ServeOptions struct { // Mfs contains pointer to variable generated from Generate. // This option is used to use embedded files for serving on HTTP. @@ -13,9 +13,7 @@ import ( "github.com/shuLhan/share/lib/memfs" ) -// // server contains the HTTP server that serve the generated HTML files. -// type server struct { http *libhttp.Server htmlg *htmlGenerator @@ -23,13 +21,11 @@ type server struct { opts ServeOptions } -// // newServer create an HTTP server to serve HTML files in directory "root". // // The address parameter is optional, if not set its default to ":8080". // The htmlTemplate parameter is optional, if not set its default to // embedded HTML template. -// func newServer(opts *ServeOptions) (srv *server, err error) { var ( logp = "newServer" @@ -91,9 +87,7 @@ func newServer(opts *ServeOptions) (srv *server, err error) { return srv, nil } -// // start the web server. -// func (srv *server) start() (err error) { logp := "start" @@ -14,10 +14,8 @@ import ( "github.com/shuLhan/share/lib/memfs" ) -// // watcher watch for changes on all markup files and convert them // automatically to HTML. -// type watcher struct { changes *clise.Clise watchDir *memfs.DirWatcher @@ -32,7 +30,6 @@ type watcher struct { dir string } -// // newWatcher create a watcher that monitor every files changes in directory // "dir" for new, modified, and deleted markup files and HTML template file. // @@ -46,7 +43,6 @@ type watcher struct { // +-- watchHtmlTemplate +--> DELETE --> htmlGenerator.htmlTemplateUseInternal() // | // +--> UPDATE --> htmlGenerated.htmlTemplateReload() -// func newWatcher(htmlg *htmlGenerator, convertOpts *ConvertOptions) (w *watcher, err error) { var ( logp = "newWatcher" @@ -84,9 +80,7 @@ func newWatcher(htmlg *htmlGenerator, convertOpts *ConvertOptions) (w *watcher, return w, nil } -// // start watching for changes. -// func (w *watcher) start() (err error) { err = w.watchDir.Start() if err != nil { @@ -105,10 +99,8 @@ func (w *watcher) start() (err error) { return nil } -// // watchFileMarkup watch the markup files inside the "content" directory, // and re-generate them into HTML file when changed. -// func (w *watcher) watchFileMarkup() { var ( logp = "watchFileMarkup" @@ -173,10 +165,8 @@ func (w *watcher) watchFileMarkup() { } } -// // watchHtmlTemplate reload the HTML template and re-convert all markup // files. -// func (w *watcher) watchHtmlTemplate() { var ( logp = "watchHtmlTemplate" diff --git a/watcher_test.go b/watcher_test.go index e512b05..3ce17ee 100644 --- a/watcher_test.go +++ b/watcher_test.go @@ -140,10 +140,8 @@ func testDelete(t *testing.T) { test.Assert(t, "adoc file deleted", false, gotIsExist) } -// // removeFooter remove the footer from generated HTML. The footer is 4 lines // at the bottom. -// func removeFooter(in string) string { lines := strings.Split(in, "\n") n := len(lines) |
