diff --git a/formats/xmp/decode.go b/formats/xmp/decode.go index 473ce16..15e88c7 100644 --- a/formats/xmp/decode.go +++ b/formats/xmp/decode.go @@ -109,7 +109,7 @@ func MetadataFromXMP(r io.Reader) (types.Metadata, error) { if thick, err := strconv.ParseFloat(js.Models.Postcard.PhysicalThicknessMM, 64); err == nil { meta.Physical.ThicknessMM = thick } - if c, err := types.ColorFromString(js.Models.Postcard.CardColor); err != nil { + if c, err := types.ColorFromString(js.Models.Postcard.CardColor); err == nil { meta.Physical.CardColor = c } diff --git a/internal/testhelpers/sample-meta.yaml b/internal/testhelpers/sample-meta.yaml index da82e2e..8d436cb 100644 --- a/internal/testhelpers/sample-meta.yaml +++ b/internal/testhelpers/sample-meta.yaml @@ -48,3 +48,4 @@ context: physical: front_size: 14.80cm x 10.50cm thickness_mm: 0.4 + card_color: '#E6E6D9' diff --git a/pkg/xmpinject/1px-xmp.jpg b/pkg/xmpinject/1px-xmp.jpg index a18b826d8def8088d8f93af56cd7c557506e7413..2215738ba22ccbaeb5f23b82c98659466779e16d 100644 GIT binary patch delta 79 zcmaE^GE Um~xZ9@Y}FF3vQ{KY$Biu07IJ_zW@LL delta 31 ncmeBIysI!lg^_)tYB!Uf!Nx5v{F5~VtXNiE+P{2qnt&z%rp^lB diff --git a/pkg/xmpinject/1px-xmp.webp b/pkg/xmpinject/1px-xmp.webp index 7cca9782d7693ba6308e658bfcd3f0f9654c2b24..ceb96bc6b4e6465011843de9ee1b93b5cc0f7ad7 100644 GIT binary patch delta 79 zcmX@4@I`?&$kWX&XCkXRld`}>zhV{>JwwBdhh6yf0`iMXk`s$kteg{zQk?U1@{8=0 TUCmt0Tr6$$G36$+3fKYw`fwS# delta 30 mcmeyOa7ckQ$kWZuY9gyU(?|Y^e#K0B1{;sM@K3fBum%917zxe* diff --git a/types/color.go b/types/color.go index 75a5c40..f07d8b3 100644 --- a/types/color.go +++ b/types/color.go @@ -18,6 +18,7 @@ func ColorFromString(str string) (*Color, error) { R: r, G: g, B: b, + A: 0xff, }, nil } diff --git a/types/yaml.go b/types/yaml.go index 5d35d47..d46721b 100644 --- a/types/yaml.go +++ b/types/yaml.go @@ -157,7 +157,7 @@ func (d Date) MarshalYAML() (interface{}, error) { } func (c Color) MarshalYAML() (interface{}, error) { - return fmt.Sprintf(`"#%02X%02X%02X"`, c.R, c.G, c.B), nil + return fmt.Sprintf(`#%02X%02X%02X`, c.R, c.G, c.B), nil } func (c *Color) UnmarshalYAML(y *yaml.Node) error { @@ -171,6 +171,7 @@ func (c *Color) UnmarshalYAML(y *yaml.Node) error { } c.R, c.G, c.B = r, g, b + c.A = 255 return nil }