luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

logs

Browse source
This commit is contained in:
Alexander Wang 2023-06-06 10:56:44 -07:00
parent c40dc7ec34
commit b37b5571e1
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/imgbundler/imgbundler.go
View file

@ -111,7 +111,7 @@ func runWorkers(ctx context.Context, ms *xmain.State, svg []byte, imgs [][][]byt
<-sema <-sema
}() }()
bundledImage, err := worker(ctx, &imgCache, img[1], isRemote) bundledImage, err := worker(ctx, ms, img[1], isRemote)
if err != nil { if err != nil {
ms.Log.Error.Printf("failed to bundle %s: %v", img[1], err) ms.Log.Error.Printf("failed to bundle %s: %v", img[1], err)
errhrefsMu.Lock() errhrefsMu.Lock()
@ -150,16 +150,18 @@ func runWorkers(ctx context.Context, ms *xmain.State, svg []byte, imgs [][][]byt
} }
} }
func worker(ctx context.Context, cache *sync.Map, href []byte, isRemote bool) ([]byte, error) { func worker(ctx context.Context, ms *xmain.State, href []byte, isRemote bool) ([]byte, error) {
if hit, ok := cache.Load(string(href)); ok { if hit, ok := imgCache.Load(string(href)); ok {
return hit.([]byte), nil return hit.([]byte), nil
} }
var buf []byte var buf []byte
var mimeType string var mimeType string
var err error var err error
if isRemote { if isRemote {
ms.Log.Debug.Printf("fetching %s remotely", string(href))
buf, mimeType, err = httpGet(ctx, html.UnescapeString(string(href))) buf, mimeType, err = httpGet(ctx, html.UnescapeString(string(href)))
} else { } else {
ms.Log.Debug.Printf("reading %s from disk", string(href))
buf, err = os.ReadFile(html.UnescapeString(string(href))) buf, err = os.ReadFile(html.UnescapeString(string(href)))
} }
if err != nil { if err != nil {
@ -173,7 +175,7 @@ func worker(ctx context.Context, cache *sync.Map, href []byte, isRemote bool) ([
b64 := base64.StdEncoding.EncodeToString(buf) b64 := base64.StdEncoding.EncodeToString(buf)
out := []byte(fmt.Sprintf(`<image href="data:%s;base64,%s"`, mimeType, b64)) out := []byte(fmt.Sprintf(`<image href="data:%s;base64,%s"`, mimeType, b64))
cache.Store(string(href), out) imgCache.Store(string(href), out)
return out, nil return out, nil
} }