#8 try fix font inlining

lucas-gaitzsch · Dec 1, 2023 · 958497f · 958497f
1 parent 889472d
commit 958497f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/services/renderer/html-to-pdf-renderer-chromium.go b/services/renderer/html-to-pdf-renderer-chromium.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"regexp"
 
 	"github.com/lucas-gaitzsch/pdf-turtle/models"
 	"github.com/lucas-gaitzsch/pdf-turtle/services/renderer/headlesschromium"
@@ -19,8 +18,6 @@ import (
 const magicHeaderFooterScaleFactor = 0.75
 const magicBodyPaddingInInches = 0.004
 
-var urlReferenceRegex = regexp.MustCompile(`(src|href)="(.+)"`)
-
 type HtmlToPdfRendererChromium struct {
 	ChromiumCtx          context.Context
 	chromiumCancelFunc   context.CancelFunc

diff --git a/utils/html-css.go b/utils/html-css.go
@@ -42,7 +42,7 @@ func MergeCss(css ...*string) *string {
 	return &mergedCss
 }
 
-var urlReferenceRegex = regexp.MustCompile(`( src="| href="|src: *url\(")([^"]+)("\)|")`)
+var urlReferenceRegex = regexp.MustCompile(`(\ssrc="|\shref="|src:\s*(local\(.*\),)?\s*url\(["'])([^"']+)(["']\)|")`)
 
 type HttpClientExecuter interface {
     Do(req *http.Request) (*http.Response, error)
@@ -64,10 +64,10 @@ func RequestAndInlineAllHtmlResources(ctx context.Context, htmlPtr *string, base
 
 func requestAndReturnBase64IfPossible(ctx context.Context, htmlAttribute string, baseUrl string, logger *zerolog.Logger) string {
 
-	groups := urlReferenceRegex.FindAllStringSubmatch(htmlAttribute, 2)
+	groups := urlReferenceRegex.FindAllStringSubmatch(htmlAttribute, 4)
 	prefix := groups[0][1]
-	src := groups[0][2]
-	suffix := groups[0][3]
+	src := groups[0][3]
+	suffix := groups[0][4]
 
 	if baseUrl != "" && !strings.HasPrefix(src, "http") {
 		src = baseUrl + src