fix: check is currentDir is set

fixes #88
dundee · Aug 27, 2021 · 49eb695 · 49eb695
1 parent 5b3a81b
commit 49eb695
Show file tree

Hide file tree

Showing 8 changed files with 161 additions and 11 deletions.
diff --git a/tui/actions.go b/tui/actions.go
@@ -220,6 +220,10 @@ func (ui *UI) deleteSelected(shouldEmpty bool) {
 }
 
 func (ui *UI) showFile() *tview.TextView {
+	if ui.currentDir == nil {
+		return nil
+	}
+
 	row, column := ui.table.GetSelection()
 	selectedFile := ui.table.GetCell(row, column).GetReference().(analyze.Item)
 	if selectedFile.IsDir() {
@@ -305,6 +309,10 @@ func (ui *UI) showFile() *tview.TextView {
 }
 
 func (ui *UI) showInfo() {
+	if ui.currentDir == nil {
+		return
+	}
+
 	var content, numberColor string
 	row, column := ui.table.GetSelection()
 	selectedFile := ui.table.GetCell(row, column).GetReference().(analyze.Item)

diff --git a/tui/actions_test.go b/tui/actions_test.go
@@ -198,6 +198,19 @@ func TestViewDirContents(t *testing.T) {
 	assert.Nil(t, res)
 }
 
+func TestViewFileWithoutCurrentDir(t *testing.T) {
+	simScreen := testapp.CreateSimScreen(50, 50)
+	defer simScreen.Fini()
+
+	app := testapp.CreateMockedApp(true)
+	ui := CreateUI(app, simScreen, &bytes.Buffer{}, false, true)
+	ui.Analyzer = &testanalyze.MockedAnalyzer{}
+	ui.done = make(chan struct{})
+
+	res := ui.showFile() // no current directory
+	assert.Nil(t, res)
+}
+
 func TestViewContentsOfNotExistingFile(t *testing.T) {
 	simScreen := testapp.CreateSimScreen(50, 50)
 	defer simScreen.Fini()
@@ -317,6 +330,21 @@ func TestShowInfoBW(t *testing.T) {
 	assert.True(t, ui.pages.HasPage("info"))
 }
 
+func TestShowInfoWithoutCurrentDir(t *testing.T) {
+	fin := testdir.CreateTestDir()
+	defer fin()
+	simScreen := testapp.CreateSimScreen(50, 50)
+	defer simScreen.Fini()
+
+	app := testapp.CreateMockedApp(true)
+	ui := CreateUI(app, simScreen, &bytes.Buffer{}, false, true)
+	ui.done = make(chan struct{})
+
+	// pressing `i` will do nothing
+	ui.keyPressed(tcell.NewEventKey(tcell.KeyRune, 'i', 0))
+	assert.False(t, ui.pages.HasPage("info"))
+}
+
 func TestExitViewFile(t *testing.T) {
 	fin := testdir.CreateTestDir()
 	defer fin()

diff --git a/tui/filter.go b/tui/filter.go
@@ -15,6 +15,10 @@ func (ui *UI) hideFilterInput() {
 }
 
 func (ui *UI) showFilterInput() {
+	if ui.currentDir == nil {
+		return
+	}
+
 	if ui.filteringInput == nil {
 		ui.filteringInput = tview.NewInputField()
 

diff --git a/tui/filter_test.go b/tui/filter_test.go
@@ -46,6 +46,20 @@ func TestFiltering(t *testing.T) {
 	assert.Contains(t, ui.table.GetCell(0, 0).Text, "aaa") // filtering reset
 }
 
+func TestFilteringWithoutCurrentDir(t *testing.T) {
+	simScreen := testapp.CreateSimScreen(50, 50)
+	defer simScreen.Fini()
+
+	app := testapp.CreateMockedApp(false)
+	ui := CreateUI(app, simScreen, &bytes.Buffer{}, true, true)
+	ui.Analyzer = &testanalyze.MockedAnalyzer{}
+	ui.done = make(chan struct{})
+
+	ui.showFilterInput()
+
+	assert.False(t, ui.filtering)
+}
+
 func TestSwitchToTable(t *testing.T) {
 	fin := testdir.CreateTestDir()
 	defer fin()

diff --git a/tui/keys.go b/tui/keys.go
@@ -40,13 +40,7 @@ func (ui *UI) keyPressed(key *tcell.EventKey) *tcell.EventKey {
 		ui.app.Stop()
 		return nil
 	case 'b':
-		ui.app.Stop()
-		if err := os.Chdir(ui.currentDirPath); err != nil {
-			panic(err)
-		}
-		if err := ui.exec(getShellBin(), nil, os.Environ()); err != nil {
-			panic(err)
-		}
+		ui.spawnShell()
 		return nil
 	case '?':
 		ui.showHelp()
@@ -121,10 +115,8 @@ func (ui *UI) keyPressed(key *tcell.EventKey) *tcell.EventKey {
 		ui.setSorting("mtime")
 	case '/':
 		ui.showFilterInput()
-	default:
-		return key
 	}
-	return nil
+	return key
 }
 
 func (ui *UI) handleLeft() {
@@ -166,3 +158,18 @@ func (ui *UI) handleDelete(shouldEmpty bool) {
 		ui.deleteSelected(shouldEmpty)
 	}
 }
+
+func (ui *UI) spawnShell() {
+	if ui.currentDir == nil {
+		return
+	}
+
+	ui.app.Stop()
+	if err := os.Chdir(ui.currentDirPath); err != nil {
+		ui.showErr("Error changing directory", err)
+		return
+	}
+	if err := ui.exec(getShellBin(), nil, os.Environ()); err != nil {
+		ui.showErr("Error executing shell", err)
+	}
+}
diff --git a/tui/keys_test.go b/tui/keys_test.go
@@ -2,6 +2,7 @@ package tui
 
 import (
 	"bytes"
+	"errors"
 	"testing"
 
 	"github.com/dundee/gdu/v5/internal/testanalyze"
@@ -206,6 +207,78 @@ func TestSpawnShell(t *testing.T) {
 	assert.True(t, called)
 }
 
+func TestSpawnShellWithoutDir(t *testing.T) {
+	fin := testdir.CreateTestDir()
+	defer fin()
+	simScreen := testapp.CreateSimScreen(50, 50)
+	defer simScreen.Fini()
+
+	app := testapp.CreateMockedApp(false)
+	buff := &bytes.Buffer{}
+	ui := CreateUI(app, simScreen, buff, true, true)
+	var called = false
+	ui.exec = func(argv0 string, argv, envv []string) error {
+		called = true
+		return nil
+	}
+
+	ui.done = make(chan struct{})
+
+	key := ui.keyPressed(tcell.NewEventKey(tcell.KeyRune, 'b', 0))
+	assert.Nil(t, key)
+	assert.False(t, called)
+}
+
+func TestSpawnShellWithWrongDir(t *testing.T) {
+	fin := testdir.CreateTestDir()
+	defer fin()
+	simScreen := testapp.CreateSimScreen(50, 50)
+	defer simScreen.Fini()
+
+	app := testapp.CreateMockedApp(false)
+	buff := &bytes.Buffer{}
+	ui := CreateUI(app, simScreen, buff, true, true)
+	var called = false
+	ui.exec = func(argv0 string, argv, envv []string) error {
+		called = true
+		return nil
+	}
+
+	ui.done = make(chan struct{})
+	ui.currentDir = &analyze.Dir{}
+	ui.currentDirPath = "/xxxxx"
+
+	key := ui.keyPressed(tcell.NewEventKey(tcell.KeyRune, 'b', 0))
+	assert.Nil(t, key)
+	assert.False(t, called)
+	assert.True(t, ui.pages.HasPage("error"))
+}
+
+func TestSpawnShellWithError(t *testing.T) {
+	fin := testdir.CreateTestDir()
+	defer fin()
+	simScreen := testapp.CreateSimScreen(50, 50)
+	defer simScreen.Fini()
+
+	app := testapp.CreateMockedApp(false)
+	buff := &bytes.Buffer{}
+	ui := CreateUI(app, simScreen, buff, true, true)
+	var called = false
+	ui.exec = func(argv0 string, argv, envv []string) error {
+		called = true
+		return errors.New("wrong shell")
+	}
+
+	ui.done = make(chan struct{})
+	ui.currentDir = &analyze.Dir{}
+	ui.currentDirPath = "."
+
+	key := ui.keyPressed(tcell.NewEventKey(tcell.KeyRune, 'b', 0))
+	assert.Nil(t, key)
+	assert.True(t, called)
+	assert.True(t, ui.pages.HasPage("error"))
+}
+
 func TestShowConfirm(t *testing.T) {
 	simScreen := testapp.CreateSimScreen(50, 50)
 	defer simScreen.Fini()
@@ -241,7 +314,7 @@ func TestDeleteEmpty(t *testing.T) {
 	ui.done = make(chan struct{})
 
 	key := ui.keyPressed(tcell.NewEventKey(tcell.KeyRune, 'd', 0))
-	assert.Nil(t, key)
+	assert.NotNil(t, key)
 }
 
 func TestDelete(t *testing.T) {

diff --git a/tui/sort_test.go b/tui/sort_test.go
@@ -103,6 +103,18 @@ func TestSetSorting(t *testing.T) {
 	assert.Equal(t, "asc", ui.sortOrder)
 }
 
+func TestSetSortingWithoutCurrentDir(t *testing.T) {
+	simScreen := testapp.CreateSimScreen(50, 50)
+	defer simScreen.Fini()
+
+	app := testapp.CreateMockedApp(true)
+	ui := CreateUI(app, simScreen, &bytes.Buffer{}, false, true)
+
+	// calling setSorting does nothing if we have not current dir
+	ui.setSorting("itemCount")
+	assert.Equal(t, "size", ui.sortBy)
+}
+
 func getAnalyzedPathWithSorting(sortBy string, sortOrder string, apparentSize bool) *UI {
 	simScreen := testapp.CreateSimScreen(50, 50)
 	defer simScreen.Fini()

diff --git a/tui/tui.go b/tui/tui.go
@@ -368,6 +368,10 @@ func (ui *UI) showErr(msg string, err error) {
 }
 
 func (ui *UI) setSorting(newOrder string) {
+	if ui.currentDir == nil {
+		return
+	}
+
 	if newOrder == ui.sortBy {
 		if ui.sortOrder == "asc" {
 			ui.sortOrder = "desc"