Allow metadata fields to be PropertyConverters for symmetry.

service/datastore/pls_impl.go

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // HEAVILY adapted from github.com/golang/appengine/datastore
 
 package datastore
 
 import (
         "fmt"
@@ skipping 280 matching lines @@
         }
         return
 }
 
 func (p *structPLS) GetMeta(key string) (interface{}, error) {
         if err := p.Problem(); err != nil {
                 return nil, err
         }
 
         if idx, ok := p.c.byMeta[key]; ok {
-                return p.getMetaFor(idx), nil
+                return p.getMetaFor(idx)
         }
 
         if key == "kind" {
                 return p.getDefaultKind(), nil
         }
         return nil, ErrMetaFieldUnset
 }
 
-func (p *structPLS) getMetaFor(idx int) interface{} {
+func (p *structPLS) getMetaFor(idx int) (interface{}, error) {
         st := p.c.byIndex[idx]
         val := st.metaVal
-        f := p.o.Field(idx)
         if st.canSet {
+                f := p.o.Field(idx)
+                if st.convert {
+                        prop, err := f.Addr().Interface().(PropertyConverter).ToProperty()
+                        if err == nil {

[dnj, 2015/11/03 01:18:10]

nit: Handle err != nil (more standard).

+                                return prop.value, err
+                        }
+                        return nil, err
+                }
+
                 if !reflect.DeepEqual(reflect.Zero(f.Type()).Interface(), f.Interface()) {
                         val = f.Interface()
                         if bf, ok := val.(Toggle); ok {
                                 val = bf == On // true if On, otherwise false
                         }
                 }
         }
-        return val
+        return val, nil
 }
 
 func (p *structPLS) GetAllMeta() PropertyMap {
         needKind := true
         ret := make(PropertyMap, len(p.c.byMeta)+1)
         for k, idx := range p.c.byMeta {
-                val := p.getMetaFor(idx)
-                p := Property{}
-                if err := p.SetValue(val, NoIndex); err != nil {
-                        continue
+                val, err := p.getMetaFor(idx)

[dnj, 2015/11/03 01:18:10]

Do we care about non-nil errors? If not, have getMetaFor return a boolean
instead of an error.

[iannucci, 2015/11/03 01:29:12]

eh, returning an error is standarder

[dnj, 2015/11/03 03:11:25]

Gah I I don't like the feel of returning an error and then not responding to it.
I do think a bool is more appropriate here. I'll leave it up to you though; I
don't care that much.

[iannucci, 2015/11/03 20:29:32]

done

+                if err == nil {
+                        p := Property{}
+                        if err := p.SetValue(val, NoIndex); err != nil {
+                                continue
+                        }
+                        ret["$"+k] = []Property{p}
                 }
-                ret["$"+k] = []Property{p}
         }
         if needKind {
                 if _, ok := p.c.byMeta["kind"]; !ok {
                         ret["$kind"] = []Property{MkPropertyNI(p.getDefaultKind())}
                 }
         }
         return ret
 }
 
 func (p *structPLS) GetMetaDefault(key string, def interface{}) interface{} {
         return GetMetaDefaultImpl(p.GetMeta, key, def)
 }
 
 func (p *structPLS) SetMeta(key string, val interface{}) (err error) {
         if err = p.Problem(); err != nil {
                 return
         }
         idx, ok := p.c.byMeta[key]
         if !ok {
                 return ErrMetaFieldUnset
         }
-        if !p.c.byIndex[idx].canSet {
+        st := p.c.byIndex[idx]
+        if !st.canSet {
                 return fmt.Errorf("gae/helper: cannot set meta %q: unexported field", key)
         }
+        if st.convert {
+                return p.o.Field(idx).Addr().Interface().(PropertyConverter).FromProperty(
+                        MkPropertyNI(val))
+        }
+
         // setting a BoolField
         if b, ok := val.(bool); ok {
                 if b {
                         val = On
                 } else {
                         val = Off
                 }
         }
         f := p.o.Field(idx)
         if val == nil {
@@ skipping 67 matching lines @@
                         c.byIndex = nil
                         c.byName = nil
                         c.byMeta = nil
                 }
         }()
         structCodecs[t] = c
 
         for i := range c.byIndex {
                 st := &c.byIndex[i]
                 f := t.Field(i)
+                ft := f.Type
+
                 name := f.Tag.Get("gae")
                 opts := ""
                 if i := strings.Index(name, ","); i != -1 {
                         name, opts = name[:i], name[i+1:]
                 }
                 st.canSet = f.PkgPath == "" // blank == exported
+                if reflect.PtrTo(ft).Implements(typeOfPropertyConverter) {

[dnj, 2015/11/03 01:18:10]

nit: st.convert = reflect.PtrTo(ft)....

[iannucci, 2015/11/03 01:29:12]

DERP

+                        st.convert = true
+                }
                 switch {
                 case name == "":
                         if !f.Anonymous {
                                 name = f.Name
                         }
                 case name[0] == '$':
                         name = name[1:]
                         if _, ok := c.byMeta[name]; ok {
                                 c.problem = me("meta field %q set multiple times", "$"+name)
                                 return
                         }
                         c.byMeta[name] = i
-                        mv, err := convertMeta(opts, f.Type)
-                        if err != nil {
-                                c.problem = me("meta field %q has bad type: %s", "$"+name, err)
-                                return
+                        if !st.convert {
+                                mv, err := convertMeta(opts, f.Type)

[dnj, 2015/11/03 01:18:10]

nit: f.Type => ft

[iannucci, 2015/11/03 01:29:13]

done (and others)

+                                if err != nil {
+                                        c.problem = me("meta field %q has bad type: %s", "$"+name, err)
+                                        return
+                                }
+                                st.metaVal = mv
                         }
-                        st.metaVal = mv
                         fallthrough
                 case name == "-":
                         st.name = "-"
                         continue
                 default:
                         if !validPropertyName(name) {
                                 c.problem = me("struct tag has invalid property name: %q", name)
                                 return
                         }
                 }
                 if !st.canSet {
                         st.name = "-"
                         continue
                 }
 
                 substructType := reflect.Type(nil)
-                ft := f.Type
-                if reflect.PtrTo(ft).Implements(typeOfPropertyConverter) {
-                        st.convert = true
-                } else {
+                if !st.convert {
                         switch f.Type.Kind() {
                         case reflect.Struct:
                                 if ft != typeOfTime && ft != typeOfGeoPoint {
                                         substructType = ft
                                 }
                         case reflect.Slice:
                                 if reflect.PtrTo(ft.Elem()).Implements(typeOfPropertyConverter) {
                                         st.convert = true
                                 } else if ft.Elem().Kind() == reflect.Struct {
                                         substructType = ft.Elem()
@@ skipping 84 matching lines @@
                 switch val {
                 case "on", "On", "true":
                         return true, nil
                 case "off", "Off", "false":
                         return false, nil
                 }
                 return nil, fmt.Errorf("Toggle field has bad/missing default, got %q", val)
         }
         return nil, fmt.Errorf("helper: meta field with bad type/value %s/%q", t, val)
 }