Add option to not extract received directories

Fixes #50
Jacalz · Jan 15, 2024 · c27def8 · c27def8
1 parent 7370c87
commit c27def8
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 7 deletions.
diff --git a/internal/transport/receiver.go b/internal/transport/receiver.go
@@ -41,6 +41,10 @@ func (c *Client) NewReceive(code string) (*wormhole.IncomingMessage, error) {
 func (c *Client) SaveToDisk(msg *wormhole.IncomingMessage, targetPath string, progress func(int64, int64)) (err error) {
 	contents := util.NewProgressReader(msg, progress, msg.TransferBytes)
 
+	if msg.Type == wormhole.TransferDirectory && c.NoExtractDirectory {
+		targetPath += ".zip" // We are saving the zip-file and not extracting.
+	}
+
 	if !c.OverwriteExisting {
 		if _, err := os.Stat(targetPath); err == nil || os.IsExist(err) {
 			targetPath, err = addFileIncrement(targetPath)
@@ -51,7 +55,7 @@ func (c *Client) SaveToDisk(msg *wormhole.IncomingMessage, targetPath string, pr
 		}
 	}
 
-	if msg.Type == wormhole.TransferFile {
+	if msg.Type == wormhole.TransferFile || c.NoExtractDirectory {
 		var file *os.File
 		file, err = os.Create(targetPath) // #nosec Path is cleaned by filepath.Join().
 		if err != nil {

diff --git a/internal/transport/transport.go b/internal/transport/transport.go
@@ -13,17 +13,20 @@ type Client struct {
 	// App is a reference to the currently running Fyne application.
 	App fyne.App
 
+	// CustomCode defines if we should pass a custom code or let wormhole-william generate on for us.
+	CustomCode bool
+
+	// DownloadPath holds the download path used for saving received files.
+	DownloadPath string
+
+	// NoExtractDirectory specifies if we should extract directories or not.
+	NoExtractDirectory bool
+
 	// Notification holds the settings value for if we have notifications enabled or not.
 	Notifications bool
 
 	// OverwriteExisting holds the settings value for if we should overwrite already existing files.
 	OverwriteExisting bool
-
-	// DownloadPath holds the download path used for saving received files.
-	DownloadPath string
-
-	// Defines if we should pass a custom code or let wormhole-william generate on for us.
-	CustomCode bool
 }
 
 // ShowNotification sends a notification if c.Notifications is true.

diff --git a/internal/ui/settings.go b/internal/ui/settings.go
@@ -21,6 +21,7 @@ type settings struct {
 	downloadPathEntry *widget.Entry
 	overwriteFiles    *widget.RadioGroup
 	notificationRadio *widget.RadioGroup
+	extractRadio      *widget.RadioGroup
 	checkUpdatesRadio *widget.RadioGroup
 
 	componentSlider     *widget.Slider
@@ -109,6 +110,11 @@ func (s *settings) onNotificationsChanged(selected string) {
 	s.preferences.SetBool("Notifications", s.client.Notifications)
 }
 
+func (s *settings) onExtractChanged(selected string) {
+	s.client.NoExtractDirectory = selected == "Off" // UI representation is flipped.
+	s.preferences.SetBool("NoExtractDirectory", s.client.NoExtractDirectory)
+}
+
 func (s *settings) onCheckUpdatesChanged(selected string) {
 	s.preferences.SetBool("CheckUpdates", selected == "On")
 }
@@ -171,6 +177,9 @@ func (s *settings) getPreferences(app fyne.App) {
 	s.client.Notifications = s.preferences.BoolWithFallback("Notifications", true)
 	s.notificationRadio.Selected = onOrOff(s.client.Notifications)
 
+	s.client.NoExtractDirectory = s.preferences.Bool("NoExtractDirectory")
+	s.extractRadio.Selected = onOrOff(!s.client.NoExtractDirectory)
+
 	checkUpdates := s.preferences.BoolWithFallback("CheckUpdates", true)
 	if !updater.Enabled {
 		checkUpdates = false
@@ -211,6 +220,8 @@ func (s *settings) buildUI(app fyne.App) *container.Scroll {
 
 	s.notificationRadio = &widget.RadioGroup{Options: onOffOptions, Horizontal: true, Required: true, OnChanged: s.onNotificationsChanged}
 
+	s.extractRadio = &widget.RadioGroup{Options: onOffOptions, Horizontal: true, Required: true, OnChanged: s.onExtractChanged}
+
 	s.checkUpdatesRadio = &widget.RadioGroup{Options: onOffOptions, Horizontal: true, Required: true, OnChanged: s.onCheckUpdatesChanged}
 
 	s.verifyRadio = &widget.RadioGroup{Options: onOffOptions, Horizontal: true, Required: true, OnChanged: s.onVerifyChanged}
@@ -240,6 +251,7 @@ func (s *settings) buildUI(app fyne.App) *container.Scroll {
 		newBoldLabel("Save files to"), s.downloadPathEntry,
 		newBoldLabel("Overwrite files"), s.overwriteFiles,
 		newBoldLabel("Notifications"), s.notificationRadio,
+		newBoldLabel("Extract received directory"), s.extractRadio,
 		newBoldLabel("Check for updates"), s.checkUpdatesRadio,
 	)