4 Commits

Author SHA1 Message Date
Adrian Zürcher
8df18a243f add console hide for windows 2025-12-29 11:07:36 +01:00
Adrian Zürcher
613b74ee55 add new feature to set progress callback 2025-12-25 01:14:03 +01:00
Adrian Zürcher
edb8d7e830 change chrome path priority close #1 2025-12-24 12:15:50 +01:00
Adrian Zürcher
537179af03 fix test model 2025-12-24 12:09:34 +01:00
3 changed files with 72 additions and 17 deletions

View File

@@ -2,11 +2,13 @@ package converter
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
"runtime" "runtime"
"strings" "strings"
"syscall"
"time" "time"
"gitea.tecamino.com/paadi/html2pdf/models" "gitea.tecamino.com/paadi/html2pdf/models"
@@ -19,12 +21,22 @@ type Converter struct {
chromePath string chromePath string
ctx context.Context ctx context.Context
cancel context.CancelFunc cancel context.CancelFunc
progress func(progress int)
} }
// NewConverter starts a new converter instance with a chrome headless shell executable // 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
if runtime.GOOS == "windows" {
hideConsole()
}
c := &Converter{chromePath: chromePath} c := &Converter{chromePath: chromePath}
chromePath = c.getChromePath() chromePath, err = c.getChromePath()
if err != nil {
return nil, err
}
opts := append(chromedp.DefaultExecAllocatorOptions[:], opts := append(chromedp.DefaultExecAllocatorOptions[:],
chromedp.ExecPath(chromePath), chromedp.ExecPath(chromePath),
@@ -36,12 +48,20 @@ func NewConverter(chromePath string) *Converter {
var allocCtx context.Context var allocCtx context.Context
allocCtx, c.cancel = chromedp.NewExecAllocator(context.Background(), opts...) allocCtx, c.cancel = chromedp.NewExecAllocator(context.Background(), opts...)
c.ctx, c.cancel = chromedp.NewContext(allocCtx) 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 // Convert converts all given input files
func (c *Converter) Convert(files ...models.File) error { 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" { if f.Input == "" || filepath.Ext(f.Input) != ".html" {
return fmt.Errorf("no .html input file path provided: %s", f.Input) return fmt.Errorf("no .html input file path provided: %s", f.Input)
} else if f.Output == "" || filepath.Ext(f.Output) != ".pdf" { } else if f.Output == "" || filepath.Ext(f.Output) != ".pdf" {
@@ -97,10 +117,22 @@ func (c *Converter) Convert(files ...models.File) error {
} }
// getChromePath checks for system Chrome, else falls back to bundled headless shell // 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 // Candidate paths for system Chrome
candidates := []string{} candidates := []string{}
// Fallback:
switch runtime.GOOS { switch runtime.GOOS {
case "windows": case "windows":
candidates = []string{ candidates = []string{
@@ -124,14 +156,25 @@ func (c *Converter) getChromePath() string {
// Check system paths first // Check system paths first
for _, path := range candidates { for _, path := range candidates {
if _, err := os.Stat(path); err == nil { if _, err := os.Stat(path); err == nil {
return path return path, nil
} }
} }
// Fallback: use bundled headless shell return "", errors.New("chrome path not found")
chromeExec := "chrome-headless-shell" }
if runtime.GOOS == "windows" {
chromeExec += ".exe" var (
kernel32 = syscall.NewLazyDLL("kernel32.dll")
user32 = syscall.NewLazyDLL("user32.dll")
getConsoleWindow = kernel32.NewProc("GetConsoleWindow")
showWindow = user32.NewProc("ShowWindow")
)
const SW_HIDE = 0
func hideConsole() {
hwnd, _, _ := getConsoleWindow.Call()
if hwnd != 0 {
showWindow.Call(hwnd, SW_HIDE)
} }
return filepath.Join(c.chromePath, chromeExec)
} }

View File

@@ -11,11 +11,14 @@ func Convert(chromePath, inputFile, outputFile string) error {
Input: inputFile, Input: inputFile,
Output: outputFile, Output: outputFile,
} }
c := converter.NewConverter(chromePath) c, err := converter.NewConverter(chromePath)
if err != nil {
return err
}
return c.Convert(input) return c.Convert(input)
} }
// NewConverterInstance start new chrome headless shell instance // NewConverterInstance start new chrome headless shell instance
func NewConverterInstance(chromePath string) *converter.Converter { func NewConverterInstance(chromePath string) (*converter.Converter, error) {
return converter.NewConverter(chromePath) return converter.NewConverter(chromePath)
} }

View File

@@ -1,12 +1,14 @@
package html2pdf package html2pdf
import ( import (
"fmt"
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
"testing" "testing"
"gitea.tecamino.com/paadi/html2pdf/converter" "gitea.tecamino.com/paadi/html2pdf/converter"
"gitea.tecamino.com/paadi/html2pdf/models"
) )
func TestConvert(t *testing.T) { func TestConvert(t *testing.T) {
@@ -27,20 +29,27 @@ func TestConvertFiles(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
var input []converter.File var input []models.File
for _, f := range files { for _, f := range files {
ext := filepath.Ext(f.Name()) ext := filepath.Ext(f.Name())
if ext != ".html" { if ext != ".html" {
continue continue
} }
input = append(input, converter.File{ input = append(input, models.File{
Input: filepath.Join(rootPath, f.Name()), Input: filepath.Join(rootPath, f.Name()),
Output: strings.Replace(f.Name(), ext, ".pdf", 1), 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 { if err := c.Convert(input...); err != nil {
t.Fatal(err) t.Fatal(err)