Merge pull request #49 from jiaozifs/feat/support_tree_property

feat: add tree node properties

Author: Brownjy

api/api_impl/server.go

@@ -6,6 +6,8 @@ import (
 	"net"
 	"net/http"
 
+	"github.com/jiaozifs/jiaozifs/auth/crypt"
+
 	"github.com/MadAppGang/httplog"
 	"github.com/rs/cors"
 
@@ -32,7 +34,7 @@ var log = logging.Logger("rpc")
 
 const APIV1Prefix = "/api/v1"
 
-func SetupAPI(lc fx.Lifecycle, apiConfig *config.APIConfig, sessionStore sessions.Store, repo models.IRepo, controller APIController) error {
+func SetupAPI(lc fx.Lifecycle, apiConfig *config.APIConfig, secretStore crypt.SecretStore, sessionStore sessions.Store, repo models.IRepo, controller APIController) error {
 	swagger, err := api.GetSwagger()
 	if err != nil {
 		return err
@@ -64,7 +66,7 @@ func SetupAPI(lc fx.Lifecycle, apiConfig *config.APIConfig, sessionStore session
 			},
 			SilenceServersWarning: true,
 		}),
-		auth.Middleware(swagger, nil, nil, repo.UserRepo(), sessionStore),
+		auth.Middleware(swagger, nil, secretStore, repo.UserRepo(), sessionStore),
 	)
 
 	raw, err := api.RawSpec()

api/jiaozifs.gen.go

@@ -157,15 +157,23 @@ components:
       required:
         - Hash
         - Type
+        - CheckSum
+        - Properties
         - Size
         - CreatedAt
         - UpdatedAt
       properties:
         Hash:
           type: string
+        CheckSum:
+          type: string
         Type:
           type: integer
           format: int8
+        Properties:
+          type: object
+          additionalProperties:
+            type: string
         Size:
           type: integer
           format: int64
@@ -208,9 +216,6 @@ components:
       properties:
         Hash:
           type: string
-        Type:
-          type: integer
-          format: int8
         Author:
           $ref: "#/components/schemas/Signature"
         Committer:
@@ -238,17 +243,27 @@ components:
           type: string
         Hash:
           type: string
-        Mode:
-          type: integer
-          format: uint32
+        IsDir:
+          type: boolean
     TreeNode:
       type: object
+      required:
+        - Hash
+        - Type
+        - Properties
+        - SubObjects
+        - CreatedAt
+        - UpdatedAt
       properties:
         Hash:
           type: string
         Type:
           type: integer
           format: int8
+        Properties:
+          type: object
+          additionalProperties:
+            type: string
         SubObjects:
           type: array
           items:

api/swagger.yml

@@ -6,7 +6,10 @@ import (
 	"github.com/jiaozifs/jiaozifs/config"
 )
 
-func NewSessionStore(authConfig *config.AuthConfig) sessions.Store {
-	sstore := crypt.NewSecretStore(authConfig.SecretKey)
-	return sessions.NewCookieStore(sstore.SharedSecret())
+func NewSessionStore(secretStrore crypt.SecretStore) sessions.Store {
+	return sessions.NewCookieStore(secretStrore.SharedSecret())
+}
+
+func NewSectetStore(authConfig *config.AuthConfig) crypt.SecretStore {
+	return crypt.NewSecretStore(authConfig.SecretKey)
 }

auth/session_store.go

@@ -3,6 +3,8 @@ package cmd
 import (
 	"context"
 
+	"github.com/jiaozifs/jiaozifs/auth/crypt"
+
 	"github.com/jiaozifs/jiaozifs/version"
 
 	"github.com/gorilla/sessions"
@@ -65,6 +67,7 @@ var daemonCmd = &cobra.Command{
 
 			fx_opt.Override(fx_opt.NextInvoke(), migrations.MigrateDatabase),
 			//api
+			fx_opt.Override(new(crypt.SecretStore), auth.NewSectetStore),
 			fx_opt.Override(new(sessions.Store), auth.NewSessionStore),
 			fx_opt.Override(fx_opt.NextInvoke(), apiImpl.SetupAPI),
 		)

cmd/daemon.go

@@ -33,13 +33,13 @@ func (commitCtl CommitController) GetEntriesInCommit(ctx context.Context, w *api
 		return
 	}
 
-	commit, err := commitCtl.Repo.ObjectRepo().Get(ctx, models.NewGetObjParams().SetHash(ref.CommitHash))
+	commit, err := commitCtl.Repo.CommitRepo().Commit(ctx, ref.CommitHash)
 	if err != nil {
 		w.Error(err)
 		return
 	}
 
-	workTree, err := versionmgr.NewWorkTree(ctx, commitCtl.Repo.ObjectRepo(), models.NewRootTreeEntry(commit.TreeHash))
+	workTree, err := versionmgr.NewWorkTree(ctx, commitCtl.Repo.FileTreeRepo(), models.NewRootTreeEntry(commit.TreeHash))
 	if err != nil {
 		w.Error(err)
 		return
@@ -75,7 +75,7 @@ func (commitCtl CommitController) GetCommitDiff(ctx context.Context, w *api.Jiao
 		return
 	}
 
-	bashCommit, err := commitCtl.Repo.ObjectRepo().Commit(ctx, bashCommitHash)
+	bashCommit, err := commitCtl.Repo.CommitRepo().Commit(ctx, bashCommitHash)
 	if err != nil {
 		w.Error(err)
 		return

controller/commit_ctl.go

@@ -61,13 +61,13 @@ func (oct ObjectController) DeleteObject(ctx context.Context, w *api.JiaozifsRes
 		w.Error(err)
 		return
 	}
-	commit, err := oct.Repo.ObjectRepo().Commit(ctx, ref.CommitHash)
+	commit, err := oct.Repo.CommitRepo().Commit(ctx, ref.CommitHash)
 	if err != nil {
 		w.Error(err)
 		return
 	}
 
-	workTree, err := versionmgr.NewWorkTree(ctx, oct.Repo.ObjectRepo(), models.NewRootTreeEntry(commit.TreeHash))
+	workTree, err := versionmgr.NewWorkTree(ctx, oct.Repo.FileTreeRepo(), models.NewRootTreeEntry(commit.TreeHash))
 	if err != nil {
 		w.Error(err)
 		return
@@ -111,13 +111,13 @@ func (oct ObjectController) GetObject(ctx context.Context, w *api.JiaozifsRespon
 		w.Error(err)
 		return
 	}
-	commit, err := oct.Repo.ObjectRepo().Commit(ctx, ref.CommitHash)
+	commit, err := oct.Repo.CommitRepo().Commit(ctx, ref.CommitHash)
 	if err != nil {
 		w.Error(err)
 		return
 	}
 
-	workTree, err := versionmgr.NewWorkTree(ctx, oct.Repo.ObjectRepo(), models.NewRootTreeEntry(commit.TreeHash))
+	workTree, err := versionmgr.NewWorkTree(ctx, oct.Repo.FileTreeRepo(), models.NewRootTreeEntry(commit.TreeHash))
 	if err != nil {
 		w.Error(err)
 		return
@@ -195,14 +195,14 @@ func (oct ObjectController) HeadObject(ctx context.Context, w *api.JiaozifsRespo
 		return
 	}
 
-	commit, err := oct.Repo.ObjectRepo().Commit(ctx, ref.CommitHash)
+	commit, err := oct.Repo.CommitRepo().Commit(ctx, ref.CommitHash)
 	if err != nil {
 		w.Error(err)
 		return
 	}
 
-	objRepo := oct.Repo.ObjectRepo()
-	treeOp, err := versionmgr.NewWorkTree(ctx, oct.Repo.ObjectRepo(), models.NewRootTreeEntry(commit.TreeHash))
+	fileRepo := oct.Repo.FileTreeRepo()
+	treeOp, err := versionmgr.NewWorkTree(ctx, fileRepo, models.NewRootTreeEntry(commit.TreeHash))
 	if err != nil {
 		w.Error(err)
 		return
@@ -220,7 +220,7 @@ func (oct ObjectController) HeadObject(ctx context.Context, w *api.JiaozifsRespo
 
 	objectWithName := existNodes[len(existNodes)-1]
 
-	blob, err := objRepo.Blob(ctx, objectWithName.Node().Hash)
+	blob, err := fileRepo.Blob(ctx, objectWithName.Node().Hash)
 	if err != nil {
 		w.Error(err)
 		return
@@ -307,12 +307,12 @@ func (oct ObjectController) UploadObject(ctx context.Context, w *api.JiaozifsRes
 			return err
 		}
 
-		workingTree, err := versionmgr.NewWorkTree(ctx, dRepo.ObjectRepo(), models.NewRootTreeEntry(stash.CurrentTree))
+		workingTree, err := versionmgr.NewWorkTree(ctx, dRepo.FileTreeRepo(), models.NewRootTreeEntry(stash.CurrentTree))
 		if err != nil {
 			return err
 		}
 
-		blob, err := workingTree.WriteBlob(ctx, oct.BlockAdapter, reader, r.ContentLength, block.PutOpts{})
+		blob, err := workingTree.WriteBlob(ctx, oct.BlockAdapter, reader, r.ContentLength, models.DefaultLeafProperty())
 		if err != nil {
 			return err
 		}

controller/object_ctl.go

@@ -186,14 +186,14 @@ func (repositoryCtl RepositoryController) GetCommitsInRepository(ctx context.Con
 		return
 	}
 
-	commit, err := repositoryCtl.Repo.ObjectRepo().Commit(ctx, ref.CommitHash)
+	commit, err := repositoryCtl.Repo.CommitRepo().Commit(ctx, ref.CommitHash)
 	if err != nil {
 		w.Error(err)
 		return
 	}
 
 	var commits []api.Commit
-	iter := versionmgr.NewCommitPreorderIter(versionmgr.NewCommitNode(ctx, commit, repositoryCtl.Repo.ObjectRepo()), nil, nil)
+	iter := versionmgr.NewCommitPreorderIter(versionmgr.NewCommitNode(ctx, commit, repositoryCtl.Repo.CommitRepo()), nil, nil)
 	for {
 		commit, err := iter.Next()
 		if err == nil {
@@ -215,7 +215,6 @@ func (repositoryCtl RepositoryController) GetCommitsInRepository(ctx context.Con
 				Message:      modelCommit.Message,
 				ParentHashes: hash.HexArrayOfHashes(modelCommit.ParentHashes...),
 				TreeHash:     modelCommit.TreeHash.Hex(),
-				Type:         int8(modelCommit.Type),
 				UpdatedAt:    modelCommit.UpdatedAt,
 			})
 			continue