summaryrefslogtreecommitdiff
path: root/libs/sftp/src
diff options
context:
space:
mode:
Diffstat (limited to 'libs/sftp/src')
-rw-r--r--libs/sftp/src/main/java/org/the_jk/cleversync/io/sftp/SftpConnection.kt53
-rw-r--r--libs/sftp/src/main/java/org/the_jk/cleversync/io/sftp/SftpDirectory.kt23
-rw-r--r--libs/sftp/src/main/java/org/the_jk/cleversync/io/sftp/SftpLink.kt5
3 files changed, 25 insertions, 56 deletions
diff --git a/libs/sftp/src/main/java/org/the_jk/cleversync/io/sftp/SftpConnection.kt b/libs/sftp/src/main/java/org/the_jk/cleversync/io/sftp/SftpConnection.kt
index 706116b..9f05138 100644
--- a/libs/sftp/src/main/java/org/the_jk/cleversync/io/sftp/SftpConnection.kt
+++ b/libs/sftp/src/main/java/org/the_jk/cleversync/io/sftp/SftpConnection.kt
@@ -1,6 +1,7 @@
package org.the_jk.cleversync.io.sftp
import android.net.Uri
+import org.the_jk.cleversync.PathUtils
internal class SftpConnection(uri: Uri, credentials: SftpCredentials) {
val description = uri.toString()
@@ -29,22 +30,22 @@ internal class SftpConnection(uri: Uri, credentials: SftpCredentials) {
}
fun openDir(path: String): NativeSftp.Dir? =
- sftpSession?.openDir(join(baseDir, path))
+ sftpSession?.openDir(PathUtils.join(baseDir, path))
fun entry(path: String, followLink: Boolean = true): NativeSftp.DirEntry? =
- sftpSession?.stat(join(baseDir, path), followLink)
+ sftpSession?.stat(PathUtils.join(baseDir, path), followLink)
fun makeDir(path: String): Boolean =
- sftpSession?.makeDir(join(baseDir, path), 511 /* 0777 */) ?: false
+ sftpSession?.makeDir(PathUtils.join(baseDir, path), 511 /* 0777 */) ?: false
fun removeDir(path: String): Boolean =
- sftpSession?.removeDir(join(baseDir, path)) ?: false
+ sftpSession?.removeDir(PathUtils.join(baseDir, path)) ?: false
fun unlink(path: String): Boolean =
- sftpSession?.unlink(join(baseDir, path)) ?: false
+ sftpSession?.unlink(PathUtils.join(baseDir, path)) ?: false
fun readLink(path: String): String? {
- val target = sftpSession?.readlink(join(baseDir, path))
+ val target = sftpSession?.readlink(PathUtils.join(baseDir, path))
if (target?.startsWith(baseDir) == true) {
return target.substring(baseDir.length + 1)
}
@@ -55,13 +56,13 @@ internal class SftpConnection(uri: Uri, credentials: SftpCredentials) {
val relativeTarget = if (rawTarget) {
target
} else {
- join(baseDir, target)
+ PathUtils.join(baseDir, target)
}
- return sftpSession?.symlink(relativeTarget, join(baseDir, path)) ?: false
+ return sftpSession?.symlink(relativeTarget, PathUtils.join(baseDir, path)) ?: false
}
fun openFile(path: String, mode: NativeSftp.OpenMode): NativeSftp.File? =
- sftpSession?.openFile(join(baseDir, path), mode)
+ sftpSession?.openFile(PathUtils.join(baseDir, path), mode)
override fun toString() = description
@@ -94,39 +95,5 @@ internal class SftpConnection(uri: Uri, credentials: SftpCredentials) {
companion object {
private const val DEFAULT_PORT = 22
-
- fun join(a: String, b: String): String {
- if (a.isEmpty() || b.startsWith("/")) return b
- if (b.isEmpty()) return a
- return if (a.endsWith("/")) a + b else "${a}/${b}"
- }
-
- fun dirname(path: String): String {
- var start = path.lastIndex
- while (start > -1 && path[start] == '/') start--;
- if (start > -1) {
- val index = path.lastIndexOf('/', startIndex = start)
- if (index > -1) return path.substring(0, index)
- }
- return ""
- }
-
- fun resolve(path: String): String {
- val parts = path.split('/').filterIndexed { index, part ->
- index == 0 || (part.isNotEmpty() && part != ".")
- }.toMutableList()
- var i = 1
- while (i < parts.size) {
- if (parts[i] == "..") {
- parts.removeAt(i)
- if (parts[i].isNotEmpty()) {
- parts.removeAt(i - 1)
- }
- } else {
- i++
- }
- }
- return parts.joinToString("/")
- }
}
}
diff --git a/libs/sftp/src/main/java/org/the_jk/cleversync/io/sftp/SftpDirectory.kt b/libs/sftp/src/main/java/org/the_jk/cleversync/io/sftp/SftpDirectory.kt
index d547471..90a3127 100644
--- a/libs/sftp/src/main/java/org/the_jk/cleversync/io/sftp/SftpDirectory.kt
+++ b/libs/sftp/src/main/java/org/the_jk/cleversync/io/sftp/SftpDirectory.kt
@@ -5,6 +5,7 @@ import android.os.Looper
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.map
+import org.the_jk.cleversync.PathUtils
import org.the_jk.cleversync.io.Directory
import org.the_jk.cleversync.io.File
import org.the_jk.cleversync.io.ModifiableDirectory
@@ -55,21 +56,21 @@ internal open class SftpDirectory(
}
override fun modifiableOpenDir(name: String): ModifiableDirectory? {
- val newPath = SftpConnection.join(path, name)
+ val newPath = PathUtils.join(path, name)
val entry = conn.entry(newPath) ?: return null
if (entry.type != NativeSftp.DirEntryType.DIR) return null
return SftpDirectory(conn, newPath, name)
}
override fun modifiableOpenFile(name: String): ModifiableFile? {
- val newPath = SftpConnection.join(path, name)
+ val newPath = PathUtils.join(path, name)
val entry = conn.entry(newPath) ?: return null
if (entry.type != NativeSftp.DirEntryType.FILE) return null
return SftpFile(conn, newPath, name, entry.size, entry.lastModified)
}
override fun modifiableOpenLink(name: String): ModifiableLink? {
- val newPath = SftpConnection.join(path, name)
+ val newPath = PathUtils.join(path, name)
val entry = conn.entry(newPath, followLink = false) ?: return null
if (entry.type != NativeSftp.DirEntryType.LINK) return null
return SftpLink(conn, newPath, name)
@@ -82,7 +83,7 @@ internal open class SftpDirectory(
val dir = conn.openDir(path)
if (dir != null) {
dir.list().forEach { entry ->
- val entryPath = SftpConnection.join(path, entry.name)
+ val entryPath = PathUtils.join(path, entry.name)
when (entry.type) {
NativeSftp.DirEntryType.DIR -> {
directories.add(SftpDirectory(conn, entryPath, entry.name))
@@ -103,13 +104,13 @@ internal open class SftpDirectory(
override fun modifiableLiveList() = modifiableLiveContent
override fun createDirectory(name: String): ModifiableDirectory {
- val newPath = SftpConnection.join(path, name)
+ val newPath = PathUtils.join(path, name)
if (!conn.makeDir(newPath)) throw IOException(conn.error)
return SftpDirectory(conn, newPath, name)
}
override fun createFile(name: String): ModifiableFile {
- val newPath = SftpConnection.join(path, name)
+ val newPath = PathUtils.join(path, name)
return SftpFile(conn, newPath, name, 0UL, Instant.EPOCH, Instant.EPOCH)
}
@@ -126,13 +127,13 @@ internal open class SftpDirectory(
}
private fun createLink(name: String, target: String, rawTarget: Boolean): ModifiableLink {
- val newPath = SftpConnection.join(path, name)
+ val newPath = PathUtils.join(path, name)
if (!conn.symlink(target, rawTarget, newPath)) throw IOException(conn.error)
return SftpLink(conn, newPath, name)
}
override fun removeDirectory(name: String): Boolean {
- val removePath = SftpConnection.join(path, name)
+ val removePath = PathUtils.join(path, name)
val entry = conn.entry(removePath) ?: return false
if (entry.type != NativeSftp.DirEntryType.DIR) return false
return removeRecursive(removePath)
@@ -142,7 +143,7 @@ internal open class SftpDirectory(
val dir = conn.openDir(removePath) ?: return false
try {
dir.list().forEach { entry ->
- val entryPath = SftpConnection.join(removePath, entry.name)
+ val entryPath = PathUtils.join(removePath, entry.name)
if (!when (entry.type) {
NativeSftp.DirEntryType.FILE,
NativeSftp.DirEntryType.LINK,
@@ -160,14 +161,14 @@ internal open class SftpDirectory(
}
override fun removeFile(name: String): Boolean {
- val removePath = SftpConnection.join(path, name)
+ val removePath = PathUtils.join(path, name)
val entry = conn.entry(removePath) ?: return false
if (entry.type != NativeSftp.DirEntryType.FILE) return false
return conn.unlink(removePath)
}
override fun removeLink(name: String): Boolean {
- val removePath = SftpConnection.join(path, name)
+ val removePath = PathUtils.join(path, name)
val entry = conn.entry(removePath, followLink = false) ?: return false
if (entry.type != NativeSftp.DirEntryType.LINK) return false
return conn.unlink(removePath)
diff --git a/libs/sftp/src/main/java/org/the_jk/cleversync/io/sftp/SftpLink.kt b/libs/sftp/src/main/java/org/the_jk/cleversync/io/sftp/SftpLink.kt
index c2259ac..a922e26 100644
--- a/libs/sftp/src/main/java/org/the_jk/cleversync/io/sftp/SftpLink.kt
+++ b/libs/sftp/src/main/java/org/the_jk/cleversync/io/sftp/SftpLink.kt
@@ -1,5 +1,6 @@
package org.the_jk.cleversync.io.sftp
+import org.the_jk.cleversync.PathUtils
import org.the_jk.cleversync.io.Directory
import org.the_jk.cleversync.io.ModifiableLink
import org.the_jk.cleversync.io.File
@@ -65,8 +66,8 @@ internal class SftpLink(
var entry: NativeSftp.DirEntry? = null
while (true) {
val target = conn.readLink(linkPath) ?: break
- linkPath = SftpConnection.resolve(
- SftpConnection.join(SftpConnection.dirname(linkPath), target),
+ linkPath = PathUtils.resolve(
+ PathUtils.join(PathUtils.dirname(linkPath), target),
)
if (!paths.add(linkPath)) break
entry = conn.entry(linkPath, followLink = false) ?: break
generated by cgit v1.2.3-70-g09d2 (git 2.52.0) at 2025-12-07 12:56:55 +0000