norohind/dive-zfs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keep modified/unmodified nomenclature the same

Browse Source
This commit is contained in:
Alex Goodman 2019-07-21 15:02:09 -04:00
parent 48df08f117
commit 174dc6de1a
No known key found for this signature in database
GPG Key ID: 98AF011C5C78EB7E
10 changed files with 57 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/root.go
View File

@ -70,7 +70,7 @@ func initConfig() {
viper.SetDefault("keybinding.toggle-added-files", "ctrl+a") viper.SetDefault("keybinding.toggle-added-files", "ctrl+a")
viper.SetDefault("keybinding.toggle-removed-files", "ctrl+r") viper.SetDefault("keybinding.toggle-removed-files", "ctrl+r")
viper.SetDefault("keybinding.toggle-modified-files", "ctrl+m") viper.SetDefault("keybinding.toggle-modified-files", "ctrl+m")
viper.SetDefault("keybinding.toggle-unchanged-files", "ctrl+u") viper.SetDefault("keybinding.toggle-unmodified-files", "ctrl+u")
viper.SetDefault("keybinding.page-up", "pgup") viper.SetDefault("keybinding.page-up", "pgup")
viper.SetDefault("keybinding.page-down", "pgdn") viper.SetDefault("keybinding.page-down", "pgdn")

20
filetree/data.go
View File

@ -10,8 +10,8 @@ import (
) )
const ( const (
Unchanged DiffType = iota Unmodified DiffType = iota
Changed Modified
Added Added
Removed Removed
) )
@ -23,7 +23,7 @@ func NewNodeData() *NodeData {
return &NodeData{ return &NodeData{
ViewInfo: *NewViewInfo(), ViewInfo: *NewViewInfo(),
FileInfo: FileInfo{}, FileInfo: FileInfo{},
DiffType: Unchanged, DiffType: Unmodified,
} }
} }
@ -129,19 +129,19 @@ func (data *FileInfo) Compare(other FileInfo) DiffType {
data.Mode == other.Mode && data.Mode == other.Mode &&
data.Uid == other.Uid && data.Uid == other.Uid &&
data.Gid == other.Gid { data.Gid == other.Gid {
return Unchanged return Unmodified
} }
} }
return Changed return Modified
} }
// String of a DiffType // String of a DiffType
func (diff DiffType) String() string { func (diff DiffType) String() string {
switch diff { switch diff {
case Unchanged: case Unmodified:
return "Unchanged" return "Unmodified"
case Changed: case Modified:
return "Changed" return "Modified"
case Added: case Added:
return "Added" return "Added"
case Removed: case Removed:
@ -157,5 +157,5 @@ func (diff DiffType) merge(other DiffType) DiffType {
if diff == other { if diff == other {
return diff return diff
} }
return Changed return Modified
} }

16
filetree/data_test.go
View File

@ -10,23 +10,23 @@ func TestAssignDiffType(t *testing.T) {
if err != nil { if err != nil {
t.Errorf("Expected no error from fetching path. got: %v", err) t.Errorf("Expected no error from fetching path. got: %v", err)
} }
node.Data.DiffType = Changed node.Data.DiffType = Modified
if tree.Root.Children["usr"].Data.DiffType != Changed { if tree.Root.Children["usr"].Data.DiffType != Modified {
t.Fail() t.Fail()
} }
} }
func TestMergeDiffTypes(t *testing.T) { func TestMergeDiffTypes(t *testing.T) {
a := Unchanged a := Unmodified
b := Unchanged b := Unmodified
merged := a.merge(b) merged := a.merge(b)
if merged != Unchanged { if merged != Unmodified {
t.Errorf("Expected Unchaged (0) but got %v", merged) t.Errorf("Expected Unchaged (0) but got %v", merged)
} }
a = Changed a = Modified
b = Unchanged b = Unmodified
merged = a.merge(b) merged = a.merge(b)
if merged != Changed { if merged != Modified {
t.Errorf("Expected Unchaged (0) but got %v", merged) t.Errorf("Expected Unchaged (0) but got %v", merged)
} }
} }

10
filetree/node.go
View File

@ -17,10 +17,10 @@ const (
) )
var diffTypeColor = map[DiffType]*color.Color{ var diffTypeColor = map[DiffType]*color.Color{
Added: color.New(color.FgGreen), Added: color.New(color.FgGreen),
Removed: color.New(color.FgRed), Removed: color.New(color.FgRed),
Changed: color.New(color.FgYellow), Modified: color.New(color.FgYellow),
Unchanged: color.New(color.Reset), Unmodified: color.New(color.Reset),
} }
// NewNode creates a new FileNode relative to the given parent node with a payload. // NewNode creates a new FileNode relative to the given parent node with a payload.
@ -292,7 +292,7 @@ func (node *FileNode) AssignDiffType(diffType DiffType) error {
// compare the current node against the given node, returning a definitive DiffType. // compare the current node against the given node, returning a definitive DiffType.
func (node *FileNode) compare(other *FileNode) DiffType { func (node *FileNode) compare(other *FileNode) DiffType {
if node == nil && other == nil { if node == nil && other == nil {
return Unchanged return Unmodified
} }
if node == nil && other != nil { if node == nil && other != nil {

14
filetree/node_test.go
View File

@ -115,7 +115,7 @@ func TestIsWhiteout(t *testing.T) {
func TestDiffTypeFromAddedChildren(t *testing.T) { func TestDiffTypeFromAddedChildren(t *testing.T) {
tree := NewFileTree() tree := NewFileTree()
node, _, _ := tree.AddPath("/usr", *BlankFileChangeInfo("/usr")) node, _, _ := tree.AddPath("/usr", *BlankFileChangeInfo("/usr"))
node.Data.DiffType = Unchanged node.Data.DiffType = Unmodified
node, _, _ = tree.AddPath("/usr/bin", *BlankFileChangeInfo("/usr/bin")) node, _, _ = tree.AddPath("/usr/bin", *BlankFileChangeInfo("/usr/bin"))
node.Data.DiffType = Added node.Data.DiffType = Added
@ -123,11 +123,11 @@ func TestDiffTypeFromAddedChildren(t *testing.T) {
node, _, _ = tree.AddPath("/usr/bin2", *BlankFileChangeInfo("/usr/bin2")) node, _, _ = tree.AddPath("/usr/bin2", *BlankFileChangeInfo("/usr/bin2"))
node.Data.DiffType = Removed node.Data.DiffType = Removed
err := tree.Root.Children["usr"].deriveDiffType(Unchanged) err := tree.Root.Children["usr"].deriveDiffType(Unmodified)
checkError(t, err, "unable to setup test") checkError(t, err, "unable to setup test")
if tree.Root.Children["usr"].Data.DiffType != Changed { if tree.Root.Children["usr"].Data.DiffType != Modified {
t.Errorf("Expected Changed but got %v", tree.Root.Children["usr"].Data.DiffType) t.Errorf("Expected Modified but got %v", tree.Root.Children["usr"].Data.DiffType)
} }
} }
func TestDiffTypeFromRemovedChildren(t *testing.T) { func TestDiffTypeFromRemovedChildren(t *testing.T) {
@ -142,11 +142,11 @@ func TestDiffTypeFromRemovedChildren(t *testing.T) {
node, _, _ = tree.AddPath("/usr/.wh.bin2", *info2) node, _, _ = tree.AddPath("/usr/.wh.bin2", *info2)
node.Data.DiffType = Removed node.Data.DiffType = Removed
err := tree.Root.Children["usr"].deriveDiffType(Unchanged) err := tree.Root.Children["usr"].deriveDiffType(Unmodified)
checkError(t, err, "unable to setup test") checkError(t, err, "unable to setup test")
if tree.Root.Children["usr"].Data.DiffType != Changed { if tree.Root.Children["usr"].Data.DiffType != Modified {
t.Errorf("Expected Changed but got %v", tree.Root.Children["usr"].Data.DiffType) t.Errorf("Expected Modified but got %v", tree.Root.Children["usr"].Data.DiffType)
} }
} }

2
filetree/tree.go
View File

@ -334,7 +334,7 @@ func (tree *FileTree) CompareAndMark(upper *FileTree) error {
if err != nil { if err != nil {
return err return err
} }
} else if pair.lowerNode.Data.DiffType == Unchanged { } else if pair.lowerNode.Data.DiffType == Unmodified {
err = pair.lowerNode.deriveDiffType(pair.tentative) err = pair.lowerNode.deriveDiffType(pair.tentative)
if err != nil { if err != nil {
return err return err

14
filetree/tree_test.go
View File

@ -423,7 +423,7 @@ func TestCompareWithNoChanges(t *testing.T) {
if n.Path() == "/" { if n.Path() == "/" {
return nil return nil
} }
if (n.Data.DiffType) != Unchanged { if (n.Data.DiffType) != Unmodified {
t.Errorf("Expecting node at %s to have DiffType unchanged, but had %v", n.Path(), n.Data.DiffType) t.Errorf("Expecting node at %s to have DiffType unchanged, but had %v", n.Path(), n.Data.DiffType)
} }
return nil return nil
@ -477,11 +477,11 @@ func TestCompareWithAdds(t *testing.T) {
failedAssertions = append(failedAssertions, err) failedAssertions = append(failedAssertions, err)
} }
} else if stringInSlice(p, []string{"/usr/bin", "/usr"}) { } else if stringInSlice(p, []string{"/usr/bin", "/usr"}) {
if err := AssertDiffType(n, Changed); err != nil { if err := AssertDiffType(n, Modified); err != nil {
failedAssertions = append(failedAssertions, err) failedAssertions = append(failedAssertions, err)
} }
} else { } else {
if err := AssertDiffType(n, Unchanged); err != nil { if err := AssertDiffType(n, Unmodified); err != nil {
failedAssertions = append(failedAssertions, err) failedAssertions = append(failedAssertions, err)
} }
} }
@ -588,11 +588,11 @@ func TestCompareWithChanges(t *testing.T) {
if p == "/" { if p == "/" {
return nil return nil
} else if stringInSlice(p, changedPaths) { } else if stringInSlice(p, changedPaths) {
if err := AssertDiffType(n, Changed); err != nil { if err := AssertDiffType(n, Modified); err != nil {
failedAssertions = append(failedAssertions, err) failedAssertions = append(failedAssertions, err)
} }
} else { } else {
if err := AssertDiffType(n, Unchanged); err != nil { if err := AssertDiffType(n, Unmodified); err != nil {
failedAssertions = append(failedAssertions, err) failedAssertions = append(failedAssertions, err)
} }
} }
@ -656,11 +656,11 @@ func TestCompareWithRemoves(t *testing.T) {
failedAssertions = append(failedAssertions, err) failedAssertions = append(failedAssertions, err)
} }
} else if stringInSlice(p, []string{"/usr", "/root"}) { } else if stringInSlice(p, []string{"/usr", "/root"}) {
if err := AssertDiffType(n, Changed); err != nil { if err := AssertDiffType(n, Modified); err != nil {
failedAssertions = append(failedAssertions, err) failedAssertions = append(failedAssertions, err)
} }
} else { } else {
if err := AssertDiffType(n, Unchanged); err != nil { if err := AssertDiffType(n, Unmodified); err != nil {
failedAssertions = append(failedAssertions, err) failedAssertions = append(failedAssertions, err)
} }
} }

20
ui/filetree_controller.go
View File

@ -35,7 +35,7 @@ type FileTreeController struct {
keybindingToggleAdded []keybinding.Key keybindingToggleAdded []keybinding.Key
keybindingToggleRemoved []keybinding.Key keybindingToggleRemoved []keybinding.Key
keybindingToggleModified []keybinding.Key keybindingToggleModified []keybinding.Key
keybindingToggleUnchanged []keybinding.Key keybindingToggleUnmodified []keybinding.Key
keybindingPageDown []keybinding.Key keybindingPageDown []keybinding.Key
keybindingPageUp []keybinding.Key keybindingPageUp []keybinding.Key
} }
@ -80,9 +80,13 @@ func NewFileTreeController(name string, gui *gocui.Gui, tree *filetree.FileTree,
logrus.Error(err) logrus.Error(err)
} }
controller.keybindingToggleUnchanged, err = keybinding.ParseAll(viper.GetString("keybinding.toggle-unchanged-files")) // support legacy behavior first, then use default behavior
controller.keybindingToggleUnmodified, err = keybinding.ParseAll(viper.GetString("keybinding.toggle-unchanged-files"))
if err != nil { if err != nil {
logrus.Error(err) controller.keybindingToggleUnmodified, err = keybinding.ParseAll(viper.GetString("keybinding.toggle-unmodified-files"))
if err != nil {
logrus.Error(err)
}
} }
controller.keybindingPageUp, err = keybinding.ParseAll(viper.GetString("keybinding.page-up")) controller.keybindingPageUp, err = keybinding.ParseAll(viper.GetString("keybinding.page-up"))
@ -162,12 +166,12 @@ func (controller *FileTreeController) Setup(v *gocui.View, header *gocui.View) e
} }
} }
for _, key := range controller.keybindingToggleModified { for _, key := range controller.keybindingToggleModified {
if err := controller.gui.SetKeybinding(controller.Name, key.Value, key.Modifier, func(*gocui.Gui, *gocui.View) error { return controller.toggleShowDiffType(filetree.Changed) }); err != nil { if err := controller.gui.SetKeybinding(controller.Name, key.Value, key.Modifier, func(*gocui.Gui, *gocui.View) error { return controller.toggleShowDiffType(filetree.Modified) }); err != nil {
return err return err
} }
} }
for _, key := range controller.keybindingToggleUnchanged { for _, key := range controller.keybindingToggleUnmodified {
if err := controller.gui.SetKeybinding(controller.Name, key.Value, key.Modifier, func(*gocui.Gui, *gocui.View) error { return controller.toggleShowDiffType(filetree.Unchanged) }); err != nil { if err := controller.gui.SetKeybinding(controller.Name, key.Value, key.Modifier, func(*gocui.Gui, *gocui.View) error { return controller.toggleShowDiffType(filetree.Unmodified) }); err != nil {
return err return err
} }
} }
@ -392,7 +396,7 @@ func (controller *FileTreeController) KeyHelp() string {
renderStatusOption(controller.keybindingToggleCollapseAll[0].String(), "Collapse all dir", false) + renderStatusOption(controller.keybindingToggleCollapseAll[0].String(), "Collapse all dir", false) +
renderStatusOption(controller.keybindingToggleAdded[0].String(), "Added", !controller.vm.HiddenDiffTypes[filetree.Added]) + renderStatusOption(controller.keybindingToggleAdded[0].String(), "Added", !controller.vm.HiddenDiffTypes[filetree.Added]) +
renderStatusOption(controller.keybindingToggleRemoved[0].String(), "Removed", !controller.vm.HiddenDiffTypes[filetree.Removed]) + renderStatusOption(controller.keybindingToggleRemoved[0].String(), "Removed", !controller.vm.HiddenDiffTypes[filetree.Removed]) +
renderStatusOption(controller.keybindingToggleModified[0].String(), "Modified", !controller.vm.HiddenDiffTypes[filetree.Changed]) + renderStatusOption(controller.keybindingToggleModified[0].String(), "Modified", !controller.vm.HiddenDiffTypes[filetree.Modified]) +
renderStatusOption(controller.keybindingToggleUnchanged[0].String(), "Unmodified", !controller.vm.HiddenDiffTypes[filetree.Unchanged]) + renderStatusOption(controller.keybindingToggleUnmodified[0].String(), "Unmodified", !controller.vm.HiddenDiffTypes[filetree.Unmodified]) +
renderStatusOption(controller.keybindingToggleAttributes[0].String(), "Attributes", controller.vm.ShowAttributes) renderStatusOption(controller.keybindingToggleAttributes[0].String(), "Attributes", controller.vm.ShowAttributes)
} }

8
ui/filetree_viewmodel.go
View File

@ -53,10 +53,10 @@ func NewFileTreeViewModel(tree *filetree.FileTree, refTrees []*filetree.FileTree
treeViewModel.HiddenDiffTypes[filetree.Added] = true treeViewModel.HiddenDiffTypes[filetree.Added] = true
case "removed": case "removed":
treeViewModel.HiddenDiffTypes[filetree.Removed] = true treeViewModel.HiddenDiffTypes[filetree.Removed] = true
case "changed": case "modified":
treeViewModel.HiddenDiffTypes[filetree.Changed] = true treeViewModel.HiddenDiffTypes[filetree.Modified] = true
case "unchanged": case "unmodified":
treeViewModel.HiddenDiffTypes[filetree.Unchanged] = true treeViewModel.HiddenDiffTypes[filetree.Unmodified] = true
default: default:
utils.PrintAndExit(fmt.Sprintf("unknown diff.hide value: %s", t)) utils.PrintAndExit(fmt.Sprintf("unknown diff.hide value: %s", t))
} }

4
ui/filetree_viewmodel_test.go
View File

@ -324,7 +324,7 @@ func TestFileTreeHideAddedRemovedModified(t *testing.T) {
vm.toggleShowDiffType(filetree.Added) vm.toggleShowDiffType(filetree.Added)
// hide modified files // hide modified files
vm.toggleShowDiffType(filetree.Changed) vm.toggleShowDiffType(filetree.Modified)
// hide removed files // hide removed files
vm.toggleShowDiffType(filetree.Removed) vm.toggleShowDiffType(filetree.Removed)
@ -350,7 +350,7 @@ func TestFileTreeHideUnmodified(t *testing.T) {
} }
// hide unmodified files // hide unmodified files
vm.toggleShowDiffType(filetree.Unchanged) vm.toggleShowDiffType(filetree.Unmodified)
runTestCase(t, vm, width, height, nil) runTestCase(t, vm, width, height, nil)
} }