Skip to content

Commit

Permalink
Fix file/folder name when starting with . (but not hidden)
Browse files Browse the repository at this point in the history
  • Loading branch information
andydotxyz committed Aug 5, 2020
1 parent 9dd8adb commit 88eb229
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -27,6 +27,8 @@ More detailed release notes can be found on the [releases page](https://github.c
* Update the extended progressbar on refresh (#1219)
* Segfault if font fails (#1200)
* Slider rendering incorrectly when window maximized (#1223)
* Changing form label not refreshed (#1231)
* Files and folders starting "." show no name (#1235)


## 1.3.2 - 11 July 2020
Expand Down
2 changes: 1 addition & 1 deletion dialog/fileitem.go
Expand Up @@ -46,7 +46,7 @@ func (i *fileDialogItem) CreateRenderer() fyne.WidgetRenderer {

func fileName(path string) (name string) {
name = filepath.Base(path)
ext := filepath.Ext(path)
ext := filepath.Ext(name[1:])
name = name[:len(name)-len(ext)]

return
Expand Down
28 changes: 28 additions & 0 deletions dialog/fileitem_test.go
Expand Up @@ -11,6 +11,34 @@ import (
"github.com/stretchr/testify/assert"
)

func TestFileItem_Name(t *testing.T) {
f := &fileDialog{file: &FileDialog{}}
_ = f.makeUI()

item := f.newFileItem("/path/to/filename.txt", false)
assert.Equal(t, "filename", item.name)

item = f.newFileItem("/path/to/MyFile.jpeg", false)
assert.Equal(t, "MyFile", item.name)

item = f.newFileItem("/path/to/.maybeHidden.txt", false)
assert.Equal(t, ".maybeHidden", item.name)
}

func TestFileItem_FolderName(t *testing.T) {
f := &fileDialog{file: &FileDialog{}}
_ = f.makeUI()

item := f.newFileItem("/path/to/foldername/", true)
assert.Equal(t, "foldername", item.name)

item = f.newFileItem("/path/to/myapp.app/", true)
assert.Equal(t, "myapp", item.name)

item = f.newFileItem("/path/to/.maybeHidden/", true)
assert.Equal(t, ".maybeHidden", item.name)
}

func TestNewFileItem(t *testing.T) {
f := &fileDialog{file: &FileDialog{}}
_ = f.makeUI()
Expand Down

0 comments on commit 88eb229

Please sign in to comment.