Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
70102e991a | ||
|
|
39fb913f87 |
@@ -8,7 +8,6 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
"runtime"
|
||||||
"strings"
|
"strings"
|
||||||
"syscall"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"gitea.tecamino.com/paadi/html2pdf/models"
|
"gitea.tecamino.com/paadi/html2pdf/models"
|
||||||
@@ -43,6 +42,9 @@ func NewConverter(chromePath string) (*Converter, error) {
|
|||||||
chromedp.NoSandbox,
|
chromedp.NoSandbox,
|
||||||
chromedp.Headless,
|
chromedp.Headless,
|
||||||
chromedp.DisableGPU,
|
chromedp.DisableGPU,
|
||||||
|
chromedp.Flag("disable-software-rasterizer", true),
|
||||||
|
chromedp.Flag("disable-dev-shm-usage", true),
|
||||||
|
chromedp.Flag("no-first-run", true),
|
||||||
)
|
)
|
||||||
|
|
||||||
var allocCtx context.Context
|
var allocCtx context.Context
|
||||||
@@ -85,7 +87,6 @@ func (c *Converter) Convert(files ...models.File) error {
|
|||||||
htmlURL.WriteString(filepath.ToSlash(absPath))
|
htmlURL.WriteString(filepath.ToSlash(absPath))
|
||||||
|
|
||||||
c.ctx, c.cancel = context.WithTimeout(c.ctx, 60*time.Second)
|
c.ctx, c.cancel = context.WithTimeout(c.ctx, 60*time.Second)
|
||||||
defer c.cancel()
|
|
||||||
|
|
||||||
var pdfData []byte
|
var pdfData []byte
|
||||||
err = chromedp.Run(c.ctx,
|
err = chromedp.Run(c.ctx,
|
||||||
@@ -104,15 +105,19 @@ func (c *Converter) Convert(files ...models.File) error {
|
|||||||
return nil
|
return nil
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
c.cancel()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Save PDF to file
|
// Save PDF to file
|
||||||
if err := os.WriteFile(f.Output, pdfData, 0644); err != nil {
|
if err := os.WriteFile(f.Output, pdfData, 0644); err != nil {
|
||||||
|
c.cancel()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
c.cancel()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -162,19 +167,3 @@ func (c *Converter) getChromePath() (string, error) {
|
|||||||
|
|
||||||
return "", errors.New("chrome path not found")
|
return "", errors.New("chrome path not found")
|
||||||
}
|
}
|
||||||
|
|
||||||
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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
9
converter/hideOthers.go
Normal file
9
converter/hideOthers.go
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
//go:build !windows
|
||||||
|
|
||||||
|
package converter
|
||||||
|
|
||||||
|
// hideConsole does nothing on non-Windows systems
|
||||||
|
func hideConsole() {
|
||||||
|
// macOS and Linux don't have the same "console window" concept
|
||||||
|
// that needs manual hiding at runtime like Windows.
|
||||||
|
}
|
||||||
23
converter/hideWindows.go
Normal file
23
converter/hideWindows.go
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
//go:build windows
|
||||||
|
|
||||||
|
package converter
|
||||||
|
|
||||||
|
import (
|
||||||
|
"syscall"
|
||||||
|
)
|
||||||
|
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user