Merge branch 'develop' into release/v2.2.x

fyne-io · Jun 3, 2022 · c433ae1 · c433ae1
2 parents 55c7f02 + 3c1f987
commit c433ae1
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/dialog/fileitem.go b/dialog/fileitem.go
@@ -63,15 +63,6 @@ func (i *fileDialogItem) CreateRenderer() fyne.WidgetRenderer {
 	}
 }
 
-func fileName(path fyne.URI) (name string) {
-	pathstr := path.String()[len(path.Scheme())+3:]
-	name = filepath.Base(pathstr)
-	ext := filepath.Ext(name[1:])
-	name = name[:len(name)-len(ext)]
-
-	return
-}
-
 func (i *fileDialogItem) isDirectory() bool {
 	return i.dir
 }
@@ -80,13 +71,13 @@ func (f *fileDialog) newFileItem(location fyne.URI, dir bool) *fileDialogItem {
 	item := &fileDialogItem{
 		picker:   f,
 		location: location,
+		name:     location.Name(),
 		dir:      dir,
 	}
 
-	if dir {
-		item.name = location.Name()
-	} else {
-		item.name = fileName(location)
+	if f.view == gridView {
+		ext := filepath.Ext(item.name[1:])
+		item.name = item.name[:len(item.name)-len(ext)]
 	}
 
 	item.ExtendBaseWidget(item)

diff --git a/dialog/fileitem_test.go b/dialog/fileitem_test.go
@@ -22,6 +22,24 @@ func TestFileItem_Name(t *testing.T) {
 
 	item = f.newFileItem(storage.NewFileURI("/path/to/.maybeHidden.txt"), false)
 	assert.Equal(t, ".maybeHidden", item.name)
+
+	item = f.newFileItem(storage.NewFileURI("/path/to/noext"), false)
+	assert.Equal(t, "noext", item.name)
+
+	// Test that the extension remains for the list view.
+	f.view = listView
+
+	item = f.newFileItem(storage.NewFileURI("/path/to/filename.txt"), false)
+	assert.Equal(t, "filename.txt", item.name)
+
+	item = f.newFileItem(storage.NewFileURI("/path/to/MyFile.jpeg"), false)
+	assert.Equal(t, "MyFile.jpeg", item.name)
+
+	item = f.newFileItem(storage.NewFileURI("/path/to/.maybeHidden.txt"), false)
+	assert.Equal(t, ".maybeHidden.txt", item.name)
+
+	item = f.newFileItem(storage.NewFileURI("/path/to/noext"), false)
+	assert.Equal(t, "noext", item.name)
 }
 
 func TestFileItem_FolderName(t *testing.T) {
@@ -32,10 +50,15 @@ func TestFileItem_FolderName(t *testing.T) {
 	assert.Equal(t, "foldername", item.name)
 
 	item = f.newFileItem(storage.NewFileURI("/path/to/myapp.app/"), true)
-	assert.Equal(t, "myapp.app", item.name)
+	assert.Equal(t, "myapp", item.name)
 
 	item = f.newFileItem(storage.NewFileURI("/path/to/.maybeHidden/"), true)
 	assert.Equal(t, ".maybeHidden", item.name)
+
+	// Test that the extension remains for the list view.
+	f.view = listView
+	item = f.newFileItem(storage.NewFileURI("/path/to/myapp.app/"), true)
+	assert.Equal(t, "myapp.app", item.name)
 }
 
 func TestNewFileItem(t *testing.T) {