Handle cancelling out of selection

app.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"log"
@@ -69,28 +70,37 @@ func (b *App) shutdown(ctx context.Context) {
 }
 
 // Greet returns a greeting for the given name
-func (b *App) OpenDirectoryDialog() []string {
+func (b *App) OpenDirectoryDialog() ([]string, error) {
 	opts := runtime.OpenDialogOptions{Title: "Select Directory", DefaultDirectory: b.GetDownloadsFolder(), AllowDirectories: true}
 	selection, err := runtime.OpenDirectoryDialog(b.ctx, opts)
 	if err != nil {
 		runtime.LogInfo(b.ctx, "Error opening dialog")
 		b.ShowErrorDialog(err.Error())
 	}
 	runtime.LogInfo(b.ctx, "File Selected:"+selection)
+	if selection == "" {
+		runtime.LogError(b.ctx, "No files selected")
+		return b.selectedFiles, errors.New("invalid selection")
+	}
 	b.selectedFiles = []string{selection}
-	return b.selectedFiles
+	return b.selectedFiles, nil
 }
 
-func (b *App) OpenFilesDialog() []string {
+func (b *App) OpenFilesDialog() ([]string, error) {
 	opts := runtime.OpenDialogOptions{Title: "Select File", AllowFiles: true, DefaultDirectory: b.GetDownloadsFolder()}
 	selection, err := runtime.OpenMultipleFilesDialog(b.ctx, opts)
 	if err != nil {
 		runtime.LogInfo(b.ctx, "Error opening dialog")
+		b.ShowErrorDialog(err.Error())
 	}
 	runtime.LogInfo(b.ctx, "File Selected:")
 	log.Println(selection)
+	if len(selection) == 0 {
+		runtime.LogError(b.ctx, "No files selected")
+		return b.selectedFiles, errors.New("invalid selection")
+	}
 	b.selectedFiles = selection
-	return b.selectedFiles
+	return b.selectedFiles, nil
 }
 
 func (b *App) SendFile(filePath string) {

frontend/src/sender.svelte

@@ -26,6 +26,7 @@
         }
       })
       .catch((err) => {
+        // No directory selected
         console.log(err);
       });
   }
@@ -40,6 +41,7 @@
         }
       })
       .catch((err) => {
+        // No files selected
         console.log(err);
       });
   }

frontend/wailsjs/go/bindings.d.ts

@@ -6,9 +6,9 @@ interface go {
 		GetDownloadsFolder():Promise<string>
 		GetNotificationsParam():Promise<boolean>
 		GetOverwriteParam():Promise<boolean>
-		OpenDirectoryDialog():Promise<Array<string>>
+		OpenDirectoryDialog():Promise<Array<string>|Error>
 		OpenFile(arg1:string):Promise<void>
-		OpenFilesDialog():Promise<Array<string>>
+		OpenFilesDialog():Promise<Array<string>|Error>
 		ReceiveFile(arg1:string):Promise<void>
 		SelectedFilesSend():Promise<void>
 		SendDirectory(arg1:string):Promise<void>

frontend/wailsjs/go/bindings.js

@@ -41,7 +41,7 @@ const go = {
       },
       /**
        * OpenDirectoryDialog
-       * @returns {Promise<Array<string>>}  - Go Type: []string
+       * @returns {Promise<Array<string>|Error>}  - Go Type: []string
        */
       "OpenDirectoryDialog": () => {
         return window.go.main.App.OpenDirectoryDialog();
@@ -56,7 +56,7 @@ const go = {
       },
       /**
        * OpenFilesDialog
-       * @returns {Promise<Array<string>>}  - Go Type: []string
+       * @returns {Promise<Array<string>|Error>}  - Go Type: []string
        */
       "OpenFilesDialog": () => {
         return window.go.main.App.OpenFilesDialog();