2021-03-21 06:25:29 +02:00
|
|
|
package filetree
|
2020-11-15 01:45:55 +02:00
|
|
|
|
|
|
|
import (
|
2021-03-21 00:57:13 +02:00
|
|
|
"sort"
|
2020-11-15 01:45:55 +02:00
|
|
|
"strings"
|
|
|
|
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/commands/models"
|
|
|
|
)
|
|
|
|
|
2021-03-31 14:26:53 +02:00
|
|
|
func BuildTreeFromFiles(files []*models.File) *FileNode {
|
|
|
|
root := &FileNode{}
|
2020-11-15 01:45:55 +02:00
|
|
|
|
2021-03-31 14:26:53 +02:00
|
|
|
var curr *FileNode
|
2020-11-15 01:45:55 +02:00
|
|
|
for _, file := range files {
|
2021-04-08 13:24:49 +02:00
|
|
|
splitPath := split(file.Name)
|
2020-11-15 01:45:55 +02:00
|
|
|
curr = root
|
|
|
|
outer:
|
2021-04-08 13:24:49 +02:00
|
|
|
for i := range splitPath {
|
2020-11-15 01:45:55 +02:00
|
|
|
var setFile *models.File
|
2021-04-08 13:24:49 +02:00
|
|
|
isFile := i == len(splitPath)-1
|
2021-03-20 23:41:06 +02:00
|
|
|
if isFile {
|
2020-11-15 01:45:55 +02:00
|
|
|
setFile = file
|
|
|
|
}
|
2021-03-20 23:41:06 +02:00
|
|
|
|
2021-04-08 13:24:49 +02:00
|
|
|
path := join(splitPath[:i+1])
|
2020-11-15 01:45:55 +02:00
|
|
|
for _, existingChild := range curr.Children {
|
2021-03-20 23:41:06 +02:00
|
|
|
if existingChild.Path == path {
|
2020-11-15 01:45:55 +02:00
|
|
|
curr = existingChild
|
|
|
|
continue outer
|
|
|
|
}
|
|
|
|
}
|
2021-03-20 23:41:06 +02:00
|
|
|
|
2021-03-31 14:26:53 +02:00
|
|
|
newChild := &FileNode{
|
2021-03-20 23:41:06 +02:00
|
|
|
Path: path,
|
2020-11-15 01:45:55 +02:00
|
|
|
File: setFile,
|
|
|
|
}
|
|
|
|
curr.Children = append(curr.Children, newChild)
|
|
|
|
|
|
|
|
curr = newChild
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-03-14 10:38:59 +02:00
|
|
|
root.Sort()
|
|
|
|
root.Compress()
|
2020-11-15 01:45:55 +02:00
|
|
|
|
|
|
|
return root
|
|
|
|
}
|
2021-03-20 23:41:06 +02:00
|
|
|
|
2021-03-31 14:26:53 +02:00
|
|
|
func BuildFlatTreeFromCommitFiles(files []*models.CommitFile) *CommitFileNode {
|
2021-03-31 13:08:55 +02:00
|
|
|
rootAux := BuildTreeFromCommitFiles(files)
|
|
|
|
sortedFiles := rootAux.GetLeaves()
|
|
|
|
|
2021-03-31 14:26:53 +02:00
|
|
|
return &CommitFileNode{Children: sortedFiles}
|
2021-03-31 13:08:55 +02:00
|
|
|
}
|
|
|
|
|
2021-03-31 14:26:53 +02:00
|
|
|
func BuildTreeFromCommitFiles(files []*models.CommitFile) *CommitFileNode {
|
|
|
|
root := &CommitFileNode{}
|
2021-03-31 13:08:55 +02:00
|
|
|
|
2021-03-31 14:26:53 +02:00
|
|
|
var curr *CommitFileNode
|
2021-03-31 13:08:55 +02:00
|
|
|
for _, file := range files {
|
2021-04-08 13:24:49 +02:00
|
|
|
splitPath := split(file.Name)
|
2021-03-31 13:08:55 +02:00
|
|
|
curr = root
|
|
|
|
outer:
|
2021-04-08 13:24:49 +02:00
|
|
|
for i := range splitPath {
|
2021-03-31 13:08:55 +02:00
|
|
|
var setFile *models.CommitFile
|
2021-04-08 13:24:49 +02:00
|
|
|
isFile := i == len(splitPath)-1
|
2021-03-31 13:08:55 +02:00
|
|
|
if isFile {
|
|
|
|
setFile = file
|
|
|
|
}
|
|
|
|
|
2021-04-08 13:24:49 +02:00
|
|
|
path := join(splitPath[:i+1])
|
2021-03-31 13:08:55 +02:00
|
|
|
|
|
|
|
for _, existingChild := range curr.Children {
|
|
|
|
if existingChild.Path == path {
|
|
|
|
curr = existingChild
|
|
|
|
continue outer
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-03-31 14:26:53 +02:00
|
|
|
newChild := &CommitFileNode{
|
2021-03-31 13:08:55 +02:00
|
|
|
Path: path,
|
|
|
|
File: setFile,
|
|
|
|
}
|
|
|
|
curr.Children = append(curr.Children, newChild)
|
|
|
|
|
|
|
|
curr = newChild
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
root.Sort()
|
|
|
|
root.Compress()
|
|
|
|
|
|
|
|
return root
|
|
|
|
}
|
|
|
|
|
2021-03-31 14:26:53 +02:00
|
|
|
func BuildFlatTreeFromFiles(files []*models.File) *FileNode {
|
2021-03-21 06:25:29 +02:00
|
|
|
rootAux := BuildTreeFromFiles(files)
|
2021-03-21 01:46:43 +02:00
|
|
|
sortedFiles := rootAux.GetLeaves()
|
2021-03-21 00:06:15 +02:00
|
|
|
|
2021-04-12 13:57:43 +02:00
|
|
|
// from top down we have merge conflict files, then tracked file, then untracked
|
|
|
|
// files. This is the one way in which sorting differs between flat mode and
|
|
|
|
// tree mode
|
2021-03-21 01:46:43 +02:00
|
|
|
sort.SliceStable(sortedFiles, func(i, j int) bool {
|
2021-04-12 13:57:43 +02:00
|
|
|
iFile := sortedFiles[i].File
|
|
|
|
jFile := sortedFiles[j].File
|
|
|
|
|
|
|
|
// never going to happen but just to be safe
|
|
|
|
if iFile == nil || jFile == nil {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
if iFile.HasMergeConflicts && !jFile.HasMergeConflicts {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
if jFile.HasMergeConflicts && !iFile.HasMergeConflicts {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
if iFile.Tracked && !jFile.Tracked {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
if jFile.Tracked && !iFile.Tracked {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
return false
|
2021-03-21 00:57:13 +02:00
|
|
|
})
|
|
|
|
|
2021-03-31 14:26:53 +02:00
|
|
|
return &FileNode{Children: sortedFiles}
|
2021-03-20 23:41:06 +02:00
|
|
|
}
|
2021-04-08 13:24:49 +02:00
|
|
|
|
|
|
|
func split(str string) []string {
|
|
|
|
return strings.Split(str, "/")
|
|
|
|
}
|
|
|
|
|
|
|
|
func join(strs []string) string {
|
|
|
|
return strings.Join(strs, "/")
|
|
|
|
}
|