Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://camlistore.googlesource.com/camlistore

This commit is contained in:
Brad Fitzpatrick 2014-04-18 18:20:06 -07:00
parent 42cbd03db7 8def41a4b5
commit 7ee0d657cd
4 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/importer/foursquare/foursquare.go
View File

@ -113,16 +113,6 @@ func (r *run) token() string {
return r.RunContext.AccountNode().Attr(acctAttrAccessToken)
}
func (r *run) initRoot() error {
root := r.RootNode()
user := r.AccountNode().Attr("foursquareUser")
if user == "" {
return errors.New("The 'foursquareUser' attribute on the account node is empty.")
}
title := fmt.Sprintf("Foursquare (%s)", user)
return root.SetAttr("title", title)
}
func (im *imp) Run(ctx *importer.RunContext) error {
clientId, secret, err := ctx.Credentials()
if err != nil {

2
pkg/importer/importer.go
View File

@ -204,7 +204,7 @@ func (rc *RunContext) Credentials() (clientID, clientSecret string, err error) {
// missing anything).
func (rc *RunContext) AccountNode() *Object { return rc.ia.acct }
// AccountNode returns the initially-empty permanode storing the root
// RootNode returns the initially-empty permanode storing the root
// of this account's data. You can change anything at will. This will
// typically be modeled as a dynamic directory (with camliPath:xxxx
// attributes), where each path element is either a file, object, or

12
pkg/schema/schema.go
View File

@ -712,7 +712,7 @@ type claimParam struct {
target blob.Ref
}
func NewClaim(claims ...*claimParam) *Builder {
func newClaim(claims ...*claimParam) *Builder {
bb := base(1, "claim")
bb.SetClaimDate(clockNow())
if len(claims) == 1 {
@ -751,7 +751,7 @@ func populateClaimMap(m map[string]interface{}, cp *claimParam) {
// NewShareRef creates a *Builder for a "share" claim.
func NewShareRef(authType string, target blob.Ref, transitive bool) *Builder {
return NewClaim(&claimParam{
return newClaim(&claimParam{
claimType: ShareClaim,
authType: authType,
target: target,
@ -760,7 +760,7 @@ func NewShareRef(authType string, target blob.Ref, transitive bool) *Builder {
}
func NewSetAttributeClaim(permaNode blob.Ref, attr, value string) *Builder {
return NewClaim(&claimParam{
return newClaim(&claimParam{
permanode: permaNode,
claimType: SetAttributeClaim,
attribute: attr,
@ -769,7 +769,7 @@ func NewSetAttributeClaim(permaNode blob.Ref, attr, value string) *Builder {
}
func NewAddAttributeClaim(permaNode blob.Ref, attr, value string) *Builder {
return NewClaim(&claimParam{
return newClaim(&claimParam{
permanode: permaNode,
claimType: AddAttributeClaim,
attribute: attr,
@ -781,7 +781,7 @@ func NewAddAttributeClaim(permaNode blob.Ref, attr, value string) *Builder {
// values set for the attribute attr of permaNode. If value is empty then
// all the values for attribute are cleared.
func NewDelAttributeClaim(permaNode blob.Ref, attr, value string) *Builder {
return NewClaim(&claimParam{
return newClaim(&claimParam{
permanode: permaNode,
claimType: DelAttributeClaim,
attribute: attr,
@ -791,7 +791,7 @@ func NewDelAttributeClaim(permaNode blob.Ref, attr, value string) *Builder {
// NewDeleteClaim creates a new claim to delete a target claim or permanode.
func NewDeleteClaim(target blob.Ref) *Builder {
return NewClaim(&claimParam{
return newClaim(&claimParam{
target: target,
claimType: DeleteClaim,
})

2
pkg/schema/schema_test.go
View File

@ -194,7 +194,7 @@ func TestAttribute(t *testing.T) {
}`,
},
{
bb: NewClaim(&claimParam{
bb: newClaim(&claimParam{
permanode: br,
claimType: SetAttributeClaim,
attribute: "foo",