feat: copy api and file browser ui tweaks

Author: bajrangCoder

src/fileSystem/sftp.js

@@ -226,35 +226,77 @@ class SftpClient {
 		});
 	}
 
-	copyTo(dest) {
+	async copyTo(dest) {
 		const src = this.#path;
 		return new Promise((resolve, reject) => {
 			sftp.isConnected((connectionID) => {
 				(async () => {
-					if (this.#notConnected(connectionID)) {
-						try {
+					try {
+						if (this.#notConnected(connectionID)) {
 							await this.connect();
-						} catch (error) {
-							reject(error);
-							return;
 						}
+
+						const srcStat = await this.stat();
+
+						if (srcStat.isDirectory) {
+							await this.#copyDirectory(src, dest);
+						} else {
+							await this.#copyFile(src, dest);
+						}
+
+						const finalPath = Path.join(dest, Path.basename(src));
+						resolve(Url.join(this.#base, finalPath));
+					} catch (error) {
+						reject(error);
 					}
-					console.log(this.#safeName(src), this.#safeName(dest));
-					sftp.copy(
-						this.#safeName(src),
-						this.#safeName(dest),
-						async (_res) => {
-							resolve(Url.join(this.#base, dest));
-						},
-						(err) => {
-							reject(err);
-						},
-					);
 				})();
 			}, reject);
 		});
 	}
 
+	async #copyFile(src, dest) {
+		const destPath = Path.join(dest, Path.basename(src));
+		const tempFile = this.#getLocalname(src);
+
+		// Download source file
+		await new Promise((resolve, reject) => {
+			sftp.getFile(this.#safeName(src), tempFile, resolve, reject);
+		});
+
+		// Upload
+		await new Promise((resolve, reject) => {
+			sftp.putFile(this.#safeName(destPath), tempFile, resolve, reject);
+		});
+
+		// Clean up temp file
+		try {
+			await internalFs.delete(tempFile);
+		} catch (error) {
+			console.warn("Failed to cleanup temp file:", error);
+		}
+	}
+
+	async #copyDirectory(src, dest) {
+		// Create destination directory
+		const destDir = Path.join(dest, Path.basename(src));
+		await new Promise((resolve, reject) => {
+			sftp.mkdir(this.#safeName(destDir), resolve, reject);
+		});
+
+		// Get contents of source directory
+		const contents = await this.lsDir(src);
+
+		// Copy all items
+		for (const item of contents) {
+			const itemSrc = Path.join(src, item.name);
+			if (item.isDirectory) {
+				await this.#copyDirectory(itemSrc, destDir);
+			} else {
+				await this.#copyFile(itemSrc, destDir);
+			}
+		}
+	}
+
 	moveTo(dest) {
 		return this.rename(dest, true);
 	}
@@ -569,11 +611,9 @@ Sftp.test = (url) => /^sftp:/.test(url);
 function createFs(sftp) {
 	return {
 		lsDir() {
-			console.log("lsdir");
 			return sftp.lsDir();
 		},
 		async readFile(encoding) {
-			console.log("readfile");
 			const { data } = await sftp.readFile();
 
 			if (encoding) {
@@ -583,45 +623,36 @@ function createFs(sftp) {
 			return data;
 		},
 		async writeFile(content, encoding) {
-			console.log("writeFile");
 			if (typeof content === "string" && encoding) {
 				content = await encode(content, encoding);
 			}
 
 			return sftp.writeFile(content, null);
 		},
 		createFile(name, data) {
-			console.log("createfile");
 			return sftp.createFile(name, data);
 		},
 		createDirectory(name) {
-			console.log("dir");
 			return sftp.createDir(name);
 		},
 		delete() {
-			console.log("delete");
 			return sftp.delete();
 		},
 		copyTo(dest) {
-			console.log("copy");
 			dest = Url.pathname(dest);
 			return sftp.copyTo(dest);
 		},
 		moveTo(dest) {
-			console.log("move");
 			dest = Url.pathname(dest);
 			return sftp.moveTo(dest);
 		},
 		renameTo(newname) {
-			console.log("rename");
 			return sftp.rename(newname);
 		},
 		exists() {
-			console.log("exists");
 			return sftp.exists();
 		},
 		stat() {
-			console.log("stat");
 			return sftp.stat();
 		},
 		get localName() {

src/pages/fileBrowser/fileBrowser.scss

@@ -53,13 +53,25 @@
     }
     &.symlink {
       .icon {
-        color: rgb(255, 165, 0);
+        position: relative;
+        color: var(--link-text-color);
+        &::after {
+          content: "🔗";
+          position: absolute;
+          bottom: 13px;
+          right: 10px;
+          font-size: 0.4em;
+          color: inherit;
+        }
       }
 
-      .text::after {
-        content: " (symlink)";
-        font-size: 0.8em;
-        color: rgb(255, 165, 0);
+      .text {
+        color: var(--link-text-color);
+        &::after {
+          content: " (symlink)";
+          font-size: 0.8em;
+          color: color-mix(in srgb, var(--primary-text-color) 60%, transparent);
+        }
       }
     }
   }

src/plugins/sftp/src/com/foxdebug/sftp/Sftp.java

@@ -589,73 +589,6 @@ public void run() {
       );
   }
 
-  public void copy(JSONArray args, CallbackContext callback) {
-    cordova
-      .getThreadPool()
-      .execute(
-        new Runnable() {
-          public void run() {
-            try {
-              String source = args.optString(0);
-              String destination = args.optString(1);
-
-              if (ssh != null && sftp != null) {
-                try {
-                  SftpFileAttributes sourceAttrs = sftp.stat(source);
-
-                  if (sourceAttrs.isFile()) {
-                    // file copy
-                    try (java.io.InputStream in = sftp.getInputStream(source)) {
-                      sftp.put(in, destination);
-                    }
-                  } else if (sourceAttrs.isDirectory()) {
-                    // directory copy
-                    sftp.mkdir(destination);
-
-                    for (SftpFile file : sftp.ls(source)) {
-                      String filename = file.getFilename();
-                      if (!filename.equals(".") && !filename.equals("..")) {
-                        String sourcePath = source + "/" + filename;
-                        String destPath = destination + "/" + filename;
-
-                        if (file.getAttributes().isDirectory()) {
-                          // Recursively copy subdirectories
-                          JSONArray subDirArgs = new JSONArray();
-                          subDirArgs.put(sourcePath);
-                          subDirArgs.put(destPath);
-                          copy(subDirArgs, callback);
-                        } else {
-                          // Copy files within directory
-                          try (
-                            java.io.InputStream in = sftp.getInputStream(
-                              sourcePath
-                            )
-                          ) {
-                            sftp.put(in, destPath);
-                          }
-                        }
-                      }
-                    }
-                  }
-
-                  callback.success();
-                  return;
-                } catch (SftpStatusException e) {
-                  callback.error("Source does not exist: " + errMessage(e));
-                  return;
-                }
-              }
-              callback.error("Not connected");
-            } catch (
-              SshException | IOException | TransferCancelledException e
-            ) {
-              callback.error(errMessage(e));
-            }
-          }
-        }
-      );
-  }
-
   public void pwd(JSONArray args, CallbackContext callback) {
     cordova
       .getThreadPool()

src/plugins/sftp/www/sftp.js

@@ -42,9 +42,6 @@ module.exports = {
   rename: function (oldpath, newpath, onSuccess, onFail) {
     cordova.exec(onSuccess, onFail, 'Sftp', 'rename', [oldpath, newpath]);
   },
-  copy: function (source, destination, onSuccess, onFail) {
-    cordova.exec(onSuccess, onFail, 'Sftp', 'copy', [source, destination]);
-  },
   pwd: function (onSuccess, onFail) {
     cordova.exec(onSuccess, onFail, 'Sftp', 'pwd', []);
   },