Skip to content
This repository has been archived by the owner on Apr 14, 2024. It is now read-only.

Commit

Permalink
fixes #13: missing header and footer
Browse files Browse the repository at this point in the history
  • Loading branch information
gulien committed Dec 16, 2019
1 parent fd2468c commit 7b8922a
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 14 deletions.
11 changes: 0 additions & 11 deletions chrome.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,3 @@ func (req *chromeRequest) PageRanges(ranges string) {
func (req *chromeRequest) GoogleChromeRpccBufferSize(bufferSize int64) {
req.values[googleChromeRpccBufferSize] = strconv.FormatInt(bufferSize, 10)
}

func (req *chromeRequest) formFiles() map[string]Document {
files := make(map[string]Document)
if req.header != nil {
files["header.html"] = req.header
}
if req.footer != nil {
files["footer.html"] = req.footer
}
return files
}
6 changes: 6 additions & 0 deletions html.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ func (req *HTMLRequest) postURL() string {
func (req *HTMLRequest) formFiles() map[string]Document {
files := make(map[string]Document)
files["index.html"] = req.index
if req.header != nil {
files["header.html"] = req.header
}
if req.footer != nil {
files["footer.html"] = req.footer
}
for _, asset := range req.assets {
files[asset.Filename()] = asset
}
Expand Down
6 changes: 6 additions & 0 deletions markdown.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ func (req *MarkdownRequest) formFiles() map[string]Document {
for _, markdown := range req.markdowns {
files[markdown.Filename()] = markdown
}
if req.header != nil {
files["header.html"] = req.header
}
if req.footer != nil {
files["footer.html"] = req.footer
}
for _, asset := range req.assets {
files[asset.Filename()] = asset
}
Expand Down
17 changes: 14 additions & 3 deletions url.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,25 @@ func NewURLRequest(url string) *URLRequest {
return req
}

func (url *URLRequest) postURL() string {
func (req *URLRequest) postURL() string {
return "/convert/url"
}

// AddRemoteURLHTTPHeader add a remote URL custom HTTP header.
func (url *URLRequest) AddRemoteURLHTTPHeader(key, value string) {
func (req *URLRequest) AddRemoteURLHTTPHeader(key, value string) {
key = fmt.Sprintf("%s%s", remoteURLBaseHTTPHeaderKey, key)
url.httpHeaders[key] = value
req.httpHeaders[key] = value
}

func (req *URLRequest) formFiles() map[string]Document {
files := make(map[string]Document)
if req.header != nil {
files["header.html"] = req.header
}
if req.footer != nil {
files["footer.html"] = req.footer
}
return files
}

// Compile-time checks to ensure type implements desired interfaces.
Expand Down

0 comments on commit 7b8922a

Please sign in to comment.