Add the ability to filter files in the File Dialog

cmd/fyne_demo/screens/window.go

@@ -145,6 +145,18 @@ func loadDialogGroup(win fyne.Window) *widget.Group {
 				fileOpened(reader)
 			}, win)
 		}),
+		widget.NewButton("File Open With Filter (only show txt or png)", func() {
+			fd := dialog.NewFileOpen(func(reader fyne.FileReadCloser, err error) {
+				if err != nil {
+					dialog.ShowError(err, win)
+					return
+				}
+
+				fileOpened(reader)
+			}, win)
+			fd.SetFilter(dialog.NewExtensionFileFilter([]string{".png", ".txt"}))
+			fd.Show()
+		}),
 		widget.NewButton("File Save", func() {
 			dialog.ShowFileSave(func(writer fyne.FileWriteCloser, err error) {
 				if err != nil {
@@ -155,6 +167,18 @@ func loadDialogGroup(win fyne.Window) *widget.Group {
 				fileSaved(writer)
 			}, win)
 		}),
+		widget.NewButton("File Save With Filter (only show images)", func() {
+			fd := dialog.NewFileSave(func(writer fyne.FileWriteCloser, err error) {
+				if err != nil {
+					dialog.ShowError(err, win)
+					return
+				}
+
+				fileSaved(writer)
+			}, win)
+			fd.SetFilter(dialog.NewMimeTypeFileFilter([]string{"image/*"}))
+			fd.Show()
+		}),
 		widget.NewButton("Custom Dialog (Login Form)", func() {
 			username := widget.NewEntry()
 			password := widget.NewPasswordEntry()

dialog/file.go

@@ -20,22 +20,72 @@ type textWidget interface {
 }
 
 type fileDialog struct {
+	file       *FileDialog
 	fileName   textWidget
 	open       *widget.Button
 	breadcrumb *widget.Box
 	files      *fyne.Container
 	fileScroll *widget.ScrollContainer
-	parent     fyne.Window
 
 	win      *widget.PopUp
 	selected *fileDialogItem
-	callback interface{}
 	dir      string
+}
+
+// FileDialog is a dialog containing a file picker for use in opening or saving files.
+type FileDialog struct {
 	save     bool
+	callback interface{}
+	filter   FileFilter
+	parent   fyne.Window
+	dialog   *fileDialog
+}
+
+// FileFilter is an interface that can be implemented to provide a filter to a file dialog.
+type FileFilter interface {
+	Matches(fyne.URI) bool
+}
+
+type extensionFileFilter struct {
+	extensions []string
+}
+
+type mimeTypeFileFilter struct {
+	mimeTypes []string
+}
+
+// Matches returns true if a file URI has one of the filtered extensions.
+func (e *extensionFileFilter) Matches(uri fyne.URI) bool {
+	extension := uri.Extension()
+	for _, ext := range e.extensions {
+		if extension == ext {
+			return true
+		}
+	}
+	return false
+}
+
+// Matches returns true if a file URI has one of the filtered mimetypes.
+func (mt *mimeTypeFileFilter) Matches(uri fyne.URI) bool {
+	mimeType, mimeSubType := mimeTypeGet(uri)
+	for _, mimeTypeFull := range mt.mimeTypes {
+		mimeTypeSplit := strings.Split(mimeTypeFull, "/")
+		if len(mimeTypeSplit) <= 1 {
+			continue
+		}
+		mType := mimeTypeSplit[0]
+		mSubType := strings.Split(mimeTypeSplit[1], ";")[0]
+		if mType == mimeType {
+			if mSubType == mimeSubType || mSubType == "*" {
+				return true
+			}
+		}
+	}
+	return false
 }
 
 func (f *fileDialog) makeUI() fyne.CanvasObject {
-	if f.save {
+	if f.file.save {
 		saveName := widget.NewEntry()
 		saveName.OnChanged = func(s string) {
 			if s == "" {
@@ -50,17 +100,17 @@ func (f *fileDialog) makeUI() fyne.CanvasObject {
 	}
 
 	label := "Open"
-	if f.save {
+	if f.file.save {
 		label = "Save"
 	}
 	f.open = widget.NewButton(label, func() {
-		if f.callback == nil {
+		if f.file.callback == nil {
 			f.win.Hide()
 			return
 		}
 
-		if f.save {
-			callback := f.callback.(func(fyne.FileWriteCloser, error))
+		if f.file.save {
+			callback := f.file.callback.(func(fyne.FileWriteCloser, error))
 			name := f.fileName.(*widget.Entry).Text
 			path := filepath.Join(f.dir, name)
 
@@ -71,7 +121,7 @@ func (f *fileDialog) makeUI() fyne.CanvasObject {
 				return
 			} else if info.IsDir() {
 				ShowInformation("Cannot overwrite",
-					"Files cannot replace a directory,\ncheck the file name and try again", f.parent)
+					"Files cannot replace a directory,\ncheck the file name and try again", f.file.parent)
 				return
 			}
 
@@ -84,9 +134,9 @@ func (f *fileDialog) makeUI() fyne.CanvasObject {
 
 					callback(storage.SaveFileToURI(storage.NewURI("file://" + path)))
 					f.win.Hide()
-				}, f.parent)
+				}, f.file.parent)
 		} else if f.selected != nil {
-			callback := f.callback.(func(fyne.FileReadCloser, error))
+			callback := f.file.callback.(func(fyne.FileReadCloser, error))
 			f.win.Hide()
 			callback(storage.OpenFileFromURI(storage.NewURI("file://" + f.selected.path)))
 		}
@@ -96,11 +146,11 @@ func (f *fileDialog) makeUI() fyne.CanvasObject {
 	buttons := widget.NewHBox(
 		widget.NewButton("Cancel", func() {
 			f.win.Hide()
-			if f.callback != nil {
-				if f.save {
-					f.callback.(func(fyne.FileWriteCloser, error))(nil, nil)
+			if f.file.callback != nil {
+				if f.file.save {
+					f.file.callback.(func(fyne.FileWriteCloser, error))(nil, nil)
 				} else {
-					f.callback.(func(fyne.FileReadCloser, error))(nil, nil)
+					f.file.callback.(func(fyne.FileReadCloser, error))(nil, nil)
 				}
 			}
 		}),
@@ -165,11 +215,10 @@ func (f *fileDialog) refreshDir(dir string) {
 		if isHidden(file.Name(), dir) {
 			continue
 		}
-
 		itemPath := filepath.Join(dir, file.Name())
 		if file.IsDir() {
 			icons = append(icons, f.newFileItem(itemPath, true))
-		} else {
+		} else if f.file.filter == nil || f.file.filter.Matches(storage.NewURI("file://"+itemPath)) {
 			icons = append(icons, f.newFileItem(itemPath, false))
 		}
 	}
@@ -232,8 +281,8 @@ func (f *fileDialog) setSelected(file *fileDialogItem) {
 	}
 }
 
-func showFileDialog(save bool, callback interface{}, parent fyne.Window) {
-	d := &fileDialog{callback: callback, save: save, parent: parent}
+func showFile(file *FileDialog) *fileDialog {
+	d := &fileDialog{file: file}
 	ui := d.makeUI()
 	dir, err := os.UserHomeDir()
 	if err != nil {
@@ -245,27 +294,80 @@ func showFileDialog(save bool, callback interface{}, parent fyne.Window) {
 	size := ui.MinSize().Add(fyne.NewSize(fileIconCellWidth*2+theme.Padding()*4,
 		(fileIconSize+fileTextSize)+theme.Padding()*4))
 
-	d.win = widget.NewModalPopUp(ui, parent.Canvas())
+	d.win = widget.NewModalPopUp(ui, file.parent.Canvas())
 	d.win.Resize(size)
 
 	d.win.Show()
+	return d
+}
+
+// SetFilter sets a filter for limiting files that can be chosen in the file dialog.
+func (f *FileDialog) SetFilter(filter FileFilter) {
+	f.filter = filter
+	if f.dialog != nil {
+		f.dialog.refreshDir(f.dialog.dir)
+	}
 }
 
-// ShowFileOpen shows a file dialog allowing the user to choose a file to open.
+// Show shows the file dialog
+func (f *FileDialog) Show() {
+	if !f.save {
+		if fileOpenOSOverride(f.callback.(func(fyne.FileReadCloser, error)), f.parent) {
+			return
+		} 
+	else {
+		if fileSaveOSOverride(f.callback.(func(fyne.FileWriteCloser, error)), f.parent) {
+			return
+		}
+	}
+
+	f.dialog = showFile(f)
+}
+
+// NewExtensionFileFilter takes a string slice of extensions with a leading . and creates a filter for the file dialog.
+// Example: .jpg, .mp3, .txt, .sh
+func NewExtensionFileFilter(extensions []string) FileFilter {
+	return &extensionFileFilter{extensions: extensions}
+}
+
+// NewMimeTypeFileFilter takes a string slice of mimetypes, including globs, and creates a filter for the file dialog.
+// Example: image/*, audio/mp3, text/plain, application/*
+func NewMimeTypeFileFilter(mimeTypes []string) FileFilter {
+	return &mimeTypeFileFilter{mimeTypes: mimeTypes}
+}
+
+// NewFileOpen creates a file dialog allowing the user to choose a file to open.
+// The dialog will appear over the window specified when Show() is called.
+func NewFileOpen(callback func(fyne.FileReadCloser, error), parent fyne.Window) *FileDialog {
+	dialog := &FileDialog{callback: callback, parent: parent}
+	return dialog
+}
+
+// NewFileSave creates a file dialog allowing the user to choose a file to save to (new or overwrite).
+// If the user chooses an existing file they will be asked if they are sure.
+// The dialog will appear over the window specified when Show() is called.
+func NewFileSave(callback func(fyne.FileWriteCloser, error), parent fyne.Window) *FileDialog {
+	dialog := &FileDialog{callback: callback, parent: parent, save: true}
+	return dialog
+}
+
+// ShowFileOpen creates and shows a file dialog allowing the user to choose a file to open.
 // The dialog will appear over the window specified.
 func ShowFileOpen(callback func(fyne.FileReadCloser, error), parent fyne.Window) {
+	dialog := NewFileOpen(callback, parent)
 	if fileOpenOSOverride(callback, parent) {
-		return
+		return nil
 	}
-	showFileDialog(false, callback, parent)
+	dialog.Show()
 }
 
-// ShowFileSave shows a file dialog allowing the user to choose a file to save to (new or overwrite).
+// ShowFileSave creates and shows a file dialog allowing the user to choose a file to save to (new or overwrite).
 // If the user chooses an existing file they will be asked if they are sure.
 // The dialog will appear over the window specified.
 func ShowFileSave(callback func(fyne.FileWriteCloser, error), parent fyne.Window) {
+	dialog := NewFileSave(callback, parent)
 	if fileSaveOSOverride(callback, parent) {
-		return
+		return nil
 	}
-	showFileDialog(true, callback, parent)
+	dialog.Show()
 }

dialog/file_test.go

@@ -4,11 +4,13 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 
 	"fyne.io/fyne"
+	"fyne.io/fyne/storage"
 	"fyne.io/fyne/test"
 	"fyne.io/fyne/widget"
 )
@@ -133,3 +135,56 @@ func TestShowFileSave(t *testing.T) {
 	err = os.Remove(expectedPath)
 	assert.Nil(t, err)
 }
+
+func TestFileFilters(t *testing.T) {
+	win := test.NewWindow(widget.NewLabel("Content"))
+	f := NewFileOpen(func(file fyne.FileReadCloser, err error) {
+	}, win)
+
+	f.SetFilter(NewExtensionFileFilter([]string{".png"}))
+	f.Show()
+
+	workingDir, err := os.Getwd()
+	if err != nil {
+		fyne.LogError("Could not get current working directory", err)
+		t.FailNow()
+	}
+	testDataDir := filepath.Join(workingDir, "testdata")
+
+	f.dialog.setDirectory(testDataDir)
+
+	count := 0
+	for _, icon := range f.dialog.files.Objects {
+		if icon.(*fileDialogItem).dir == false {
+			uri := storage.NewURI("file://" + icon.(*fileDialogItem).path)
+			assert.Equal(t, uri.Extension(), ".png")
+			count++
+		}
+	}
+	assert.Equal(t, count, 1)
+
+	f.SetFilter(NewMimeTypeFileFilter([]string{"image/jpeg"}))
+
+	count = 0
+	for _, icon := range f.dialog.files.Objects {
+		if icon.(*fileDialogItem).dir == false {
+			uri := storage.NewURI("file://" + icon.(*fileDialogItem).path)
+			assert.Equal(t, uri.MimeType(), "image/jpeg")
+			count++
+		}
+	}
+	assert.Equal(t, count, 1)
+
+	f.SetFilter(NewMimeTypeFileFilter([]string{"image/*"}))
+
+	count = 0
+	for _, icon := range f.dialog.files.Objects {
+		if icon.(*fileDialogItem).dir == false {
+			uri := storage.NewURI("file://" + icon.(*fileDialogItem).path)
+			mimeType := strings.Split(uri.MimeType(), "/")[0]
+			assert.Equal(t, mimeType, "image")
+			count++
+		}
+	}
+	assert.Equal(t, count, 2)
+}

dialog/fileicon.go

@@ -6,7 +6,6 @@ import (
 
 	"fyne.io/fyne"
 	"fyne.io/fyne/canvas"
-	"fyne.io/fyne/storage"
 	"fyne.io/fyne/theme"
 	"fyne.io/fyne/widget"
 )
@@ -29,9 +28,10 @@ type fileIconRenderer struct {
 const ratioDown float64 = 0.45
 
 // NewFileIcon takes a filepath and creates an icon with an overlayed label using the detected mimetype and extension
-func NewFileIcon(path string) fyne.CanvasObject {
+func NewFileIcon(uri fyne.URI) fyne.CanvasObject {
 
-	ext, mimeType, mimeSubType := mimeTypeGet(path)
+	mimeType, mimeSubType := mimeTypeGet(uri)
+	ext := uri.Extension()
 
 	var res fyne.Resource
 	switch mimeType {
@@ -97,9 +97,8 @@ func (s fileIconRenderer) Refresh() {
 	canvas.Refresh(s.item)
 }
 
-func mimeTypeGet(path string) (ext, mimeType, mimeSubType string) {
-	uri := storage.NewURI(path)
-	ext = uri.Extension()
+func mimeTypeGet(uri fyne.URI) (mimeType, mimeSubType string) {
+	ext := uri.Extension()
 	if len(ext) > 5 {
 		ext = ext[:5]
 	}