mirror of
https://github.com/rwinkhart/glamour-temp-MUTN.git
synced 2026-09-06 08:57:14 -04:00
Drop redundant TableData struct
This commit is contained in:
@@ -10,7 +10,6 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/microcosm-cc/bluemonday"
|
"github.com/microcosm-cc/bluemonday"
|
||||||
"github.com/olekukonko/tablewriter"
|
|
||||||
bf "gopkg.in/russross/blackfriday.v2"
|
bf "gopkg.in/russross/blackfriday.v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -18,16 +17,10 @@ var (
|
|||||||
stripper = bluemonday.StrictPolicy()
|
stripper = bluemonday.StrictPolicy()
|
||||||
)
|
)
|
||||||
|
|
||||||
type TableData struct {
|
|
||||||
table *tablewriter.Table
|
|
||||||
tableHeader []string
|
|
||||||
tableCell []string
|
|
||||||
}
|
|
||||||
|
|
||||||
type TermRenderer struct {
|
type TermRenderer struct {
|
||||||
BaseURL string
|
BaseURL string
|
||||||
style map[StyleType]*ElementStyle
|
style map[StyleType]*ElementStyle
|
||||||
tableData TableData
|
table TableElement
|
||||||
}
|
}
|
||||||
|
|
||||||
func Render(in string, stylePath string) ([]byte, error) {
|
func Render(in string, stylePath string) ([]byte, error) {
|
||||||
|
|||||||
@@ -8,6 +8,9 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type TableElement struct {
|
type TableElement struct {
|
||||||
|
writer *tablewriter.Table
|
||||||
|
header []string
|
||||||
|
cell []string
|
||||||
}
|
}
|
||||||
|
|
||||||
type TableRowElement struct {
|
type TableRowElement struct {
|
||||||
@@ -20,25 +23,25 @@ type TableCellElement struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (e *TableElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error {
|
func (e *TableElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error {
|
||||||
tr.tableData.table = tablewriter.NewWriter(w)
|
tr.table.writer = tablewriter.NewWriter(w)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *TableElement) Finish(w io.Writer, node *bf.Node, tr *TermRenderer) error {
|
func (e *TableElement) Finish(w io.Writer, node *bf.Node, tr *TermRenderer) error {
|
||||||
tr.tableData.table.Render()
|
tr.table.writer.Render()
|
||||||
tr.tableData = TableData{}
|
tr.table.writer = nil
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *TableRowElement) Finish(w io.Writer, node *bf.Node, tr *TermRenderer) error {
|
func (e *TableRowElement) Finish(w io.Writer, node *bf.Node, tr *TermRenderer) error {
|
||||||
tr.tableData.table.Append(tr.tableData.tableCell)
|
tr.table.writer.Append(tr.table.cell)
|
||||||
tr.tableData.tableCell = []string{}
|
tr.table.cell = []string{}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *TableHeadElement) Finish(w io.Writer, node *bf.Node, tr *TermRenderer) error {
|
func (e *TableHeadElement) Finish(w io.Writer, node *bf.Node, tr *TermRenderer) error {
|
||||||
tr.tableData.table.SetHeader(tr.tableData.tableHeader)
|
tr.table.writer.SetHeader(tr.table.header)
|
||||||
tr.tableData.tableHeader = []string{}
|
tr.table.header = []string{}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -52,9 +55,9 @@ func (e *TableCellElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if node.Parent.Parent.Type == bf.TableHead {
|
if node.Parent.Parent.Type == bf.TableHead {
|
||||||
tr.tableData.tableHeader = append(tr.tableData.tableHeader, s)
|
tr.table.header = append(tr.table.header, s)
|
||||||
} else {
|
} else {
|
||||||
tr.tableData.tableCell = append(tr.tableData.tableCell, s)
|
tr.table.cell = append(tr.table.cell, s)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
Reference in New Issue
Block a user