Update dcraw.

Author: ncruces

jpeg.go

@@ -32,7 +32,7 @@ func previewJPEG(ctx context.Context, path string) ([]byte, error) {
 		return nil, err
 	}
 
-	exf := rotateflip.Orientation(rawOrientation(path))
+	exf := rotateflip.Orientation(dcraw.GetOrientation(ctx, path))
 	img = rotateflip.Image(img, exf.Op())
 
 	buf := bytes.Buffer{}

meta.go

@@ -3,7 +3,6 @@ package main
 import (
 	"bufio"
 	"bytes"
-	"fmt"
 	"log"
 	"path/filepath"
 
@@ -52,22 +51,6 @@ func dngHasEdits(path string) bool {
 	return err == nil && len(out) > 0
 }
 
-func rawOrientation(path string) int {
-	log.Print("exiftool (get orientation)...")
-	out, err := exifserver.Command("--printConv", "-short3", "-fast2", "-Orientation", path)
-	if err != nil {
-		return 0
-	}
-
-	var orientation int
-	_, err = fmt.Fscanf(bytes.NewReader(out), "%d\n", &orientation)
-	if err != nil {
-		return 0
-	}
-
-	return orientation
-}
-
 func cameraMatchingWhiteBalance(path string) string {
 	log.Print("exiftool (get camera matching white balance)...")
 	out, err := exifserver.Command("-duplicates", "-short3", "-fast", "-ExifIFD:WhiteBalance", "-MakerNotes:WhiteBalance", path)

pkg/dcraw/README.md

@@ -1,2 +1,2 @@
-`dcraw.wasm` is built from:<br>
-[github.com/ncruces/dcraw@ncruces-rethinkraw](https://github.com/ncruces/dcraw/tree/ncruces-rethinkraw)
+`dcraw.wasm` is built from:\
+[github.com/ncruces/dcraw@ncruces-wasm](https://github.com/ncruces/dcraw/tree/ncruces-wasm)

pkg/dcraw/dcraw.go

@@ -32,6 +32,7 @@ var (
 	wasm       wazero.Runtime
 	module     wazero.CompiledModule
 	sem        *semaphore.Weighted
+	orienRegex *regexp.Regexp
 	thumbRegex *regexp.Regexp
 	counter    atomic.Uint64
 )
@@ -48,6 +49,7 @@ func compile() {
 	}
 
 	sem = semaphore.NewWeighted(6)
+	orienRegex = regexp.MustCompile(`Orientation: +(\d)`)
 	thumbRegex = regexp.MustCompile(`Thumb size: +(\d+) x (\d+)`)
 }
 
@@ -78,7 +80,7 @@ func run(ctx context.Context, root fs.FS, args ...string) ([]byte, error) {
 // The thumbnail will either be a JPEG, or a PNM file in 8-bit P5/P6 format.
 // For more about PNM, see https://en.wikipedia.org/wiki/Netpbm
 func GetThumb(ctx context.Context, file string) ([]byte, error) {
-	out, err := run(ctx, fileFS(file), "dcraw", "-e", "-c", fileFSname)
+	out, err := run(ctx, fileFS(file), "dcraw", "-e", "-e", "-c", fileFSname)
 	if err != nil {
 		return nil, err
 	}
@@ -121,6 +123,19 @@ func GetThumbSize(ctx context.Context, file string) (int, error) {
 	return max, nil
 }
 
+// GetOrientation returns the EXIF orientation of the RAW file, or 0 if unknown.
+func GetOrientation(ctx context.Context, file string) int {
+	out, err := run(ctx, fileFS(file), "dcraw", "-i", "-v", fileFSname)
+	if err != nil {
+		return 0
+	}
+
+	if match := orienRegex.FindSubmatch(out); match != nil {
+		return int(match[1][0] - '0')
+	}
+	return 0
+}
+
 // GetRAWPixels develops an half-resolution, demosaiced, not white balanced
 // image from the RAW file.
 func GetRAWPixels(ctx context.Context, file string) ([]byte, error) {