fix issues with folder structure

Author: ckanz

code2cypher.go

@@ -7,20 +7,19 @@ import (
   "os"
   "log"
   "strings"
-  "strconv"
 )
 
 type fileInfo struct {
   Name string
+  Path string
   Url string
   Size int64
   Level int
   IsDir bool
   Id string
   Extension string
   ModTime int64
-  ParentName string
-  ParentId string
+  ParentPath string
   Contributions []fileContribution
   CommitCount int
 }
@@ -42,12 +41,6 @@ func initFlags() {
   flag.Parse()
 }
 
-// getUniqueNameString creates a unique string for a file based on its nested depth in the folder and its name
-// TODO: instead of depth, modified timestamp might be a better value to create unique variable names with
-func getUniqueNameString(index int, element string) string {
-  return strconv.Itoa(index) + "-" + element
-}
-
 // getFileExtension returns the extension for a given file's full name
 func getFileExtension (info os.FileInfo) string {
   if (info.IsDir() == false) {
@@ -85,9 +78,10 @@ func main() {
       fileDepth := len(pathSegments) - 1
       fileName := info.Name()
       verboseLog("fileName: " + fileName)
-      uniqueNameString := getUniqueNameString(fileDepth, fileName)
 
-      if (processedFiles[uniqueNameString] != true) {
+      if (processedFiles[path] != true) {
+        parentPath := strings.Join(pathSegments[:len(pathSegments)-1], "/")
+        verboseLog("parentPath: " + parentPath)
         parentDepth := fileDepth - 1
         if (parentDepth < 0) {
           parentDepth = 0
@@ -97,19 +91,19 @@ func main() {
 
         nodes = append(nodes, fileInfo{
           Name: fileName,
+          Path: path,
           Url: buildGitHubUrl(gitRepoUrl, path, info.IsDir()),
           Size: info.Size(),
           Level: fileDepth,
           Extension: getFileExtension(info),
-          Id: createCypherFriendlyVarName(fileName, fileDepth),
+          Id: createCypherFriendlyVarName(path, fileDepth),
           IsDir: info.IsDir(),
           ModTime: info.ModTime().Unix(),
-          ParentName: pathSegments[parentDepth],
-          ParentId : createCypherFriendlyVarName(pathSegments[parentDepth], parentDepth),
+          ParentPath: parentPath,
           Contributions: contributions,
           CommitCount: len(contributions),
         })
-        processedFiles[uniqueNameString] = true
+        processedFiles[path] = true
       }
     }
 
@@ -126,9 +120,9 @@ func main() {
     fmt.Println(":BEGIN")
     label := getLabelForFileNode(currentFile)
 
-    if (!processedNodes[currentFile.Id]) {
+    if (!processedNodes[currentFile.Path]) {
       fmt.Println(fileInfoToCypher(currentFile, label))
-      processedNodes[currentFile.Id] = true
+      processedNodes[currentFile.Path] = true
     }
 
     if (label == "file") {
@@ -157,7 +151,7 @@ func main() {
     fmt.Println(";")
     fmt.Println(":COMMIT")
 
-    if (currentFile.Id != currentFile.ParentId) {
+    if (len(currentFile.ParentPath) > 0) {
       fmt.Println(":BEGIN")
       fmt.Println(folderStructureToCypher(currentFile))
       fmt.Println(";")

cypherGenerator.go

@@ -28,6 +28,7 @@ func getLabelForFileNode(currentFile fileInfo) string {
 // fileInfoToCypher returns a cypher statement to create a node for a given file
 func fileInfoToCypher(currentFile fileInfo, label string) string {
   properties := ("{ name: '" + currentFile.Name +
+    "', path: '" + currentFile.Path +
     "', url: '" + currentFile.Url +
     "', _tempId: '" + currentFile.Id + "'")
 
@@ -73,7 +74,7 @@ func contributionToCypherUpdate(contributionId string, commitCount int) string {
 
 // folderStructureToCypher returns to cypher statement to create a relationship between a file and its parent folder
 func folderStructureToCypher(currentFile fileInfo) string {
-  return "Match (a:directory { _tempId: '" + currentFile.ParentId +"' }) Match (b { _tempId: '" + currentFile.Id +"' }) CREATE (b)-[:IN_FOLDER]->(a)"
+  return "Match (a:directory { path: '" + currentFile.ParentPath +"' }) Match (b { path: '" + currentFile.Path +"' }) CREATE (b)-[:IN_FOLDER]->(a)"
 }
 
 // returns a cypher statement that removes a given property from all nodes