From c07e09d1550b7621c46985b69c3df2a09e25a991 Mon Sep 17 00:00:00 2001 From: deranjer Date: Sat, 4 Jul 2020 22:05:02 -0400 Subject: [PATCH] fixing bug with config generation, started fixing add command, next commit command --- client/.gvc/.gvcconfig.toml | 4 +- client/.gvc/gvc.db | Bin 65536 -> 131072 bytes client/.gvc/logs/gvclog.log | 230 +++++++++++++++++++++++++++++++++++ client/client.go | 10 +- client/clientcmd/add.go | 6 +- client/clientcmd/init.go | 2 +- common/database/create-db.go | 4 +- common/database/db-ops.go | 6 +- common/engine/filesystem.go | 22 ---- common/engine/manager.go | 16 +-- 10 files changed, 256 insertions(+), 44 deletions(-) diff --git a/client/.gvc/.gvcconfig.toml b/client/.gvc/.gvcconfig.toml index c37ad40..a2054af 100644 --- a/client/.gvc/.gvcconfig.toml +++ b/client/.gvc/.gvcconfig.toml @@ -1,8 +1,8 @@ version = "0.1.5" loglevel = 0 rootpath = "" -reponame = "" -currentbranch = "" +reponame = "client" +currentbranch = "master" [locked] diff --git a/client/.gvc/gvc.db b/client/.gvc/gvc.db index 6615d1e5a6c5d1d5ea0c27446dd20e47909eefe8..e30e95494ed4e4525a774862dbe3f8be189a260b 100644 GIT binary patch literal 131072 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 delta 223 zcmZo@;Am)InV`VPI{9O~_~bWxI0Tp&AVBwjm%athL5t0XA2#q$5>Q}dp8PRieDWWl z5@x89lnEC;?@!#f9il{`K+{OU(8S8n(#q6A&&b5W%*4z>LD#^T\ufffd\u0012 at time: %!s(func() string=0x68d580)"} +{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientcmd\\lock.go"} +{"level":"info","message":"Hash generated for file: clientcmd\\lock.go hash: fed0c794edd5021894feccd43fb174345ff402c5173cc88f80f17e157fa0d3b7"} +{"level":"warn","module":"database","message":"clientcmd\\lock.go not found in tracked database"} +{"level":"info","message":"added file: lock.go at path: clientcmd\\lock.go with hash: \ufffd\ufffdǔ\ufffd\ufffd\u0002\u0018\ufffd\ufffd\ufffd\ufffd?\ufffdt4_\ufffd\u0002\ufffd\u0017<ȏ\ufffd\ufffd~\u0015\u007f\ufffdӷ at time: %!s(func() string=0x68d580)"} +{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientcmd\\refresh.go"} +{"level":"info","message":"Hash generated for file: clientcmd\\refresh.go hash: ea80c045b05e3a63b219b2e0db6bd324fc078e67ffdb670929b2dd3ef72d91ad"} +{"level":"warn","module":"database","message":"clientcmd\\refresh.go not found in tracked database"} +{"level":"info","message":"added file: refresh.go at path: clientcmd\\refresh.go with hash: \ufffd\ufffd\ufffdE\ufffd^:c\ufffd\u0019\ufffd\ufffd\ufffdk\ufffd$\ufffd\u0007\ufffdg\ufffd\ufffdg\t)\ufffd\ufffd>\ufffd-\ufffd\ufffd at time: %!s(func() string=0x68d580)"} +{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientcmd\\remote.go"} +{"level":"info","message":"Hash generated for file: clientcmd\\remote.go hash: 4efc3f749ac533188374f8f1e32fff9f60f6f32e7b5f2a788bdd42367916e5dd"} +{"level":"warn","module":"database","message":"clientcmd\\remote.go not found in tracked database"} +{"level":"info","message":"added file: remote.go at path: clientcmd\\remote.go with hash: N\ufffd?t\ufffd\ufffd3\u0018\ufffdt\ufffd\ufffd\ufffd/\ufffd\ufffd`\ufffd\ufffd.{_*x\ufffd\ufffdB6y\u0016\ufffd\ufffd at time: %!s(func() string=0x68d580)"} +{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientcmd\\switch.go"} +{"level":"info","message":"Hash generated for file: clientcmd\\switch.go hash: 68876bd199dc8e35be2cab865a4c40625c0788b14fdf9ba5741c6b3478c55f58"} +{"level":"warn","module":"database","message":"clientcmd\\switch.go not found in tracked database"} +{"level":"info","message":"added file: switch.go at path: clientcmd\\switch.go with hash: h\ufffdkљ܎5\ufffd,\ufffd\ufffdZL@b\\\u0007\ufffd\ufffdOߛ\ufffdt\u001ck4x\ufffd_X at time: %!s(func() string=0x68d580)"} +{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientconfig"} +{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientconfig\\config.go"} +{"level":"info","message":"Hash generated for file: clientconfig\\config.go hash: 18b64cc522732723dc9becaf7b074af9adb4085e05568d90cb117187ce388c97"} +{"level":"warn","module":"database","message":"clientconfig\\config.go not found in tracked database"} +{"level":"info","message":"added file: config.go at path: clientconfig\\config.go with hash: \u0018\ufffdL\ufffd\"s'#ܛ\ufffd\ufffd{\u0007J\ufffd\ufffd\ufffd\b^\u0005V\ufffd\ufffd\ufffd\u0011q\ufffd\ufffd8\ufffd\ufffd at time: %!s(func() string=0x68d580)"} +{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\clientconfig\\structures.go"} +{"level":"info","message":"Hash generated for file: clientconfig\\structures.go hash: 95caca8d32844a2ca82d071eb487df5b253c1b495ae558b26455d14a4797e062"} +{"level":"warn","module":"database","message":"clientconfig\\structures.go not found in tracked database"} +{"level":"info","message":"added file: structures.go at path: clientconfig\\structures.go with hash: \ufffd\ufffdʍ2\ufffdJ,\ufffd-\u0007\u001e\ufffd\ufffd\ufffd[%<\u001bIZ\ufffdX\ufffddU\ufffdJG\ufffd\ufffdb at time: %!s(func() string=0x68d580)"} +{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\test"} +{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\test\\test.go.old"} +{"level":"info","message":"Hash generated for file: test\\test.go.old hash: 0342f4965b2e42d610ca0c4efe58fe1d3f5b7a48deba94323d69ed7c2412161f"} +{"level":"warn","module":"database","message":"test\\test.go.old not found in tracked database"} +{"level":"info","message":"added file: test.go.old at path: test\\test.go.old with hash: \u0003B\ufffd\ufffd[.B\ufffd\u0010\ufffd\fN\ufffdX\ufffd\u001d?[zH޺\ufffd2=i\ufffd|$\u0012\u0016\u001f at time: %!s(func() string=0x68d580)"} +{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\test\\test2.go"} +{"level":"info","message":"Hash generated for file: test\\test2.go hash: 71afb737f43158c15d99af3037c6497f362d08ed199cf4a2b602da380a904c52"} +{"level":"warn","module":"database","message":"test\\test2.go not found in tracked database"} +{"level":"info","message":"added file: test2.go at path: test\\test2.go with hash: q\ufffd\ufffd7\ufffd1X\ufffd]\ufffd\ufffd07\ufffdI\u007f6-\b\ufffd\u0019\ufffd\ufffd\ufffd\ufffd\u0002\ufffd8\n\ufffdLR at time: %!s(func() string=0x68d580)"} +{"level":"info","message":"Adding file to repo: C:\\Users\\deranjer\\go\\src\\github.com\\deranjer\\gvc\\client\\test.go"} +{"level":"info","message":"Hash generated for file: test.go hash: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"} +{"level":"warn","module":"database","message":"test.go not found in tracked database"} +{"level":"error","module":"database","error":"already exists","message":"Error initialising file in database"} +{"level":"error","message":"Error checking if file [test.go] is monitored. Error already exists"} +{"level":"info","message":"Adding the following files to tracked: [client.go clientcmd\\add.go clientcmd\\branch.go clientcmd\\commit.go clientcmd\\commonlib.go clientcmd\\ignore.go clientcmd\\info.go clientcmd\\init.go clientcmd\\lock.go clientcmd\\refresh.go clientcmd\\remote.go clientcmd\\switch.go clientconfig\\config.go clientconfig\\structures.go test\\test.go.old test\\test2.go]"} diff --git a/client/client.go b/client/client.go index db7bc62..eacedff 100644 --- a/client/client.go +++ b/client/client.go @@ -168,12 +168,10 @@ func initCommand(cli *clir.Cli, conf *clientconfig.Gvcconfig, dbPath string) { if err != nil { log.Fatalf("unable to create new repo: %s", err) } - newConf := clientconfig.Gvcconfig{ - RepoName: repoName, - Version: version, - CurrentBranch: "master", - } - err = store.Save(configPath, &newConf) + conf.RepoName = repoName + conf.Version = version + conf.CurrentBranch = "master" + fmt.Println("Branch is now set to: ", conf.CurrentBranch) if err != nil { log.Fatalf("unable to create new config in .gvc %s", err) } diff --git a/client/clientcmd/add.go b/client/clientcmd/add.go index 6492b1b..042a035 100644 --- a/client/clientcmd/add.go +++ b/client/clientcmd/add.go @@ -150,6 +150,7 @@ func AddFiles(input string, inputType string, ignore common.FileTypes, m *engine m.Info().Msg("Adding all files...") filepath.Walk(workingDir, func(path string, info os.FileInfo, err error) error { if err != nil { + fmt.Println("Err accessing path: ", err) return fmt.Errorf("failure accessing path %s", err) } if info.IsDir() { @@ -178,9 +179,12 @@ func AddFiles(input string, inputType string, ignore common.FileTypes, m *engine if relativePath == "." { //Ignoring current directory return nil } + fmt.Println("Adding file to repo: ", path) + m.Info().Msgf("Adding file to repo: %s", path) err = m.AddFileToRepo(relativePath) if err != nil { - return fmt.Errorf("unable to add file to repo: %s", err) + fmt.Printf("unable to add file to repo: %s\n", err) + return nil } trackedFiles = append(trackedFiles, relativePath) return nil diff --git a/client/clientcmd/init.go b/client/clientcmd/init.go index 6ba07d0..d2785f5 100644 --- a/client/clientcmd/init.go +++ b/client/clientcmd/init.go @@ -20,7 +20,7 @@ func InitializeRepo(dbPath string, version string, rootPath string) (string, err fmt.Println("Initializing repo in dir: ", cwd) err = os.Mkdir(".gvc", 0644) if err != nil { - fmt.Printf(".gvc directory already exists, but no config file... continuing") + fmt.Printf(".gvc directory already exists, but no config file... continuing\n") } err = engine.CreatePaths(rootPath) if err != nil { diff --git a/common/database/create-db.go b/common/database/create-db.go index b750d09..7dc508c 100644 --- a/common/database/create-db.go +++ b/common/database/create-db.go @@ -9,7 +9,7 @@ import ( "github.com/rs/zerolog" ) -// OpenDB returns a new database object, from opening existing db +// OpenDB returns a new database object, from opening existing db //TODO, figure out when to close this func OpenDB(dbPath string, log *zerolog.Logger, version string) (*DB, error) { var db DB var err error @@ -20,7 +20,7 @@ func OpenDB(dbPath string, log *zerolog.Logger, version string) (*DB, error) { db.Err(err).Msg("No existing database found. this does not appear to be a repo, please init repo") return &db, err } - defer db.Close() + //defer db.Close() return &db, nil } diff --git a/common/database/db-ops.go b/common/database/db-ops.go index 478220a..4831ad0 100644 --- a/common/database/db-ops.go +++ b/common/database/db-ops.go @@ -15,11 +15,11 @@ func (db *DB) CheckIfFileCurrentlyMonitored(path string) bool { if err := db.One("Path", path, &file); err != nil { if err.Error() != "not found" { db.Err(err).Msg("Error finding file by path") - fmt.Printf("Not found: %s error: %s\n", path, err) + fmt.Printf("Database Error occurred: %s error: %s\n", path, err) return false } - db.Warn().Msg("no file found") - fmt.Printf("Not found: %s error: %s\n", path, err) + db.Warn().Msgf("%s not found in tracked database", path) + fmt.Printf("%s not found in tracked file database", path) return false } fmt.Printf("Found!: %s searched: %s\n", file.Path, path) diff --git a/common/engine/filesystem.go b/common/engine/filesystem.go index b285b49..18fb168 100644 --- a/common/engine/filesystem.go +++ b/common/engine/filesystem.go @@ -68,28 +68,6 @@ func ExpandToIntArray(length int64, arry []byte, intArray *[]int64) error { // return fileName, nil // } -//InitiateDirectory checks all of the directories to make sure they exist -func InitiateDirectory(directory string) { - // For the keys-folder we need to check if the folder exists... - checkDir, err := IsDirectory(directory) - if err != nil { - fmt.Println("Error checking for "+directory+" directory: %s\r\n", err) - panic(err) - } - - if checkDir == true { - fmt.Println(directory + " already exists") - } else { - // Create the directory. - fmt.Println("Creating " + directory) - err = CreateDirectory(directory) - if err != nil { - fmt.Println("Error creating the folder %s\r\n", err) - panic(err) - } - } -} - func ConvertFileForStorage(file *database.File, folder string) error { fileBytes, err := ioutil.ReadFile(file.Path) if err != nil { diff --git a/common/engine/manager.go b/common/engine/manager.go index 2355029..b283115 100644 --- a/common/engine/manager.go +++ b/common/engine/manager.go @@ -46,6 +46,7 @@ func NewManager(rootDir string, version string, dbPath string, informer chan Ope informer, dirPaths, } + return &m, nil } @@ -112,13 +113,13 @@ func CreatePaths(rootDir string) error { if err != nil { return fmt.Errorf("unable to generate file paths.. %s", err) } - InitiateDirectory(fullFilePaths.KeyFolder) - InitiateDirectory(fullFilePaths.DownloadFolder) - InitiateDirectory(fullFilePaths.SyncFolder) - InitiateDirectory(fullFilePaths.ObjectFolder) - InitiateDirectory(fullFilePaths.ThumbFolder) - InitiateDirectory(fullFilePaths.LogFolder) - InitiateDirectory(fullFilePaths.PluginFolder) + CreateDirectory(fullFilePaths.KeyFolder) + CreateDirectory(fullFilePaths.DownloadFolder) + CreateDirectory(fullFilePaths.SyncFolder) + CreateDirectory(fullFilePaths.ObjectFolder) + CreateDirectory(fullFilePaths.ThumbFolder) + CreateDirectory(fullFilePaths.LogFolder) + CreateDirectory(fullFilePaths.PluginFolder) return nil } @@ -160,6 +161,7 @@ func (m *Manager) AddFileToRepo(relFilePath string) error { if hash, err = UniqueFileHash(relFilePath); err != nil { return err } + m.Info().Msgf("Hash generated for file: %s hash: %s", relFilePath, hex.EncodeToString(hash)) alreadyTracked := m.dB.CheckIfFileCurrentlyMonitored(relFilePath) if alreadyTracked { return fmt.Errorf("file already found in tracked files, not adding: %s", relFilePath)