Compare commits
3 Commits
48793c65bc
...
v0.0.6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
613b74ee55 | ||
|
|
edb8d7e830 | ||
|
|
537179af03 |
@@ -2,6 +2,7 @@ package converter
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
@@ -19,12 +20,17 @@ type Converter struct {
|
||||
chromePath string
|
||||
ctx context.Context
|
||||
cancel context.CancelFunc
|
||||
progress func(progress int)
|
||||
}
|
||||
|
||||
// NewConverter starts a new converter instance with a chrome headless shell executable
|
||||
func NewConverter(chromePath string) *Converter {
|
||||
func NewConverter(chromePath string) (*Converter, error) {
|
||||
var err error
|
||||
c := &Converter{chromePath: chromePath}
|
||||
chromePath = c.getChromePath()
|
||||
chromePath, err = c.getChromePath()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
opts := append(chromedp.DefaultExecAllocatorOptions[:],
|
||||
chromedp.ExecPath(chromePath),
|
||||
@@ -36,12 +42,20 @@ func NewConverter(chromePath string) *Converter {
|
||||
var allocCtx context.Context
|
||||
allocCtx, c.cancel = chromedp.NewExecAllocator(context.Background(), opts...)
|
||||
c.ctx, c.cancel = chromedp.NewContext(allocCtx)
|
||||
return c
|
||||
return c, nil
|
||||
}
|
||||
|
||||
func (c *Converter) SetProgressCallback(cb func(progress int)) {
|
||||
c.progress = cb
|
||||
}
|
||||
|
||||
// Convert converts all given input files
|
||||
func (c *Converter) Convert(files ...models.File) error {
|
||||
for _, f := range files {
|
||||
for i, f := range files {
|
||||
if c.progress != nil {
|
||||
c.progress(i + 1)
|
||||
}
|
||||
|
||||
if f.Input == "" || filepath.Ext(f.Input) != ".html" {
|
||||
return fmt.Errorf("no .html input file path provided: %s", f.Input)
|
||||
} else if f.Output == "" || filepath.Ext(f.Output) != ".pdf" {
|
||||
@@ -97,10 +111,22 @@ func (c *Converter) Convert(files ...models.File) error {
|
||||
}
|
||||
|
||||
// getChromePath checks for system Chrome, else falls back to bundled headless shell
|
||||
func (c *Converter) getChromePath() string {
|
||||
func (c *Converter) getChromePath() (string, error) {
|
||||
|
||||
chromeExec := "chrome-headless-shell"
|
||||
if runtime.GOOS == "windows" {
|
||||
chromeExec += ".exe"
|
||||
}
|
||||
|
||||
path := filepath.Join(c.chromePath, chromeExec)
|
||||
if _, err := os.Stat(path); err == nil {
|
||||
return path, nil
|
||||
}
|
||||
|
||||
// Candidate paths for system Chrome
|
||||
candidates := []string{}
|
||||
|
||||
// Fallback:
|
||||
switch runtime.GOOS {
|
||||
case "windows":
|
||||
candidates = []string{
|
||||
@@ -124,14 +150,9 @@ func (c *Converter) getChromePath() string {
|
||||
// Check system paths first
|
||||
for _, path := range candidates {
|
||||
if _, err := os.Stat(path); err == nil {
|
||||
return path
|
||||
return path, nil
|
||||
}
|
||||
}
|
||||
|
||||
// Fallback: use bundled headless shell
|
||||
chromeExec := "chrome-headless-shell"
|
||||
if runtime.GOOS == "windows" {
|
||||
chromeExec += ".exe"
|
||||
}
|
||||
return filepath.Join(c.chromePath, chromeExec)
|
||||
return "", errors.New("chrome path not found")
|
||||
}
|
||||
|
||||
@@ -11,11 +11,14 @@ func Convert(chromePath, inputFile, outputFile string) error {
|
||||
Input: inputFile,
|
||||
Output: outputFile,
|
||||
}
|
||||
c := converter.NewConverter(chromePath)
|
||||
c, err := converter.NewConverter(chromePath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return c.Convert(input)
|
||||
}
|
||||
|
||||
// NewConverterInstance start new chrome headless shell instance
|
||||
func NewConverterInstance(chromePath string) *converter.Converter {
|
||||
func NewConverterInstance(chromePath string) (*converter.Converter, error) {
|
||||
return converter.NewConverter(chromePath)
|
||||
}
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
package html2pdf
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"gitea.tecamino.com/paadi/html2pdf/converter"
|
||||
"gitea.tecamino.com/paadi/html2pdf/models"
|
||||
)
|
||||
|
||||
func TestConvert(t *testing.T) {
|
||||
@@ -27,20 +29,27 @@ func TestConvertFiles(t *testing.T) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
var input []converter.File
|
||||
var input []models.File
|
||||
for _, f := range files {
|
||||
ext := filepath.Ext(f.Name())
|
||||
if ext != ".html" {
|
||||
continue
|
||||
}
|
||||
|
||||
input = append(input, converter.File{
|
||||
input = append(input, models.File{
|
||||
Input: filepath.Join(rootPath, f.Name()),
|
||||
Output: strings.Replace(f.Name(), ext, ".pdf", 1),
|
||||
})
|
||||
}
|
||||
|
||||
c := converter.NewConverter("./assets")
|
||||
c, err := converter.NewConverter("./assets")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
c.SetProgressCallback(func(progress int) {
|
||||
fmt.Println(progress)
|
||||
})
|
||||
|
||||
if err := c.Convert(input...); err != nil {
|
||||
t.Fatal(err)
|
||||
|
||||
Reference in New Issue
Block a user