diff options
Diffstat (limited to 'app/src/main/java')
6 files changed, 47 insertions, 18 deletions
diff --git a/app/src/main/java/org/the_jk/cleversync/io/Link.kt b/app/src/main/java/org/the_jk/cleversync/io/Link.kt index 3ecf5e6..c05f29e 100644 --- a/app/src/main/java/org/the_jk/cleversync/io/Link.kt +++ b/app/src/main/java/org/the_jk/cleversync/io/Link.kt @@ -7,7 +7,7 @@ interface Link { sealed class LinkTarget - class DirectoryTarget(val directory: Directory): LinkTarget() - class FileTarget(val file: File): LinkTarget() + data class DirectoryTarget(val directory: Directory): LinkTarget() + data class FileTarget(val file: File): LinkTarget() data object NoTarget: LinkTarget() } diff --git a/app/src/main/java/org/the_jk/cleversync/io/ModifiableDirectory.kt b/app/src/main/java/org/the_jk/cleversync/io/ModifiableDirectory.kt index 32d288a..8bddc2c 100644 --- a/app/src/main/java/org/the_jk/cleversync/io/ModifiableDirectory.kt +++ b/app/src/main/java/org/the_jk/cleversync/io/ModifiableDirectory.kt @@ -12,6 +12,8 @@ interface ModifiableDirectory : Directory { fun createDirectory(name: String): ModifiableDirectory fun createFile(name: String): ModifiableFile + fun createLink(name: String, target: Directory): ModifiableLink + fun createLink(name: String, target: File): ModifiableLink fun createLink(name: String, target: String): ModifiableLink fun removeDirectory(name: String): Boolean diff --git a/app/src/main/java/org/the_jk/cleversync/io/ModifiableLink.kt b/app/src/main/java/org/the_jk/cleversync/io/ModifiableLink.kt index a20bb6a..7dd565b 100644 --- a/app/src/main/java/org/the_jk/cleversync/io/ModifiableLink.kt +++ b/app/src/main/java/org/the_jk/cleversync/io/ModifiableLink.kt @@ -3,13 +3,13 @@ package org.the_jk.cleversync.io interface ModifiableLink : Link { fun modifiableResolve(): ModifiableLinkTarget - fun target(directory: Directory) = target(directory.name) - fun target(file: File) = target(file.name) + fun target(directory: Directory) + fun target(file: File) fun target(name: String) sealed class ModifiableLinkTarget - class ModifiableDirectoryTarget(val directory: ModifiableDirectory): ModifiableLinkTarget() - class ModifiableFileTarget(val file: ModifiableFile): ModifiableLinkTarget() - data object ModifiableNoTarget: ModifiableLinkTarget() + data class ModifiableDirectoryTarget(val directory: ModifiableDirectory): ModifiableLinkTarget() + data class ModifiableFileTarget(val file: ModifiableFile): ModifiableLinkTarget() + data object NoTarget: ModifiableLinkTarget() } diff --git a/app/src/main/java/org/the_jk/cleversync/io/impl/PathDirectory.kt b/app/src/main/java/org/the_jk/cleversync/io/impl/PathDirectory.kt index 730e048..55bed6a 100644 --- a/app/src/main/java/org/the_jk/cleversync/io/impl/PathDirectory.kt +++ b/app/src/main/java/org/the_jk/cleversync/io/impl/PathDirectory.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.map import org.the_jk.cleversync.io.Directory +import org.the_jk.cleversync.io.File import org.the_jk.cleversync.io.ModifiableDirectory import org.the_jk.cleversync.io.ModifiableFile import org.the_jk.cleversync.io.ModifiableLink @@ -25,7 +26,7 @@ import kotlin.io.path.readSymbolicLink @OptIn(ExperimentalPathApi::class) internal open class PathDirectory( - private val path: Path, + internal val path: Path, private val pathWatcher: PathWatcher, ) : ModifiableDirectory { private val watcher: DirectoryWatcher by lazy { @@ -51,7 +52,7 @@ internal open class PathDirectory( if (path.isDirectory(LinkOption.NOFOLLOW_LINKS)) return PathDirectory(path, pathWatcher) if (path.isSymbolicLink()) { val target = path.readSymbolicLink() - if (target.isDirectory()) return PathDirectory(target, pathWatcher) + if (target.isDirectory()) return PathDirectory(target.toRealPath(), pathWatcher) } return null } @@ -61,7 +62,7 @@ internal open class PathDirectory( if (path.isRegularFile(LinkOption.NOFOLLOW_LINKS)) return PathFile(path) if (path.isSymbolicLink()) { val target = path.readSymbolicLink() - if (target.isRegularFile()) return PathFile(target) + if (target.isRegularFile()) return PathFile(target.toRealPath()) } return null } @@ -84,9 +85,20 @@ internal open class PathDirectory( return PathFile(path) } + override fun createLink(name: String, target: Directory): ModifiableLink { + val path = path.resolve(name) + return PathLink(path.createSymbolicLinkPointingTo((target as PathDirectory).path), pathWatcher) + } + + override fun createLink(name: String, target: File): ModifiableLink { + val path = path.resolve(name) + return PathLink(path.createSymbolicLinkPointingTo((target as PathFile).path), pathWatcher) + } + override fun createLink(name: String, target: String): ModifiableLink { + val targetPath = path.resolve(target) val path = path.resolve(name) - return PathLink(path.createSymbolicLinkPointingTo(path.resolve(target)), pathWatcher) + return PathLink(path.createSymbolicLinkPointingTo(targetPath), pathWatcher) } override fun removeDirectory(name: String): Boolean { @@ -123,6 +135,7 @@ internal open class PathDirectory( override fun equals(other: Any?) = other is PathDirectory && other.path == path override fun hashCode() = path.hashCode() + override fun toString() = path.toString() private inner class DirectoryWatcher : PathWatcher.Delegate { val content: LiveData<ModifiableDirectory.Content> diff --git a/app/src/main/java/org/the_jk/cleversync/io/impl/PathFile.kt b/app/src/main/java/org/the_jk/cleversync/io/impl/PathFile.kt index 2ccc37c..9a8d160 100644 --- a/app/src/main/java/org/the_jk/cleversync/io/impl/PathFile.kt +++ b/app/src/main/java/org/the_jk/cleversync/io/impl/PathFile.kt @@ -16,7 +16,7 @@ import kotlin.io.path.inputStream import kotlin.io.path.name import kotlin.io.path.outputStream -internal class PathFile(private val path: Path) : ModifiableFile { +internal class PathFile(internal val path: Path) : ModifiableFile { override fun write(): OutputStream { // If file doesn't exist, write to it directly. if (!path.exists(LinkOption.NOFOLLOW_LINKS)) @@ -62,4 +62,5 @@ internal class PathFile(private val path: Path) : ModifiableFile { override fun equals(other: Any?) = other is PathFile && other.path == path override fun hashCode() = path.hashCode() + override fun toString() = path.toString() } diff --git a/app/src/main/java/org/the_jk/cleversync/io/impl/PathLink.kt b/app/src/main/java/org/the_jk/cleversync/io/impl/PathLink.kt index 5d11228..9ae8b51 100644 --- a/app/src/main/java/org/the_jk/cleversync/io/impl/PathLink.kt +++ b/app/src/main/java/org/the_jk/cleversync/io/impl/PathLink.kt @@ -1,5 +1,7 @@ package org.the_jk.cleversync.io.impl +import org.the_jk.cleversync.io.Directory +import org.the_jk.cleversync.io.File import org.the_jk.cleversync.io.Link import org.the_jk.cleversync.io.ModifiableLink import java.nio.file.Path @@ -17,17 +19,27 @@ internal class PathLink( override fun modifiableResolve(): ModifiableLink.ModifiableLinkTarget { val target = path.readSymbolicLink() return if (target.isDirectory()) { - ModifiableLink.ModifiableDirectoryTarget(PathDirectory(target, pathWatcher)) + ModifiableLink.ModifiableDirectoryTarget(PathDirectory(target.toRealPath(), pathWatcher)) } else if (target.isRegularFile()) { - ModifiableLink.ModifiableFileTarget(PathFile(target)) + ModifiableLink.ModifiableFileTarget(PathFile(target.toRealPath())) } else { - ModifiableLink.ModifiableNoTarget + ModifiableLink.NoTarget } } + override fun target(directory: Directory) { + path.deleteIfExists() + path.createSymbolicLinkPointingTo((directory as PathDirectory).path) + } + + override fun target(file: File) { + path.deleteIfExists() + path.createSymbolicLinkPointingTo((file as PathFile).path) + } + override fun target(name: String) { path.deleteIfExists() - path.createSymbolicLinkPointingTo(path.resolve(name)) + path.createSymbolicLinkPointingTo(path.parent.resolve(name)) } override val name: String @@ -35,13 +47,14 @@ internal class PathLink( override fun equals(other: Any?) = other is PathLink && other.path == path override fun hashCode() = path.hashCode() + override fun toString() = path.toString() override fun resolve(): Link.LinkTarget { val target = path.readSymbolicLink() return if (target.isDirectory()) { - Link.DirectoryTarget(PathDirectory(target, pathWatcher)) + Link.DirectoryTarget(PathDirectory(target.toRealPath(), pathWatcher)) } else if (target.isRegularFile()) { - Link.FileTarget(PathFile(target)) + Link.FileTarget(PathFile(target.toRealPath())) } else { Link.NoTarget } |