feat(photos): full EXIF metadata extraction, backfill and info panel
- backend: switch EXIF parser to dsoprea/go-exif/v3 (all recognised tags, numeric normalization); store in photos.exif jsonb (migration 000003); add storage.Get and cmd/backfill-exif to backfill existing photos from S3 originals - frontend: info panel renders all EXIF attributes with RU labels, enum translation and units (1/N, f/N, mm, EV); service tags hidden - viewer: remove make-cover action (cover managed from panel only), icon-only download - openspec: sync lightroom-workspace-ui artifacts (EXIF, cover-from-panel) and add plan for configurable info attributes/labels stored in user profile
This commit is contained in:
@@ -2,12 +2,16 @@ package photos
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"image"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
exif "github.com/dsoprea/go-exif/v3"
|
||||
exifcommon "github.com/dsoprea/go-exif/v3/common"
|
||||
"github.com/disintegration/imaging"
|
||||
"github.com/gen2brain/webp"
|
||||
"github.com/rwcarlsen/goexif/exif"
|
||||
)
|
||||
|
||||
type ImageMeta struct {
|
||||
@@ -29,23 +33,90 @@ func inspect(data []byte) (width, height int, ok bool) {
|
||||
return cfg.Width, cfg.Height, true
|
||||
}
|
||||
|
||||
func extractEXIF(data []byte) (taken *time.Time, lat, lon *float64) {
|
||||
x, err := exif.Decode(bytes.NewReader(data))
|
||||
if err != nil {
|
||||
return nil, nil, nil
|
||||
type exifInfo struct {
|
||||
TakenAt *time.Time
|
||||
Latitude *float64
|
||||
Longitude *float64
|
||||
Attributes map[string]any
|
||||
}
|
||||
|
||||
func collectTags(ifd *exif.Ifd, dst map[string]any) {
|
||||
if ifd == nil {
|
||||
return
|
||||
}
|
||||
if dt, err := x.Get(exif.DateTimeOriginal); err == nil {
|
||||
if s, err := dt.StringVal(); err == nil {
|
||||
if t, err := time.Parse("2006:01:02 15:04:05", s); err == nil {
|
||||
utc := t.UTC()
|
||||
taken = &utc
|
||||
}
|
||||
for _, ite := range ifd.Entries() {
|
||||
name := ite.TagName()
|
||||
if name == "" || strings.HasPrefix(name, "UnknownTag") {
|
||||
continue
|
||||
}
|
||||
if _, exists := dst[name]; exists {
|
||||
continue
|
||||
}
|
||||
s, err := ite.FormatFirst()
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
s = strings.TrimSpace(strings.TrimRight(s, "\x00"))
|
||||
if s == "" {
|
||||
continue
|
||||
}
|
||||
dst[name] = normalizeExifValue(s)
|
||||
}
|
||||
for _, child := range ifd.Children() {
|
||||
collectTags(child, dst)
|
||||
}
|
||||
}
|
||||
|
||||
func normalizeExifValue(s string) any {
|
||||
base := strings.TrimSuffix(s, "...")
|
||||
if i := strings.IndexByte(base, '/'); i > 0 {
|
||||
num, err1 := strconv.ParseInt(strings.TrimSpace(base[:i]), 10, 64)
|
||||
den, err2 := strconv.ParseInt(strings.TrimSpace(base[i+1:]), 10, 64)
|
||||
if err1 == nil && err2 == nil && den != 0 {
|
||||
return float64(num) / float64(den)
|
||||
}
|
||||
}
|
||||
if la, lo, err := x.LatLong(); err == nil {
|
||||
lat, lon = &la, &lo
|
||||
if n, err := strconv.ParseInt(base, 10, 64); err == nil {
|
||||
return n
|
||||
}
|
||||
return taken, lat, lon
|
||||
if f, err := strconv.ParseFloat(base, 64); err == nil {
|
||||
return f
|
||||
}
|
||||
return s
|
||||
}
|
||||
|
||||
func extractEXIF(data []byte) exifInfo {
|
||||
out := exifInfo{Attributes: map[string]any{}}
|
||||
raw, err := exif.SearchAndExtractExif(data)
|
||||
if err != nil {
|
||||
return out
|
||||
}
|
||||
im, err := exifcommon.NewIfdMappingWithStandard()
|
||||
if err != nil {
|
||||
return out
|
||||
}
|
||||
ti := exif.NewTagIndex()
|
||||
_, index, err := exif.Collect(im, ti, raw)
|
||||
if err != nil || index.RootIfd == nil {
|
||||
return out
|
||||
}
|
||||
collectTags(index.RootIfd, out.Attributes)
|
||||
if v, ok := out.Attributes["DateTimeOriginal"]; ok {
|
||||
if t, err := time.Parse("2006:01:02 15:04:05", fmt.Sprintf("%v", v)); err == nil {
|
||||
utc := t.UTC()
|
||||
out.TakenAt = &utc
|
||||
}
|
||||
}
|
||||
if gi, err := index.RootIfd.GpsInfo(); err == nil {
|
||||
lat := gi.Latitude.Decimal()
|
||||
lon := gi.Longitude.Decimal()
|
||||
out.Latitude, out.Longitude = &lat, &lon
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func ExtractEXIFAttributes(data []byte) map[string]any {
|
||||
return extractEXIF(data).Attributes
|
||||
}
|
||||
|
||||
func buildVariants(data []byte) (thumb, preview []byte, err error) {
|
||||
|
||||
Reference in New Issue
Block a user