Refactoring for better file handling

convex-cli/src/main/java/convex/cli/Helpers.java

@@ -2,8 +2,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.security.GeneralSecurityException;
 import java.util.ArrayList;
 import java.util.List;

convex-cli/src/main/java/convex/cli/Main.java

@@ -282,9 +282,10 @@ public char[] getKeyPassword() {
 	 * Gets the keystore file name currently used for the CLI
 	 * @return File name, or null if not specified
 	 */
-	public String getKeyStoreFilename() {
+	public File getKeyStoreFile() {
 		if ( keyStoreFilename != null) {
-			return Helpers.expandTilde(keyStoreFilename).strip();
+			File f= Utils.getPath(keyStoreFilename);
+			return f;
 		}
 		return null;
 	}
@@ -318,7 +319,7 @@ public KeyStore loadKeyStore()  {
 	 * @return KeyStore instance, or null if does not exist
 	 */
 	public KeyStore loadKeyStore(boolean isCreate, char[] password)  {
-		File keyFile = new File(getKeyStoreFilename());
+		File keyFile = getKeyStoreFile();
 		try {
 			if (keyFile.exists()) {
 				keyStore = PFXTools.loadStore(keyFile, password);
@@ -358,7 +359,7 @@ public AKeyPair loadKeyFromStore(String publicKey) {
 
 		char[] storePassword=getStorePassword();
 
-		File keyFile = new File(getKeyStoreFilename());
+		File keyFile = getKeyStoreFile();
 		try {
 			if (!keyFile.exists()) {
 				throw new CLIError("Cannot find keystore file "+keyFile.getCanonicalPath());
@@ -431,7 +432,7 @@ public void saveKeyStore(char[] storePassword) {
 		// save the keystore file
 		if (keyStore==null) throw new CLIError("Trying to save a keystore that has not been loaded!");
 		try {
-			PFXTools.saveStore(keyStore, new File(getKeyStoreFilename()), storePassword);
+			PFXTools.saveStore(keyStore, getKeyStoreFile(), storePassword);
 		} catch (Throwable t) {
 			throw Utils.sneakyThrow(t);
 		}

convex-cli/src/main/java/convex/cli/peer/APeerCommand.java

@@ -1,20 +1,12 @@
 package convex.cli.peer;
 
-import convex.cli.Helpers;
 import convex.cli.Main;
 import picocli.CommandLine.ParentCommand;
 
 public abstract class APeerCommand implements Runnable {
 
 	@ParentCommand
 	private Peer peerParent;
-
-	public String getEtchStoreFilename() {
-		if ( peerParent.etchStoreFilename != null) {
-			return Helpers.expandTilde(peerParent.etchStoreFilename).strip();
-		}
-		return null;
-	}
 
 	protected Main cli() {
 		return peerParent.cli();

convex-cli/src/main/java/convex/cli/peer/PeerCreate.java

@@ -88,7 +88,7 @@ public void run() {
 			// save the new keypair in the keystore
 			PFXTools.setKeyPair(keyStore, keyPair, mainParent.getKeyPassword());
 
-			File keyFile = new File(mainParent.getKeyStoreFilename());
+			File keyFile = mainParent.getKeyStoreFile();
 
 			// save the store to a file
 			PFXTools.saveStore(keyStore, keyFile, mainParent.getStorePassword());

convex-core/src/main/java/convex/core/util/Utils.java

@@ -77,26 +77,34 @@ public static BigInteger toSignedBigInteger(byte[] data) {
 	}
 
 	/**
-	 * Create a path if necessary to a File object. Interprets leading "~" as user home directory
+	 * Create a path if necessary to a File object. Interprets leading "~" as user home directory.
 	 *
 	 * @param file File object to see if the path part of the filename exists, if not then create it.
 	 * @return target File, as an absolute path, with parent directories created recursively if needed
 	 * @throws IOException 
 	 */
 	public static File ensurePath(File file) throws IOException {
-		String path=file.getPath();
-		if (path!=null && path.startsWith("~")) {
-			path=System.getProperty("user.home")+path.substring(1);
-		} else {
-			path=file.getAbsolutePath();
-		}
-
 		// Get path of parent directory, using absolute path (may be current working directory user.dir)
-		File target=new File(path);
+		File target=getPath(file.getPath());
 		String dirPath=target.getParent();
 		Files.createDirectories(Path.of(dirPath));
 		return target;
 	}
+
+	/**
+	 * Gets the absolute path File for a given file name. Interprets leading "~" as user home directory.
+	 * @param filename
+	 * @return
+	 */
+	public static File getPath(String path) {
+		if (path!=null && path.startsWith("~")) {
+			path=System.getProperty("user.home")+path.substring(1);
+			return new File(path);
+		} else {
+			path=new File(path).getAbsolutePath();
+			return new File(path);
+		}
+	}
 
 	/**
 	 * Converts an int to a hex string e.g. "80cafe80"