working on lock command

server/config/serverConfig.toml

@@ -0,0 +1,30 @@
+version = "0.1"
+port = 80
+ip = ""
+rawport = 0
+reporootpath = "F:\\repos"
+
+[[repo]]
+  rootpath = ""
+  reponame = "gvc"
+  defaultbranch = "master"
+  localbranches = ["master"]
+
+  [[repo.client]]
+    name = "deranjer"
+    key = "12345"
+    lastcommit = "4343434343434"
+  [repo.locked]
+    files = ["client1.exe", "client2.exe"]
+  [repo.defaultignore]
+  [repo.nocompress]
+
+[[repo]]
+  rootpath = ""
+  reponame = "testrepo"
+  defaultbranch = "master"
+  localbranches = ["master", "feature1"]
+  [repo.locked]
+  [repo.defaultignore]
+  [repo.nocompress]
+

server/engine/engine.go

@@ -2,17 +2,18 @@ package engine
 
 import (
 	"fmt"
+	"log"
 	"net/http"
 
 	"github.com/deranjer/gvc/common"
 	serverconfig "github.com/deranjer/gvc/server/serverconfig"
+	"github.com/deranjer/store"
 	"github.com/labstack/echo"
 )
 
 // GetInfo return the relevant repo specific info to the client
 func (Server *GVCServer) GetInfo(context echo.Context) error {
 	repo := context.Param("repo")
-	fmt.Println("Asking about repo: ", repo)
 	config := Server.Config
 	var repoInfo RepoInfoRequest // Create an engine struct that contains basic server info as well as all repo info
 	for _, knownRepo := range config.Repos {
@@ -35,19 +36,32 @@ func (Server *GVCServer) LockFile(context echo.Context) error {
 	fileType := context.Param("type")
 	fileName := context.Param("name")
 	repoName := context.Param("repo")
-	var repo serverconfig.RepoConfig
-	for i, knownRepo := range Server.Config.Repos {
-		if knownRepo.RepoName == repoName {
-			repo = Server.Config.Repos[i]
+	fmt.Printf("Lockfile: %s %s %s", repoName, fileType, fileName)
+	var locked common.FileTypes
+	for i, repo := range Server.Config.Repos {
+		if repo.RepoName == repoName {
+			locked = Server.Config.Repos[i].Locked
 		}
 	}
+	err := common.CheckFileTypes(fileName, fileType, locked) // making sure fi/f/wc is not already locked or cannot be locked.
+	if err != nil {
+		return fmt.Errorf("failed checking file lock: %s", err)
+	}
 	switch fileType {
 	case "file":
-		err := common.CheckFileTypes(fileName, fileType, repo.Locked)
-		if err != nil {
-			return fmt.Errorf("failed checking file lock: %s", err)
-		}
 		fmt.Println("Filename: ", fileName)
+		locked.Files = append(locked.Files, fileName)
+	case "folder":
+		fmt.Println("Folder: ", fileName)
+		locked.Folders = append(locked.Folders, fileName)
+	case "wildcard":
+		fmt.Println("Wildcard: ", fileName)
+		locked.Exts = append(locked.Exts, fileName)
+	}
+	fmt.Println("Locked: ", locked)                                 // TODO!!!!!!!!!!!! Write this to conf
+	err = store.Save(serverconfig.DefaultConfigPath, Server.Config) // Save our new default config back to TOML so it can be read in
+	if err != nil {
+		log.Fatalf("unable to save config to toml file: %s", err)
 	}
 	return nil
 }

server/server.go

@@ -49,10 +49,10 @@ func main() {
 	server.Echo = e
 	//Start the routes
 	//e.GET("/hello", server.Hello)
-	e.GET("/:repo/info/", server.GetInfo)
-	e.GET("/:repo/lock/:type/:name", server.LockFile)
-	e.GET("/:repo/refresh", server.Refresh)
-	e.GET("/:repo/revert/:hash", server.Revert) // TODO: Might not need this, just add extra args to pull?
-	e.GET("/:repo/pull/:branch", server.Pull)
+	e.GET("/info/:repo", server.GetInfo)
+	e.GET("/lock/:repo/:type/:name", server.LockFile)
+	e.GET("/refresh/:repo", server.Refresh)
+	e.GET("/revert/:repo/:hash", server.Revert) // TODO: Might not need this, just add extra args to pull?
+	e.GET("/pull/:repo/:branch", server.Pull)
 	e.Logger.Fatal(e.Start(fmt.Sprintf("%s:%d", server.Config.BindIP, server.Config.Port)))
 }