Skip to content

Add a fix for new avif cli #581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 13, 2024
Merged

Add a fix for new avif cli #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions cmds/genimgs/genimgs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"fmt"
"image"
"io/ioutil"
"math"
"os"
"os/exec"
"path"
Expand Down Expand Up @@ -239,6 +240,10 @@ func (c *client) createImages(imgs []generateImage) error {
return imgs[i].outputPath < imgs[j].outputPath
})

// Print this before the progress bar is displayed
workers := int(math.Max(1, float64(runtime.NumCPU())))
fmt.Printf("🤖️ Creating %v images using %v workers\n", len(imgs), workers)

bar := progressbar.NewOptions(
len(imgs),
progressbar.OptionSetRenderBlankState(true),
Expand All @@ -251,7 +256,7 @@ func (c *client) createImages(imgs []generateImage) error {
jobs := make(chan generateImage, len(imgs))
results := make(chan error, len(imgs))

for w := 1; w <= runtime.NumCPU(); w++ {
for w := 1; w <= workers; w++ {
go c.imgCreatorWorker(w, jobs, results)
}

Expand Down Expand Up @@ -527,7 +532,7 @@ func createAvifImage(img generateImage) error {
if err != nil {
return err
}
defer os.RemoveAll(tmpDir) // Clean up temporary directory
defer os.RemoveAll(tmpDir) // Clean up temporary directory

origExt := path.Ext(img.originalPath)
outputExt := path.Ext(img.outputPath)
Expand All @@ -550,7 +555,8 @@ func createAvifImage(img generateImage) error {
return fmt.Errorf("failed to created output directory %q: %w", outputDir, err)
}

cmd := exec.Command("npx", "avif", "--input", tmpPath, "--output", outputDir, "--overwrite")
cmd := exec.Command("npx", "avif", "--input", tmpFilename, "--output", outputDir, "--overwrite")
cmd.Dir = tmpDir
output, err := cmd.CombinedOutput()
if err != nil {
fmt.Printf("Failed to run npx avif: %v\n", string(output[:]))
Expand Down
Loading
Loading