Add author struct. Add peer config.

Author: nasdf

cmd/multi/clone.go

@@ -23,7 +23,7 @@ var cloneCommand = &cli.Command{
 			Name:    "branch",
 			Aliases: []string{"b"},
 			Usage:   "Branch name",
-			Value:   "default",
+			Value:   "main",
 		},
 		&cli.IntFlag{
 			Name:    "limit",

cmd/multi/config.go

@@ -12,6 +12,8 @@ import (
 )
 
 const (
+	// DefaultBranch is the name of the default branch.
+	DefaultBranch = "main"
 	// ConfigFile is the name of the config file.
 	ConfigFile = "multi.json"
 	// IgnoreFile is the name of the ignore file.
@@ -38,7 +40,7 @@ type Config struct {
 // NewConfig returns a config with default settings.
 func NewConfig(root string) *Config {
 	return &Config{
-		Branch: "default",
+		Branch: DefaultBranch,
 		Path:   filepath.Join(root, ConfigFile),
 		Root:   root,
 	}

cmd/multi/daemon.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/ipfs/go-ds-badger2"
 	"github.com/multiverse-vcs/go-multiverse/data"
-	"github.com/multiverse-vcs/go-multiverse/key"
 	"github.com/multiverse-vcs/go-multiverse/peer"
 	"github.com/multiverse-vcs/go-multiverse/rpc"
 	"github.com/multiverse-vcs/go-multiverse/web"
@@ -49,28 +48,19 @@ func daemonAction(c *cli.Context) error {
 	}
 
 	dpath := filepath.Join(root, "datastore")
-	dstore, err := badger.NewDatastore(dpath, &badger.DefaultOptions)
-	if err != nil {
-		return err
-	}
-
-	kpath := filepath.Join(root, "keystore")
-	kstore, err := key.NewKeystore(kpath)
-	if err != nil {
-		return err
-	}
+	dopts := badger.DefaultOptions
 
-	key, err := kstore.DefaultKey()
+	dstore, err := badger.NewDatastore(dpath, &dopts)
 	if err != nil {
 		return err
 	}
 
-	client, err := peer.New(c.Context, dstore, key)
+	config, err := peer.LoadConfig(root)
 	if err != nil {
 		return err
 	}
 
-	peerId, err := client.PeerID()
+	client, err := peer.New(c.Context, dstore, config)
 	if err != nil {
 		return err
 	}
@@ -80,7 +70,7 @@ func daemonAction(c *cli.Context) error {
 	go rpc.ListenAndServe(client, store)
 
 	fmt.Printf(daemonBanner)
-	fmt.Printf("Peer ID: %s\n", peerId.Pretty())
+	fmt.Printf("Peer ID: %s\n", client.PeerID().Pretty())
 	fmt.Printf("Web URL: %s\n", web.BindAddr)
 
 	quit := make(chan os.Signal, 1)

cmd/multi/init.go

@@ -13,15 +13,21 @@ var initCommand = &cli.Command{
 	Name:      "init",
 	Usage:     "Create a repo",
 	ArgsUsage: "<name>",
+	Flags: []cli.Flag{
+		&cli.StringFlag{
+			Name:    "branch",
+			Aliases: []string{"b"},
+			Usage:   "Default branch",
+			Value:   DefaultBranch,
+		},
+	},
 }
 
 func initAction(c *cli.Context) error {
 	if c.NArg() < 1 {
 		cli.ShowSubcommandHelpAndExit(c, 1)
 	}
 
-	name := c.Args().Get(0)
-
 	cwd, err := os.Getwd()
 	if err != nil {
 		return err
@@ -37,7 +43,8 @@ func initAction(c *cli.Context) error {
 	}
 
 	args := rpc.InitArgs{
-		Name: name,
+		Name:   c.Args().Get(0),
+		Branch: c.String("branch"),
 	}
 
 	var reply rpc.InitReply
@@ -46,6 +53,7 @@ func initAction(c *cli.Context) error {
 	}
 
 	config := NewConfig(cwd)
-	config.Name = name
+	config.Name = args.Name
+	config.Branch = args.Branch
 	return config.Save()
 }

data/author.go

@@ -0,0 +1,72 @@
+package data
+
+import (
+	"context"
+	"encoding/json"
+
+	"github.com/ipfs/go-cid"
+	"github.com/ipfs/go-ipld-cbor"
+	ipld "github.com/ipfs/go-ipld-format"
+	"github.com/multiformats/go-multihash"
+)
+
+// Author contains info about a user.
+type Author struct {
+	// Name is the human friendly name of the author.
+	Name string `json:"name"`
+	// Email is the email address of the author.
+	Email string `json:"email"`
+	// Repositories is a map of repositories.
+	Repositories map[string]cid.Cid `json:"repositories"`
+}
+
+// GetAuthor returns the author with the given CID.
+func GetAuthor(ctx context.Context, dag ipld.DAGService, id cid.Cid) (*Author, error) {
+	node, err := dag.Get(ctx, id)
+	if err != nil {
+		return nil, err
+	}
+
+	return AuthorFromCBOR(node.RawData())
+}
+
+// AddAuthor adds a author to the given dag.
+func AddAuthor(ctx context.Context, dag ipld.DAGService, author *Author) (cid.Cid, error) {
+	node, err := cbornode.WrapObject(author, multihash.SHA2_256, -1)
+	if err != nil {
+		return cid.Cid{}, err
+	}
+
+	if err := dag.Add(ctx, node); err != nil {
+		return cid.Cid{}, err
+	}
+
+	return node.Cid(), nil
+}
+
+// AuthorFromJON decodes a author from json.
+func AuthorFromJSON(data []byte) (*Author, error) {
+	var author Author
+	if err := json.Unmarshal(data, &author); err != nil {
+		return nil, err
+	}
+
+	return &author, nil
+}
+
+// AuthorFromCBOR decodes a author from an ipld node.
+func AuthorFromCBOR(data []byte) (*Author, error) {
+	var author Author
+	if err := cbornode.DecodeInto(data, &author); err != nil {
+		return nil, err
+	}
+
+	return &author, nil
+}
+
+// NewAuthor returns a new author.
+func NewAuthor() *Author {
+	return &Author{
+		Repositories: make(map[string]cid.Cid),
+	}
+}

data/data.go

@@ -23,6 +23,7 @@ var timeAtlasEntry = atlas.BuildEntry(time.Time{}).
 
 func init() {
 	cbornode.RegisterCborType(timeAtlasEntry)
+	cbornode.RegisterCborType(Author{})
 	cbornode.RegisterCborType(Commit{})
 	cbornode.RegisterCborType(Repository{})
 }

data/repository.go

@@ -8,16 +8,15 @@ import (
 	"github.com/ipfs/go-ipfs-pinner"
 	"github.com/ipfs/go-ipld-cbor"
 	ipld "github.com/ipfs/go-ipld-format"
-	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/multiformats/go-multihash"
 )
 
 // Repository contains all versions of a project.
 type Repository struct {
-	// Author is the peer id of the author.
-	Author peer.ID `json:"author"`
 	// Name is the human friendly name of the repo.
 	Name string `json:"name"`
+	// DefaultBranch is the base branch of the repo.
+	DefaultBranch string `json:"default_branch"`
 	// Description describes the project.
 	Description string `json:"description"`
 	// Branches is a map of names to commit CIDs.
@@ -95,24 +94,3 @@ func NewRepository(name string) *Repository {
 		Metadata: make(map[string]string),
 	}
 }
-
-// DefaultBranch returns the default branch of the repo.
-func (r *Repository) DefaultBranch() string {
-	for branch := range r.Branches {
-		return branch
-	}
-	return ""
-}
-
-// Ref returns the cid of the given ref.
-func (r *Repository) Ref(ref string) (cid.Cid, error) {
-	if id, ok := r.Branches[ref]; ok {
-		return id, nil
-	}
-
-	if id, ok := r.Tags[ref]; ok {
-		return id, nil
-	}
-
-	return cid.Parse(ref)
-}

key/key.go

@@ -0,0 +1,38 @@
+package p2p
+
+import (
+	"github.com/libp2p/go-libp2p-core/crypto"
+)
+
+// DefaultKeyType is the default private key type.
+const DefaultKeyType = crypto.Ed25519
+
+// GenerateKey returns a new private key.
+func GenerateKey() (crypto.PrivKey, error) {
+	priv, _, err := crypto.GenerateKeyPair(DefaultKeyType, -1)
+	if err != nil {
+		return nil, err
+	}
+
+	return priv, nil
+}
+
+// EncodeKey returns a base64 encoded version of the key.
+func EncodeKey(priv crypto.PrivKey) (string, error) {
+	data, err := crypto.MarshalPrivateKey(priv)
+	if err != nil {
+		return "", err
+	}
+
+	return crypto.ConfigEncodeKey(data), nil
+}
+
+// DecodeKey returns a key from a base64 encoded version.
+func DecodeKey(encoded string) (crypto.PrivKey, error) {
+	data, err := crypto.ConfigDecodeKey(encoded)
+	if err != nil {
+		return nil, err
+	}
+
+	return crypto.UnmarshalPrivateKey(data)
+}