Add incoming directory support

app/src/main/java/io/xeres/app/application/Startup.java

@@ -48,8 +48,11 @@
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
+import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.stream.Collectors;
 
 @Component
@@ -110,6 +113,8 @@ public void run(ApplicationArguments args)
 			return;
 		}
 
+		configureDefaults();
+
 		if (networkService.checkReadiness())
 		{
 			splashService.status("Starting network");
@@ -259,4 +264,29 @@ private void syncAutoStart()
 			}
 		}
 	}
+
+	/**
+	 * Configures defaults that cannot be done on the database definition because
+	 * they depend on some runtime parameters. This is not called in UI client
+	 * only mode.
+	 */
+	private void configureDefaults()
+	{
+		if (!settingsService.hasIncomingDirectory() && dataDirConfiguration.getDataDir() != null) // Don't do it for tests
+		{
+			var incomingDirectory = Path.of(dataDirConfiguration.getDataDir(), "Incoming");
+			if (Files.notExists(incomingDirectory))
+			{
+				try
+				{
+					Files.createDirectory(incomingDirectory);
+				}
+				catch (IOException e)
+				{
+					throw new IllegalStateException("Couldn't create incoming directory: " + incomingDirectory + ", :" + e.getMessage());
+				}
+			}
+			settingsService.setIncomingDirectory(incomingDirectory.toString());
+		}
+	}
 }

app/src/main/java/io/xeres/app/database/model/settings/Settings.java

@@ -56,6 +56,8 @@ public class Settings
 
 	private boolean autoStartEnabled;
 
+	private String incomingDirectory;
+
 	protected Settings()
 	{
 	}
@@ -199,4 +201,14 @@ public void setAutoStartEnabled(boolean autoStartEnabled)
 	{
 		this.autoStartEnabled = autoStartEnabled;
 	}
+
+	public String getIncomingDirectory()
+	{
+		return incomingDirectory;
+	}
+
+	public void setIncomingDirectory(String incomingDirectory)
+	{
+		this.incomingDirectory = incomingDirectory;
+	}
 }

app/src/main/java/io/xeres/app/database/model/settings/SettingsMapper.java

@@ -43,7 +43,8 @@ public static SettingsDTO toDTO(Settings settings)
 				settings.isUpnpEnabled(),
 				settings.isBroadcastDiscoveryEnabled(),
 				settings.isDhtEnabled(),
-				settings.isAutoStartEnabled()
+				settings.isAutoStartEnabled(),
+				settings.getIncomingDirectory()
 		);
 	}
 
@@ -63,6 +64,7 @@ public static Settings fromDTO(SettingsDTO dto)
 		settings.setBroadcastDiscoveryEnabled(dto.broadcastDiscoveryEnabled());
 		settings.setDhtEnabled(dto.dhtEnabled());
 		settings.setAutoStartEnabled(dto.autoStartEnabled());
+		settings.setIncomingDirectory(dto.incomingDirectory());
 		return settings;
 	}
 }

app/src/main/java/io/xeres/app/service/SettingsService.java

@@ -24,6 +24,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.fge.jsonpatch.JsonPatch;
 import com.github.fge.jsonpatch.JsonPatchException;
+import io.micrometer.common.util.StringUtils;
 import io.xeres.app.application.events.SettingsChangedEvent;
 import io.xeres.app.database.model.settings.Settings;
 import io.xeres.app.database.model.settings.SettingsMapper;
@@ -265,4 +266,20 @@ public boolean isAutoStartEnabled()
 	{
 		return settings.isAutoStartEnabled();
 	}
+
+	public boolean hasIncomingDirectory()
+	{
+		return StringUtils.isNotEmpty(settings.getIncomingDirectory());
+	}
+
+	public String getIncomingDirectory()
+	{
+		return settings.getIncomingDirectory();
+	}
+
+	public void setIncomingDirectory(String directory)
+	{
+		settings.setIncomingDirectory(directory);
+		settingsRepository.save(settings);
+	}
 }

app/src/main/resources/db/migration/V00_0_2_202312151830__AddIncomingDirectory.sql

@@ -0,0 +1,4 @@
+--
+-- Add incoming directory to settings
+--
+ALTER TABLE settings ADD COLUMN incoming_directory VARCHAR(1024) DEFAULT NULL AFTER auto_start_enabled;

common/src/main/java/io/xeres/common/dto/settings/SettingsDTO.java

@@ -27,7 +27,8 @@ public record SettingsDTO(
 		boolean upnpEnabled,
 		boolean broadcastDiscoveryEnabled,
 		boolean dhtEnabled,
-		boolean autoStartEnabled
+		boolean autoStartEnabled,
+		String incomingDirectory
 )
 {
 }

common/src/testFixtures/java/io/xeres/common/dto/settings/SettingsDTOFakes.java

@@ -39,6 +39,7 @@ public static SettingsDTO create()
 				BooleanFakes.create(),
 				BooleanFakes.create(),
 				BooleanFakes.create(),
-				BooleanFakes.create());
+				BooleanFakes.create(),
+				"/foo/bar");
 	}
 }

ui/src/main/java/io/xeres/ui/controller/settings/SettingsTransferController.java

@@ -19,7 +19,9 @@
 
 package io.xeres.ui.controller.settings;
 
+import io.xeres.ui.JavaFxApplication;
 import io.xeres.ui.model.settings.Settings;
+import io.xeres.ui.support.util.TextFieldUtils;
 import io.xeres.ui.support.util.UiUtils;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -29,6 +31,9 @@
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
+import java.nio.file.Path;
+
+import static javafx.scene.control.Alert.AlertType.INFORMATION;
 
 @Component
 @FxmlView(value = "/view/settings/settings_transfer.fxml")
@@ -40,14 +45,23 @@ public class SettingsTransferController implements SettingsController
 	@FXML
 	private Button incomingDirectorySelector;
 
+	private Settings settings;
+
 	@Override
 	public void initialize() throws IOException
 	{
 		incomingDirectorySelector.setOnAction(event -> {
-			// XXX: this is all wrong. I cannot use that because the file system is actually REMOTE. have to write everything by hand (browsing, selection, etc...)
+			if (JavaFxApplication.isRemoteUiClient())
+			{
+				UiUtils.alert(INFORMATION, "Cannot chose a directory in remote mode");
+				return;
+			}
 			var directoryChooser = new DirectoryChooser();
 			directoryChooser.setTitle("Select Incoming Directory");
-			//directoryChooser.setInitialDirectory(Path.of()); ... how to get dataDir? have to ask the server... actually... the selection would be remote :) this is hard...
+			if (settings.hasIncomingDirectory())
+			{
+				directoryChooser.setInitialDirectory(Path.of(settings.getIncomingDirectory()).toFile());
+			}
 			var selectedDirectory = directoryChooser.showDialog(UiUtils.getWindow(event));
 			if (selectedDirectory != null && selectedDirectory.isDirectory())
 			{
@@ -59,12 +73,16 @@ public void initialize() throws IOException
 	@Override
 	public void onLoad(Settings settings)
 	{
+		this.settings = settings;
 
+		incomingDirectory.setText(settings.getIncomingDirectory());
 	}
 
 	@Override
 	public Settings onSave()
 	{
-		return null;
+		settings.setIncomingDirectory(TextFieldUtils.getString(incomingDirectory));
+
+		return settings;
 	}
 }

ui/src/main/java/io/xeres/ui/model/settings/Settings.java

@@ -19,6 +19,8 @@
 
 package io.xeres.ui.model.settings;
 
+import io.micrometer.common.util.StringUtils;
+
 public class Settings implements Cloneable
 {
 	private String torSocksHost;
@@ -35,6 +37,8 @@ public class Settings implements Cloneable
 
 	private boolean autoStartEnabled;
 
+	private String incomingDirectory;
+
 	public String getTorSocksHost()
 	{
 		return torSocksHost;
@@ -115,6 +119,21 @@ public void setAutoStartEnabled(boolean autoStartEnabled)
 		this.autoStartEnabled = autoStartEnabled;
 	}
 
+	public boolean hasIncomingDirectory()
+	{
+		return StringUtils.isNotEmpty(incomingDirectory);
+	}
+
+	public String getIncomingDirectory()
+	{
+		return incomingDirectory;
+	}
+
+	public void setIncomingDirectory(String incomingDirectory)
+	{
+		this.incomingDirectory = incomingDirectory;
+	}
+
 	@Override
 	public Settings clone()
 	{

ui/src/main/java/io/xeres/ui/model/settings/SettingsMapper.java

@@ -45,6 +45,7 @@ public static Settings fromDTO(SettingsDTO dto)
 		settings.setBroadcastDiscoveryEnabled(dto.broadcastDiscoveryEnabled());
 		settings.setDhtEnabled(dto.dhtEnabled());
 		settings.setAutoStartEnabled(dto.autoStartEnabled());
+		settings.setIncomingDirectory(dto.incomingDirectory());
 		return settings;
 	}
 
@@ -63,7 +64,8 @@ public static SettingsDTO toDTO(Settings settings)
 				settings.isUpnpEnabled(),
 				settings.isBroadcastDiscoveryEnabled(),
 				settings.isDhtEnabled(),
-				settings.isAutoStartEnabled()
+				settings.isAutoStartEnabled(),
+				settings.getIncomingDirectory()
 		);
 	}
 }